summaryrefslogtreecommitdiffstats
path: root/oparent
diff options
context:
space:
mode:
Diffstat (limited to 'oparent')
-rwxr-xr-xoparent/pom.xml35
1 files changed, 29 insertions, 6 deletions
diff --git a/oparent/pom.xml b/oparent/pom.xml
index b76f1ddc..89cc0931 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>