ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-05-29 21:54:26 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-2963: Update the Deterministic Java API artifacts. (#5637)

Browse Source 
* CORDA-2963: Restore FileChannel to deterministic-rt but still remove it from the API artifact.

* CORDA-2963: Restore stub ObjectStream classes to deterministic-rt but still remove them from the API artifact.

* CORDA-2963: Add currency.data to deterministic-rt.jar as a resource.

* CORDA-2963: Add tzdb.dat to deterministic-rt.jar as a resource.

* CORDA-3326: Restore supported java.util.concurrent.* classes to the API artifact.
This commit is contained in:
Chris Rankin 2019-10-25 10:39:56 +01:00 committed by Rick Parker
parent 6e43bc1db6
commit bcba66f95d
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
create-jdk8u/Makefile
View File

@ -12,7 +12,7 @@ jdk8u/build/%/spec.gmk: jdk8u/common/autoconf/configure
jdk-image: jdk8u/build/linux-x86_64-normal-server-release/spec.gmk jdk-image: jdk8u/build/linux-x86_64-normal-server-release/spec.gmk
$(MAKE) -C jdk8u images docs $(MAKE) -C jdk8u images docs
all: libs/rt.jar libs/jce.jar libs/jsse.jar all: libs/rt.jar libs/jce.jar libs/jsse.jar libs/currency.data libs/tzdb.dat
clean: clean:
$(MAKE) -C jdk8u clean $(MAKE) -C jdk8u clean
@ -20,6 +20,6 @@ clean:
libs: libs:
mkdir $@ mkdir $@
libs/rt.jar libs/jce.jar libs/jsse.jar: libs jdk-image libs/rt.jar libs/jce.jar libs/jsse.jar libs/currency.data libs/tzdb.dat: libs jdk-image
cp -f jdk8u/build/*/images/j2re-image/lib/$(@F) $@ cp -f jdk8u/build/*/images/j2re-image/lib/$(@F) $@

31
create-jdk8u/build.gradle
View File

@ -50,9 +50,11 @@ task runtimeJar(type: Jar, dependsOn: makeJdk) {
baseName 'deterministic-rt' baseName 'deterministic-rt'
inputs.dir "libs" inputs.dir "libs"
from(zipTree("libs/rt.jar")) from(zipTree('libs/rt.jar'))
from(zipTree("libs/jce.jar")) from(zipTree('libs/jce.jar'))
from(zipTree("libs/jsse.jar")) from(zipTree('libs/jsse.jar'))
from 'libs/currency.data'
from 'libs/tzdb.dat'
reproducibleFileOrder = true reproducibleFileOrder = true
includeEmptyDirs = false includeEmptyDirs = false
@ -102,16 +104,37 @@ task apiJar(type: Jar, dependsOn: runtimeJar) {
exclude 'java/io/FileReader*.class' exclude 'java/io/FileReader*.class'
exclude 'java/io/FileSystem*.class' exclude 'java/io/FileSystem*.class'
exclude 'java/io/File*Stream*.class' exclude 'java/io/File*Stream*.class'
exclude 'java/io/ObjectInputStream*.class'
exclude 'java/io/ObjectOutputStream*.class'
exclude 'java/io/ObjectStreamClass.class'
exclude 'java/io/ObjectStreamConstants.class'
exclude 'java/io/ObjectStreamField.class'
exclude 'java/net/*Content*.class' exclude 'java/net/*Content*.class'
exclude 'java/net/Host*.class' exclude 'java/net/Host*.class'
exclude 'java/net/Inet*.class' exclude 'java/net/Inet*.class'
exclude 'java/nio/channels/FileChannel*.class'
exclude 'java/nio/channels/spi/'
exclude 'java/nio/file/Path.class' exclude 'java/nio/file/Path.class'
exclude 'java/nio/file/attribute/' exclude 'java/nio/file/attribute/'
exclude 'java/util/SplittableRandom*.class' exclude 'java/util/SplittableRandom*.class'
exclude 'java/util/Random.class' exclude 'java/util/Random.class'
exclude 'java/util/Random$*.class' exclude 'java/util/Random$*.class'
exclude 'java/util/WeakHashMap*.class' exclude 'java/util/WeakHashMap*.class'
exclude 'java/util/concurrent/*.class' exclude 'java/util/concurrent/Blocking*.class'
exclude 'java/util/concurrent/CompletionService.class'
exclude 'java/util/concurrent/CompletionStage.class'
exclude 'java/util/concurrent/ConcurrentLinked*.class'
exclude 'java/util/concurrent/ConcurrentNavigable*.class'
exclude 'java/util/concurrent/CopyOnWrite*.class'
exclude 'java/util/concurrent/*Executor*.class'
exclude 'java/util/concurrent/Future*.class'
exclude 'java/util/concurrent/Linked*.class'
exclude 'java/util/concurrent/RejectedExecution*.class'
exclude 'java/util/concurrent/Runnable*.class'
exclude 'java/util/concurrent/Semaphore*.class'
exclude 'java/util/concurrent/Synchronous*.class'
exclude 'java/util/concurrent/Thread*.class'
exclude 'java/util/concurrent/TransferQueue.class'
exclude 'java/util/concurrent/locks/' exclude 'java/util/concurrent/locks/'
exclude 'javax/activation/' exclude 'javax/activation/'
} }