From 5605ee0d3f06711f318da0c68ed152a5d3561134 Mon Sep 17 00:00:00 2001 From: zhouping Date: Tue, 31 Dec 2019 14:36:21 +0800 Subject: [PATCH] =?UTF-8?q?KERNEL-1298=20FineThird=E6=94=AF=E6=8C=81JDK11,?= =?UTF-8?q?=E9=80=82=E9=85=8Dopenjdk=EF=BC=8C=E7=A7=BB=E5=8C=85=EF=BC=8C?= =?UTF-8?q?=E6=94=B9=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.third_step1.gradle | 7 +++++-- build.third_step2.gradle | 3 +++ build.third_step3.gradle | 1 + build.third_step4.gradle | 1 + build.third_step5.gradle | 1 + build.third_step6.gradle | 2 ++ build.third_step7.gradle | 3 ++- .../com/sun/image/codec/jpeg/ImageFormatException.java | 0 .../src/main/java/com/sun/image/codec/jpeg/JPEGCodec.java | 0 .../java/com/sun/image/codec/jpeg/JPEGDecodeParam.java | 0 .../java/com/sun/image/codec/jpeg/JPEGEncodeParam.java | 0 .../java/com/sun/image/codec/jpeg/JPEGHuffmanTable.java | 0 .../java/com/sun/image/codec/jpeg/JPEGImageDecoder.java | 0 .../java/com/sun/image/codec/jpeg/JPEGImageEncoder.java | 0 .../src/main/java/com/sun/image/codec/jpeg/JPEGQTable.java | 0 .../com/sun/image/codec/jpeg/TruncatedFileException.java | 0 .../java/sun/awt/image/codec/JPEGImageDecoderImpl.java | 0 .../java/sun/awt/image/codec/JPEGImageEncoderImpl.java | 0 .../src/main/java/sun/awt/image/codec/JPEGParam.java | 0 .../java/javax/xml/validation/SchemaFactoryFinder.java | 4 ++-- .../src/main/java/javax/xml/xpath/XPathFactoryFinder.java | 4 ++-- 21 files changed, 19 insertions(+), 7 deletions(-) rename {fine-third-jdk11 => fine-third-default}/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/ImageFormatException.java (100%) rename {fine-third-jdk11 => fine-third-default}/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGCodec.java (100%) rename {fine-third-jdk11 => fine-third-default}/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGDecodeParam.java (100%) rename {fine-third-jdk11 => fine-third-default}/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGEncodeParam.java (100%) rename {fine-third-jdk11 => fine-third-default}/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGHuffmanTable.java (100%) rename {fine-third-jdk11 => fine-third-default}/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGImageDecoder.java (100%) rename {fine-third-jdk11 => fine-third-default}/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGImageEncoder.java (100%) rename {fine-third-jdk11 => fine-third-default}/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGQTable.java (100%) rename {fine-third-jdk11 => fine-third-default}/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/TruncatedFileException.java (100%) rename {fine-third-jdk11 => fine-third-default}/fine-sun-jpeg/src/main/java/sun/awt/image/codec/JPEGImageDecoderImpl.java (100%) rename {fine-third-jdk11 => fine-third-default}/fine-sun-jpeg/src/main/java/sun/awt/image/codec/JPEGImageEncoderImpl.java (100%) rename {fine-third-jdk11 => fine-third-default}/fine-sun-jpeg/src/main/java/sun/awt/image/codec/JPEGParam.java (100%) diff --git a/build.third_step1.gradle b/build.third_step1.gradle index b5af74328..b8416f930 100644 --- a/build.third_step1.gradle +++ b/build.third_step1.gradle @@ -53,7 +53,7 @@ sourceSets{ "${srcDir}/fine-imageJ/src/main/java", "${srcDir}/fine-j2v8/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-jetbrains/src", "${srcDir}/fine-jgit/src", @@ -81,6 +81,7 @@ sourceSets{ "${srcDir}/fine-default/fine-slf4j-api/src/main/java", "${srcDir}/fine-default/fine-sjsxp/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" ] } @@ -112,6 +113,7 @@ dependencies{ compile fileTree(dir:"${srcDir}/fine-org-dom4j/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-sense4/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" 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-j2v8/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-jetbrains/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-sjsxp/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") into "${classesDir}" } diff --git a/build.third_step2.gradle b/build.third_step2.gradle index 13ae212a4..2bd6311c5 100644 --- a/build.third_step2.gradle +++ b/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-nio/src/main/java", "${srcDir}/fine-httpcomponents/http-core/httpcore-nio/src/main/java-deprecated", + "${srcDir}/fine-jai/src/main/java", "${srcDir}/fine-kryo/src", "${srcDir}/fine-log4j/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-commons/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" 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-nio/src/main/java") 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-log4j/src") with dataContent.call("${srcDir}/fine-log4j/resources") diff --git a/build.third_step3.gradle b/build.third_step3.gradle index 95daa54a7..c30f794d7 100644 --- a/build.third_step3.gradle +++ b/build.third_step3.gradle @@ -50,6 +50,7 @@ def MVN_BRANCH = branchVariable.toUpperCase() dependencies{ compile fileTree(dir:"${srcDir}/fine-jboss-logging/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" testCompile 'junit:junit:4.12' } diff --git a/build.third_step4.gradle b/build.third_step4.gradle index ccafa5b45..8a6f60787 100644 --- a/build.third_step4.gradle +++ b/build.third_step4.gradle @@ -51,6 +51,7 @@ dependencies{ compile fileTree(dir:"${srcDir}/fine-hibernate/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-spring/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" testCompile 'junit:junit:4.12' } diff --git a/build.third_step5.gradle b/build.third_step5.gradle index bf7ce1e97..5c4c0d4cd 100644 --- a/build.third_step5.gradle +++ b/build.third_step5.gradle @@ -50,6 +50,7 @@ dependencies{ compile fileTree(dir:"${srcDir}/fine-druid/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-socketio/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" testCompile 'junit:junit:4.12' } diff --git a/build.third_step6.gradle b/build.third_step6.gradle index 691cccc8d..9234975d6 100644 --- a/build.third_step6.gradle +++ b/build.third_step6.gradle @@ -47,6 +47,8 @@ def MVN_BRANCH = branchVariable.toUpperCase() //指定依赖 dependencies{ 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" testCompile 'junit:junit:4.12' } diff --git a/build.third_step7.gradle b/build.third_step7.gradle index dff4a9ddb..8afed6aad 100644 --- a/build.third_step7.gradle +++ b/build.third_step7.gradle @@ -47,7 +47,8 @@ def MVN_BRANCH = branchVariable.toUpperCase() //指定依赖 dependencies{ 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" testCompile 'junit:junit:4.12' } diff --git a/fine-third-jdk11/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/ImageFormatException.java b/fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/ImageFormatException.java similarity index 100% rename from fine-third-jdk11/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/ImageFormatException.java rename to fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/ImageFormatException.java diff --git a/fine-third-jdk11/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGCodec.java b/fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGCodec.java similarity index 100% rename from fine-third-jdk11/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGCodec.java rename to fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGCodec.java diff --git a/fine-third-jdk11/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGDecodeParam.java b/fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGDecodeParam.java similarity index 100% rename from fine-third-jdk11/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGDecodeParam.java rename to fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGDecodeParam.java diff --git a/fine-third-jdk11/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGEncodeParam.java b/fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGEncodeParam.java similarity index 100% rename from fine-third-jdk11/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGEncodeParam.java rename to fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGEncodeParam.java diff --git a/fine-third-jdk11/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGHuffmanTable.java b/fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGHuffmanTable.java similarity index 100% rename from fine-third-jdk11/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGHuffmanTable.java rename to fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGHuffmanTable.java diff --git a/fine-third-jdk11/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGImageDecoder.java b/fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGImageDecoder.java similarity index 100% rename from fine-third-jdk11/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGImageDecoder.java rename to fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGImageDecoder.java diff --git a/fine-third-jdk11/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGImageEncoder.java b/fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGImageEncoder.java similarity index 100% rename from fine-third-jdk11/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGImageEncoder.java rename to fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGImageEncoder.java diff --git a/fine-third-jdk11/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGQTable.java b/fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGQTable.java similarity index 100% rename from fine-third-jdk11/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGQTable.java rename to fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/JPEGQTable.java diff --git a/fine-third-jdk11/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/TruncatedFileException.java b/fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/TruncatedFileException.java similarity index 100% rename from fine-third-jdk11/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/TruncatedFileException.java rename to fine-third-default/fine-sun-jpeg/src/main/java/com/sun/image/codec/jpeg/TruncatedFileException.java diff --git a/fine-third-jdk11/fine-sun-jpeg/src/main/java/sun/awt/image/codec/JPEGImageDecoderImpl.java b/fine-third-default/fine-sun-jpeg/src/main/java/sun/awt/image/codec/JPEGImageDecoderImpl.java similarity index 100% rename from fine-third-jdk11/fine-sun-jpeg/src/main/java/sun/awt/image/codec/JPEGImageDecoderImpl.java rename to fine-third-default/fine-sun-jpeg/src/main/java/sun/awt/image/codec/JPEGImageDecoderImpl.java diff --git a/fine-third-jdk11/fine-sun-jpeg/src/main/java/sun/awt/image/codec/JPEGImageEncoderImpl.java b/fine-third-default/fine-sun-jpeg/src/main/java/sun/awt/image/codec/JPEGImageEncoderImpl.java similarity index 100% rename from fine-third-jdk11/fine-sun-jpeg/src/main/java/sun/awt/image/codec/JPEGImageEncoderImpl.java rename to fine-third-default/fine-sun-jpeg/src/main/java/sun/awt/image/codec/JPEGImageEncoderImpl.java diff --git a/fine-third-jdk11/fine-sun-jpeg/src/main/java/sun/awt/image/codec/JPEGParam.java b/fine-third-default/fine-sun-jpeg/src/main/java/sun/awt/image/codec/JPEGParam.java similarity index 100% rename from fine-third-jdk11/fine-sun-jpeg/src/main/java/sun/awt/image/codec/JPEGParam.java rename to fine-third-default/fine-sun-jpeg/src/main/java/sun/awt/image/codec/JPEGParam.java diff --git a/fine-third-jdk8/xml-apis/src/main/java/javax/xml/validation/SchemaFactoryFinder.java b/fine-third-jdk8/xml-apis/src/main/java/javax/xml/validation/SchemaFactoryFinder.java index 9b90fdca7..cc1e838dd 100644 --- a/fine-third-jdk8/xml-apis/src/main/java/javax/xml/validation/SchemaFactoryFinder.java +++ b/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"); // Allow simply setting the prop to turn on debug debug = val != null && (! "false".equals(val)); - } catch (Exception _) { + } catch (Exception ignore) { debug = false; } } @@ -123,7 +123,7 @@ final class SchemaFactoryFinder { catch (ThreadDeath td) { throw td; } - catch (Throwable _) { + catch (Throwable ignore) { ; // getContextClassLoader() undefined in JDK1.1 } diff --git a/fine-third-jdk8/xml-apis/src/main/java/javax/xml/xpath/XPathFactoryFinder.java b/fine-third-jdk8/xml-apis/src/main/java/javax/xml/xpath/XPathFactoryFinder.java index f6c65c654..68df19c76 100644 --- a/fine-third-jdk8/xml-apis/src/main/java/javax/xml/xpath/XPathFactoryFinder.java +++ b/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"); // Allow simply setting the prop to turn on debug debug = val != null && (! "false".equals(val)); - } catch (Exception _) { + } catch (Exception ignore) { debug = false; } } @@ -119,7 +119,7 @@ final class XPathFactoryFinder { catch (ThreadDeath td) { throw td; } - catch (Throwable _) { + catch (Throwable ignore) { ; // getContextClassLoader() undefined in JDK1.1 }