Spring/spring-ldap
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to Gradle 7.3.3

Browse Source 
Issue gh-610
Closes gh-613
Closes gh-581
This commit is contained in:
Josh Cummings
2022-01-13 16:16:50 -07:00
parent 02ee328e6c
commit 28f2ca6ee0
221 changed files with 10092 additions and 2337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/integration-tests-ad/build.gradle
View File

@@ -1,17 +1,17 @@
apply from: JAVA_SCRIPT
apply plugin: 'io.spring.convention.spring-test'
dependencies {
implementation project(":spring-ldap-test"),
project(":spring-ldap-odm"),
project(":spring-ldap-core-tiger")
provided "org.springframework:spring-jdbc:$springVersion",
"org.springframework:spring-orm:$springVersion"
provided "org.springframework:spring-jdbc",
"org.springframework:spring-orm"
testCompile "org.springframework:spring-test:$springVersion",
"junit:junit:$junitVersion",
"org.slf4j:slf4j-log4j12:$slf4jVersion",
"org.assertj:assertj-core:$assertjVersion"
testImplementation "org.springframework:spring-test",
"junit:junit",
"org.slf4j:slf4j-log4j12",
"org.assertj:assertj-core"
}

20
test/integration-tests-openldap/build.gradle
View File

@@ -1,22 +1,22 @@
apply from: JAVA_SCRIPT
apply plugin: 'io.spring.convention.spring-test'
dependencies {
implementation project(":spring-ldap-core-tiger"),
project(":spring-ldap-test"),
"commons-lang:commons-lang:$commonsLangVersion",
"commons-logging:commons-logging:$commonsLoggingVersion",
"commons-lang:commons-lang",
"commons-logging:commons-logging",
"commons-httpclient:commons-httpclient:3.1",
"commons-codec:commons-codec:1.3"
provided "org.springframework:spring-jdbc:$springVersion"
provided "org.springframework:spring-jdbc"
testCompile "org.springframework:spring-aop:$springVersion",
"org.springframework:spring-test:$springVersion",
"gsbase:gsbase:$gsbaseVersion",
"junit:junit:$junitVersion",
testImplementation "org.springframework:spring-aop",
"org.springframework:spring-test",
"gsbase:gsbase",
"junit:junit",
"com.sun:ldapbp:1.0",
"org.slf4j:slf4j-log4j12:$slf4jVersion",
"org.assertj:assertj-core:$assertjVersion"
"org.slf4j:slf4j-log4j12",
"org.assertj:assertj-core"
}

17
test/integration-tests-sunone/build.gradle
View File

@@ -1,4 +1,4 @@
apply from: JAVA_SCRIPT
apply plugin: 'io.spring.convention.spring-test'
dependencies {
implementation project(":spring-ldap-test"),
@@ -7,16 +7,15 @@ dependencies {
project(":spring-ldap-core-tiger"),
"commons-pool:commons-pool:1.4"
provided "org.springframework:spring-jdbc:$springVersion",
provided "org.springframework:spring-jdbc",
"com.sun:ldapbp:1.0"
testCompile "junit:junit:$junitVersion",
"org.springframework:spring-aop:$springVersion",
"org.springframework:spring-aop:$springVersion",
"gsbase:gsbase:$gsbaseVersion",
"org.slf4j:slf4j-log4j12:$slf4jVersion",
"org.assertj:assertj-core:$assertjVersion",
apachedsDependencies
testImplementation "junit:junit",
"org.springframework:spring-aop",
"org.springframework:spring-aop",
"gsbase:gsbase",
"org.slf4j:slf4j-log4j12",
"org.assertj:assertj-core"
}

46
test/integration-tests/build.gradle
View File

@@ -1,11 +1,4 @@
repositories {
maven { url "https://download.java.net/maven/2/" }
}
apply from: JAVA_SCRIPT
configurations {
jacoco //Configuration Group used by Sonar to provide Code Coverage using JaCoCo
}
apply plugin: 'io.spring.convention.spring-test'
idea.module.excludeDirs = [
file('.gradle'),
@@ -26,15 +19,15 @@ dependencies {
implementation project(":spring-ldap-test"),
project(":spring-ldap-core-tiger")
implementation "com.querydsl:querydsl-apt:$queryDslVersion",
"commons-lang:commons-lang:$commonsLangVersion"
implementation "com.querydsl:querydsl-apt",
"commons-lang:commons-lang"
implementation("org.springframework.data:spring-data-commons:$springDataVersion") {
implementation("org.springframework.data:spring-data-commons") {
exclude group: "org.springframework", module: "spring-beans"
exclude group: "org.springframework", module: "spring-core"
}
implementation("org.springframework.security:spring-security-core:$springSecurityVersion") {
implementation("org.springframework.security:spring-security-core") {
exclude group: "org.springframework", module: "spring-expression"
exclude group: "org.springframework", module: "spring-core"
exclude group: "org.springframework", module: "spring-context"
@@ -42,25 +35,24 @@ dependencies {
exclude group: "org.springframework", module: "spring-aop"
}
provided "commons-pool:commons-pool:$commonsPoolVersion",
"org.springframework:spring-jdbc:$springVersion",
"org.springframework:spring-orm:$springVersion"
provided "commons-pool:commons-pool",
"org.springframework:spring-jdbc",
"org.springframework:spring-orm"
testImplementation "org.springframework:spring-test:$springVersion",
"org.springframework:spring-aop:$springVersion",
"org.springframework:spring-expression:$springVersion",
"org.hibernate:hibernate-core:$hibernateVersion",
testImplementation "org.springframework:spring-test",
"org.springframework:spring-aop",
"org.springframework:spring-expression",
"org.hibernate:hibernate-core",
"aspectj:aspectjrt:1.5.4",
"aspectj:aspectjweaver:1.5.4",
"hsqldb:hsqldb:1.8.0.7",
"junit:junit:$junitVersion",
"org.springframework.security:spring-security-config:$springSecurityVersion",
"org.slf4j:slf4j-log4j12:$slf4jVersion",
"org.assertj:assertj-core:$assertjVersion",
apachedsDependencies
"junit:junit",
"org.springframework.security:spring-security-config",
"org.slf4j:slf4j-log4j12",
"org.assertj:assertj-core"
testImplementation("org.springframework.security:spring-security-ldap:$springSecurityVersion") {
testImplementation("org.springframework.security:spring-security-ldap") {
exclude group: "org.springframework.ldap", module: "spring-ldap-core"
}
}
@@ -80,12 +72,8 @@ idea {
}
}
dependencies {
jacoco group: "org.jacoco", name: "org.jacoco.agent", version: "0.7.1.201405082137", classifier: "runtime"
}
test {
jvmArgs "-javaagent:${configurations.jacoco.asPath}=destfile=$projectDir/../../core/build/jacoco.exec,includes=org.springframework.*"
systemProperties = System.properties
}