diff options
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 76 |
1 files changed, 45 insertions, 31 deletions
@@ -1,6 +1,5 @@ -<?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<?xml version="1.0" ?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.oparent</groupId> @@ -11,7 +10,7 @@ <groupId>org.onap.so</groupId> <artifactId>so</artifactId> <packaging>pom</packaging> - <version>1.6.0-SNAPSHOT</version> + <version>1.7.1-SNAPSHOT</version> <name>so</name> <description>This Maven project is responsible to build and package all child projects - contributions in the MSO project. This build can be configured to run Functional tests and to start/stop a jboss server + Mysql DB. @@ -29,6 +28,8 @@ <module>mso-api-handlers</module> <module>adapters</module> <module>asdc-controller</module> + <module>so-optimization-clients</module> + <module>so-sdn-clients</module> <module>bpmn</module> <module>cloudify-client</module> <module>cxf-logging</module> @@ -41,6 +42,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <sonar.language>java</sonar.language> + <java.version>11</java.version> <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin> <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath> <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths> @@ -65,14 +67,16 @@ <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> <format.skipValidate>false</format.skipValidate> <format.skipExecute>true</format.skipExecute> <io.fabric8.version>0.33.0</io.fabric8.version> - <appc.client.version>1.7.1</appc.client.version> + <appc.client.version>1.8.0-SNAPSHOT</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 +216,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,18 +232,20 @@ <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> + <forceJavacCompilerUse>true</forceJavacCompilerUse> + <source>11</source> + <target>11</target> + <release>11</release> </configuration> </plugin> <plugin> @@ -327,7 +334,7 @@ <version>4.20</version> <configuration> <buildId>mso-${project.version}</buildId> - <source>1.8</source> + <source>${java.version}</source> </configuration> </plugin> <plugin> @@ -534,7 +541,7 @@ </plugins> <pluginManagement> <plugins> - <plugin> + <plugin> <groupId>org.eclipse.m2e</groupId> <artifactId>lifecycle-mapping</artifactId> <version>1.0.0</version> @@ -554,7 +561,7 @@ <execute /> </action> </pluginExecution> - <pluginExecution> + <pluginExecution> <pluginExecutionFilter> <groupId>org.codehaus.gmaven</groupId> <artifactId>groovy-maven-plugin</artifactId> @@ -580,14 +587,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 +621,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 +635,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> @@ -644,6 +654,7 @@ <goal>unpack</goal> </goals> <configuration> + <skip>true</skip> <artifactItems> <artifactItem> <groupId>org.onap.so</groupId> @@ -665,12 +676,11 @@ <executions> <execution> <id>original</id> - <phase>package</phase> + <phase>none</phase> <goals> <goal>jar</goal> </goals> <configuration> - <skip>true</skip> <classifier>${originalClassifier}</classifier> <includes> <include>**</include> @@ -823,7 +833,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 +858,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,22 +871,20 @@ </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> - <version>1.6.7-SNAPSHOT</version> + <version>1.6.7</version> </dependency> <dependency> <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-filter-base</artifactId> - <version>1.6.7-SNAPSHOT</version> + <version>1.6.7</version> </dependency> <dependency> <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-filter-spring</artifactId> - <version>1.6.7-SNAPSHOT</version> + <version>1.6.7</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -906,7 +920,7 @@ <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> - <version>1.23</version> + <version>1.26</version> </dependency> <dependency> <groupId>javax.interceptor</groupId> |