From e9b3b4fa5a7b295a06c9c9453d2c3ce608951da6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rg=20Prante?= Date: Thu, 8 Feb 2018 11:52:13 +0100 Subject: [PATCH] update dependencies, prepare for Java 9 --- build.gradle | 13 +++++--- gradle.properties | 6 ++-- gradle/publish.gradle | 39 +++++++++++++++++++++-- gradle/wrapper/gradle-wrapper.jar | Bin 54333 -> 54333 bytes gradle/wrapper/gradle-wrapper.properties | 4 +-- settings.gradle | 2 -- z3950/build.gradle | 2 +- 7 files changed, 52 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 2a2f60c..8ddbf05 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id "io.codearte.nexus-staging" version "0.11.0" } -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"), @@ -13,9 +13,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() subprojects { apply plugin: 'java' @@ -35,8 +35,8 @@ subprojects { } dependencies { - testCompile 'junit:junit:4.12' - wagon 'org.apache.maven.wagon:wagon-ssh:3.0.0' + testCompile "junit:junit:${project.property('junit.version')}" + wagon "org.apache.maven.wagon:wagon-ssh:${project.property('wagon.version')}" } sourceCompatibility = JavaVersion.VERSION_1_8 @@ -62,12 +62,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 diff --git a/gradle.properties b/gradle.properties index 82091e4..bf3b47f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,7 @@ group = org.xbib name = z3950 -version = 1.0.2 +version = 1.1.0 -xbib-cql.version = 1.1.1 +xbib-cql.version = 1.2.0 +junit.version = 4.12 +wagon.version = 3.0.0 \ No newline at end of file diff --git a/gradle/publish.gradle b/gradle/publish.gradle index 9e1750d..9a58fff 100644 --- a/gradle/publish.gradle +++ b/gradle/publish.gradle @@ -1,13 +1,47 @@ task xbibUpload(type: Upload, dependsOn: build) { + group = 'publish' configuration = configurations.archives uploadDescriptor = true repositories { if (project.hasProperty('xbibUsername')) { mavenDeployer { configuration = configurations.wagon - repository(url: uri('sftp://xbib.org/repository')) { - authentication(userName: xbibUsername, privateKey: xbibPrivateKey) + repository(url: uri(project.property('xbibUrl'))) { + authentication(userName: xbibUsername, privateKey: xbibPrivateKey) + } + pom.project { + groupId project.group + artifactId project.name + version project.version + name project.name + description projectDescription + packaging 'jar' + inceptionYear '2017' + 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' + } + } } } } @@ -15,6 +49,7 @@ task xbibUpload(type: Upload, dependsOn: build) { } task sonatypeUpload(type: Upload, dependsOn: build) { + group = 'publish' configuration = configurations.archives uploadDescriptor = true repositories { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 99340b4ad18d3c7e764794d300ffd35017036793..c44b679acd3f794ddbb3aa5e919244914911014a 100644 GIT binary patch delta 67 zcmdnHf_d)><_YF3^<10PCt62xypsG>^s$JMVS?1gZT}APTs3B42=Hd-&|;n)KKZ~Q Tf3UjE!iVn(uz-cWUiJV0iuD?> delta 67 zcmdnHf_d)><_YF3rx}klPPC5Xcp>?z=wlHh!vv{~+x{KoxoFJ75a7+uA)6T)Hu=CI Tf3UjE!iVn(uz-cWUiJV0zM~v6 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4a12f1d..a92b9c8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Jan 16 10:22:51 CET 2018 +#Thu Feb 08 11:39:35 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 diff --git a/settings.gradle b/settings.gradle index dba40c7..417ca2f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,2 @@ -rootProject.name = name - include 'asn1' include 'z3950' diff --git a/z3950/build.gradle b/z3950/build.gradle index 4e9d481..d7620a0 100644 --- a/z3950/build.gradle +++ b/z3950/build.gradle @@ -5,5 +5,5 @@ plugins { dependencies { compile project(':asn1') - compile "org.xbib:cql:${project.property('xbib-cql.version')}" + compile "org.xbib:cql-common:${project.property('xbib-cql.version')}" }