X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=oparent%2Fpom.xml;h=6ca7c8308ba8bb9e155c8869f664b526e48b427d;hb=5700b8593826798ef4f9d0356f852698c1c91bef;hp=3cd1928af75a04dfcf5431541dbc173e68513ddc;hpb=aa7c2484c692878d24753fe462069e94f6c3291b;p=ccsdk%2Fparent.git

diff --git a/oparent/pom.xml b/oparent/pom.xml
index 3cd1928a..6ca7c830 100755
--- a/oparent/pom.xml
+++ b/oparent/pom.xml
@@ -50,23 +50,11 @@
         <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>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>
+        <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>
         <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>
@@ -83,13 +71,13 @@
                 <groupId>org.onap.ccsdk.parent</groupId>
                 <artifactId>dependencies-bom</artifactId>
                 <version>2.1.1-SNAPSHOT</version>
-                <type>pom</type>
                 <scope>import</scope>
+                <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.3.8.RELEASE</version>
+                <version>2.3.5.RELEASE</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -201,20 +189,10 @@
         </repository>
     </repositories>
 
+
     <build>
         <pluginManagement>
             <plugins>
-                <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>
                     <artifactId>maven-resources-plugin</artifactId>
@@ -337,7 +315,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>${bundle.plugin.version}</version>
+                <version>4.2.1</version>
                 <extensions>true</extensions>
             </plugin>
             <plugin>