diff options
| author |   Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2024-02-21 15:15:39 +0100 |
|---|---|---|
| committer | Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2024-02-22 16:59:47 +0100 |
| commit | 139f9b088e4bc02b4bc4ff6b37a1261ac0f4cadf (patch) | |
| tree | f133ea9289d1c6470b6ed7375bc02a1a14d536eb /pom.xml | |
| parent | 41dafac1b153d3db7f99c94dfee1b87ec10330f5 (diff) | |
Update aai-common version to 1.13.4 in graphadmin
- update to 1.13.4
- bump activemq dep to fix security vulnerability
- update mockito from 1.X to 3.4
- bump graphadmin version to 1.13.4 to be in sync with aai-common
Issue-ID: AAI-3784
Change-Id: Idcaf9b18ce6cb100b5db88ce0fc6d62157b6c387
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Diffstat (limited to 'pom.xml')
| -rwxr-xr-x | pom.xml | 63 |
1 files changed, 39 insertions, 24 deletions
@@ -26,16 +26,15 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.9.4</version> + <version>1.13.4</version> </parent> <groupId>org.onap.aai.graphadmin</groupId> <artifactId>aai-graphadmin</artifactId> - <version>1.12.3-SNAPSHOT</version> + <version>1.13.4-SNAPSHOT</version> <properties> <!-- Start of Compiler Related Properties --> - <mockito.core.version>1.10.19</mockito.core.version> <java.version>1.8</java.version> <maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.target>1.8</maven.compiler.target> @@ -56,7 +55,7 @@ <docker.push.registry>localhost:5000</docker.push.registry> <aai.docker.version>1.0.0</aai.docker.version> <aai.schema.service.version>1.12.3</aai.schema.service.version> - <aai.common.version>1.9.4</aai.common.version> + <aai.common.version>1.13.4</aai.common.version> <aai.build.directory>${project.build.directory}/${project.artifactId}-${project.version}-build/ </aai.build.directory> <aai.docker.namespace>onap</aai.docker.namespace> @@ -72,7 +71,7 @@ Nexus Proxy Properties and Snapshot Locations Ideally this can be overwritten at runtime per internal environment specific values at runtime --> - <nexusproxy>https://nexus.onap.org</nexusproxy> + <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <site.path>/content/sites/site/org/onap/aai/graphadmin/${project.artifactId}/${project.version}</site.path> <release.path>/content/repositories/releases/</release.path> <snapshot.path>/content/repositories/snapshots/</snapshot.path> @@ -107,7 +106,8 @@ <micrometer.core.version>1.8.1</micrometer.core.version> <micrometer.registry.prometheus.version>1.8.1</micrometer.registry.prometheus.version> <micrometer.jersey2.version>1.8.1</micrometer.jersey2.version> - <spring.boot.starter.actuator.version>2.1.12.RELEASE</spring.boot.starter.actuator.version> + <activemq.version>5.16.7</activemq.version> + <antlr.version>4.9.3</antlr.version> <!-- End of graphadmin metric collection Properties --> </properties> @@ -342,6 +342,18 @@ </profile> </profiles> + <dependencyManagement> + <dependencies> + <!-- Keeping guava at 19 is necessary here, since the janusgraph-cql driver in version + 2.3 has a dependency on it. Remove this override, once we are using janusgraph > 0.2.3/tinkerpop > 3.2.3 + --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>19.0</version> + </dependency> + </dependencies> + </dependencyManagement> <dependencies> <!-- Start of graphadmin metric collection dependencies --> <dependency> @@ -468,10 +480,6 @@ <artifactId>tinkergraph-gremlin</artifactId> </dependency> <dependency> - <groupId>org.antlr</groupId> - <artifactId>antlr4-runtime</artifactId> - </dependency> - <dependency> <groupId>org.apache.tinkerpop</groupId> <artifactId>gremlin-core</artifactId> </dependency> @@ -494,12 +502,6 @@ <groupId>org.json</groupId> <artifactId>json</artifactId> </dependency> - <!-- Start of JAXB Dependencies --> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </dependency> - <!-- End of JAXB Dependencies --> <dependency> <groupId>org.eclipse.persistence</groupId> <artifactId>eclipselink</artifactId> @@ -521,10 +523,12 @@ <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>com.sun.jersey</groupId> @@ -592,10 +596,6 @@ </dependency> <dependency> <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-test</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-jersey</artifactId> <exclusions> <exclusion> @@ -607,7 +607,6 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-actuator</artifactId> - <version>${spring.boot.starter.actuator.version}</version> <exclusions> <exclusion> <groupId>org.springframework.boot</groupId> @@ -668,7 +667,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> @@ -676,7 +675,23 @@ <artifactId>jsonassert</artifactId> <scope>test</scope> </dependency> - <!-- End of Junit Test Dependencies --> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> + <scope>test</scope> + </dependency> + <!-- TODO: Migrate tests to junit 5 and remove this dependency --> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> <build> @@ -971,7 +986,7 @@ <plugin> <groupId>org.antlr</groupId> <artifactId>antlr4-maven-plugin</artifactId> - <version>4.7</version> + <version>${antlr.version}</version> <executions> <execution> <goals> |