diff options
| author |   Jimmy Forsyth <jf2512@att.com> | 2019-11-15 16:28:26 -0500 |
|---|---|---|
| committer | Jimmy Forsyth <jf2512@att.com> | 2019-11-15 16:28:28 -0500 |
| commit | e373a3bb7d81f760c92738e4aa70b3784af20f71 (patch) | |
| tree | 40964c718de65145a652b554b5e1a6b958526586 | |
| parent | 6aacebe5f9cd895fe6fbf48799ce04f48eda42eb (diff) | |
Replace springboot jackson deps
Issue-ID: AAI-2699
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Change-Id: Ic59085a19948869425abcef32e66108393207ba8
| -rw-r--r-- | aai-core/pom.xml | 5 | ||||
| -rw-r--r-- | aai-parent/pom.xml | 29 |
2 files changed, 33 insertions, 1 deletions
diff --git a/aai-core/pom.xml b/aai-core/pom.xml index 2bccc4bc..c96d4a57 100644 --- a/aai-core/pom.xml +++ b/aai-core/pom.xml @@ -47,7 +47,6 @@ <eelf.core.version>1.0.1-oss</eelf.core.version> <logback.version>1.2.3</logback.version> <freemarker.version>2.3.21</freemarker.version> - <activemq.version>5.15.6</activemq.version> <jacoco.line.coverage.limit>0.50</jacoco.line.coverage.limit> <gremlin.version>3.2.2</gremlin.version> <groovy.version>2.4.15</groovy.version> @@ -373,6 +372,10 @@ <artifactId>activemq-broker</artifactId> </dependency> <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-openwire-legacy</artifactId> + </dependency> + <dependency> <groupId>com.opencsv</groupId> <artifactId>opencsv</artifactId> </dependency> diff --git a/aai-parent/pom.xml b/aai-parent/pom.xml index 9d1f085e..3bdd2fe1 100644 --- a/aai-parent/pom.xml +++ b/aai-parent/pom.xml @@ -26,6 +26,7 @@ <properties> <aaf.version>2.1.15</aaf.version> + <activemq.version>5.15.10</activemq.version> <codehaus.jackson.version>1.9.13</codehaus.jackson.version> <commons.beanutils.version>1.9.4</commons.beanutils.version> <commons.cli.version>1.4</commons.cli.version> @@ -42,6 +43,7 @@ <groovy.version>2.4.17</groovy.version> <gson.version>2.8.6</gson.version> <hamcrest.junit.version>2.0.0.0</hamcrest.junit.version> + <jackson.bom.version>2.10.1</jackson.bom.version> <janusgraph.version>0.2.3</janusgraph.version> <javatuples.version>1.2</javatuples.version> <jaxb.version>2.2.12</jaxb.version> @@ -67,6 +69,15 @@ </properties> <dependencyManagement> <dependencies> + + <dependency> + <groupId>com.fasterxml.jackson</groupId> + <artifactId>jackson-bom</artifactId> + <version>${jackson.bom.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> @@ -243,6 +254,24 @@ </dependency> <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-broker</artifactId> + <version>${activemq.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-client</artifactId> + <version>${activemq.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-openwire-legacy</artifactId> + <version>${activemq.version}</version> + </dependency> + + <dependency> <groupId>org.onap.aaf.authz</groupId> <artifactId>aaf-cadi-aaf</artifactId> <version>${aaf.version}</version> |