From a193f8a4cfa4173931b97d7d4d3e6bd745d57e23 Mon Sep 17 00:00:00 2001
From: zhouping <zhouping@finereport.com>
Date: Thu, 26 Mar 2020 20:06:51 +0800
Subject: [PATCH] =?UTF-8?q?rt=20=E5=B0=9D=E8=AF=95=E6=8A=8Ajdk11=E7=9A=84?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=89=93=E5=88=B0jdk8=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base-third-project/pom.xml       |  2 +-
 build.third_step1.gradle         | 14 +++++++++++++-
 fine-third-jdk8/pom.xml          |  4 +++-
 fine-third-jdk8/xml-apis/pom.xml | 17 +++++++++++++++++
 4 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 fine-third-jdk8/xml-apis/pom.xml

diff --git a/base-third-project/pom.xml b/base-third-project/pom.xml
index c03cf160d..136eb106c 100644
--- a/base-third-project/pom.xml
+++ b/base-third-project/pom.xml
@@ -11,7 +11,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <classes-path>G:\Code\10.0\feature-third-maven\base-third\base-third-project\</classes-path>
         <revision>10.0-FEATURE-SNAPSHOT</revision>
-        <language-level>11</language-level>
+        <language-level>1.8</language-level>
     </properties>
 
     <modules>
diff --git a/build.third_step1.gradle b/build.third_step1.gradle
index 3baba05b6..76fdb9037 100644
--- a/build.third_step1.gradle
+++ b/build.third_step1.gradle
@@ -81,7 +81,13 @@ sourceSets{
 				"${srcDir}/fine-third-default/fine-sjsxp/src/main/java",
 				"${srcDir}/fine-third-default/fine-stax/src/main/java",
 				"${srcDir}/fine-third-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",
+				"${srcDir}/fine-third-jdk11/fine-activation/src/main/java",
+				"${srcDir}/fine-third-jdk11/fine-javax-annotation/src/main/java",
+				"${srcDir}/fine-third-jdk11/fine-javax-jws/src/main/java",
+				"${srcDir}/fine-third-jdk11/fine-javax-xml-soap/src/main/java",
+				"${srcDir}/fine-third-jdk11/fine-jaxb/src/main/java",
+				"${srcDir}/fine-third-jdk11/fine-jaxws/src/main/java"
 				]
 		}
 	}
@@ -219,6 +225,12 @@ task copyFiles(type:Copy,dependsOn:'compileJava'){
 		with dataContent.call("${srcDir}/fine-third-default/fine-stax/src/main/java")
 		with dataContent.call("${srcDir}/fine-third-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-jdk11/fine-activation/src/main/java")
+		with dataContent.call("${srcDir}/fine-third-jdk11/fine-javax-annotation/src/main/java")
+		with dataContent.call("${srcDir}/fine-third-jdk11/fine-javax-jws/src/main/java")
+		with dataContent.call("${srcDir}/fine-third-jdk11/fine-javax-xml-soap/src/main/java")
+		with dataContent.call("${srcDir}/fine-third-jdk11/fine-jaxb/src/main/java")
+		with dataContent.call("${srcDir}/fine-third-jdk11/fine-jaxws/src/main/java")
 		into "${classesDir}"
 	}
 }
diff --git a/fine-third-jdk8/pom.xml b/fine-third-jdk8/pom.xml
index 769b55d5e..76e6abcb6 100644
--- a/fine-third-jdk8/pom.xml
+++ b/fine-third-jdk8/pom.xml
@@ -14,5 +14,7 @@
     <artifactId>fine-third-jdk8</artifactId>
     <version>${revision}</version>
 
-    
+    <modules>
+        <module>xml-apis</module>
+    </modules>
 </project>
\ No newline at end of file
diff --git a/fine-third-jdk8/xml-apis/pom.xml b/fine-third-jdk8/xml-apis/pom.xml
new file mode 100644
index 000000000..34e110e2e
--- /dev/null
+++ b/fine-third-jdk8/xml-apis/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.fr.third</groupId>
+        <artifactId>fine-third-jdk8</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <artifactId>xml-apis</artifactId>
+    <version>${revision}</version>
+
+    
+</project>
\ No newline at end of file