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，移包，改脚本

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}"
 	}

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")

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'
 }

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'
 }

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'
 }

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'
 }

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'
 }

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 
         }
         

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 
         }