Merge pull request #6005 in CORE/base-third from release/11.0 to bugfix/11.0

* commit 'a410e8fa7e31dc81dd0b87e11aad41641eee4a0f':
  BI-105913 BI导出变慢，按照10.0修改的方法改一下

base-third-project/base-third-step8/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.fr.third</groupId>
         <artifactId>base-third</artifactId>
-        <version>10.0-FEATURE-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>step8</artifactId>

build.third_step0-jdk11.gradle

@@ -7,7 +7,7 @@ tasks.withType(JavaCompile){
 }
 
 configurations.all {
-    resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+	resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
 }
 //源码版本
 sourceCompatibility=11
@@ -24,8 +24,8 @@ jar{
 }
 
 repositories {
-    mavenCentral()
-    maven { url "http://mvn.finedevelop.com/repository/maven-public/" }
+	mavenCentral()
+	maven { url "http://mvn.finedevelop.com/repository/maven-public/" }
 	maven { url "http://mvn.finedevelop.com/repository/fanruan/" }
 }
 
@@ -52,43 +52,51 @@ def maven_version="${version}-${MVN_BRANCH}-SNAPSHOT"
 def jar_version = version
 
 configurations {
-    // thirdjar
+	// thirdjar
 	// sigar
 	essential
 }
 
 // 主体代码与essential的对应关系配置在TeamCity
 String essentialVersion = findProperty("essentialVersion")
+String cbbVersion = findProperty("cbbVersion")
 
 //指定依赖
 dependencies{
 	compileOnly "com.fr.essential:fine-essential:${essentialVersion}"
-    // thirdjar "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
+	// thirdjar "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
 	// sigar "com.fr.third:sigar:1.6.0"
-    testCompile 'junit:junit:4.12'
+	testCompile 'junit:junit:4.12'
 }
 
 
 publishing {
-    publications {
-	third(MavenPublication) {
-            groupId "com.fr.third"
-            artifactId "fine-third"
-            version maven_version
-            from components.java
-        }
-    }
-    repositories {
+	publications {
+		third(MavenPublication) {
+			groupId "com.fr.third"
+			artifactId "fine-third"
+			version maven_version
+			from components.java
+			pom.withXml {
+				def dep = asNode().appendNode('dependencies');
+				def node = dep.appendNode("dependency")
+				node.appendNode("groupId", "com.fr.cbb")
+				node.appendNode("artifactId", "fine-cbb")
+				node.appendNode("version", "${cbbVersion}")
+			}
+		}
+	}
+	repositories {
 		maven {
-	    
-		    url "http://mvn.finedevelop.com/repository/fanruan/"
-		    credentials {
-			username =  findProperty("NEXUS_USERNAME")
-			password =  findProperty("NEXUS_PASSWORD")
-		    }
-		    
+
+			url "http://mvn.finedevelop.com/repository/fanruan/"
+			credentials {
+				username =  findProperty("NEXUS_USERNAME")
+				password =  findProperty("NEXUS_PASSWORD")
+			}
+
 		}
-        }
+	}
 }
 
 task unpack(type:Copy) {
@@ -108,7 +116,22 @@ task unpack(type:Copy) {
 		zipTree("fine-spring/lib/aopalliance-1.0.jar")
 	}
 	from  {
-		zipTree("fine-poi/lib/curvesapi-1.03.jar")
+		zipTree("fine-poi/lib/curvesapi-1.06.jar")
+	}
+	from  {
+		zipTree("fine-poi/lib/commons-collections4-4.4.jar")
+	}
+	from  {
+		zipTree("fine-poi/lib/commons-compress-1.21.jar")
+	}
+	from  {
+		zipTree("fine-poi/lib/SparseBitSet-1.2.jar")
+	}
+	from  {
+		zipTree("fine-poi/lib/ooxml-schemas-1.4.jar")
+	}
+	from  {
+		zipTree("fine-poi/lib/xmlbeans-3.1.0.jar")
 	}
 	from  {
 		zipTree("fine-freehep/lib/fine-font-10.0.jar")
@@ -118,18 +141,8 @@ task unpack(type:Copy) {
 			zipTree(file)
 		}
 	}
-	
-}
 
-// 将essential依赖等级的jar全部解压到classes下
-task unpackEssential(type:Copy) {
-	for (File file : configurations.essential.files) {
-		from zipTree(file)
-	}
-	into classesDir
 }
 
-jar.dependsOn unpackEssential
-
 jar.dependsOn unpack
 

build.third_step0.gradle

@@ -7,7 +7,7 @@ tasks.withType(JavaCompile){
 }
 
 configurations.all {
-    resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+	resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
 }
 //源码版本
 sourceCompatibility=1.8
@@ -23,8 +23,8 @@ jar{
 }
 
 repositories {
-    mavenCentral()
-    maven { url "http://mvn.finedevelop.com/repository/maven-public/" }
+	mavenCentral()
+	maven { url "http://mvn.finedevelop.com/repository/maven-public/" }
 	maven { url "http://mvn.finedevelop.com/repository/fanruan/" }
 }
 
@@ -47,26 +47,26 @@ def date = new Date()
 def formattedDate = date.format('yyyy.MM.dd')
 
 def srcDir="."
-def maven_version_build = ""
+def maven_version = ""
 def indexV = branchName.indexOf( "%2F");
 
 // "FEATURE", "RELEASE"等等
 String branchNameUpperCase = "RELEASE"
 
 if(indexV != -1){
-    version= branchName.substring(indexV+3, branchName.length()).toUpperCase()
+	version= branchName.substring(indexV+3, branchName.length()).toUpperCase()
 	branchNameUpperCase = branchName.substring(0, indexV).toUpperCase()
-	maven_version_build = project.version +"-" + branchNameUpperCase +"-SNAPSHOT"
+	maven_version = project.version +"-" + branchNameUpperCase +"-SNAPSHOT"
 } else {
-    version= branchName
-	maven_version_build =  project.version +"-SNAPSHOT"
+	version= branchName
+	maven_version =  project.version +"-SNAPSHOT"
 }
 
-def maven_version="${version}.${formattedDate}"
+//def maven_version="${version}.${formattedDate}"
 def jar_version = version
 
 configurations {
-    // thirdjar
+	// thirdjar
 	// sigar
 	essential
 }
@@ -78,64 +78,38 @@ String cbbVersion = findProperty("cbbVersion")
 //指定依赖
 dependencies{
 	essential "com.fr.essential:fine-essential:${essentialVersion}"
-	essential "com.fr.cbb:fine-scheduler:${cbbVersion}"
-	essential "com.fr.cbb:fine-function:${cbbVersion}"
-	essential "com.fr.cbb:fine-sql:${cbbVersion}"
-    // thirdjar "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
+	// thirdjar "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
 	// sigar "com.fr.third:sigar:1.6.0"
-    testCompile 'junit:junit:4.12'
+	testCompile 'junit:junit:4.12'
 }
 
 
 publishing {
-    publications {
-	third(MavenPublication) {
-            groupId "com.fr.third"
-            artifactId "fine-third"
-            version maven_version
-	    ext.repo = 'release'
-            from components.java
-        }
-
-	third_build(MavenPublication) {
-            groupId "com.fr.third"
-            artifactId project.hasProperty("withCBB") ? "fine-third" : "fine-third-without-cbb"
-            version maven_version_build
-	    ext.repo = 'snapshot'
-            from components.java
-        }
-    }
-    repositories {
-		maven {
-		    name "release"
-		    url "http://mvn.finedevelop.com/repository/fanruan-release/"
-		    credentials {
-			username =  findProperty("NEXUS_USERNAME")
-			password =  findProperty("NEXUS_PASSWORD")
-		    }
-		    
+	publications {
+		third(MavenPublication) {
+			groupId "com.fr.third"
+			artifactId "fine-third"
+			version maven_version
+			from components.java
+			pom.withXml {
+				def dep = asNode().appendNode('dependencies');
+				def node = dep.appendNode("dependency")
+				node.appendNode("groupId", "com.fr.cbb")
+				node.appendNode("artifactId", "fine-cbb")
+				node.appendNode("version", "${maven_version}")
+			}
 		}
-
+	}
+	repositories {
 		maven {
-		    name "snapshot"
-		    url   "http://mvn.finedevelop.com/repository/fanruan/"
-		    credentials {
-			username =  findProperty("NEXUS_USERNAME")
-			password =  findProperty("NEXUS_PASSWORD")
-		    }
-		    
-		}
-        }
-}
-
+			url   "http://mvn.finedevelop.com/repository/fanruan/"
+			credentials {
+				username =  findProperty("NEXUS_USERNAME")
+				password =  findProperty("NEXUS_PASSWORD")
+			}
 
-afterEvaluate {
-    tasks.withType(PublishToMavenRepository) { task ->
-        if (task.publication.hasProperty('repo') && task.publication.repo != task.repository.name) {
-            task.enabled = false
-            task.group = null
-        }
-    }
+		}
+	}
 }
 
 task unpack(type:Copy) {
@@ -155,7 +129,22 @@ task unpack(type:Copy) {
 		zipTree("fine-spring/lib/aopalliance-1.0.jar")
 	}
 	from  {
-		zipTree("fine-poi/lib/curvesapi-1.03.jar")
+		zipTree("fine-poi/lib/curvesapi-1.06.jar")
+	}
+	from  {
+		zipTree("fine-poi/lib/commons-collections4-4.4.jar")
+	}
+	from  {
+		zipTree("fine-poi/lib/commons-compress-1.21.jar")
+	}
+	from  {
+		zipTree("fine-poi/lib/SparseBitSet-1.2.jar")
+	}
+	from  {
+		zipTree("fine-poi/lib/ooxml-schemas-1.4.jar")
+	}
+	from  {
+		zipTree("fine-poi/lib/xmlbeans-3.1.0.jar")
 	}
 	from  {
 		zipTree("fine-freehep/lib/fine-font-10.0.jar")
@@ -167,18 +156,4 @@ task unpack(type:Copy) {
 	}
 }
 
-// 将essential依赖等级的jar全部解压到classes下
-task unpackEssential(type:Copy) {
-	if (project.hasProperty("withCBB")) {
-		for (File file : configurations.essential.files) {
-			from (zipTree(file)) {
-				exclude "META-INF/versions/11/*"
-			}
-		}
-		into classesDir
-	}
-}
-
-unpackEssential.dependsOn unpack
-
-jar.dependsOn unpackEssential
+jar.dependsOn unpack

build.third_step1.gradle

@@ -62,6 +62,7 @@ sourceSets{
 				"${srcDir}/fine-third-default/fine-zip-tools/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/fine-mini-tools/tools-common/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",
@@ -86,8 +87,12 @@ def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf (java.io.File.s
 def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+1)
 def MVN_BRANCH = branchVariable.toUpperCase()
 
+// 主体代码与essential的对应关系配置在TeamCity
+String essentialVersion = findProperty("essentialVersion")
+
 //指定依赖
 dependencies{
+	compileOnly "com.fr.essential:fine-essential:${essentialVersion}"
 	compile fileTree(dir:"${srcDir}/fine-aspectj/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/fine-cssparser/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/fine-freehep/lib",include:'**/*.jar')
@@ -165,6 +170,8 @@ task copyFiles(type:Copy,dependsOn:'compileJava'){
 		with dataContent.call("${srcDir}/fine-third-default/fine-zip-tools/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-jdk8/fine-mini-tools/tools-common/src/main/java")
+		with dataContent.call("${srcDir}/fine-third-jdk8/fine-mini-tools/tools-common/src/main/resources")
 		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")