aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2023-02-08 12:03:28 -0500
committerDan Timoney <dtimoney@att.com>2023-02-08 12:03:28 -0500
commit52a18309fb3008f419335fb83fd0ef5011b15f7d (patch)
tree1af78d7e84137ddf9029729b06e46fd7613debd4
parent8e3f13effa8e1d77f0f06176f4e6ad5004a07dc5 (diff)
Resolve Java 17 compile issues
Resolved java 17 compiliation issues Issue-ID: CCSDK-3813 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: I9ca70b08fbed6bdd493c2a07abcfcdb77512d8d4
-rw-r--r--ms/neng/pom.xml16
-rw-r--r--ms/sliboot/pom.xml9
-rw-r--r--ms/vlantag-api/pom.xml10
3 files changed, 18 insertions, 17 deletions
diff --git a/ms/neng/pom.xml b/ms/neng/pom.xml
index 2bddf10d..ebaa3590 100644
--- a/ms/neng/pom.xml
+++ b/ms/neng/pom.xml
@@ -43,24 +43,24 @@
<swagger.directory>${basedir}/target/classes/META-INF/resources/swagger</swagger.directory>
<icd.file>service.json</icd.file>
<icd.package>org.onap.ccsdk.apps.ms.neng.service.rs</icd.package>
- <java.version>11</java.version>
+ <java.version>17</java.version>
<docker.registry>nexus3.onap.org:10001</docker.registry>
<build.number>local</build.number>
<kube.namespace>TBD</kube.namespace>
<service.account>TBD</service.account>
<namespace>org.onap.ccsdk.apps.ms.neng</namespace>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sdk.java.rest>6.2.0.11</sdk.java.rest>
<serviceArtifactName>ms-networkelementnamegen</serviceArtifactName>
- <ccsdk.distribution.version>1.4.1</ccsdk.distribution.version>
+ <ccsdk.distribution.version>1.5.0-SNAPSHOT</ccsdk.distribution.version>
<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
<docker.push.phase>deploy</docker.push.phase>
<docker.verbose>true</docker.verbose>
<ccsdk.project.version>${project.version}</ccsdk.project.version>
<base.image.name>onap/ccsdk-alpine-j11-image</base.image.name>
- <base.image.version>1.4.1</base.image.version>
+ <base.image.version>1.5-STAGING-latest</base.image.version>
<image.name>onap/ccsdk-apps-ms-neng</image.name>
<timestamp>${maven.build.timestamp}</timestamp>
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
@@ -299,9 +299,9 @@
<plugins>
<plugin>
- <groupId>org.codehaus.groovy.maven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <version>1.0</version>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>groovy-maven-plugin</artifactId>
+ <version>2.1.1</version>
<executions>
<execution>
<phase>validate</phase>
diff --git a/ms/sliboot/pom.xml b/ms/sliboot/pom.xml
index 65169937..64c6e4fe 100644
--- a/ms/sliboot/pom.xml
+++ b/ms/sliboot/pom.xml
@@ -19,10 +19,10 @@
<start-class>org.onap.ccsdk.apps.ms.sliboot.SlibootApp</start-class>
<aaf.cadi.version>2.1.21</aaf.cadi.version>
<base.image.name>onap/ccsdk-alpine-j11-image</base.image.name>
- <base.image.version>1.2.2</base.image.version>
+ <base.image.version>1.5-STAGING-latest</base.image.version>
<image.name>onap/ccsdk-sliboot-alpine-image</image.name>
<ccsdk.project.version>${project.version}</ccsdk.project.version>
- <ccsdk.distribution.version>1.2.2</ccsdk.distribution.version>
+ <ccsdk.distribution.version>1.5.0-SNAPSHOT</ccsdk.distribution.version>
<ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
<ccsdk.sliboot.jar>${project.artifactId}-${project.version}-exec.jar</ccsdk.sliboot.jar>
@@ -217,8 +217,9 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.groovy.maven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>groovy-maven-plugin</artifactId>
+ <version>2.1.1</version>
<executions>
<execution>
<phase>validate</phase>
diff --git a/ms/vlantag-api/pom.xml b/ms/vlantag-api/pom.xml
index 1ae4f1d8..cdf8101c 100644
--- a/ms/vlantag-api/pom.xml
+++ b/ms/vlantag-api/pom.xml
@@ -19,7 +19,7 @@
<properties>
<swagger.directory>${basedir}/target/main/resources/META-INF/resources/swagger-ui/dist</swagger.directory>
<swagger.annotations.version>1.5.8</swagger.annotations.version>
- <java.version>11</java.version>
+ <java.version>17</java.version>
<springboot.version>2.0.4.RELEASE</springboot.version>
<mariadb.connector.version>2.1.1</mariadb.connector.version>
<docker.registry>TBD:5100</docker.registry>
@@ -33,7 +33,7 @@
<ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
<base.image.name>onap/ccsdk-alpine-j11-image</base.image.name>
- <base.image.version>1.1.1</base.image.version>
+ <base.image.version>1.5-STAGING-latest</base.image.version>
</properties>
<dependencies>
@@ -104,9 +104,9 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.groovy.maven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <version>1.0</version>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>groovy-maven-plugin</artifactId>
+ <version>2.1.1</version>
<executions>
<execution>
<phase>validate</phase>