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

reformat

Browse Source
This commit is contained in:
Andreas Huber
2021-03-06 09:36:43 +01:00
parent 024fa06926
commit b8e73b9b7b
1 changed files with 58 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
build.gradle
View File

@@ -20,39 +20,36 @@ buildscript {
ext {
javaVersion=14
javaVersion=14
version_log4j2= '2.13.3' // keep in sync with spring-boot-starter-log4j2
version_spring = '2.4.3'
version_junit = '5.7.1'
version_junit_platform = '1.7.1'
version_log4j2= '2.13.3' // keep in sync with spring-boot-starter-log4j2
version_spring = '2.4.3'
version_junit = '5.7.1'
version_junit_platform = '1.7.1'
lib_antlr = "org.antlr:antlr4:4.9.1"
lib_antlr = "org.antlr:antlr4:4.9.1"
lib_commons_collections4 = 'org.apache.commons:commons-collections4:4.4'
lib_commons_lang3 = 'org.apache.commons:commons-lang3:3.12.0'
lib_jackson_databind = 'com.fasterxml.jackson.core:jackson-databind:2.12.2'
lib_commons_collections4 = 'org.apache.commons:commons-collections4:4.4'
lib_commons_lang3 = 'org.apache.commons:commons-lang3:3.12.0'
lib_jackson_databind = 'com.fasterxml.jackson.core:jackson-databind:2.12.2'
lib_log4j2_core = "org.apache.logging.log4j:log4j-core:${version_log4j2}"
lib_log4j2_slf4j_impl = "org.apache.logging.log4j:log4j-slf4j-impl:${version_log4j2}"
lib_log4j2_core = "org.apache.logging.log4j:log4j-core:${version_log4j2}"
lib_log4j2_slf4j_impl = "org.apache.logging.log4j:log4j-slf4j-impl:${version_log4j2}"
lib_primitive_collections='org.lucares:primitiveCollections:0.1.20201115124106'
lib_primitive_collections='org.lucares:primitiveCollections:0.1.20201115124106'
lib_spring_boot_log4j2="org.springframework.boot:spring-boot-starter-log4j2:${version_spring}"
lib_spring_boot_test="org.springframework.boot:spring-boot-starter-test:${version_spring}"
lib_spring_boot_web="org.springframework.boot:spring-boot-starter-web:${version_spring}"
lib_spring_boot_log4j2="org.springframework.boot:spring-boot-starter-log4j2:${version_spring}"
lib_spring_boot_test="org.springframework.boot:spring-boot-starter-test:${version_spring}"
lib_spring_boot_web="org.springframework.boot:spring-boot-starter-web:${version_spring}"
eclipseAccessRestrictions = [
'org.eclipse.jdt.launching.JRE_CONTAINER': [
new AccessRule('nonaccessible', 'com/sun/**'),
new AccessRule('nonaccessible', 'java/awt/List'),
new AccessRule('nonaccessible', 'sun/**'),
],
'assertj-core': [
new AccessRule('nonaccessible', 'org/assertj/core/internal/**'),
new AccessRule('nonaccessible', 'org/assertj/core/util/Arrays')
]
]
eclipseAccessRestrictions = [
'org.eclipse.jdt.launching.JRE_CONTAINER': [
new AccessRule('nonaccessible', 'com/sun/**'),
new AccessRule('nonaccessible', 'java/awt/List'),
new AccessRule('nonaccessible', 'sun/**'),
],
'assertj-core': [new AccessRule('nonaccessible', 'org/assertj/core/internal/**'), new AccessRule('nonaccessible', 'org/assertj/core/util/Arrays')
]]
}
/*
@@ -85,8 +82,8 @@ subprojects {
test{
useJUnitPlatform {
includeEngines 'junit-jupiter'
excludeEngines 'junit-vintage'
includeEngines 'junit-jupiter'
excludeEngines 'junit-vintage'
}
}
@@ -97,32 +94,32 @@ subprojects {
testImplementation "org.junit.platform:junit-platform-launcher:${version_junit_platform}" // needed by eclipse
}
task eclipseSettings(type: Copy) {
from ("${rootProject.projectDir}/eclipse/") {
include '**/*.prefs'
filter(ReplaceTokens, tokens: [javaVersion: "${rootProject.javaVersion}".toString()])
}
into "${project.projectDir}/.settings/"
task eclipseSettings(type: Copy) {
from ("${rootProject.projectDir}/eclipse/") {
include '**/*.prefs'
filter(ReplaceTokens, tokens: [javaVersion: "${rootProject.javaVersion}".toString()])
}
into "${project.projectDir}/.settings/"
}
tasks.eclipseJdt.dependsOn eclipseSettings
tasks.cleanEclipseJdt.dependsOn cleanEclipseSettings
eclipse {
classpath {
file {
whenMerged {
eclipseAccessRestrictions.each{ path, restrictions ->
def container = entries.find { it.path.contains path }
if (container != null) {
container.accessRules.addAll(restrictions)
}
}
}
classpath {
file {
whenMerged {
eclipseAccessRestrictions.each{ path, restrictions ->
def container = entries.find { it.path.contains path }
if (container != null) {
container.accessRules.addAll(restrictions)
}
}
}
}
}
}
}
wrapper {
gradleVersion = '6.8.3'
gradleVersion = '6.8.3'
}