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

update spring boot

Browse Source
This commit is contained in:
Andreas Huber
2020-10-31 09:11:32 +01:00
parent 50658b22ee
commit 0fab0c2e5e
1 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
build.gradle
View File

@@ -13,7 +13,7 @@ buildscript {
} }
dependencies { dependencies {
// usage: gradlew dependencyUpdates -Drevision=release // usage: gradlew dependencyUpdates -Drevision=release
classpath 'com.github.ben-manes:gradle-versions-plugin:0.33.0' classpath 'com.github.ben-manes:gradle-versions-plugin:0.33.0'
} }
} }
@@ -23,7 +23,7 @@ ext {
javaVersion=14 javaVersion=14
version_log4j2= '2.13.3' // keep in sync with spring-boot-starter-log4j2 version_log4j2= '2.13.3' // keep in sync with spring-boot-starter-log4j2
version_spring = '2.3.4.RELEASE' version_spring = '2.3.5.RELEASE'
version_junit = '5.7.0' version_junit = '5.7.0'
version_junit_platform = '1.7.0' version_junit_platform = '1.7.0'
@@ -59,44 +59,44 @@ ext {
* The shared configuration for all sub-projects: * The shared configuration for all sub-projects:
*/ */
subprojects { subprojects {
apply plugin: 'java-library' apply plugin: 'java-library'
apply plugin: 'eclipse' apply plugin: 'eclipse'
compileJava.options.encoding = 'UTF-8' compileJava.options.encoding = 'UTF-8'
// java compatibility version // java compatibility version
sourceCompatibility = javaVersion sourceCompatibility = javaVersion
configurations { configurations {
tests tests
} }
// the repositories for external depenencies // the repositories for external depenencies
repositories { repositories {
maven { maven {
url 'https://repo.lucares.de/' url 'https://repo.lucares.de/'
content { includeGroup "org.lucares" } content { includeGroup "org.lucares" }
} }
mavenCentral(content: { excludeGroup "org.lucares" }) mavenCentral(content: { excludeGroup "org.lucares" })
jcenter{ jcenter{
content { excludeGroup "org.lucares" } content { excludeGroup "org.lucares" }
} }
} }
test{ test{
useJUnitPlatform { useJUnitPlatform {
includeEngines 'junit-jupiter' includeEngines 'junit-jupiter'
excludeEngines 'junit-vintage' excludeEngines 'junit-vintage'
} }
} }
// dependencies that all sub-projects have // dependencies that all sub-projects have
dependencies { dependencies {
testImplementation("org.junit.jupiter:junit-jupiter-engine:${version_junit}") testImplementation("org.junit.jupiter:junit-jupiter-engine:${version_junit}")
testImplementation "org.junit.jupiter:junit-jupiter-params:${version_junit}" // for @ParameterizedTest testImplementation "org.junit.jupiter:junit-jupiter-params:${version_junit}" // for @ParameterizedTest
testImplementation "org.junit.platform:junit-platform-launcher:${version_junit_platform}" // needed by eclipse testImplementation "org.junit.platform:junit-platform-launcher:${version_junit_platform}" // needed by eclipse
} }
task eclipseSettings(type: Copy) { task eclipseSettings(type: Copy) {
from ("${rootProject.projectDir}/eclipse/") { from ("${rootProject.projectDir}/eclipse/") {
include '**/*.prefs' include '**/*.prefs'
@@ -106,8 +106,8 @@ subprojects {
} }
tasks.eclipseJdt.dependsOn eclipseSettings tasks.eclipseJdt.dependsOn eclipseSettings
tasks.cleanEclipseJdt.dependsOn cleanEclipseSettings tasks.cleanEclipseJdt.dependsOn cleanEclipseSettings
eclipse { eclipse {
classpath { classpath {
file { file {
whenMerged { whenMerged {
@@ -115,7 +115,7 @@ subprojects {
def container = entries.find { it.path.contains path } def container = entries.find { it.path.contains path }
if (container != null) { if (container != null) {
container.accessRules.addAll(restrictions) container.accessRules.addAll(restrictions)
} }
} }
} }
} }