andi/perfdb
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Activity

update gradle and java dependencies

Browse Source
This commit is contained in:
Andreas Huber
2019-10-19 18:31:02 +02:00
parent 12be86a1d6
commit 10e5c058ec
4 changed files with 29 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
build.gradle
View File

@@ -1,6 +1,6 @@
import org.gradle.plugins.ide.eclipse.model.AccessRule import org.gradle.plugins.ide.eclipse.model.AccessRule
apply plugin: 'java' //apply plugin: 'java'
apply plugin: 'eclipse' apply plugin: 'eclipse'
@@ -13,14 +13,14 @@ buildscript {
dependencies { dependencies {
// usage: gradlew dependencyUpdates -Drevision=release // usage: gradlew dependencyUpdates -Drevision=release
classpath 'com.github.ben-manes:gradle-versions-plugin:0.25.0' classpath 'com.github.ben-manes:gradle-versions-plugin:0.27.0'
} }
} }
ext { ext {
version_log4j2= '2.12.1' version_log4j2= '2.12.1'
version_spring = '2.1.9.RELEASE' version_spring = '2.2.0.RELEASE'
lib_antlr = "org.antlr:antlr4:4.7.2" lib_antlr = "org.antlr:antlr4:4.7.2"
@@ -57,6 +57,8 @@ ext {
subprojects { subprojects {
apply plugin: 'java' apply plugin: 'java'
apply plugin: 'eclipse' apply plugin: 'eclipse'
compileJava.options.encoding = 'UTF-8'
// java compatibility version // java compatibility version
sourceCompatibility = 12 sourceCompatibility = 12
@@ -88,6 +90,16 @@ subprojects {
testCompile group: 'org.testng', name: 'testng', version: '6.14.3' testCompile group: 'org.testng', name: 'testng', version: '6.14.3'
} }
task eclipseSettings(type: Copy) {
from ("${rootProject.projectDir}/eclipse/") {
include '**/*.prefs'
//filter(ReplaceTokens, tokens: [rootProjectDir: "${rootProject.projectDir}".toString().replaceAll('\\\\', '/')])
}
into "${project.projectDir}/.settings/"
}
tasks.eclipseJdt.dependsOn eclipseSettings
tasks.cleanEclipseJdt.dependsOn cleanEclipseSettings
eclipse { eclipse {
classpath { classpath {
file { file {
@@ -104,20 +116,6 @@ subprojects {
} }
} }
allprojects {
compileJava.options.encoding = 'UTF-8'
task eclipseSettings(type: Copy) {
from ("${rootProject.projectDir}/eclipse/") {
include '**/*.prefs'
//filter(ReplaceTokens, tokens: [rootProjectDir: "${rootProject.projectDir}".toString().replaceAll('\\\\', '/')])
}
into "${project.projectDir}/.settings/"
}
tasks.eclipseJdt.dependsOn eclipseSettings
tasks.cleanEclipseJdt.dependsOn cleanEclipseSettings
}
wrapper { wrapper {
gradleVersion = '5.6.2' gradleVersion = '6.0-rc-1'
} }

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-rc-1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

29
gradlew vendored
View File

@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
else else
eval `echo args$i`="\"$arg\"" eval `echo args$i`="\"$arg\""
fi fi
i=$((i+1)) i=`expr $i + 1`
done done
case $i in case $i in
(0) set -- ;; 0) set -- ;;
(1) set -- "$args0" ;; 1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;; 2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;; 3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;; 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac esac
fi fi
@@ -175,14 +175,9 @@ save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " " echo " "
} }
APP_ARGS=$(save "$@") APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules # Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi
exec "$JAVACMD" "$@" exec "$JAVACMD" "$@"