update to Gradle 5.2.1, update to module structure, update to module ES server

Author: jprante

build.gradle

@@ -6,10 +6,11 @@ buildscript {
         }
     }
     dependencies {
-        classpath "org.xbib.elasticsearch:gradle-plugin-elasticsearch-build:6.3.2.1"
+        classpath "org.xbib.elasticsearch:gradle-plugin-elasticsearch-build:${project.property('elasticsearch-devkit.version')}"
     }
 }
 
+import java.time.ZoneOffset
 import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
 
@@ -42,9 +43,9 @@ apply plugin: 'org.xbib.gradle.plugin.asciidoctor'
 
 esplugin {
     description 'Plugin bundle for Elasticsearch'
-    classname 'org.xbib.elasticsearch.plugin.bundle.BundlePlugin'
     name 'elasticsearch-plugin-bundle'
     url 'https://github.com/jprante/elasticsearch-plugin-bundle'
+    classname 'org.xbib.elasticsearch.plugin.bundle.BundlePlugin'
 }
 
 configurations {
@@ -54,30 +55,98 @@ configurations {
 dependencies {
     compile "com.ibm.icu:icu4j:${project.property('icu4j.version')}"
     compile "org.xbib:standardnumber:${project.property('standardnumber.version')}"
-    testCompile "org.xbib.elasticsearch:elasticsearch-analysis-common:${project.property('xbib-elasticsearch-test.version')}"
-    testCompile "org.apache.logging.log4j:log4j-core:${project.property('log4j.version')}"
-    testCompile "org.elasticsearch.plugin:transport-netty4-client:${project.property('elasticsearch.version')}"
+    testCompile "org.xbib.elasticsearch:elasticsearch:${project.property('elasticsearch-server.version')}"
+    testCompile "org.xbib.elasticsearch:elasticsearch-analysis-common:${project.property('elasticsearch-analysis-common.version')}"
+    testCompile "org.xbib.elasticsearch:transport-netty4:${project.property('elasticsearch-transport-netty4.version')}"
     wagon "org.apache.maven.wagon:wagon-ssh:${project.property('wagon.version')}"
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+compileJava {
+}
+
+compileTestJava {
+}
+
+tasks.withType(Javadoc) {
+    options.addStringOption('Xdoclint:none', '-quiet')
+}
+
+afterEvaluate {
+    compileJava {
+        inputs.property("moduleName", 'org.xbib.elasticsearch.plugin.bundle')
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+        doFirst {
+            options.compilerArgs = [
+                    "-Xlint:-try",
+                    '--module-path', classpath.asPath
+
+            ]
+            classpath = files()
+        }
+    }
+    compileTestJava {
+        inputs.property("moduleName", 'org.xbib.elasticsearch.plugin.bundle.test')
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+        doFirst {
+            options.compilerArgs = [
+                    "-Xlint:-cast,-deprecation,-rawtypes,-try,-unchecked",
+                    "-proc:none",
+                    '--module-path', classpath.asPath
+            ]
+            classpath = files()
+        }
+    }
+    javadoc {
+        enabled = true
+        inputs.property("moduleName", 'org.xbib.elasticsearch.plugin.bundle')
+        doFirst {
+            options.addStringOption('-module-path', classpath.asPath)
+            classpath = files()
+        }
+    }
+    jar {
+        inputs.property("moduleName", 'org.xbib.elasticsearch.plugin.bundle')
+        manifest {
+            attributes(
+                    'Implementation-Title': "${project.group}#${project.name};${project.version}",
+                    'Implementation-Version': version,
+                    'Implementation-Vendor': "${user}",
+                    'Build-Date': ZonedDateTime.now(ZoneOffset.UTC),
+                    'Build-Java-Version': System.getProperty("java.version"),
+                    'X-Compile-Source-JDK': compileJava.targetCompatibility,
+                    'X-Compile-Target-JDK': compileJava.sourceCompatibility,
+                    'X-Compile-Elasticsearch-Version': version,
+                    'X-Compile-Lucene-Version': project.property('lucene.version'),
+                    'X-Compile-Elasticsearch-Snapshot': false
+            )
+        }
+    }
+}
 
 test {
     enabled = false
+    dependsOn jar, testJar
     include '**/*Test*'
     systemProperty 'path.home', System.getProperty("user.dir")
     testLogging {
         showStandardStreams = false
         exceptionFormat = 'full'
     }
 }
+
 randomizedTest {
     enabled = false
+    dependsOn jar, testJar
 }
+
 esTest {
-    dependsOn jar
     enabled = true
+    dependsOn jar, testJar
+    //systemProperty 'tests.class', 'org.xbib.elasticsearch.plugin.bundle.test.index.analysis.icu.IcuNumberFormatTests'
+    jvmArg '--add-reads=org.xbib.elasticsearch.randomizedtesting=org.xbib.elasticsearch.plugin.bundle'
+    jvmArg '--add-reads=org.xbib.elasticsearch.randomizedtesting=org.xbib.elasticsearch.plugin.bundle.test'
 }
 
 clean {
@@ -111,4 +180,5 @@ asciidoctor {
 }
 
 checkstyleMain.source = 'src/main/java'
+
 forbiddenPatterns.exclude('**/*.txt')

gradle.properties

@@ -1,10 +1,16 @@
 group = org.xbib.elasticsearch.plugin
 name = elasticsearch-plugin-bundle
-version = 6.3.2.2
+version = 6.3.2.3
+
+elasticsearch-server.version = 6.3.2.2
+elasticsearch-libs.version = 6.3.2.1
+elasticsearch-analysis-common.version = 6.3.2.2
+elasticsearch-transport-netty4.version = 6.3.2.2
+elasticsearch-devkit.version = 6.3.2.6
 
-xbib-elasticsearch-test.version = 6.3.2.1
 elasticsearch.version = 6.3.2
 lucene.version = 7.3.1
+
 icu4j.version = 62.1
 log4j.version = 2.11.0
 jackson.version = 2.8.11
@@ -14,5 +20,6 @@ wagon.version = 3.0.0
 spatial4j.version = 0.7
 jts.version = 1.15.1
 jna.version = 4.5.1
+checkstyle.version = 8.13
 
-org.gradle.warning.mode=all
+org.gradle.warning.mode = all

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Mon Oct 01 19:05:53 CEST 2018
+#Fri Mar 08 12:42:11 CET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -28,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

gradlew

@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

gradlew.bat

@@ -1,2 +0,0 @@
-rootProject.name = name
-enableFeaturePreview('STABLE_PUBLISHING')

settings.gradle

@@ -0,0 +1,42 @@
+module org.xbib.elasticsearch.plugin.bundle {
+
+    exports org.xbib.elasticsearch.plugin.bundle;
+    exports org.xbib.elasticsearch.plugin.bundle.action.isbnformat;
+    exports org.xbib.elasticsearch.plugin.bundle.action.langdetect;
+    exports org.xbib.elasticsearch.plugin.bundle.common.decompound.patricia;
+    exports org.xbib.elasticsearch.plugin.bundle.common.fsa;
+    exports org.xbib.elasticsearch.plugin.bundle.common.langdetect;
+    exports org.xbib.elasticsearch.plugin.bundle.common.reference;
+    exports org.xbib.elasticsearch.plugin.bundle.common.standardnumber;
+    exports org.xbib.elasticsearch.plugin.bundle.index.analysis.autophrase;
+    exports org.xbib.elasticsearch.plugin.bundle.index.analysis.baseform;
+    exports org.xbib.elasticsearch.plugin.bundle.index.analysis.concat;
+    exports org.xbib.elasticsearch.plugin.bundle.index.analysis.decompound.fst;
+    exports org.xbib.elasticsearch.plugin.bundle.index.analysis.decompound.patricia;
+    exports org.xbib.elasticsearch.plugin.bundle.index.analysis.german;
+    exports org.xbib.elasticsearch.plugin.bundle.index.analysis.hyphen;
+    exports org.xbib.elasticsearch.plugin.bundle.index.analysis.icu.segmentation;
+    exports org.xbib.elasticsearch.plugin.bundle.index.analysis.icu.tokenattributes;
+    exports org.xbib.elasticsearch.plugin.bundle.index.analysis.icu.tools;
+    exports org.xbib.elasticsearch.plugin.bundle.index.analysis.icu;
+    exports org.xbib.elasticsearch.plugin.bundle.index.analysis.lemmatize;
+    exports org.xbib.elasticsearch.plugin.bundle.index.analysis.naturalsort;
+    exports org.xbib.elasticsearch.plugin.bundle.index.analysis.sortform;
+    exports org.xbib.elasticsearch.plugin.bundle.index.analysis.standardnumber;
+    exports org.xbib.elasticsearch.plugin.bundle.index.analysis.symbolname;
+    exports org.xbib.elasticsearch.plugin.bundle.index.analysis.worddelimiter;
+    exports org.xbib.elasticsearch.plugin.bundle.index.analysis.year;
+    exports org.xbib.elasticsearch.plugin.bundle.index.mapper.icu;
+    exports org.xbib.elasticsearch.plugin.bundle.index.mapper.langdetect;
+    exports org.xbib.elasticsearch.plugin.bundle.index.mapper.reference;
+    exports org.xbib.elasticsearch.plugin.bundle.index.mapper.standardnumber;
+    exports org.xbib.elasticsearch.plugin.bundle.query.decompound;
+
+    requires static org.xbib.elasticsearch.server;
+    requires static org.xbib.elasticsearch.lucene;
+    requires static org.xbib.elasticsearch.jackson;
+    requires static org.xbib.elasticsearch.joda;
+    requires static org.xbib.elasticsearch.log4j;
+
+    requires icu4j;
+}