summaryrefslogtreecommitdiffstats
path: root/pom.xml
diff options
context:
space:
mode:
authorBogumil Zebek <bogumil.zebek@nokia.com>2020-06-25 09:06:11 +0200
committerZebek Bogumil <bogumil.zebek@nokia.com>2020-07-02 08:40:33 +0200
commitdfc831bbb63ca3f42dc78135bfcca66b07cd5db2 (patch)
tree025d49791fad181265da02b4cc392879e9a48a02 /pom.xml
parente23d317a7c5ab6f0ce61054750c95748c1f26fef (diff)
Upgrade java from 8 to 113.5.0
Issue-ID: DCAEGEN2-2287 Signed-off-by: Zebek Bogumil <bogumil.zebek@nokia.com> Change-Id: I1a80ac133798ec6fbd96696aaa292244b1feec05
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml38
1 files changed, 24 insertions, 14 deletions
diff --git a/pom.xml b/pom.xml
index 0e805af..9e68e91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,6 +2,7 @@
<!--
================================================================================
Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved.
+Copyright (c) 2020 Nokia. All rights reserved.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -29,14 +30,15 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<groupId>org.onap.dcaegen2.platform</groupId>
<artifactId>inventory-api</artifactId>
- <version>3.4.1-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
<name>dcaegen2-platform-inventory-api</name>
<!--internal <version>3.0.0</version>-->
<properties>
- <dropwizard.version>1.1.1</dropwizard.version>
+ <dropwizard.version>1.3.11</dropwizard.version>
<logback.version>1.2.3</logback.version>
<swagger-core.version>1.5.8</swagger-core.version>
+ <guava.version>28.2-jre</guava.version>
<ecomp.inceptionYear>2017</ecomp.inceptionYear>
<ecomp.organizationName>AT&amp;T Intellectual Property. All rights reserved.</ecomp.organizationName>
@@ -46,9 +48,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<snapshots.path>content/repositories/snapshots/</snapshots.path>
<releases.path>content/repositories/releases/</releases.path>
<site.path>content/sites/site/org/onap/dcae/dcae-inventory/${project.artifactId}/${project.version}/</site.path>
- <sonar.coverage.jacoco.xmlReportPaths>
- ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
- </sonar.coverage.jacoco.xmlReportPaths>
+ <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
</properties>
<pluginRepositories>
@@ -201,7 +201,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>19.0</version>
+ <version>${guava.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
@@ -209,6 +209,11 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<version>2.22.1</version>
</dependency>
<dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
@@ -282,10 +287,9 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.5</version>
+ <version>3.8.0</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <release>11</release>
</configuration>
</plugin>
<plugin>
@@ -354,17 +358,23 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>1.0.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ </dependencies>
<configuration>
<imageName>${onap.nexus.dockerregistry.daily}/onap/${project.groupId}.${project.artifactId}</imageName>
- <baseImage>openjdk:8-jre-alpine</baseImage>
+ <baseImage>openjdk:11-jre-slim</baseImage>
<user>inventory</user>
<runs>
- <run>addgroup -S inventory</run>
- <run>adduser -S -G inventory inventory</run>
+ <run>useradd -r -U inventory</run>
<run>mkdir -p /opt/logs</run>
<run>chown -R inventory:inventory /opt</run>
</runs>
- <entryPoint>["java", "-jar", "/opt/${project.build.finalName}.jar", "server"]</entryPoint>
+ <entryPoint>["java", "--add-opens", "java.base/java.lang=ALL-UNNAMED", "-jar", "/opt/${project.build.finalName}.jar", "server"]</entryPoint>
<resources>
<resource>
<targetPath>/opt</targetPath>
@@ -406,7 +416,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.20.1</version>
+ <version>2.22.2</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>