From 68fb73907985d5dd1b24bad3c196cb610974e4ea Mon Sep 17 00:00:00 2001 From: Bill Kable Date: Mon, 28 Oct 2024 13:11:53 -0500 Subject: [PATCH] fix easymock version in gradle build, upgrade to 3.3.5 --- lab/00-rewards-common/pom.xml | 2 +- lab/00-rewards-common/src/main/resources/banner.txt | 2 +- lab/01-rewards-db/pom.xml | 2 +- lab/10-spring-intro-solution/pom.xml | 2 +- lab/10-spring-intro/pom.xml | 2 +- lab/12-javaconfig-dependency-injection-solution/pom.xml | 2 +- lab/12-javaconfig-dependency-injection/pom.xml | 2 +- lab/16-annotations-solution/pom.xml | 2 +- lab/16-annotations/pom.xml | 2 +- lab/22-aop-solution/pom.xml | 2 +- lab/22-aop/pom.xml | 2 +- lab/24-test-solution/pom.xml | 2 +- lab/24-test/pom.xml | 2 +- lab/26-jdbc-solution/pom.xml | 2 +- lab/26-jdbc/pom.xml | 2 +- lab/28-transactions-solution/pom.xml | 2 +- lab/28-transactions/pom.xml | 2 +- lab/30-jdbc-boot-solution/pom.xml | 2 +- lab/32-jdbc-autoconfig-solution/pom.xml | 4 ++-- lab/32-jdbc-autoconfig/pom.xml | 2 +- lab/33-autoconfig-helloworld-solution/build.gradle | 2 +- lab/33-autoconfig-helloworld-solution/pom.xml | 2 +- lab/33-autoconfig-helloworld/build.gradle | 2 +- lab/33-autoconfig-helloworld/pom.xml | 2 +- lab/34-spring-data-jpa-solution/pom.xml | 2 +- lab/34-spring-data-jpa/pom.xml | 2 +- lab/36-mvc-solution/pom.xml | 2 +- lab/36-mvc/pom.xml | 2 +- lab/38-rest-ws-solution/pom.xml | 2 +- lab/38-rest-ws/pom.xml | 2 +- lab/40-boot-test-solution/pom.xml | 2 +- lab/40-boot-test/pom.xml | 4 ++-- lab/42-security-rest-solution/pom.xml | 2 +- lab/42-security-rest/pom.xml | 2 +- lab/44-actuator-solution/pom.xml | 2 +- lab/44-actuator/pom.xml | 2 +- lab/build.gradle | 6 +++--- lab/pom.xml | 8 ++++---- 38 files changed, 45 insertions(+), 45 deletions(-) diff --git a/lab/00-rewards-common/pom.xml b/lab/00-rewards-common/pom.xml index e93fdd9..5fed900 100644 --- a/lab/00-rewards-common/pom.xml +++ b/lab/00-rewards-common/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 diff --git a/lab/00-rewards-common/src/main/resources/banner.txt b/lab/00-rewards-common/src/main/resources/banner.txt index e5c92ab..1517cb1 100644 --- a/lab/00-rewards-common/src/main/resources/banner.txt +++ b/lab/00-rewards-common/src/main/resources/banner.txt @@ -5,4 +5,4 @@ ${Ansi.GREEN} :: ____ | |__| (_) | | | __/ ___) | |_) | | | | | | | (_| | / / / \____\___/|_| \___| |____/| .__/|_| |_|_| |_|\__, | / / / ================================|_|==================|___/=/_/_/= - :: Core Spring Training :: :: v3.3.1 ::${Ansi.DEFAULT} + :: Core Spring Training :: :: v3.3.5 ::${Ansi.DEFAULT} diff --git a/lab/01-rewards-db/pom.xml b/lab/01-rewards-db/pom.xml index 726ba8c..dac796f 100644 --- a/lab/01-rewards-db/pom.xml +++ b/lab/01-rewards-db/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 diff --git a/lab/10-spring-intro-solution/pom.xml b/lab/10-spring-intro-solution/pom.xml index 94a8496..f3e41a2 100644 --- a/lab/10-spring-intro-solution/pom.xml +++ b/lab/10-spring-intro-solution/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 diff --git a/lab/10-spring-intro/pom.xml b/lab/10-spring-intro/pom.xml index 31f45c5..b592f04 100644 --- a/lab/10-spring-intro/pom.xml +++ b/lab/10-spring-intro/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 diff --git a/lab/12-javaconfig-dependency-injection-solution/pom.xml b/lab/12-javaconfig-dependency-injection-solution/pom.xml index daea2ac..9ea221d 100644 --- a/lab/12-javaconfig-dependency-injection-solution/pom.xml +++ b/lab/12-javaconfig-dependency-injection-solution/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 diff --git a/lab/12-javaconfig-dependency-injection/pom.xml b/lab/12-javaconfig-dependency-injection/pom.xml index b0e372c..060a990 100644 --- a/lab/12-javaconfig-dependency-injection/pom.xml +++ b/lab/12-javaconfig-dependency-injection/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 diff --git a/lab/16-annotations-solution/pom.xml b/lab/16-annotations-solution/pom.xml index a0b50e6..af306b1 100644 --- a/lab/16-annotations-solution/pom.xml +++ b/lab/16-annotations-solution/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 diff --git a/lab/16-annotations/pom.xml b/lab/16-annotations/pom.xml index cd95033..99854fe 100644 --- a/lab/16-annotations/pom.xml +++ b/lab/16-annotations/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 diff --git a/lab/22-aop-solution/pom.xml b/lab/22-aop-solution/pom.xml index 84af378..d8d182a 100644 --- a/lab/22-aop-solution/pom.xml +++ b/lab/22-aop-solution/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 diff --git a/lab/22-aop/pom.xml b/lab/22-aop/pom.xml index 119c804..deeece4 100644 --- a/lab/22-aop/pom.xml +++ b/lab/22-aop/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 diff --git a/lab/24-test-solution/pom.xml b/lab/24-test-solution/pom.xml index ae66d08..e949d58 100644 --- a/lab/24-test-solution/pom.xml +++ b/lab/24-test-solution/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 diff --git a/lab/24-test/pom.xml b/lab/24-test/pom.xml index 60c0a21..d09a102 100644 --- a/lab/24-test/pom.xml +++ b/lab/24-test/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 diff --git a/lab/26-jdbc-solution/pom.xml b/lab/26-jdbc-solution/pom.xml index d5f53a9..5e7398b 100644 --- a/lab/26-jdbc-solution/pom.xml +++ b/lab/26-jdbc-solution/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 diff --git a/lab/26-jdbc/pom.xml b/lab/26-jdbc/pom.xml index afab982..cb7c10e 100644 --- a/lab/26-jdbc/pom.xml +++ b/lab/26-jdbc/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 diff --git a/lab/28-transactions-solution/pom.xml b/lab/28-transactions-solution/pom.xml index 95fdf88..712498e 100644 --- a/lab/28-transactions-solution/pom.xml +++ b/lab/28-transactions-solution/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 diff --git a/lab/28-transactions/pom.xml b/lab/28-transactions/pom.xml index 3414bbb..1bed258 100644 --- a/lab/28-transactions/pom.xml +++ b/lab/28-transactions/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 diff --git a/lab/30-jdbc-boot-solution/pom.xml b/lab/30-jdbc-boot-solution/pom.xml index 923a138..e5970f6 100644 --- a/lab/30-jdbc-boot-solution/pom.xml +++ b/lab/30-jdbc-boot-solution/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.1 + 3.3.5 diff --git a/lab/32-jdbc-autoconfig-solution/pom.xml b/lab/32-jdbc-autoconfig-solution/pom.xml index 98310f4..c747a1e 100644 --- a/lab/32-jdbc-autoconfig-solution/pom.xml +++ b/lab/32-jdbc-autoconfig-solution/pom.xml @@ -10,11 +10,11 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 - + org.springframework.boot spring-boot-starter diff --git a/lab/32-jdbc-autoconfig/pom.xml b/lab/32-jdbc-autoconfig/pom.xml index ed3f260..4a11ae7 100644 --- a/lab/32-jdbc-autoconfig/pom.xml +++ b/lab/32-jdbc-autoconfig/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 diff --git a/lab/33-autoconfig-helloworld-solution/build.gradle b/lab/33-autoconfig-helloworld-solution/build.gradle index c8af0e7..057da39 100644 --- a/lab/33-autoconfig-helloworld-solution/build.gradle +++ b/lab/33-autoconfig-helloworld-solution/build.gradle @@ -1,6 +1,6 @@ buildscript { ext { - springBootVersion = "3.3.1" + springBootVersion = "3.3.5" } repositories { diff --git a/lab/33-autoconfig-helloworld-solution/pom.xml b/lab/33-autoconfig-helloworld-solution/pom.xml index b6783fa..ad06642 100644 --- a/lab/33-autoconfig-helloworld-solution/pom.xml +++ b/lab/33-autoconfig-helloworld-solution/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.1 + 3.3.5 diff --git a/lab/33-autoconfig-helloworld/build.gradle b/lab/33-autoconfig-helloworld/build.gradle index c8af0e7..057da39 100644 --- a/lab/33-autoconfig-helloworld/build.gradle +++ b/lab/33-autoconfig-helloworld/build.gradle @@ -1,6 +1,6 @@ buildscript { ext { - springBootVersion = "3.3.1" + springBootVersion = "3.3.5" } repositories { diff --git a/lab/33-autoconfig-helloworld/pom.xml b/lab/33-autoconfig-helloworld/pom.xml index b6783fa..ad06642 100644 --- a/lab/33-autoconfig-helloworld/pom.xml +++ b/lab/33-autoconfig-helloworld/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.1 + 3.3.5 diff --git a/lab/34-spring-data-jpa-solution/pom.xml b/lab/34-spring-data-jpa-solution/pom.xml index 7ba88a0..aab1b0e 100644 --- a/lab/34-spring-data-jpa-solution/pom.xml +++ b/lab/34-spring-data-jpa-solution/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 diff --git a/lab/34-spring-data-jpa/pom.xml b/lab/34-spring-data-jpa/pom.xml index 12e0b0e..0b7d30d 100644 --- a/lab/34-spring-data-jpa/pom.xml +++ b/lab/34-spring-data-jpa/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 diff --git a/lab/36-mvc-solution/pom.xml b/lab/36-mvc-solution/pom.xml index 3ab9d3a..beee493 100644 --- a/lab/36-mvc-solution/pom.xml +++ b/lab/36-mvc-solution/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 UTF-8 diff --git a/lab/36-mvc/pom.xml b/lab/36-mvc/pom.xml index b70810c..4f13dc3 100644 --- a/lab/36-mvc/pom.xml +++ b/lab/36-mvc/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 UTF-8 diff --git a/lab/38-rest-ws-solution/pom.xml b/lab/38-rest-ws-solution/pom.xml index 5547f3e..8040e11 100644 --- a/lab/38-rest-ws-solution/pom.xml +++ b/lab/38-rest-ws-solution/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 UTF-8 diff --git a/lab/38-rest-ws/pom.xml b/lab/38-rest-ws/pom.xml index 35fd868..01a34b6 100644 --- a/lab/38-rest-ws/pom.xml +++ b/lab/38-rest-ws/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 UTF-8 diff --git a/lab/40-boot-test-solution/pom.xml b/lab/40-boot-test-solution/pom.xml index 6a6b4f0..c9d040d 100644 --- a/lab/40-boot-test-solution/pom.xml +++ b/lab/40-boot-test-solution/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 UTF-8 diff --git a/lab/40-boot-test/pom.xml b/lab/40-boot-test/pom.xml index e9bae47..0279564 100644 --- a/lab/40-boot-test/pom.xml +++ b/lab/40-boot-test/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 UTF-8 @@ -43,7 +43,7 @@ spring-boot-starter-data-jpa - + org.springframework.boot diff --git a/lab/42-security-rest-solution/pom.xml b/lab/42-security-rest-solution/pom.xml index e0ad241..cc258fd 100644 --- a/lab/42-security-rest-solution/pom.xml +++ b/lab/42-security-rest-solution/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 UTF-8 diff --git a/lab/42-security-rest/pom.xml b/lab/42-security-rest/pom.xml index 22b7a40..25c3ae4 100644 --- a/lab/42-security-rest/pom.xml +++ b/lab/42-security-rest/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 UTF-8 diff --git a/lab/44-actuator-solution/pom.xml b/lab/44-actuator-solution/pom.xml index 691a32a..4907d5a 100644 --- a/lab/44-actuator-solution/pom.xml +++ b/lab/44-actuator-solution/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 UTF-8 diff --git a/lab/44-actuator/pom.xml b/lab/44-actuator/pom.xml index 0b002dd..1ed5091 100644 --- a/lab/44-actuator/pom.xml +++ b/lab/44-actuator/pom.xml @@ -10,7 +10,7 @@ io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 UTF-8 diff --git a/lab/build.gradle b/lab/build.gradle index ac8b10f..76af287 100644 --- a/lab/build.gradle +++ b/lab/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { - springBootVersion = "3.3.1" - easyMockVersion = "5.2" + springBootVersion = "3.3.5" + easyMockVersion = "5.2.0" jmonVersion = "2.82" } @@ -18,7 +18,7 @@ allprojects { apply plugin: 'maven-publish' group = 'io.spring.training.core-spring' - version = '3.3.1' + version = '3.3.5' } subprojects { diff --git a/lab/pom.xml b/lab/pom.xml index 94131c2..ec75db2 100644 --- a/lab/pom.xml +++ b/lab/pom.xml @@ -2,7 +2,7 @@ 4.0.0 io.spring.training.core-spring parentProject - 3.3.1 + 3.3.5 Spring Training https://spring.io/training @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.1 + 3.3.5 @@ -158,7 +158,7 @@ - + 38-rest-ws 38-rest-ws-solution