bump dependency versions, clean subproject structure

build.gradle

@@ -1,10 +1,10 @@
 plugins {
     id "org.sonarqube" version '2.6.1'
-    id "org.xbib.gradle.plugin.asciidoctor" version "1.5.4.1.0"
     id "io.codearte.nexus-staging" version "0.11.0"
+    id "org.xbib.gradle.plugin.asciidoctor" version "1.5.6.0.1"
 }
 
-printf "Host: %s\nOS: %s %s %s\nJVM: %s %s %s %s\nGroovy: %s\nGradle: %s\n" +
+printf "Host: %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",
         InetAddress.getLocalHost(),
         System.getProperty("os.name"),
@@ -14,8 +14,9 @@ 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"),
+        gradle.gradleVersion,
         GroovySystem.getVersion(),
-        gradle.gradleVersion
+        JavaVersion.current()
 
 apply plugin: 'java'
 apply plugin: 'org.xbib.gradle.plugin.asciidoctor'
@@ -25,7 +26,7 @@ configurations {
 }
 
 dependencies {
-    asciidoclet 'org.asciidoctor:asciidoclet:1.5.4'
+    asciidoclet "org.asciidoctor:asciidoclet:${project.property('asciidoclet.version')}"
 }
 
 asciidoctor {
@@ -70,8 +71,8 @@ subprojects {
     }
 
     dependencies {
-        testCompile 'junit:junit:4.12'
+        testCompile "junit:junit:${project.property('junit.version')}"
-        wagon 'org.apache.maven.wagon:wagon-ssh:2.12'
+        wagon "org.apache.maven.wagon:wagon-ssh:${project.property('wagon.version')}"
     }
 
     sourceCompatibility = JavaVersion.VERSION_1_8
@@ -93,12 +94,15 @@ subprojects {
         classifier 'sources'
         from sourceSets.main.allSource
     }
+
     task javadocJar(type: Jar, dependsOn: javadoc) {
         classifier 'javadoc'
     }
+
     artifacts {
         archives sourcesJar, javadocJar
     }
+
     if (project.hasProperty('signing.keyId')) {
         signing {
             sign configurations.archives
@@ -108,5 +112,4 @@ subprojects {
     apply from: "${rootProject.projectDir}/gradle/ext.gradle"
     apply from: "${rootProject.projectDir}/gradle/publish.gradle"
     apply from: "${rootProject.projectDir}/gradle/sonarqube.gradle"
-
 }

cql-elasticsearch/build.gradle

@@ -1,4 +1,4 @@
 dependencies {
-    compile project(':cql')
+    compile project(':cql-common')
     compile "org.xbib:content-core:${project.property('xbib-content.version')}"
 }

gradle.properties

@@ -1,5 +1,8 @@
 group = org.xbib
 name = cql
-version = 1.1.1
+version = 1.2.0
 
-xbib-content.version = 1.2.4
+xbib-content.version = 1.3.0
+junit.version = 4.12
+wagon.version = 3.0.0
+asciidoclet.version = 1.5.4

gradle/publish.gradle

@@ -1,5 +1,6 @@
 
 task xbibUpload(type: Upload, dependsOn: build) {
+    group = 'publish'
     configuration = configurations.archives
     uploadDescriptor = true
     repositories {
@@ -9,12 +10,45 @@ task xbibUpload(type: Upload, dependsOn: build) {
                 repository(url: uri('sftp://xbib.org/repository')) {
                         authentication(userName: xbibUsername, privateKey: xbibPrivateKey)
                 }
-            }
+                pom.project {
+                    groupId project.group
+                    artifactId project.name
+                    version project.version
+                    name project.name
+                    description projectDescription
+                    packaging 'jar'
+                    inceptionYear '2016'
+                    url scmUrl
+                    organization {
+                        name 'xbib'
+                        url 'http://xbib.org'
+                    }
+                    developers {
+                        developer {
+                            id user
+                            name 'Jörg Prante'
+                            email 'joergprante@gmail.com'
+                            url 'https://github.com/jprante'
+                        }
+                    }
+                    scm {
+                        url scmUrl
+                        connection scmConnection
+                        developerConnection scmDeveloperConnection
+                    }
+                    licenses {
+                        license {
+                            name 'The Apache License, Version 2.0'
+                            url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                        }
+                    }
+                }            }
         }
     }
 }
 
 task sonatypeUpload(type: Upload, dependsOn: build) {
+    group = 'publish'
     configuration = configurations.archives
     uploadDescriptor = true
     repositories {
@@ -65,7 +99,6 @@ task sonatypeUpload(type: Upload, dependsOn: build) {
     }
 }
 
-
 nexusStaging {
     packageGroup = "org.xbib"
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Feb 06 16:03:05 CET 2018
+#Thu Feb 08 11:11:10 CET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-all.zip

settings.gradle

@@ -1,4 +1,3 @@
-rootProject.name = 'cql-main'
 
-include 'cql'
+include 'cql-common'
 include 'cql-elasticsearch'