Merge pull request #1285 from Ensono/feat/upgrade-java-versions

updated classes to compile due to upgrade to spring boot 3. No functi…
Ensono · Jul 22, 2024 · 943806f · 943806f
2 parents 6bfff08 + 7b958eb
commit 943806f
Show file tree

Hide file tree

Showing 46 changed files with 387 additions and 374 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Amido
+Copyright (c) 2024 Ensono
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,23 +1,23 @@
-The full documentation on Amido Stacks can be found [here](https://amido.github.io/stacks/).
+The full documentation on Ensono Stacks can be found [here](https://stacks.ensono.com/).
 
 ## Using the repository to build the Java Spring Boot Rest API application
 
 ### Customised solution
 
-To customise the namespaces and create an application for your company please visit the full [documentation](https://stacks.amido.com/docs/)
+To customise the namespaces and create an application for your company please visit the full [documentation](https://stacks.ensono.com/docs)
 
 ### Running the application locally
 
 1. Clone one of the Java projects to your local machine from one of the following repos:
    ---
-    1. Simple web API: [stacks-java repository](https://github.com/amido/stacks-java)
-    2. Web API with CQRS: [stacks-java-cqrs repository](https://github.com/amido/stacks-java-cqrs)
-    3. Web API with CQRS and events: [stacks-java-cqrs-events repository](https://github.com/amido/stacks-java-cqrs-events)
+    1. Simple web API: [stacks-java repository](https://github.com/Ensono/stacks-java)
+    2. Web API with CQRS: [stacks-java-cqrs repository](https://github.com/Ensono/stacks-java-cqrs)
+    3. Web API with CQRS and events: [stacks-java-cqrs-events repository](https://github.com/Ensono/stacks-java-cqrs-events)
 
 2. Build and run the application
    ---
 
-   Note that at a minimum [Java 11](https://adoptopenjdk.net/) should be installed.
+   Note that at a minimum [Java 17](https://adoptopenjdk.net/) should be installed.
 
    Move to the `<PROJECT-NAME>/java` folder, then
 
@@ -61,8 +61,8 @@ If using Auth0 for authorization, Auth0 itself will need to be configured with b
 There are corresponding configuration values required for the Stacks application, within the `auth.properties` file, e.g.
 
 ```text
-auth0.issuer=https://amidostacks.eu.auth0.com/
-auth0.apiAudience=https://amidostacks.eu.auth0.com/api/v2/
+auth0.issuer=https://ensonostacks.eu.auth0.com/
+auth0.apiAudience=https://ensonostacks.eu.auth0.com/api/v2/
 ```
 
 These parameters are used to verify that the JWT supplied in the Authorization header of a request is valid.

diff --git a/api-tests-karate/.mvn/jvm.config b/api-tests-karate/.mvn/jvm.config
@@ -0,0 +1,11 @@
+--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+--add-opens=java.base/java.util=ALL-UNNAMED
+--add-opens=java.base/java.lang=ALL-UNNAMED
+--add-opens=java.base/java.lang.invoke=ALL-UNNAMED
+--add-opens java.base/java.lang.reflect=ALL-UNNAMED
+--add-opens java.base/java.text=ALL-UNNAMED
+--add-opens java.desktop/java.awt.font=ALL-UNNAMED
diff --git a/api-tests-karate/pom.xml b/api-tests-karate/pom.xml
@@ -9,24 +9,21 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>11</java.version>
-        <maven.compiler.version>3.8.1</maven.compiler.version>
-        <karate.version>0.9.6</karate.version>
+        <java.version>17</java.version>
+        <!-- Maven plugins -->
+        <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
+        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+        <karate.version>1.4.1</karate.version>
         <cucumber.reporting.version>5.5.3</cucumber.reporting.version>
         <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
         <puppycrawl-tools-checkstyle.version>8.44</puppycrawl-tools-checkstyle.version>
         <spotbugs-maven-plugin.version>4.2.3</spotbugs-maven-plugin.version>
         <spotbugs.version>4.5.2</spotbugs.version>
+        <owasp-dependency-check-plugin.version>10.0.3</owasp-dependency-check-plugin.version>
         <exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>com.intuit.karate</groupId>
-            <artifactId>karate-apache</artifactId>
-            <version>${karate.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.intuit.karate</groupId>
             <artifactId>karate-junit5</artifactId>
@@ -75,6 +72,25 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>owasp-dependency-check</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.owasp</groupId>
+                        <artifactId>dependency-check-maven</artifactId>
+                        <version>${owasp-dependency-check-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>check</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
     <build>
@@ -93,11 +109,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven.compiler.version}</version>
+                <version>${maven-compiler-plugin.version}</version>
                 <configuration>
                     <encoding>UTF-8</encoding>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
+                    <release>${java.version}</release>
                 </configuration>
             </plugin>
             <plugin>
@@ -129,7 +144,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
+                <version>${maven-surefire-plugin.version}</version>
             </plugin>
             <plugin>
                 <groupId>com.github.spotbugs</groupId>

diff --git a/api-tests/.mvn/jvm.config b/api-tests/.mvn/jvm.config
@@ -0,0 +1,11 @@
+--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+--add-opens=java.base/java.util=ALL-UNNAMED
+--add-opens=java.base/java.lang=ALL-UNNAMED
+--add-opens=java.base/java.lang.invoke=ALL-UNNAMED
+--add-opens java.base/java.lang.reflect=ALL-UNNAMED
+--add-opens java.base/java.text=ALL-UNNAMED
+--add-opens java.desktop/java.awt.font=ALL-UNNAMED
diff --git a/api-tests/pom.xml b/api-tests/pom.xml
@@ -20,6 +20,7 @@
         <parallel.tests>4</parallel.tests>
         <webdriver.base.url/>
         <jackson.version>2.12.3</jackson.version>
+        <java.version>17</java.version>
 
         <!-- Set 'pact.broker.url' and 'pact.broker.token' -->
         <pact.broker.url/>
@@ -48,12 +49,12 @@
 
         <!-- Maven plugins -->
         <spotbugs-maven-plugin.version>4.2.3</spotbugs-maven-plugin.version>
-        <owasp-dependency-check-plugin.version>6.5.0</owasp-dependency-check-plugin.version>
+        <owasp-dependency-check-plugin.version>10.0.3</owasp-dependency-check-plugin.version>
         <fmt-maven-plugin.version>2.13</fmt-maven-plugin.version>
         <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
         <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
         <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
-        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
         <pact.provider-plugin.version>4.3.2</pact.provider-plugin.version>
         <maven-pmd-plugin.version>3.15.0</maven-pmd-plugin.version>
         <findbugs-maven-plugin.version>3.0.5</findbugs-maven-plugin.version>
@@ -427,8 +428,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${maven-compiler-plugin.version}</version>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <encoding>UTF-8</encoding>
+                    <release>${java.version}</release>
                 </configuration>
             </plugin>
             <plugin>