Add springboot parent 31 for London
https://spring.io/security/cve-2023-20883 by upgrading spring to 3.1.0+
Issue-ID: CCSDK-3921
Change-Id: I5fd8d252982aeea81cad0e31a5fd2fc1befff5b3
Signed-off-by: JohnKeeney <john.keeney@est.tech>
diff --git a/springboot/spring-boot-setup/pom.xml b/springboot/spring-boot-setup/pom.xml
index 017cf69..c22eac8 100644
--- a/springboot/spring-boot-setup/pom.xml
+++ b/springboot/spring-boot-setup/pom.xml
@@ -143,6 +143,30 @@
<encoding>UTF-8</encoding>
</configuration>
</execution>
+ <execution>
+ <id>create-springboot31-parent-pom</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals><!-- here the phase you need -->
+ <phase>validate</phase>
+ <configuration>
+ <outputDirectory>../springboot31</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>pom-template-jdk17.xml</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <escapeString>\</escapeString>
+ <filters>
+ <filter>${basedir}/src/main/properties/springboot31.properties</filter>
+ </filters>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -194,6 +218,28 @@
<destinationFile>../springboot26/pom.xml</destinationFile>
</configuration>
</execution>
+ <execution>
+ <id>rename-springboot30-parent-pom</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>rename</goal>
+ </goals>
+ <configuration>
+ <sourceFile>../springboot30/pom-template-jdk17.xml</sourceFile>
+ <destinationFile>../springboot30/pom.xml</destinationFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>rename-springboot31-parent-pom</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>rename</goal>
+ </goals>
+ <configuration>
+ <sourceFile>../springboot31/pom-template-jdk17.xml</sourceFile>
+ <destinationFile>../springboot31/pom.xml</destinationFile>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
diff --git a/springboot/spring-boot-setup/src/main/properties/springboot31.properties b/springboot/spring-boot-setup/src/main/properties/springboot31.properties
new file mode 100644
index 0000000..ec6957f
--- /dev/null
+++ b/springboot/spring-boot-setup/src/main/properties/springboot31.properties
@@ -0,0 +1,11 @@
+springbootparent.artifactId=spring-boot-starter-parent
+springbootparent.groupId=org.springframework.boot
+springbootparent.version=3.1.0
+springboot.project.artifactId=spring-boot-31-starter-parent
+spring.version=6.0.9
+springboot.httpcomponents.core.version=4.5.16
+springboot.httpcomponents.client.version=4.5.14
+springboot.jackson.version=2.15.0
+springboot.logback.version=1.4.7
+springboot.slf4j.version=2.19.0
+springboot.antlr.version=4.12.0
diff --git a/springboot/springboot30/pom.xml b/springboot/springboot30/pom.xml
index c2f5c57..8444932 100644
--- a/springboot/springboot30/pom.xml
+++ b/springboot/springboot30/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>3.0.3</version>
+ <version>3.0.6</version>
<relativePath/>
</parent>
@@ -99,8 +99,8 @@
<ccsdk.sli.plugins.version>${ccsdk.sli.version}</ccsdk.sli.plugins.version>
<!-- Spring versions -->
- <spring.boot.version>3.0.3</spring.boot.version>
- <spring.version>6.0.4</spring.version>
+ <spring.boot.version>3.0.6</spring.boot.version>
+ <spring.version>6.0.8</spring.version>
<!-- Kotlin versions -->
<kotlin.compiler.jvmTarget>1.11</kotlin.compiler.jvmTarget>
diff --git a/springboot/springboot30/pom-template-jdk17.xml b/springboot/springboot31/pom.xml
similarity index 98%
rename from springboot/springboot30/pom-template-jdk17.xml
rename to springboot/springboot31/pom.xml
index 162efaf..16337f4 100644
--- a/springboot/springboot30/pom-template-jdk17.xml
+++ b/springboot/springboot31/pom.xml
@@ -8,13 +8,13 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>3.0.3</version>
+ <version>3.1.0</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.parent</groupId>
- <artifactId>spring-boot-30-starter-parent</artifactId>
- <version>2.5.4-SNAPSHOT</version>
+ <artifactId>spring-boot-31-starter-parent</artifactId>
+ <version>2.5.6-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -99,8 +99,8 @@
<ccsdk.sli.plugins.version>${ccsdk.sli.version}</ccsdk.sli.plugins.version>
<!-- Spring versions -->
- <spring.boot.version>3.0.3</spring.boot.version>
- <spring.version>6.0.4</spring.version>
+ <spring.boot.version>3.1.0</spring.boot.version>
+ <spring.version>6.0.9</spring.version>
<!-- Kotlin versions -->
<kotlin.compiler.jvmTarget>1.11</kotlin.compiler.jvmTarget>
@@ -125,14 +125,14 @@
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-bom</artifactId>
- <version>2.5.4-SNAPSHOT</version>
+ <version>2.5.6-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
- <version>2.14.2</version>
+ <version>2.15.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>