diff options
author | Steve Smokowski <ss835w@att.com> | 2019-02-15 12:40:15 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-02-15 12:40:15 +0000 |
commit | 7b4a8742c8ed874b436025d4f7bea43ffbf03805 (patch) | |
tree | a8ea2a819ec849261e2e0985760a7c40927789a1 /pom.xml | |
parent | 466bc45cde6b405dbd9ab71b6ca8059a98ba9fa6 (diff) | |
parent | 5442c270ad879e4db33b2759b15bf46111af2fa7 (diff) |
Merge "updated camunda springboot version"
Diffstat (limited to 'pom.xml')
-rw-r--r-- | pom.xml | 30 |
1 files changed, 15 insertions, 15 deletions
@@ -65,8 +65,8 @@ <siteNexusPath>content/sites/site/org/onap/so/${project.version}/</siteNexusPath> <cxf.version>3.2.6</cxf.version> <jax.ws.rs>2.1</jax.ws.rs> - <springboot.version>2.0.5.RELEASE</springboot.version> - <camunda.springboot.version>3.0.0</camunda.springboot.version> + <springboot.version>2.0.5.RELEASE</springboot.version> + <camunda.springboot.version>3.2.0</camunda.springboot.version> </properties> <distributionManagement> <repository> @@ -397,13 +397,13 @@ <skip>${docker.skip}</skip> <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 + <dockerHost>${docker.newHost}</dockerHost> <!-- 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 + <certPath>${docker.host.cert.path}</certPath><!-- 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, + <pushRegistry>${dockerPushRepo}</pushRegistry> <!-- 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 + <pullRegistry>${dockerPullRepo}</pullRegistry> <!-- If docker repo is not public. Update .m2/settings.xml Add server id settings.dockerRepository, username, and password --> <images> <image> @@ -522,27 +522,27 @@ <dependencies> <dependency> <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> + <artifactId>jackson-core</artifactId> </dependency> <dependency> <groupId>com.fasterxml.jackson.module</groupId> - <artifactId>jackson-module-jaxb-annotations</artifactId> + <artifactId>jackson-module-jaxb-annotations</artifactId> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> + <artifactId>jackson-databind</artifactId> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> + <artifactId>jackson-annotations</artifactId> </dependency> <dependency> <groupId>com.fasterxml.jackson.jaxrs</groupId> - <artifactId>jackson-jaxrs-base</artifactId> + <artifactId>jackson-jaxrs-base</artifactId> </dependency> <dependency> <groupId>com.fasterxml.jackson.jaxrs</groupId> - <artifactId>jackson-jaxrs-json-provider</artifactId> + <artifactId>jackson-jaxrs-json-provider</artifactId> </dependency> <dependency> <groupId>javax.ws.rs</groupId> @@ -573,7 +573,7 @@ </dependency> <dependency> <groupId>junit</groupId> - <artifactId>junit</artifactId> + <artifactId>junit</artifactId> <scope>test</scope> </dependency> <dependency> @@ -666,7 +666,7 @@ <dependencyManagement> <dependencies> <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient --> - <!-- force use of version 4.5 everywhere in transient deps, aligned on + <!-- force use of version 4.5 everywhere in transient deps, aligned on WildFly 10 version --> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -685,7 +685,7 @@ <artifactId>commons-io</artifactId> <version>2.5</version> <scope>compile</scope> - </dependency> + </dependency> <dependency> <groupId>com.sun.xml.fastinfoset</groupId> <artifactId>FastInfoset</artifactId> |