From 329661f6b95a28b327402aa8e7febad6f664b2b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rg=20Prante?= Date: Sun, 15 Sep 2019 13:51:33 +0200 Subject: [PATCH] update to jflex plugin 1.2.1, update to gradle 5.6 --- cql-common/build.gradle | 2 +- gradle.properties | 7 ++++--- gradle/wrapper/gradle-wrapper.properties | 4 ++-- gradlew | 6 +++--- gradlew.bat | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/cql-common/build.gradle b/cql-common/build.gradle index 0872724..c8a3184 100644 --- a/cql-common/build.gradle +++ b/cql-common/build.gradle @@ -1,4 +1,4 @@ plugins { - id 'org.xbib.gradle.plugin.jflex' version '1.1.0' + id 'org.xbib.gradle.plugin.jflex' version '1.2.1' id 'org.xbib.gradle.plugin.jacc' version '1.1.3' } diff --git a/gradle.properties b/gradle.properties index 97acf7a..6079414 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,9 @@ group = org.xbib name = cql -version = 2.0.0 +version = 2.0.1 -xbib-content.version = 2.0.0 -xbib-bibliographic-character-sets.version = 1.0.0 +xbib-content.version = 2.0.1 +# test junit.version = 5.5.1 +xbib-bibliographic-character-sets.version = 1.0.0 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9a71a62..bb9d48b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ -#Mon Aug 12 10:55:55 CEST 2019 -distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip +#Sun Sep 15 13:47:17 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,