Browse Source

Merge pull request #336 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0

* commit 'bd4c1d3f406211e930e1c2a8d9c26861e84f170b':
  KERNEL-1298 FineThird支持JDK11,适配openjdk,移包,改脚本
research/10.0
zhouping 5 years ago
parent
commit
a6c5de808f
  1. 7
      build.third_step1.gradle
  2. 3
      build.third_step2.gradle
  3. 1
      build.third_step3.gradle
  4. 1
      build.third_step4.gradle
  5. 1
      build.third_step5.gradle
  6. 2
      build.third_step6.gradle
  7. 3
      build.third_step7.gradle
  8. 0
      fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/ImageFormatException.java
  9. 0
      fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGCodec.java
  10. 0
      fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGDecodeParam.java
  11. 0
      fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGEncodeParam.java
  12. 0
      fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGHuffmanTable.java
  13. 0
      fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGImageDecoder.java
  14. 0
      fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGImageEncoder.java
  15. 0
      fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGQTable.java
  16. 0
      fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/TruncatedFileException.java
  17. 0
      fine-third-default/fine-sun-jpeg/src/main/java/sun/awt/image/codec/JPEGImageDecoderImpl.java
  18. 0
      fine-third-default/fine-sun-jpeg/src/main/java/sun/awt/image/codec/JPEGImageEncoderImpl.java
  19. 0
      fine-third-default/fine-sun-jpeg/src/main/java/sun/awt/image/codec/JPEGParam.java
  20. 4
      fine-third-jdk8/xml-apis/src/main/java/javax/xml/validation/SchemaFactoryFinder.java
  21. 4
      fine-third-jdk8/xml-apis/src/main/java/javax/xml/xpath/XPathFactoryFinder.java

7
build.third_step1.gradle

@ -53,7 +53,7 @@ sourceSets{
"${srcDir}/fine-imageJ/src/main/java", "${srcDir}/fine-imageJ/src/main/java",
"${srcDir}/fine-j2v8/src", "${srcDir}/fine-j2v8/src",
"${srcDir}/fine-jackson/src", "${srcDir}/fine-jackson/src",
"${srcDir}/fine-jai/src/main/java", // "${srcDir}/fine-jai/src/main/java",
"${srcDir}/fine-jboss-transaction-api/src", "${srcDir}/fine-jboss-transaction-api/src",
"${srcDir}/fine-jetbrains/src", "${srcDir}/fine-jetbrains/src",
"${srcDir}/fine-jgit/src", "${srcDir}/fine-jgit/src",
@ -81,6 +81,7 @@ sourceSets{
"${srcDir}/fine-default/fine-slf4j-api/src/main/java", "${srcDir}/fine-default/fine-slf4j-api/src/main/java",
"${srcDir}/fine-default/fine-sjsxp/src/main/java", "${srcDir}/fine-default/fine-sjsxp/src/main/java",
"${srcDir}/fine-default/fine-stax/src/main/java", "${srcDir}/fine-default/fine-stax/src/main/java",
"${srcDir}/fine-default/fine-sun-jpeg/src/main/java",
"${srcDir}/fine-third-jdk8/xml-apis/src/main/java" "${srcDir}/fine-third-jdk8/xml-apis/src/main/java"
] ]
} }
@ -112,6 +113,7 @@ dependencies{
compile fileTree(dir:"${srcDir}/fine-org-dom4j/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-org-dom4j/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-sense4/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-sense4/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar")
compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" compile group: "com.fr.third.server", name: "servlet-api", version: "3.0"
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
} }
@ -153,7 +155,7 @@ task copyFiles(type:Copy,dependsOn:'compileJava'){
with dataContent.call("${srcDir}/fine-imageJ/src/main/java") with dataContent.call("${srcDir}/fine-imageJ/src/main/java")
with dataContent.call("${srcDir}/fine-j2v8/src") with dataContent.call("${srcDir}/fine-j2v8/src")
with dataContent.call("${srcDir}/fine-jackson/src") with dataContent.call("${srcDir}/fine-jackson/src")
with dataContent.call("${srcDir}/fine-jai/src/main/java") // with dataContent.call("${srcDir}/fine-jai/src/main/java")
with dataContent.call("${srcDir}/fine-jboss-transaction-api/src") with dataContent.call("${srcDir}/fine-jboss-transaction-api/src")
with dataContent.call("${srcDir}/fine-jetbrains/src") with dataContent.call("${srcDir}/fine-jetbrains/src")
with dataContent.call("${srcDir}/fine-jgit/src") with dataContent.call("${srcDir}/fine-jgit/src")
@ -182,6 +184,7 @@ task copyFiles(type:Copy,dependsOn:'compileJava'){
with dataContent.call("${srcDir}/fine-default/fine-slf4j-api/src/main/java") with dataContent.call("${srcDir}/fine-default/fine-slf4j-api/src/main/java")
with dataContent.call("${srcDir}/fine-default/fine-sjsxp/src/main/java") with dataContent.call("${srcDir}/fine-default/fine-sjsxp/src/main/java")
with dataContent.call("${srcDir}/fine-default/fine-stax/src/main/java") with dataContent.call("${srcDir}/fine-default/fine-stax/src/main/java")
with dataContent.call("${srcDir}/fine-default/fine-sun-jpeg/src/main/java")
with dataContent.call("${srcDir}/fine-third-jdk8/xml-apis/src/main/java") with dataContent.call("${srcDir}/fine-third-jdk8/xml-apis/src/main/java")
into "${classesDir}" into "${classesDir}"
} }

3
build.third_step2.gradle

@ -39,6 +39,7 @@ sourceSets{
"${srcDir}/fine-httpcomponents/http-core/httpcore-ab/src/main/java", "${srcDir}/fine-httpcomponents/http-core/httpcore-ab/src/main/java",
"${srcDir}/fine-httpcomponents/http-core/httpcore-nio/src/main/java", "${srcDir}/fine-httpcomponents/http-core/httpcore-nio/src/main/java",
"${srcDir}/fine-httpcomponents/http-core/httpcore-nio/src/main/java-deprecated", "${srcDir}/fine-httpcomponents/http-core/httpcore-nio/src/main/java-deprecated",
"${srcDir}/fine-jai/src/main/java",
"${srcDir}/fine-kryo/src", "${srcDir}/fine-kryo/src",
"${srcDir}/fine-log4j/src", "${srcDir}/fine-log4j/src",
"${srcDir}/fine-poi/src", "${srcDir}/fine-poi/src",
@ -76,6 +77,7 @@ dependencies{
compile fileTree(dir:"${srcDir}/fine-xmlgraphics/xmlgraphics-batik/lib",include: '**/*.jar') compile fileTree(dir:"${srcDir}/fine-xmlgraphics/xmlgraphics-batik/lib",include: '**/*.jar')
compile fileTree(dir:"${srcDir}/fine-xmlgraphics/xmlgraphics-commons/lib",include: '**/*.jar') compile fileTree(dir:"${srcDir}/fine-xmlgraphics/xmlgraphics-commons/lib",include: '**/*.jar')
compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar")
compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" compile group: "com.fr.third.server", name: "servlet-api", version: "3.0"
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
} }
@ -111,6 +113,7 @@ task copyFiles(type:Copy,dependsOn:'compileJava'){
with dataContent.call("${srcDir}/fine-httpcomponents/http-core/httpcore-ab/src/main/java") with dataContent.call("${srcDir}/fine-httpcomponents/http-core/httpcore-ab/src/main/java")
with dataContent.call("${srcDir}/fine-httpcomponents/http-core/httpcore-nio/src/main/java") with dataContent.call("${srcDir}/fine-httpcomponents/http-core/httpcore-nio/src/main/java")
with dataContent.call("${srcDir}/fine-httpcomponents/http-core/httpcore-nio/src/main/java-deprecated") with dataContent.call("${srcDir}/fine-httpcomponents/http-core/httpcore-nio/src/main/java-deprecated")
with dataContent.call("${srcDir}/fine-jai/src/main/java")
with dataContent.call("${srcDir}/fine-kryo/src") with dataContent.call("${srcDir}/fine-kryo/src")
with dataContent.call("${srcDir}/fine-log4j/src") with dataContent.call("${srcDir}/fine-log4j/src")
with dataContent.call("${srcDir}/fine-log4j/resources") with dataContent.call("${srcDir}/fine-log4j/resources")

1
build.third_step3.gradle

@ -50,6 +50,7 @@ def MVN_BRANCH = branchVariable.toUpperCase()
dependencies{ dependencies{
compile fileTree(dir:"${srcDir}/fine-jboss-logging/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-jboss-logging/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar")
compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" compile group: "com.fr.third.server", name: "servlet-api", version: "3.0"
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
} }

1
build.third_step4.gradle

@ -51,6 +51,7 @@ dependencies{
compile fileTree(dir:"${srcDir}/fine-hibernate/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-hibernate/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-spring/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-spring/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar")
compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" compile group: "com.fr.third.server", name: "servlet-api", version: "3.0"
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
} }

1
build.third_step5.gradle

@ -50,6 +50,7 @@ dependencies{
compile fileTree(dir:"${srcDir}/fine-druid/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-druid/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-socketio/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-socketio/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar")
compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" compile group: "com.fr.third.server", name: "servlet-api", version: "3.0"
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
} }

2
build.third_step6.gradle

@ -47,6 +47,8 @@ def MVN_BRANCH = branchVariable.toUpperCase()
// //
dependencies{ dependencies{
compile fileTree(dir:"${srcDir}/fine-quartz/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-quartz/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar")
compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" compile group: "com.fr.third.server", name: "servlet-api", version: "3.0"
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
} }

3
build.third_step7.gradle

@ -47,7 +47,8 @@ def MVN_BRANCH = branchVariable.toUpperCase()
// //
dependencies{ dependencies{
compile fileTree(dir:"${srcDir}/fine-ehcache/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-ehcache/lib",include:'**/*.jar')
// @branch - compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar")
compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" compile group: "com.fr.third.server", name: "servlet-api", version: "3.0"
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
} }

0
fine-third-jdk11/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/ImageFormatException.java → fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/ImageFormatException.java

0
fine-third-jdk11/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGCodec.java → fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGCodec.java

0
fine-third-jdk11/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGDecodeParam.java → fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGDecodeParam.java

0
fine-third-jdk11/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGEncodeParam.java → fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGEncodeParam.java

0
fine-third-jdk11/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGHuffmanTable.java → fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGHuffmanTable.java

0
fine-third-jdk11/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGImageDecoder.java → fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGImageDecoder.java

0
fine-third-jdk11/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGImageEncoder.java → fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGImageEncoder.java

0
fine-third-jdk11/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGQTable.java → fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGQTable.java

0
fine-third-jdk11/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/TruncatedFileException.java → fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/TruncatedFileException.java

0
fine-third-jdk11/fine-sun-jpeg/src/main/java/sun/awt/image/codec/JPEGImageDecoderImpl.java → fine-third-default/fine-sun-jpeg/src/main/java/sun/awt/image/codec/JPEGImageDecoderImpl.java

0
fine-third-jdk11/fine-sun-jpeg/src/main/java/sun/awt/image/codec/JPEGImageEncoderImpl.java → fine-third-default/fine-sun-jpeg/src/main/java/sun/awt/image/codec/JPEGImageEncoderImpl.java

0
fine-third-jdk11/fine-sun-jpeg/src/main/java/sun/awt/image/codec/JPEGParam.java → fine-third-default/fine-sun-jpeg/src/main/java/sun/awt/image/codec/JPEGParam.java

4
fine-third-jdk8/xml-apis/src/main/java/javax/xml/validation/SchemaFactoryFinder.java

@ -69,7 +69,7 @@ final class SchemaFactoryFinder {
String val = SecuritySupport.getSystemProperty("jaxp.debug"); String val = SecuritySupport.getSystemProperty("jaxp.debug");
// Allow simply setting the prop to turn on debug // Allow simply setting the prop to turn on debug
debug = val != null && (! "false".equals(val)); debug = val != null && (! "false".equals(val));
} catch (Exception _) { } catch (Exception ignore) {
debug = false; debug = false;
} }
} }
@ -123,7 +123,7 @@ final class SchemaFactoryFinder {
catch (ThreadDeath td) { catch (ThreadDeath td) {
throw td; throw td;
} }
catch (Throwable _) { catch (Throwable ignore) {
; // getContextClassLoader() undefined in JDK1.1 ; // getContextClassLoader() undefined in JDK1.1
} }

4
fine-third-jdk8/xml-apis/src/main/java/javax/xml/xpath/XPathFactoryFinder.java

@ -55,7 +55,7 @@ final class XPathFactoryFinder {
String val = SecuritySupport.getSystemProperty("jaxp.debug"); String val = SecuritySupport.getSystemProperty("jaxp.debug");
// Allow simply setting the prop to turn on debug // Allow simply setting the prop to turn on debug
debug = val != null && (! "false".equals(val)); debug = val != null && (! "false".equals(val));
} catch (Exception _) { } catch (Exception ignore) {
debug = false; debug = false;
} }
} }
@ -119,7 +119,7 @@ final class XPathFactoryFinder {
catch (ThreadDeath td) { catch (ThreadDeath td) {
throw td; throw td;
} }
catch (Throwable _) { catch (Throwable ignore) {
; // getContextClassLoader() undefined in JDK1.1 ; // getContextClassLoader() undefined in JDK1.1
} }

Loading…
Cancel
Save