fix easymock version in gradle build, upgrade to 3.3.5

Bill Kable · Bill Kable · commit 68fb73907985 · 2024-10-28T13:11:53.000-05:00
diff --git a/lab/00-rewards-common/pom.xml b/lab/00-rewards-common/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
     <dependencies>
         <dependency>
diff --git 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
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/lab/10-spring-intro-solution/pom.xml b/lab/10-spring-intro-solution/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/lab/10-spring-intro/pom.xml b/lab/10-spring-intro/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/lab/12-javaconfig-dependency-injection-solution/pom.xml b/lab/12-javaconfig-dependency-injection-solution/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/lab/12-javaconfig-dependency-injection/pom.xml b/lab/12-javaconfig-dependency-injection/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/lab/16-annotations-solution/pom.xml b/lab/16-annotations-solution/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/lab/16-annotations/pom.xml b/lab/16-annotations/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/lab/22-aop-solution/pom.xml b/lab/22-aop-solution/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/lab/22-aop/pom.xml b/lab/22-aop/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/lab/24-test-solution/pom.xml b/lab/24-test-solution/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/lab/24-test/pom.xml b/lab/24-test/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/lab/26-jdbc-solution/pom.xml b/lab/26-jdbc-solution/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/lab/26-jdbc/pom.xml b/lab/26-jdbc/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/lab/28-transactions-solution/pom.xml b/lab/28-transactions-solution/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/lab/28-transactions/pom.xml b/lab/28-transactions/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/lab/30-jdbc-boot-solution/pom.xml b/lab/30-jdbc-boot-solution/pom.xml
@@ -12,7 +12,7 @@
      <parent>
           <groupId>org.springframework.boot</groupId>
           <artifactId>spring-boot-starter-parent</artifactId>
-          <version>3.3.1</version>
+          <version>3.3.5</version>
           <relativePath/> <!-- lookup parent from repository -->
      </parent>
 
diff --git a/lab/32-jdbc-autoconfig-solution/pom.xml b/lab/32-jdbc-autoconfig-solution/pom.xml
@@ -10,11 +10,11 @@
     <parent>
         <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
 
     <dependencies>
-    
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
diff --git a/lab/32-jdbc-autoconfig/pom.xml b/lab/32-jdbc-autoconfig/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
 
     <dependencies>
diff --git 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
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
         <relativePath></relativePath>
     </parent>
     <properties>
diff --git 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
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
         <relativePath></relativePath>
     </parent>
     <properties>
diff --git a/lab/34-spring-data-jpa-solution/pom.xml b/lab/34-spring-data-jpa-solution/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/lab/34-spring-data-jpa/pom.xml b/lab/34-spring-data-jpa/pom.xml
@@ -10,7 +10,7 @@
      <parent>
           <groupId>io.spring.training.core-spring</groupId>
           <artifactId>parentProject</artifactId>
-          <version>3.3.1</version>
+          <version>3.3.5</version>
      </parent>
      <dependencies>
           <dependency>
diff --git a/lab/36-mvc-solution/pom.xml b/lab/36-mvc-solution/pom.xml
@@ -10,7 +10,7 @@
      <parent>
           <groupId>io.spring.training.core-spring</groupId>
           <artifactId>parentProject</artifactId>
-          <version>3.3.1</version>
+          <version>3.3.5</version>
      </parent>
      <properties>
           <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/lab/36-mvc/pom.xml b/lab/36-mvc/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/lab/38-rest-ws-solution/pom.xml b/lab/38-rest-ws-solution/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/lab/38-rest-ws/pom.xml b/lab/38-rest-ws/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/lab/40-boot-test-solution/pom.xml b/lab/40-boot-test-solution/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/lab/40-boot-test/pom.xml b/lab/40-boot-test/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -43,7 +43,7 @@
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
 
-        
+
           <!-- Automatic application restart -->
           <dependency>
                <groupId>org.springframework.boot</groupId>
diff --git a/lab/42-security-rest-solution/pom.xml b/lab/42-security-rest-solution/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/lab/42-security-rest/pom.xml b/lab/42-security-rest/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/lab/44-actuator-solution/pom.xml b/lab/44-actuator-solution/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/lab/44-actuator/pom.xml b/lab/44-actuator/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.spring.training.core-spring</groupId>
         <artifactId>parentProject</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git 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
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.spring.training.core-spring</groupId>
     <artifactId>parentProject</artifactId>
-    <version>3.3.1</version>
+    <version>3.3.5</version>
     <organization>
         <name>Spring Training</name>
         <url>https://spring.io/training</url>
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.5</version>
     </parent>
     <properties>
         <!-- Versions of other dependencies not in spring IO. -->
@@ -158,7 +158,7 @@
             </plugin>
         </plugins>
     </build>
-    
+
     <modules>
         <!--
           // KEEP IN SYNC WITH SLIDES
@@ -196,7 +196,7 @@
         <module>34-spring-data-jpa-solution</module>
         <module>36-mvc</module>
         <module>36-mvc-solution</module>
-        
+
         <!-- Day 4 -->
         <module>38-rest-ws</module>
         <module>38-rest-ws-solution</module>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`buildscript {`
`2`	`2`	`ext {`
`3`		`- springBootVersion = "3.3.1"`
	`3`	`+ springBootVersion = "3.3.5"`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`repositories {`