Merge remote-tracking branch 'origin/feature/x' into feature/x

3 years ago · d2637593cd
2355 changed files with 178991 additions and 58526 deletions
--- a/build.third_step0.gradle
+++ b/build.third_step0.gradle
@ -171,7 +171,9 @@ task unpack(type:Copy) {
 task unpackEssential(type:Copy) {
 	if (project.hasProperty("withCBB")) {
 		for (File file : configurations.essential.files) {
-			from zipTree(file)
+			from (zipTree(file)) {
+				exclude "META-INF/versions/11/*"
+			}
 		}
 		into classesDir
 	}
--- a/fine-druid/lib/HikariCP-2.6.1.jar
+++ b/fine-druid/lib/HikariCP-2.6.1.jar
--- a/fine-druid/lib/HikariCP-java7-2.4.13.jar
+++ b/fine-druid/lib/HikariCP-java7-2.4.13.jar
--- a/fine-druid/lib/accessors-smart-1.2.jar
+++ b/fine-druid/lib/accessors-smart-1.2.jar
--- a/fine-druid/lib/aggdesigner-algorithm-6.0.jar
+++ b/fine-druid/lib/aggdesigner-algorithm-6.0.jar
--- a/fine-druid/lib/aircompressor-0.10.jar
+++ b/fine-druid/lib/aircompressor-0.10.jar
--- a/fine-druid/lib/ant-1.9.1.jar
+++ b/fine-druid/lib/ant-1.9.1.jar
--- a/fine-druid/lib/ant-launcher-1.9.1.jar
+++ b/fine-druid/lib/ant-launcher-1.9.1.jar
--- a/fine-druid/lib/antlr-2.7.7.jar
+++ b/fine-druid/lib/antlr-2.7.7.jar
--- a/fine-druid/lib/antlr-runtime-3.1.3.jar
+++ b/fine-druid/lib/antlr-runtime-3.1.3.jar
--- a/fine-druid/lib/antlr-runtime-3.5.2.jar
+++ b/fine-druid/lib/antlr-runtime-3.5.2.jar
--- a/fine-druid/lib/aopalliance-repackaged-2.5.0-b32.jar
+++ b/fine-druid/lib/aopalliance-repackaged-2.5.0-b32.jar
--- a/fine-druid/lib/apache-jsp-9.3.20.v20170531.jar
+++ b/fine-druid/lib/apache-jsp-9.3.20.v20170531.jar
--- a/fine-druid/lib/apache-jstl-9.3.20.v20170531.jar
+++ b/fine-druid/lib/apache-jstl-9.3.20.v20170531.jar
--- a/fine-druid/lib/apacheds-i18n-2.0.0-M15.jar
+++ b/fine-druid/lib/apacheds-i18n-2.0.0-M15.jar
--- a/fine-druid/lib/apacheds-kerberos-codec-2.0.0-M15.jar
+++ b/fine-druid/lib/apacheds-kerberos-codec-2.0.0-M15.jar
--- a/fine-druid/lib/api-asn1-api-1.0.0-M20.jar
+++ b/fine-druid/lib/api-asn1-api-1.0.0-M20.jar
--- a/fine-druid/lib/api-util-1.0.0-M20.jar
+++ b/fine-druid/lib/api-util-1.0.0-M20.jar
--- a/fine-druid/lib/apiguardian-api-1.1.0.jar
+++ b/fine-druid/lib/apiguardian-api-1.1.0.jar
--- a/fine-druid/lib/arrow-format-0.8.0.jar
+++ b/fine-druid/lib/arrow-format-0.8.0.jar
--- a/fine-druid/lib/arrow-memory-0.8.0.jar
+++ b/fine-druid/lib/arrow-memory-0.8.0.jar
--- a/fine-druid/lib/arrow-vector-0.8.0.jar
+++ b/fine-druid/lib/arrow-vector-0.8.0.jar
--- a/fine-druid/lib/asm-3.1.jar
+++ b/fine-druid/lib/asm-3.1.jar
--- a/fine-druid/lib/asm-5.0.4.jar
+++ b/fine-druid/lib/asm-5.0.4.jar
--- a/fine-druid/lib/asm-commons-5.0.1.jar
+++ b/fine-druid/lib/asm-commons-5.0.1.jar
--- a/fine-druid/lib/asm-tree-5.0.1.jar
+++ b/fine-druid/lib/asm-tree-5.0.1.jar
--- a/fine-druid/lib/aspectjrt-1.8.2.jar
+++ b/fine-druid/lib/aspectjrt-1.8.2.jar
--- a/fine-druid/lib/aspectjrt-1.8.9.jar
+++ b/fine-druid/lib/aspectjrt-1.8.9.jar
--- a/fine-druid/lib/audience-annotations-0.5.0.jar
+++ b/fine-druid/lib/audience-annotations-0.5.0.jar
--- a/fine-druid/lib/avatica-core-1.9.0.jar
+++ b/fine-druid/lib/avatica-core-1.9.0.jar
--- a/fine-druid/lib/avatica-metrics-1.9.0.jar
+++ b/fine-druid/lib/avatica-metrics-1.9.0.jar
--- a/fine-druid/lib/avro-1.7.7.jar
+++ b/fine-druid/lib/avro-1.7.7.jar
--- a/fine-druid/lib/bcprov-jdk15on-1.52.jar
+++ b/fine-druid/lib/bcprov-jdk15on-1.52.jar
--- a/fine-druid/lib/bonecp-spring-0.8.0.RELEASE.jar
+++ b/fine-druid/lib/bonecp-spring-0.8.0.RELEASE.jar
--- a/fine-druid/lib/buildnumber-maven-plugin-1.1.jar
+++ b/fine-druid/lib/buildnumber-maven-plugin-1.1.jar
--- a/fine-druid/lib/c3p0-0.9.1.2.jar
+++ b/fine-druid/lib/c3p0-0.9.1.2.jar
--- a/fine-druid/lib/c3p0-0.9.2.1.jar
+++ b/fine-druid/lib/c3p0-0.9.2.1.jar
--- a/fine-druid/lib/c3p0-0.9.5.4.jar
+++ b/fine-druid/lib/c3p0-0.9.5.4.jar
--- a/fine-druid/lib/calcite-core-1.26.0.jar
+++ b/fine-druid/lib/calcite-core-1.26.0.jar
--- a/fine-druid/lib/calcite-linq4j-1.26.0.jar
+++ b/fine-druid/lib/calcite-linq4j-1.26.0.jar
--- a/fine-druid/lib/checker-qual-3.5.0.jar
+++ b/fine-druid/lib/checker-qual-3.5.0.jar
--- a/fine-druid/lib/classmate-1.3.0.jar
+++ b/fine-druid/lib/classmate-1.3.0.jar
--- a/fine-druid/lib/classworlds-1.1.jar
+++ b/fine-druid/lib/classworlds-1.1.jar
--- a/fine-druid/lib/clickhouse-jdbc-0.2.4.jar
+++ b/fine-druid/lib/clickhouse-jdbc-0.2.4.jar
--- a/fine-druid/lib/commons-beanutils-1.7.0.jar
+++ b/fine-druid/lib/commons-beanutils-1.7.0.jar
--- a/fine-druid/lib/commons-beanutils-core-1.8.0.jar
+++ b/fine-druid/lib/commons-beanutils-core-1.8.0.jar
--- a/fine-druid/lib/commons-cli-1.0.jar
+++ b/fine-druid/lib/commons-cli-1.0.jar
--- a/fine-druid/lib/commons-cli-1.2.jar
+++ b/fine-druid/lib/commons-cli-1.2.jar
--- a/fine-druid/lib/commons-codec-1.12.jar
+++ b/fine-druid/lib/commons-codec-1.12.jar
--- a/fine-druid/lib/commons-codec-1.9.jar
+++ b/fine-druid/lib/commons-codec-1.9.jar
--- a/fine-druid/lib/commons-collections-3.2.1.jar
+++ b/fine-druid/lib/commons-collections-3.2.1.jar
--- a/fine-druid/lib/commons-collections4-4.1.jar
+++ b/fine-druid/lib/commons-collections4-4.1.jar
--- a/fine-druid/lib/commons-compiler-3.0.11.jar
+++ b/fine-druid/lib/commons-compiler-3.0.11.jar
--- a/fine-druid/lib/commons-compress-1.9.jar
+++ b/fine-druid/lib/commons-compress-1.9.jar
--- a/fine-druid/lib/commons-configuration-1.6.jar
+++ b/fine-druid/lib/commons-configuration-1.6.jar
--- a/fine-druid/lib/commons-crypto-1.0.0.jar
+++ b/fine-druid/lib/commons-crypto-1.0.0.jar
--- a/fine-druid/lib/commons-daemon-1.0.13.jar
+++ b/fine-druid/lib/commons-daemon-1.0.13.jar
--- a/fine-druid/lib/commons-dbcp2-2.1.1.jar
+++ b/fine-druid/lib/commons-dbcp2-2.1.1.jar
--- a/fine-druid/lib/commons-dbcp2-2.6.0.jar
+++ b/fine-druid/lib/commons-dbcp2-2.6.0.jar
--- a/fine-druid/lib/commons-digester-1.8.jar
+++ b/fine-druid/lib/commons-digester-1.8.jar
--- a/fine-druid/lib/commons-el-1.0.jar
+++ b/fine-druid/lib/commons-el-1.0.jar
--- a/fine-druid/lib/commons-httpclient-2.0.2.jar
+++ b/fine-druid/lib/commons-httpclient-2.0.2.jar
--- a/fine-druid/lib/commons-httpclient-3.1.jar
+++ b/fine-druid/lib/commons-httpclient-3.1.jar
--- a/fine-druid/lib/commons-lang-2.6.jar
+++ b/fine-druid/lib/commons-lang-2.6.jar
--- a/fine-druid/lib/commons-lang3-3.1.jar
+++ b/fine-druid/lib/commons-lang3-3.1.jar
--- a/fine-druid/lib/commons-lang3-3.8.jar
+++ b/fine-druid/lib/commons-lang3-3.8.jar
--- a/fine-druid/lib/commons-logging-1.0.4.jar
+++ b/fine-druid/lib/commons-logging-1.0.4.jar
--- a/fine-druid/lib/commons-logging-api-1.1.jar
+++ b/fine-druid/lib/commons-logging-api-1.1.jar
--- a/fine-druid/lib/commons-math3-3.1.1.jar
+++ b/fine-druid/lib/commons-math3-3.1.1.jar
--- a/fine-druid/lib/commons-net-3.1.jar
+++ b/fine-druid/lib/commons-net-3.1.jar
--- a/fine-druid/lib/commons-pool2-2.4.2.jar
+++ b/fine-druid/lib/commons-pool2-2.4.2.jar
--- a/fine-druid/lib/commons-pool2-2.6.1.jar
+++ b/fine-druid/lib/commons-pool2-2.6.1.jar
--- a/fine-druid/lib/curator-client-4.2.0.jar
+++ b/fine-druid/lib/curator-client-4.2.0.jar
--- a/fine-druid/lib/curator-framework-4.2.0.jar
+++ b/fine-druid/lib/curator-framework-4.2.0.jar
--- a/fine-druid/lib/curator-recipes-4.2.0.jar
+++ b/fine-druid/lib/curator-recipes-4.2.0.jar
--- a/fine-druid/lib/datanucleus-api-jdo-4.2.4.jar
+++ b/fine-druid/lib/datanucleus-api-jdo-4.2.4.jar
--- a/fine-druid/lib/datanucleus-core-4.1.17.jar
+++ b/fine-druid/lib/datanucleus-core-4.1.17.jar
--- a/fine-druid/lib/datanucleus-rdbms-4.1.19.jar
+++ b/fine-druid/lib/datanucleus-rdbms-4.1.19.jar
--- a/fine-druid/lib/derby-10.12.1.1.jar
+++ b/fine-druid/lib/derby-10.12.1.1.jar
--- a/fine-druid/lib/derby-10.14.1.0.jar
+++ b/fine-druid/lib/derby-10.14.1.0.jar
--- a/fine-druid/lib/disruptor-3.3.6.jar
+++ b/fine-druid/lib/disruptor-3.3.6.jar
--- a/fine-druid/lib/dnsjava-2.1.7.jar
+++ b/fine-druid/lib/dnsjava-2.1.7.jar
--- a/fine-druid/lib/dom4j-1.6.1.jar
+++ b/fine-druid/lib/dom4j-1.6.1.jar
--- a/fine-druid/lib/doxia-sink-api-1.0-alpha-7.jar
+++ b/fine-druid/lib/doxia-sink-api-1.0-alpha-7.jar
--- a/fine-druid/lib/dropwizard-metrics-hadoop-metrics2-reporter-0.1.2.jar
+++ b/fine-druid/lib/dropwizard-metrics-hadoop-metrics2-reporter-0.1.2.jar
--- a/fine-druid/lib/dubbo-2.5.3.jar
+++ b/fine-druid/lib/dubbo-2.5.3.jar
--- a/fine-druid/lib/ecj-4.4.2.jar
+++ b/fine-druid/lib/ecj-4.4.2.jar
--- a/fine-druid/lib/ehcache-3.3.1.jar
+++ b/fine-druid/lib/ehcache-3.3.1.jar
--- a/fine-druid/lib/error_prone_annotations-2.3.4.jar
+++ b/fine-druid/lib/error_prone_annotations-2.3.4.jar
--- a/fine-druid/lib/esri-geometry-api-2.2.0.jar
+++ b/fine-druid/lib/esri-geometry-api-2.2.0.jar
--- a/fine-druid/lib/failureaccess-1.0.1.jar
+++ b/fine-druid/lib/failureaccess-1.0.1.jar
--- a/fine-druid/lib/fastjson-1.2.6.jar
+++ b/fine-druid/lib/fastjson-1.2.6.jar
--- a/fine-druid/lib/fastjson-1.2.73.jar
+++ b/fine-druid/lib/fastjson-1.2.73.jar
--- a/fine-druid/lib/fastutil-6.5.6.jar
+++ b/fine-druid/lib/fastutil-6.5.6.jar
--- a/fine-druid/lib/findbugs-annotations-1.3.9-1.jar
+++ b/fine-druid/lib/findbugs-annotations-1.3.9-1.jar
--- a/fine-druid/lib/flatbuffers-1.2.0-3f79e055.jar
+++ b/fine-druid/lib/flatbuffers-1.2.0-3f79e055.jar
--- a/fine-druid/lib/fst-2.50.jar
+++ b/fine-druid/lib/fst-2.50.jar
--- a/fine-druid/lib/geronimo-jcache_1.0_spec-1.0-alpha-1.jar
+++ b/fine-druid/lib/geronimo-jcache_1.0_spec-1.0-alpha-1.jar
--- a/fine-druid/lib/geronimo-jta_1.1_spec-1.1.1.jar
+++ b/fine-druid/lib/geronimo-jta_1.1_spec-1.1.1.jar
--- a/fine-druid/lib/google-collections-1.0.jar
+++ b/fine-druid/lib/google-collections-1.0.jar
--- a/Show More
+++ b/Show More