From 8499915b3aaab19c0d0aecf1f12d4ac10a98df4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=CC=88rg=20Prante?= <joergprante@gmail.com>
Date: Thu, 15 Feb 2018 11:56:38 +0100
Subject: [PATCH] preparing for Java 9

---
 build.gradle                                  | 28 ++++++++++---------
 gradle.properties                             |  4 +--
 gradle/publish.gradle                         |  4 ++-
 ...{sonarqube.gradle => sourcequality.gradle} | 12 ++++++--
 4 files changed, 29 insertions(+), 19 deletions(-)
 rename gradle/{sonarqube.gradle => sourcequality.gradle} (82%)

diff --git a/build.gradle b/build.gradle
index a8d9496..22ecd80 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,15 @@
+import java.time.ZonedDateTime
+import java.time.format.DateTimeFormatter
+
 plugins {
     id "org.sonarqube" version "2.6.1"
     id "io.codearte.nexus-staging" version "0.11.0"
-    id "org.xbib.gradle.plugin.asciidoctor" version "1.5.6.0.1"
+    id "org.xbib.gradle.plugin.asciidoctor" version "1.6.0.0"
 }
 
-printf "Host: %s\nOS: %s %s %s\nJVM: %s %s %s %s\nGroovy: %s\nGradle: %s\n" +
+printf "Date: %s\nHost: %s\nOS: %s %s %s\nJVM: %s %s %s %s\nGradle: %s Groovy: %s Java: %s\n" +
         "Build: group: ${project.group} name: ${project.name} version: ${project.version}\n",
+        ZonedDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME),
         InetAddress.getLocalHost(),
         System.getProperty("os.name"),
         System.getProperty("os.arch"),
@@ -14,16 +18,11 @@ printf "Host: %s\nOS: %s %s %s\nJVM: %s %s %s %s\nGroovy: %s\nGradle: %s\n" +
         System.getProperty("java.vm.version"),
         System.getProperty("java.vm.vendor"),
         System.getProperty("java.vm.name"),
-        GroovySystem.getVersion(),
-        gradle.gradleVersion
+        gradle.gradleVersion, GroovySystem.getVersion(), JavaVersion.current()
 
 apply plugin: 'java'
 apply plugin: 'maven'
 apply plugin: 'signing'
-apply plugin: 'findbugs'
-apply plugin: 'pmd'
-apply plugin: 'checkstyle'
-apply plugin: "jacoco"
 apply plugin: "io.codearte.nexus-staging"
 apply plugin: 'org.xbib.gradle.plugin.asciidoctor'
 
@@ -43,16 +42,19 @@ dependencies {
     testCompile "xalan:xalan:${project.property('xalan.version')}"
     testCompile "org.xmlunit:xmlunit-matchers:${project.property('xmlunit-matchers.version')}"
     testCompile "com.github.stefanbirkner:system-rules:${project.property('system-rules.version')}"
-    asciidoclet "org.asciidoctor:asciidoclet:${project.property('asciidoclet.version')}"
+    asciidoclet "org.xbib:asciidoclet:${project.property('asciidoclet.version')}"
     wagon "org.apache.maven.wagon:wagon-ssh:${project.property('wagon.version')}"
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_1_9
 targetCompatibility = JavaVersion.VERSION_1_8
 
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 tasks.withType(JavaCompile) {
-    options.compilerArgs << "-Xlint:all" << "-profile" << "compact2"
+    options.compilerArgs << "-Xlint:all" // << "-profile" << "compact2"
+    if (JavaVersion.current().java9Compatible) {
+        options.compilerArgs << '--release' << JavaVersion.toVersion(targetCompatibility).majorVersion
+    }
 }
 
 test {
@@ -78,7 +80,7 @@ asciidoctor {
 
 javadoc {
     options.docletpath = configurations.asciidoclet.files.asType(List)
-    options.doclet = 'org.asciidoctor.Asciidoclet'
+    options.doclet = 'org.xbib.asciidoclet.Asciidoclet'
     options.overview = "src/docs/asciidoclet/overview.adoc"
     options.addStringOption "-base-dir", "${projectDir}"
     options.addStringOption "-attribute",
@@ -113,4 +115,4 @@ if (project.hasProperty('signing.keyId')) {
 
 apply from: 'gradle/ext.gradle'
 apply from: 'gradle/publish.gradle'
-apply from: 'gradle/sonarqube.gradle'
+apply from: 'gradle/sourcequality.gradle'
diff --git a/gradle.properties b/gradle.properties
index 9a0a96c..053c8b9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,12 +1,12 @@
 group = org.xbib
 name = marc
-version = 1.1.0
+version = 1.2.0
 
 xbib-content.version = 1.3.0
 xbib-bibliographic-character-sets.version = 1.0.0
 xalan.version = 2.7.2
 xmlunit-matchers.version = 2.3.0
 system-rules.version = 1.16.0
-asciidoclet.version = 1.5.4
+asciidoclet.version = 1.6.0.0
 junit.version = 4.12
 wagon.version = 3.0.0
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
index 7e1feec..09f1676 100644
--- a/gradle/publish.gradle
+++ b/gradle/publish.gradle
@@ -1,12 +1,13 @@
 
 task xbibUpload(type: Upload) {
+    group = 'publish'
     configuration = configurations.archives
     uploadDescriptor = true
     repositories {
         if (project.hasProperty('xbibUsername')) {
             mavenDeployer {
                 configuration = configurations.wagon
-                repository(url: uri('sftp://xbib.org/repository')) {
+                repository(url: uri(project.property('xbibUrl'))) {
                         authentication(userName: xbibUsername, privateKey: xbibPrivateKey)
                 }
             }
@@ -15,6 +16,7 @@ task xbibUpload(type: Upload) {
 }
 
 task sonatypeUpload(type: Upload) {
+    group = 'publish'
     configuration = configurations.archives
     uploadDescriptor = true
     repositories {
diff --git a/gradle/sonarqube.gradle b/gradle/sourcequality.gradle
similarity index 82%
rename from gradle/sonarqube.gradle
rename to gradle/sourcequality.gradle
index 3985a4f..9aecffd 100644
--- a/gradle/sonarqube.gradle
+++ b/gradle/sourcequality.gradle
@@ -1,10 +1,16 @@
-tasks.withType(FindBugs) {
-    ignoreFailures = true
+/*spotbugs {
+    ignoreFailures = false
+    sourceSets = [sourceSets.main]
+    effort = "max"
+    reportLevel = "high"
+}
+tasks.withType(com.github.spotbugs.SpotBugsTask) {
     reports {
         xml.enabled = false
         html.enabled = true
     }
 }
+
 tasks.withType(Pmd) {
     ignoreFailures = true
     reports {
@@ -26,7 +32,7 @@ jacocoTestReport {
         csv.enabled = false
     }
 }
-
+*/
 sonarqube {
     properties {
         property "sonar.projectName", "${project.group} ${project.name}"