From 8d6cb72777d9a656c7cd8defb082cf821bbb85a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rg=20Prante?= Date: Thu, 7 Nov 2019 16:47:47 +0100 Subject: [PATCH] update to nett 4.1.43, gradle 5.6.2, jackson 2.9.10, metrics 2.0.0 --- build.gradle | 22 ++++++++-------------- gradle.properties | 16 +++++++--------- gradle/wrapper/gradle-wrapper.properties | 6 +++--- gradlew | 6 +++--- gradlew.bat | 2 +- 5 files changed, 22 insertions(+), 30 deletions(-) diff --git a/build.gradle b/build.gradle index 635759c..2f8e691 100644 --- a/build.gradle +++ b/build.gradle @@ -1,21 +1,16 @@ plugins { - id "org.sonarqube" version "2.6.1" - id "io.codearte.nexus-staging" version "0.11.0" - id "com.github.spotbugs" version "1.6.9" + id "org.sonarqube" version "2.8" + id "io.codearte.nexus-staging" version "0.21.1" + id "com.github.spotbugs" version "2.0.1" id "org.xbib.gradle.plugin.asciidoctor" version "1.5.6.0.1" } -if (JavaVersion.current() < JavaVersion.VERSION_11) { - throw new GradleException("The build must be run with Java 11") -} - subprojects { apply plugin: 'java' apply plugin: 'maven' - apply plugin: 'signing' - apply plugin: 'com.github.spotbugs' apply plugin: 'pmd' apply plugin: 'checkstyle' + apply plugin: 'com.github.spotbugs' apply plugin: 'org.xbib.gradle.plugin.asciidoctor' configurations { @@ -203,9 +198,8 @@ subprojects { } } } +} - nexusStaging { - packageGroup = "org.xbib" - } - -} \ No newline at end of file +nexusStaging { + packageGroup = "org.xbib" +} diff --git a/gradle.properties b/gradle.properties index 519fda6..9bb1cbb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,17 @@ group = org.xbib name = elx -version = 2.2.1.11 +version = 2.2.1.13 # main -xbib-metrics.version = 1.2.0 +xbib-metrics.version = 2.0.0 xbib-guice.version = 4.0.4 -guava.version = 28.0-jre -xbib-netty-http.version = 4.1.38.3 +xbib-netty-http.version = 4.1.43.1 elasticsearch.version = 2.2.1 -#jackson.version = 2.6.7 -jackson.version = 2.9.9 +guava.version = 28.0-jre +#jackson.version = 2.6.7 (original ES version) +jackson.version = 2.9.10 jna.version = 4.5.2 -log4j.version = 2.12.0 +log4j.version = 2.12.1 mustache.version = 0.9.5 jts.version = 1.13 @@ -20,5 +20,3 @@ junit.version = 5.5.1 # docs asciidoclet.version = 1.5.4 - -org.gradle.warning.mode = all diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f3a4f28..f2ac731 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Jul 23 11:33:24 CEST 2019 +#Thu Nov 07 16:18:04 CET 2019 +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index b0d6d0a..83f2acf 100755 --- a/gradlew +++ b/gradlew @@ -7,7 +7,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -125,8 +125,8 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` JAVACMD=`cygpath --unix "$JAVACMD"` diff --git a/gradlew.bat b/gradlew.bat index 15e1ee3..24467a1 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -5,7 +5,7 @@ @rem you may not use this file except in compliance with the License. @rem You may obtain a copy of the License at @rem -@rem http://www.apache.org/licenses/LICENSE-2.0 +@rem https://www.apache.org/licenses/LICENSE-2.0 @rem @rem Unless required by applicable law or agreed to in writing, software @rem distributed under the License is distributed on an "AS IS" BASIS,