From 56134a0fe16c93813955a3ede90f053fd9da5a76 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 16 Nov 2021 20:47:47 -0800 Subject: [PATCH] Adapt all SSDG Gradle module build files to Gradle 7.3. --- docs/spring-session-docs.gradle | 20 ++++++------- ...mple-boot-gemfire-with-gfsh-servers.gradle | 16 +++++------ ...le-boot-gemfire-with-scoped-proxies.gradle | 18 ++++++------ .../spring-session-sample-boot-gemfire.gradle | 16 +++++------ ...ple-javaconfig-gemfire-clientserver.gradle | 24 +++++++++------- ...ssion-sample-javaconfig-gemfire-p2p.gradle | 22 +++++++++------ ...ion-sample-xml-gemfire-clientserver.gradle | 24 +++++++++------- ...ring-session-sample-xml-gemfire-p2p.gradle | 22 +++++++++------ .../spring-session-data-geode.gradle | 28 +++++++++---------- 9 files changed, 102 insertions(+), 88 deletions(-) diff --git a/docs/spring-session-docs.gradle b/docs/spring-session-docs.gradle index c2d9a07..9888f28 100644 --- a/docs/spring-session-docs.gradle +++ b/docs/spring-session-docs.gradle @@ -7,16 +7,16 @@ repositories { dependencies { - testCompile project(':spring-session-data-geode') - testCompile "javax.servlet:javax.servlet-api" - testCompile "junit:junit" - testCompile "org.assertj:assertj-core" - testCompile "org.mockito:mockito-core" - testCompile "edu.umd.cs.mtc:multithreadedtc" - testCompile "org.springframework:spring-test" - testCompile "org.springframework.security:spring-security-core" - testCompile "org.springframework.security:spring-security-test" - testCompile "org.springframework.security:spring-security-web" + testImplementation project(':spring-session-data-geode') + testImplementation "javax.servlet:javax.servlet-api" + testImplementation "junit:junit" + testImplementation "org.assertj:assertj-core" + testImplementation "org.mockito:mockito-core" + testImplementation "edu.umd.cs.mtc:multithreadedtc" + testImplementation "org.springframework:spring-test" + testImplementation "org.springframework.security:spring-security-core" + testImplementation "org.springframework.security:spring-security-test" + testImplementation "org.springframework.security:spring-security-web" } diff --git a/samples/boot/gemfire-with-gfsh-servers/spring-session-sample-boot-gemfire-with-gfsh-servers.gradle b/samples/boot/gemfire-with-gfsh-servers/spring-session-sample-boot-gemfire-with-gfsh-servers.gradle index efb27da..0daa1e8 100644 --- a/samples/boot/gemfire-with-gfsh-servers/spring-session-sample-boot-gemfire-with-gfsh-servers.gradle +++ b/samples/boot/gemfire-with-gfsh-servers/spring-session-sample-boot-gemfire-with-gfsh-servers.gradle @@ -4,23 +4,23 @@ apply plugin: 'io.spring.convention.spring-sample-boot' dependencies { - compile project(':spring-session-data-geode') + implementation project(':spring-session-data-geode') - compile("org.springframework.boot:spring-boot-starter-thymeleaf") { + implementation("org.springframework.boot:spring-boot-starter-thymeleaf") { exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } - compile("org.springframework.boot:spring-boot-starter-web") { + implementation("org.springframework.boot:spring-boot-starter-web") { exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } - compile "org.springframework.data:spring-data-geode-test" - compile "org.webjars:bootstrap" - compile "org.webjars:webjars-locator" + implementation "org.springframework.data:spring-data-geode-test" + implementation "org.webjars:bootstrap" + implementation "org.webjars:webjars-locator" - runtime "org.springframework.shell:spring-shell" + runtimeOnly "org.springframework.shell:spring-shell" - testCompile("org.springframework.boot:spring-boot-starter-test") { + testImplementation("org.springframework.boot:spring-boot-starter-test") { exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } } diff --git a/samples/boot/gemfire-with-scoped-proxies/spring-session-sample-boot-gemfire-with-scoped-proxies.gradle b/samples/boot/gemfire-with-scoped-proxies/spring-session-sample-boot-gemfire-with-scoped-proxies.gradle index fd1b1ab..faa8d2f 100644 --- a/samples/boot/gemfire-with-scoped-proxies/spring-session-sample-boot-gemfire-with-scoped-proxies.gradle +++ b/samples/boot/gemfire-with-scoped-proxies/spring-session-sample-boot-gemfire-with-scoped-proxies.gradle @@ -3,27 +3,27 @@ apply plugin: "application" dependencies { - compile project(':spring-session-data-geode') + implementation project(':spring-session-data-geode') - compile("org.springframework.boot:spring-boot-starter-thymeleaf") { + implementation("org.springframework.boot:spring-boot-starter-thymeleaf") { exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } - compile("org.springframework.boot:spring-boot-starter-web") { + implementation("org.springframework.boot:spring-boot-starter-web") { exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } - compile "org.springframework.data:spring-data-geode-test" - compile "org.webjars:bootstrap" - compile "org.webjars:webjars-locator" + implementation "org.springframework.data:spring-data-geode-test" + implementation "org.webjars:bootstrap" + implementation "org.webjars:webjars-locator" - runtime "org.springframework.shell:spring-shell" + runtimeOnly "org.springframework.shell:spring-shell" - testCompile("org.springframework.boot:spring-boot-starter-test") { + testImplementation("org.springframework.boot:spring-boot-starter-test") { exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } - testCompile seleniumDependencies + testImplementation seleniumDependencies } diff --git a/samples/boot/gemfire/spring-session-sample-boot-gemfire.gradle b/samples/boot/gemfire/spring-session-sample-boot-gemfire.gradle index 7a8f271..08d219f 100644 --- a/samples/boot/gemfire/spring-session-sample-boot-gemfire.gradle +++ b/samples/boot/gemfire/spring-session-sample-boot-gemfire.gradle @@ -4,23 +4,23 @@ apply plugin: "application" dependencies { - compile project(':spring-session-data-geode') + implementation project(':spring-session-data-geode') - compile("org.springframework.boot:spring-boot-starter-thymeleaf") { + implementation("org.springframework.boot:spring-boot-starter-thymeleaf") { exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } - compile("org.springframework.boot:spring-boot-starter-web") { + implementation("org.springframework.boot:spring-boot-starter-web") { exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } - compile "org.springframework.data:spring-data-geode-test" - compile "org.webjars:bootstrap" - compile "org.webjars:webjars-locator" + implementation "org.springframework.data:spring-data-geode-test" + implementation "org.webjars:bootstrap" + implementation "org.webjars:webjars-locator" - runtime "org.springframework.shell:spring-shell" + runtimeOnly "org.springframework.shell:spring-shell" - testCompile("org.springframework.boot:spring-boot-starter-test") { + testImplementation("org.springframework.boot:spring-boot-starter-test") { exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } diff --git a/samples/javaconfig/gemfire-clientserver/spring-session-sample-javaconfig-gemfire-clientserver.gradle b/samples/javaconfig/gemfire-clientserver/spring-session-sample-javaconfig-gemfire-clientserver.gradle index 029fb14..dd8dd96 100644 --- a/samples/javaconfig/gemfire-clientserver/spring-session-sample-javaconfig-gemfire-clientserver.gradle +++ b/samples/javaconfig/gemfire-clientserver/spring-session-sample-javaconfig-gemfire-clientserver.gradle @@ -1,23 +1,27 @@ +plugins { + id "org.gretty" version "4.0.0" +} + apply plugin: 'io.spring.convention.spring-sample-war' apply plugin: "gemfire-server" apply plugin: "application" dependencies { - compile project(':spring-session-data-geode') - compile "org.springframework:spring-web" - compile "org.springframework.data:spring-data-geode-test" - compile "org.webjars:bootstrap" - compile "org.webjars:webjars-taglib" - compile jstlDependencies - compile slf4jDependencies + implementation project(':spring-session-data-geode') + implementation "org.springframework:spring-web" + implementation "org.springframework.data:spring-data-geode-test" + implementation "org.webjars:bootstrap" + implementation "org.webjars:webjars-taglib" + implementation jstlDependencies + implementation slf4jDependencies providedCompile "javax.servlet:javax.servlet-api" - runtime "org.springframework.shell:spring-shell" + runtimeOnly "org.springframework.shell:spring-shell" - testCompile "junit:junit" - testCompile "org.assertj:assertj-core" + testImplementation "junit:junit" + testImplementation "org.assertj:assertj-core" integrationTestCompile seleniumDependencies diff --git a/samples/javaconfig/gemfire-p2p/spring-session-sample-javaconfig-gemfire-p2p.gradle b/samples/javaconfig/gemfire-p2p/spring-session-sample-javaconfig-gemfire-p2p.gradle index 2b20144..ad52c62 100644 --- a/samples/javaconfig/gemfire-p2p/spring-session-sample-javaconfig-gemfire-p2p.gradle +++ b/samples/javaconfig/gemfire-p2p/spring-session-sample-javaconfig-gemfire-p2p.gradle @@ -1,20 +1,24 @@ +plugins { + id "org.gretty" version "4.0.0" +} + apply plugin: 'io.spring.convention.spring-sample-war' dependencies { - compile project(':spring-session-data-geode') - compile "org.springframework:spring-web" - compile "org.webjars:bootstrap" - compile "org.webjars:webjars-taglib" - compile jstlDependencies - compile slf4jDependencies + implementation project(':spring-session-data-geode') + implementation "org.springframework:spring-web" + implementation "org.webjars:bootstrap" + implementation "org.webjars:webjars-taglib" + implementation jstlDependencies + implementation slf4jDependencies providedCompile "javax.servlet:javax.servlet-api" - runtime "org.springframework.shell:spring-shell" + runtimeOnly "org.springframework.shell:spring-shell" - testCompile "junit:junit" - testCompile "org.assertj:assertj-core" + testImplementation "junit:junit" + testImplementation "org.assertj:assertj-core" integrationTestCompile seleniumDependencies diff --git a/samples/xml/gemfire-clientserver/spring-session-sample-xml-gemfire-clientserver.gradle b/samples/xml/gemfire-clientserver/spring-session-sample-xml-gemfire-clientserver.gradle index 029fb14..dd8dd96 100644 --- a/samples/xml/gemfire-clientserver/spring-session-sample-xml-gemfire-clientserver.gradle +++ b/samples/xml/gemfire-clientserver/spring-session-sample-xml-gemfire-clientserver.gradle @@ -1,23 +1,27 @@ +plugins { + id "org.gretty" version "4.0.0" +} + apply plugin: 'io.spring.convention.spring-sample-war' apply plugin: "gemfire-server" apply plugin: "application" dependencies { - compile project(':spring-session-data-geode') - compile "org.springframework:spring-web" - compile "org.springframework.data:spring-data-geode-test" - compile "org.webjars:bootstrap" - compile "org.webjars:webjars-taglib" - compile jstlDependencies - compile slf4jDependencies + implementation project(':spring-session-data-geode') + implementation "org.springframework:spring-web" + implementation "org.springframework.data:spring-data-geode-test" + implementation "org.webjars:bootstrap" + implementation "org.webjars:webjars-taglib" + implementation jstlDependencies + implementation slf4jDependencies providedCompile "javax.servlet:javax.servlet-api" - runtime "org.springframework.shell:spring-shell" + runtimeOnly "org.springframework.shell:spring-shell" - testCompile "junit:junit" - testCompile "org.assertj:assertj-core" + testImplementation "junit:junit" + testImplementation "org.assertj:assertj-core" integrationTestCompile seleniumDependencies diff --git a/samples/xml/gemfire-p2p/spring-session-sample-xml-gemfire-p2p.gradle b/samples/xml/gemfire-p2p/spring-session-sample-xml-gemfire-p2p.gradle index 2b20144..ad52c62 100644 --- a/samples/xml/gemfire-p2p/spring-session-sample-xml-gemfire-p2p.gradle +++ b/samples/xml/gemfire-p2p/spring-session-sample-xml-gemfire-p2p.gradle @@ -1,20 +1,24 @@ +plugins { + id "org.gretty" version "4.0.0" +} + apply plugin: 'io.spring.convention.spring-sample-war' dependencies { - compile project(':spring-session-data-geode') - compile "org.springframework:spring-web" - compile "org.webjars:bootstrap" - compile "org.webjars:webjars-taglib" - compile jstlDependencies - compile slf4jDependencies + implementation project(':spring-session-data-geode') + implementation "org.springframework:spring-web" + implementation "org.webjars:bootstrap" + implementation "org.webjars:webjars-taglib" + implementation jstlDependencies + implementation slf4jDependencies providedCompile "javax.servlet:javax.servlet-api" - runtime "org.springframework.shell:spring-shell" + runtimeOnly "org.springframework.shell:spring-shell" - testCompile "junit:junit" - testCompile "org.assertj:assertj-core" + testImplementation "junit:junit" + testImplementation "org.assertj:assertj-core" integrationTestCompile seleniumDependencies diff --git a/spring-session-data-geode/spring-session-data-geode.gradle b/spring-session-data-geode/spring-session-data-geode.gradle index 4ade32a..d9e533b 100644 --- a/spring-session-data-geode/spring-session-data-geode.gradle +++ b/spring-session-data-geode/spring-session-data-geode.gradle @@ -3,17 +3,17 @@ plugins { } apply plugin: 'io.spring.convention.spring-module' -apply from: MAVEN_POM_EDITOR_GRADLE +//apply from: MAVEN_POM_EDITOR_GRADLE description = "Spring Session for Apache Geode" dependencies { - compile "org.springframework:spring-context-support" - compile "org.springframework:spring-jcl" - compile "org.springframework.data:spring-data-geode" - compile "org.springframework.session:spring-session-core" - compile slf4jDependencies + implementation "org.springframework:spring-context-support" + implementation "org.springframework:spring-jcl" + implementation "org.springframework.data:spring-data-geode" + implementation "org.springframework.session:spring-session-core" + implementation slf4jDependencies compileOnly "com.google.code.findbugs:jsr305:$findbugsVersion" @@ -27,15 +27,13 @@ dependencies { provided "org.apache.geode:geode-logging:$apacheGeodeVersion" provided "org.apache.geode:geode-serialization:$apacheGeodeVersion" // Need for Geode Serialization - testCompile "org.assertj:assertj-core" - testCompile "junit:junit" - testCompile "org.mockito:mockito-core" - testCompile "edu.umd.cs.mtc:multithreadedtc" - testCompile "org.springframework:spring-test" - testCompile "org.springframework:spring-web" - testCompile "org.springframework.data:spring-data-geode-test" - - testCompileOnly "com.google.code.findbugs:jsr305:$findbugsVersion" + testImplementation "org.assertj:assertj-core" + testImplementation "junit:junit" + testImplementation "org.mockito:mockito-core" + testImplementation "edu.umd.cs.mtc:multithreadedtc" + testImplementation "org.springframework:spring-test" + testImplementation "org.springframework:spring-web" + testImplementation "org.springframework.data:spring-data-geode-test" testRuntime "ch.qos.logback:logback-classic" testRuntime "org.apache.logging.log4j:log4j-to-slf4j"