Upgrade to Spring Boot 3.2.0, adjust licenses

NationalSecurityAgency · Nov 30, 2023 · a8b1ce9 · a8b1ce9
1 parent b4cd851
commit a8b1ce9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/skills-client-integration/pom.xml b/skills-client-integration/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.1</version>
+        <version>3.2.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>skills</groupId>

diff --git a/skills-client-integration/skills-int-e2e-test/pom.xml b/skills-client-integration/skills-int-e2e-test/pom.xml
@@ -137,6 +137,7 @@
                             <licenseMerges>
                                 <licenseMerge>The Apache Software License, Version 2.0|Apache License, Version 2.0</licenseMerge>
                                 <licenseMerge>The Apache Software License, Version 2.0|Apache 2</licenseMerge>
+                                <licenseMerge>The Apache Software License, Version 2.0|Apache-2.0</licenseMerge>
                                 <licenseMerge>The Apache Software License, Version 2.0|The Apache License, Version 2.0</licenseMerge>
                                 <licenseMerge>The Apache Software License, Version 2.0|The Apache Software License, version 2.0</licenseMerge>
                                 <licenseMerge>Eclipse Public License - Version 1.0|Eclipse Public License 1.0</licenseMerge>

diff --git a/skills-client-integration/skills-int-service/pom.xml b/skills-client-integration/skills-int-service/pom.xml
@@ -91,6 +91,7 @@
 								<licenseMerge>The Apache Software License, Version 2.0|Apache License, Version 2.0</licenseMerge>
 								<licenseMerge>The Apache Software License, Version 2.0|Apache Public License 2.0</licenseMerge>
 								<licenseMerge>The Apache Software License, Version 2.0|Apache 2.0</licenseMerge>
+								<licenseMerge>The Apache Software License, Version 2.0|Apache-2.0</licenseMerge>
 								<licenseMerge>The Apache Software License, Version 2.0|The Apache License, Version 2.0</licenseMerge>
 								<licenseMerge>The Apache Software License, Version 2.0|Apache License, version 2.0</licenseMerge>
 								<licenseMerge>The Apache Software License, Version 2.0|Apache License 2.0</licenseMerge>