X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=springboot%2Fspring-boot-setup%2Fpom.xml;h=c4ae6b47f5b9d088b48c54ecc4f6e28339aaa00b;hb=fd59f6bb47ee6e9a401ce271ce21663dff7dc871;hp=055b6916a30b1e314b0961f1fc0442917e6f50b4;hpb=9d4203e3683a9ef94011b9d2ae015f216287b6f3;p=ccsdk%2Fparent.git

diff --git a/springboot/spring-boot-setup/pom.xml b/springboot/spring-boot-setup/pom.xml
index 055b6916..c4ae6b47 100644
--- a/springboot/spring-boot-setup/pom.xml
+++ b/springboot/spring-boot-setup/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>springboot-aggregator</artifactId>
-        <version>2.5.0-SNAPSHOT</version>
+        <version>2.6.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>spring-boot-setup</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>2.6.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -24,97 +24,145 @@
                 <version>2.6</version>
                 <executions>
                     <execution>
-                        <id>create-springboot1-parent-pom</id>
+                        <id>create-springboot23-parent-pom</id>
                         <goals>
                             <goal>copy-resources</goal>
                         </goals><!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
-                            <outputDirectory>../springboot1</outputDirectory>
+                            <outputDirectory>../springboot23</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>src/main/resources</directory>
                                     <includes>
-                                        <include>pom-template-jdk8.xml</include>
+                                        <include>pom-template-jdk17.xml</include>
                                     </includes>
                                     <filtering>true</filtering>
                                 </resource>
                             </resources>
                             <escapeString>\</escapeString>
                             <filters>
-                                <filter>${basedir}/src/main/properties/springboot1.properties</filter>
+                                <filter>${basedir}/src/main/properties/springboot23.properties</filter>
                             </filters>
                             <encoding>UTF-8</encoding>
                         </configuration>
                     </execution>
                     <execution>
-                        <id>create-springboot23-parent-pom</id>
+                        <id>create-springboot25-parent-pom</id>
                         <goals>
                             <goal>copy-resources</goal>
                         </goals><!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
-                            <outputDirectory>../springboot23</outputDirectory>
+                            <outputDirectory>../springboot25</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>src/main/resources</directory>
                                     <includes>
-                                        <include>pom-template-jdk8.xml</include>
+                                        <include>pom-template-jdk17.xml</include>
                                     </includes>
                                     <filtering>true</filtering>
                                 </resource>
                             </resources>
                             <escapeString>\</escapeString>
                             <filters>
-                                <filter>${basedir}/src/main/properties/springboot23.properties</filter>
+                                <filter>${basedir}/src/main/properties/springboot25.properties</filter>
                             </filters>
                             <encoding>UTF-8</encoding>
                         </configuration>
                     </execution>
                     <execution>
-                        <id>create-springboot25-parent-pom</id>
+                        <id>create-springboot26-parent-pom</id>
                         <goals>
                             <goal>copy-resources</goal>
                         </goals><!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
-                            <outputDirectory>../springboot25</outputDirectory>
+                            <outputDirectory>../springboot26</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>src/main/resources</directory>
                                     <includes>
-                                        <include>pom-template-jdk11.xml</include>
+                                        <include>pom-template-jdk17.xml</include>
                                     </includes>
                                     <filtering>true</filtering>
                                 </resource>
                             </resources>
                             <escapeString>\</escapeString>
                             <filters>
-                                <filter>${basedir}/src/main/properties/springboot25.properties</filter>
+                                <filter>${basedir}/src/main/properties/springboot26.properties</filter>
                             </filters>
                             <encoding>UTF-8</encoding>
                         </configuration>
                     </execution>
                     <execution>
-                        <id>create-springboot26-parent-pom</id>
+                        <id>create-springboot27-parent-pom</id>
                         <goals>
                             <goal>copy-resources</goal>
                         </goals><!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
-                            <outputDirectory>../springboot26</outputDirectory>
+                            <outputDirectory>../springboot27</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>src/main/resources</directory>
                                     <includes>
-                                        <include>pom-template-jdk11.xml</include>
+                                        <include>pom-template-jdk17.xml</include>
                                     </includes>
                                     <filtering>true</filtering>
                                 </resource>
                             </resources>
                             <escapeString>\</escapeString>
                             <filters>
-                                <filter>${basedir}/src/main/properties/springboot26.properties</filter>
+                                <filter>${basedir}/src/main/properties/springboot27.properties</filter>
+                            </filters>
+                            <encoding>UTF-8</encoding>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>create-springboot30-parent-pom</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>../springboot30</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/springboot30.properties</filter>
+                            </filters>
+                            <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>
@@ -127,47 +175,69 @@
                 <version>1.0.1</version>
                 <executions>
                     <execution>
-                        <id>rename-springboot1-parent-pom</id>
+                        <id>rename-springboot23-parent-pom</id>
                         <phase>validate</phase>
                         <goals>
                             <goal>rename</goal>
                         </goals>
                         <configuration>
-                            <sourceFile>../springboot1/pom-template-jdk8.xml</sourceFile>
-                            <destinationFile>../springboot1/pom.xml</destinationFile>
+                            <sourceFile>../springboot23/pom-template-jdk17.xml</sourceFile>
+                            <destinationFile>../springboot23/pom.xml</destinationFile>
                         </configuration>
                     </execution>
                     <execution>
-                        <id>rename-springboot23-parent-pom</id>
+                        <id>rename-springboot25-parent-pom</id>
                         <phase>validate</phase>
                         <goals>
                             <goal>rename</goal>
                         </goals>
                         <configuration>
-                            <sourceFile>../springboot23/pom-template-jdk8.xml</sourceFile>
-                            <destinationFile>../springboot23/pom.xml</destinationFile>
+                            <sourceFile>../springboot25/pom-template-jdk17.xml</sourceFile>
+                            <destinationFile>../springboot25/pom.xml</destinationFile>
                         </configuration>
                     </execution>
                     <execution>
-                        <id>rename-springboot25-parent-pom</id>
+                        <id>rename-springboot26-parent-pom</id>
                         <phase>validate</phase>
                         <goals>
                             <goal>rename</goal>
                         </goals>
                         <configuration>
-                            <sourceFile>../springboot25/pom-template-jdk11.xml</sourceFile>
-                            <destinationFile>../springboot25/pom.xml</destinationFile>
+                            <sourceFile>../springboot26/pom-template-jdk17.xml</sourceFile>
+                            <destinationFile>../springboot26/pom.xml</destinationFile>
                         </configuration>
                     </execution>
                     <execution>
-                        <id>rename-springboot26-parent-pom</id>
+                        <id>rename-springboot27-parent-pom</id>
                         <phase>validate</phase>
                         <goals>
                             <goal>rename</goal>
                         </goals>
                         <configuration>
-                            <sourceFile>../springboot26/pom-template-jdk11.xml</sourceFile>
-                            <destinationFile>../springboot26/pom.xml</destinationFile>
+                            <sourceFile>../springboot27/pom-template-jdk17.xml</sourceFile>
+                            <destinationFile>../springboot27/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>