update gradle and java dependencies

This commit is contained in:
2019-10-19 18:31:02 +02:00
parent 12be86a1d6
commit 10e5c058ec
4 changed files with 29 additions and 36 deletions

View File

@@ -1,6 +1,6 @@
import org.gradle.plugins.ide.eclipse.model.AccessRule
apply plugin: 'java'
//apply plugin: 'java'
apply plugin: 'eclipse'
@@ -13,14 +13,14 @@ buildscript {
dependencies {
// 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 {
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"
@@ -57,6 +57,8 @@ ext {
subprojects {
apply plugin: 'java'
apply plugin: 'eclipse'
compileJava.options.encoding = 'UTF-8'
// java compatibility version
sourceCompatibility = 12
@@ -88,6 +90,16 @@ subprojects {
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 {
classpath {
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 {
gradleVersion = '5.6.2'
gradleVersion = '6.0-rc-1'
}