From b27158d62e9353e4c7e903362aa2297582ac2879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rg=20Prante?= Date: Sun, 15 Sep 2019 23:12:13 +0200 Subject: [PATCH] update to gradle 5.6, woodstox 6.0.1 --- content-xml/build.gradle | 1 + gradle.properties | 3 ++- gradle/wrapper/gradle-wrapper.properties | 4 ++-- gradlew | 6 +++--- gradlew.bat | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/content-xml/build.gradle b/content-xml/build.gradle index 506a6bd..d618b1d 100644 --- a/content-xml/build.gradle +++ b/content-xml/build.gradle @@ -3,4 +3,5 @@ dependencies { compile project(':content-resource') compile "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${project.property('jackson.version')}" compile "com.fasterxml.jackson.core:jackson-databind:${project.property('jackson-databind.version')}" + compile "com.fasterxml.woodstox:woodstox-core:${project.property('woodstox.version')}" } diff --git a/gradle.properties b/gradle.properties index 670a470..bcf23fa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,11 @@ group = org.xbib name = content -version = 2.0.1 +version = 2.0.2 xbib-net.version = 2.0.1 jackson.version = 2.9.9 jackson-databind.version = 2.9.9.2 +woodstox.version = 6.0.1 # test junit.version = 4.12 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cd3de92..9f1c64e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ -#Thu Aug 08 14:58:24 CEST 2019 -distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip +#Sun Sep 15 22:30:22 CEST 2019 +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists 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,