aboutsummaryrefslogtreecommitdiffstats
path: root/pom.xml
diff options
context:
space:
mode:
authorSteve Smokowski <ss835w@att.com>2020-06-19 14:11:45 +0000
committerGerrit Code Review <gerrit@onap.org>2020-06-19 14:11:45 +0000
commit0abec191b0645a80c9bc5df4af3423a9377b83db (patch)
treed5a1c8aa302d8c1b8c689c8ed32e36d672581e0d /pom.xml
parentdcca3afc8f9c4de72e84a7573932544996438c7c (diff)
parent9868f1749ac413b5b7df287d35983bf24ce517ea (diff)
Merge "Prepare for java 11"
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml83
1 files changed, 66 insertions, 17 deletions
diff --git a/pom.xml b/pom.xml
index f19e3f2f1c..b2fd0d5898 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
<snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
<publicNexusPath>content/repositories/public/</publicNexusPath>
<siteNexusPath>content/sites/site/org/onap/so/${project.version}/</siteNexusPath>
- <cxf.version>3.2.6</cxf.version>
+ <cxf.version>3.3.3</cxf.version>
<jax.ws.rs>2.1</jax.ws.rs>
<springboot.version>2.1.5.RELEASE</springboot.version>
<camunda.springboot.version>3.2.0</camunda.springboot.version>
@@ -73,6 +73,8 @@
<format.skipExecute>true</format.skipExecute>
<io.fabric8.version>0.33.0</io.fabric8.version>
<appc.client.version>1.7.1</appc.client.version>
+ <bowman.client.version>0.8.0</bowman.client.version>
+ <aaf.cadi.version>2.1.15</aaf.cadi.version>
</properties>
<distributionManagement>
<repository>
@@ -212,9 +214,10 @@
</resource>
</resources>
<plugins>
- <!-- <plugin> <groupId>org.sonatype.plugins</groupId> <artifactId>nexus-staging-maven-plugin</artifactId> <version>1.6.7</version>
- <extensions>true</extensions> <configuration> <nexusUrl>${nexusproxy}</nexusUrl> <stagingProfileId>176c31dfe190a</stagingProfileId>
- <serverId>ecomp-staging</serverId> </configuration> </plugin> -->
+ <!-- <plugin> <groupId>org.sonatype.plugins</groupId> <artifactId>nexus-staging-maven-plugin</artifactId>
+ <version>1.6.7</version> <extensions>true</extensions> <configuration> <nexusUrl>${nexusproxy}</nexusUrl>
+ <stagingProfileId>176c31dfe190a</stagingProfileId> <serverId>ecomp-staging</serverId>
+ </configuration> </plugin> -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
@@ -227,15 +230,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.6.1</version>
+ <version>3.8.0</version>
<configuration>
<debug>true</debug>
<compilerArgument>-Xlint</compilerArgument>
<verbose>true</verbose>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
- <source>1.8</source>
- <target>1.8</target>
<compilerArgs>
<arg>-parameters</arg>
</compilerArgs>
@@ -580,14 +581,17 @@
<skipBuild>${docker.skip.build}</skipBuild>
<skipPush>${docker.skip.push}</skipPush>
<dockerHost>${docker.newHost}</dockerHost>
- <!-- 1. Update address to your local docker VM. 2. Add IP to your NO_PROXY environment variable -->
+ <!-- 1. Update address to your local docker VM. 2. Add IP to
+ your NO_PROXY environment variable -->
<certPath>${docker.host.cert.path}</certPath>
- <!-- Add -Ddocker.host.cert.pat="path to your local certs directory" to maven build command -->
+ <!-- Add -Ddocker.host.cert.pat="path to your local certs directory"
+ to maven build command -->
<pushRegistry>${dockerPushRepo}</pushRegistry>
- <!-- Update .m2/settings.xml Add server id settings.dockerRepository, username, and password -->
+ <!-- Update .m2/settings.xml Add server id settings.dockerRepository,
+ username, and password -->
<pullRegistry>${dockerPullRepo}</pullRegistry>
- <!-- If docker repo is not public. Update .m2/settings.xml Add server id settings.dockerRepository, username,
- and password -->
+ <!-- If docker repo is not public. Update .m2/settings.xml Add
+ server id settings.dockerRepository, username, and password -->
<images>
<image>
<alias>service</alias>
@@ -611,7 +615,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.20</version>
+ <version>2.22.2</version>
<configuration>
<systemPropertyVariables>
<so.log.level>DEBUG</so.log.level>
@@ -625,7 +629,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.20</version>
+ <version>2.22.2</version>
<configuration>
<skip>true</skip>
<systemPropertyVariables>
@@ -823,7 +827,7 @@
<dependency>
<groupId>com.openpojo</groupId>
<artifactId>openpojo</artifactId>
- <version>0.8.10</version>
+ <version>0.8.13</version>
</dependency>
<dependency>
<groupId>com.shazam</groupId>
@@ -848,6 +852,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>7.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>com.googlecode.junit-toolbox</groupId>
<artifactId>junit-toolbox</artifactId>
<version>2.4</version>
@@ -855,8 +865,6 @@
</dependencies>
<dependencyManagement>
<dependencies>
- <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
- <!-- force use of version 4.5 everywhere in transient deps, aligned on WildFly 10 version -->
<dependency>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-slf4j</artifactId>
@@ -985,5 +993,46 @@
<originalClassifier />
</properties>
</profile>
+ <profile>
+ <id>java8</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.0</version>
+ <configuration>
+ <forceJavacCompilerUse>true</forceJavacCompilerUse>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <activation>
+ <property>
+ <name>m2e.version</name>
+ </property>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+ <profile>
+ <id>java11</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.0</version>
+ <configuration>
+ <forceJavacCompilerUse>true</forceJavacCompilerUse>
+ <source>11</source>
+ <target>11</target>
+ <release>11</release>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>