trying to upgrade project to java jdk 17 and spring boot 3

teixeira-fernando · Oct 22, 2023 · 6c9de85 · 6c9de85
1 parent 94c2eab
commit 6c9de85
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 50 deletions.
diff --git a/.github/workflows/PR-pipeline.yml b/.github/workflows/PR-pipeline.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'adopt'
       - name: Cache Maven packages
         uses: actions/cache@v3
@@ -49,7 +49,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'adopt'
       - name: Cache SonarCloud packages
         uses: actions/cache@v3
@@ -86,7 +86,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'adopt'
       - name: Cache
         uses: actions/[email protected]

diff --git a/base-domain/pom.xml b/base-domain/pom.xml
@@ -49,7 +49,7 @@
     <dependency>
       <artifactId>spring-boot-starter-data-mongodb</artifactId>
       <groupId>org.springframework.boot</groupId>
-      <version>2.7.14</version>
+      <version>3.1.2</version>
     </dependency>
     <dependency>
       <artifactId>de.flapdoodle.embed.mongo</artifactId>
@@ -73,9 +73,9 @@
   </distributionManagement>
 
   <properties>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
-    <java.version>11</java.version>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
+    <java.version>17</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.plugin.validation>VERBOSE</maven.plugin.validation>
     <revision>1.0.0-SNAPSHOT</revision>

diff --git a/inventory/pom.xml b/inventory/pom.xml
@@ -8,7 +8,6 @@
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>
-                <version>2.22.1</version>
                 <executions>
                     <execution>
                         <id>apply</id>
@@ -40,13 +39,11 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.3.2.RELEASE</version>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
@@ -150,12 +147,10 @@
         <dependency>
             <artifactId>spring-boot-starter-actuator</artifactId>
             <groupId>org.springframework.boot</groupId>
-            <version>2.7.14</version>
         </dependency>
         <dependency>
             <artifactId>spring-boot-starter-web</artifactId>
             <groupId>org.springframework.boot</groupId>
-            <version>2.7.14</version>
         </dependency>
 
         <dependency>
@@ -167,55 +162,31 @@
                 </exclusion>
             </exclusions>
             <groupId>org.springframework.boot</groupId>
-            <version>3.1.2</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <artifactId>persistence-api</artifactId>
-            <groupId>javax.persistence</groupId>
-            <version>1.0.2</version>
-        </dependency>
         <dependency>
             <artifactId>spring-boot-starter-data-mongodb</artifactId>
             <groupId>org.springframework.boot</groupId>
-            <version>3.1.2</version>
-        </dependency>
-        <dependency>
-            <artifactId>de.flapdoodle.embed.mongo</artifactId>
-            <groupId>de.flapdoodle.embed</groupId>
-            <scope>test</scope>
-            <version>2.2.0</version>
+          <version>3.1.2</version>
         </dependency>
+      <dependency>
+        <artifactId>de.flapdoodle.embed.mongo</artifactId>
+        <groupId>de.flapdoodle.embed</groupId>
+        <scope>test</scope>
+        <version>3.5.4</version>
+      </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <version>1.18.24</version>
         </dependency>
 
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <version>2.0.1.Final</version>
-        </dependency>
-
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
             <version>3.0.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-boot-starter</artifactId>
-            <version>3.0.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>3.0.0</version>
-        </dependency>
-
         <dependency>
             <groupId>au.com.dius.pact.provider</groupId>
             <artifactId>junit5spring</artifactId>
@@ -243,11 +214,11 @@
         <artifactId>spring-boot-starter-parent</artifactId>
         <groupId>org.springframework.boot</groupId>
         <relativePath/>
-        <version>2.3.2.RELEASE</version> <!-- lookup parent from com.ecommerceapp.shipment.repository -->
+        <version>3.1.2</version>
     </parent>
 
     <properties>
-        <java.version>11</java.version>
+        <java.version>17</java.version>
         <sonar.coverage.jacoco.xmlReportPaths>
             ${project.basedir}/../inventory/target/site/jacoco/jacoco.xml
         </sonar.coverage.jacoco.xmlReportPaths>

diff --git a/inventory/src/test/java/com/ecommerceapp/inventory/contract/InventoryProviderPact.java b/inventory/src/test/java/com/ecommerceapp/inventory/contract/InventoryProviderPact.java
@@ -24,11 +24,10 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 @ExtendWith(SpringExtension.class)
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 @Provider("InventoryModule")
 @PactBroker(
     url = "${PACT_BROKER_URL}",
@@ -38,13 +37,11 @@
 @IgnoreNoPactsToVerify
 class InventoryProviderPact {
 
-  @LocalServerPort private int localServerPort;
-
   @MockBean private InventoryService inventoryService;
 
   @BeforeEach
   void setUp(PactVerificationContext context) throws MalformedURLException {
-    context.setTarget(HttpTestTarget.fromUrl(new URL("http://localhost:" + localServerPort)));
+    context.setTarget(HttpTestTarget.fromUrl(new URL("http://localhost:" + 7080)));
   }
 
   @TestTemplate