commit c6bdd9a5a0b6d710f130f655df2e6b15c3a58998
author Michael DÜrre <michael.duerre@highstreet-technologies.com> Tue Dec 01 13:34:56 2020 +0100
committer Dan Timoney <dtimoney@att.com> Tue Feb 02 10:17:54 2021 -0500
tree 59149a519c353c550d750258ca9b8e086ebfc7cc
parent e1d0e25da4f0d49adcd6d2bc2dc5f4f0bef4adfd

ccsdk parents for alu-sr0

migrate parents to aluminium-sr0

Change-Id: Iafc8f9bdefe7fb3593166bb067210cc944d65561
Issue-ID: CCSDK-3012
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>

oparent/pom.xml

diff --git a/oparent/pom.xml b/oparent/pom.xml
index b76f1dd..89cc093 100755
--- a/oparent/pom.xml
+++ b/oparent/pom.xml
@@ -50,11 +50,23 @@
         <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
         <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
 
-        <java.version.source>1.8</java.version.source>
-        <java.version.target>1.8</java.version.target>
-        <bundle.plugin.version>2.5.0</bundle.plugin.version>
+        <java.version>11</java.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>
+        <bundle.plugin.version>4.2.1</bundle.plugin.version>
+        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <checkstyle.skip>true</checkstyle.skip>
 
+        <!-- CCSDK component versions -->
+        <ccsdk.cds.version>1.1.1-SNAPSHOT</ccsdk.cds.version>
+        <ccsdk.features.version>1.1.1-SNAPSHOT</ccsdk.features.version>
+        <ccsdk.sli.version>1.2.0-SNAPSHOT</ccsdk.sli.version>
+        <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
+        <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
+        <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>
+        <ccsdk.sli.plugins.version>${ccsdk.sli.version}</ccsdk.sli.plugins.version>
+        <ccsdk.distribution.version>1.1.1-SNAPSHOT</ccsdk.distribution.version>
+
         <mariadb.connector.version>2.1.1</mariadb.connector.version>
         <fasterxml.jackson.version>2.10.0</fasterxml.jackson.version>
         <velocity.version>2.0</velocity.version>
@@ -77,9 +89,9 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.3.5.RELEASE</version>
-                <type>pom</type>
+                <version>2.3.8.RELEASE</version>
                 <scope>import</scope>
+                <type>pom</type>
             </dependency>
 
             <dependency>
@@ -199,6 +211,17 @@
                         <skip/>
                         <deployAtEnd>true</deployAtEnd>
                     </configuration>
+                 </plugin>
+                 <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>${maven-compiler-plugin.version}</version>
+                    <configuration>
+                        <release>${java.version}</release>
+                        <!--explicitly remove source and target-->
+                        <source combine.self="override"/>
+                        <target combine.self="override"/>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -322,7 +345,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>4.2.1</version>
+                <version>${bundle.plugin.version}</version>
                 <extensions>true</extensions>
             </plugin>
             <plugin>