aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFiete Ostkamp <Fiete.Ostkamp@telekom.de>2024-08-15 08:23:12 +0200
committerFiete Ostkamp <Fiete.Ostkamp@telekom.de>2024-08-15 08:23:12 +0200
commit2fd7864b0681864ee5a8853270a9a032e7ee6acc (patch)
tree9bcc66069c476795ad5c5e4d0303b3f81536ef96
parentdbd864953e512321fa929a95843070c79b622403 (diff)
Update Janusgraph to 0.6.4 in traversal1.14.6
- update Tinkerpop (3.5.0 -> 3.5.8), Janusgraph (0.6.0 -> 0.6.4) - declare cassandra-driver related deps in dependencyManagement [0] - update spring-cloud dependencies (2020.0.2 -> 2020.0.6) - bump snapshot version to 1.14.6-SNAPSHOT [0] since spring-boot would otherwise downgrade the driver version to a (much) older version Issue-ID: AAI-3967 Change-Id: I18a0b6f039ead2e7c308f507ead3ea7079d21877 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
-rw-r--r--aai-traversal/pom.xml47
-rw-r--r--pom.xml2
-rw-r--r--version.properties2
3 files changed, 43 insertions, 8 deletions
diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml
index c513d2c..ea889ea 100644
--- a/aai-traversal/pom.xml
+++ b/aai-traversal/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.aai.traversal</groupId>
<artifactId>traversal</artifactId>
- <version>1.14.5-SNAPSHOT</version>
+ <version>1.14.6-SNAPSHOT</version>
</parent>
<groupId>org.onap.aai.traversal</groupId>
<artifactId>aai-traversal</artifactId>
@@ -92,10 +92,18 @@
<!-- versions -->
<spring.boot.version>2.4.13</spring.boot.version>
- <janusgraph.version>0.6.0</janusgraph.version>
- <gremlin.version>3.5.1</gremlin.version>
+ <janusgraph.version>0.6.4</janusgraph.version>
+ <gremlin.version>3.5.8</gremlin.version>
+
+ <spring-cloud.version>2020.0.6</spring-cloud.version>
+
+ <!-- fix the driver version to match the one defined in janusgraph-cql
+ spring-boot (2.4) is otherwise downgrading it to 4.9.0 -->
+ <!-- see https://github.com/spring-projects/spring-boot/blob/d336a96b7f204a398b8237560c5dfa7095c53460/spring-boot-project/spring-boot-dependencies/build.gradle#L163 -->
+ <!-- see https://github.com/JanusGraph/janusgraph/blob/6105d67f412def90ed6e704fa01cbf656602e6c9/pom.xml#L112 -->
+ <cassandra-driver.version>4.17.0</cassandra-driver.version>
+ <datastax.native-protocol.version>1.5.1</datastax.native-protocol.version>
- <spring-cloud.version>2020.0.2</spring-cloud.version>
<javax.servlet.version>4.0.1</javax.servlet.version>
<antlr.version>4.9.3</antlr.version>
@@ -632,6 +640,10 @@
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-guava</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -669,6 +681,12 @@
<artifactId>testcontainers-keycloak</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
@@ -709,7 +727,24 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>25.0-jre</version>
- </dependency>
+ </dependency>
+ <!-- cassandra driver -->
+ <dependency>
+ <groupId>com.datastax.oss</groupId>
+ <artifactId>java-driver-core</artifactId>
+ <version>${cassandra-driver.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.datastax.oss</groupId>
+ <artifactId>java-driver-query-builder</artifactId>
+ <version>${cassandra-driver.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.datastax.oss</groupId>
+ <artifactId>native-protocol</artifactId>
+ <version>${datastax.native-protocol.version}</version>
+ </dependency>
+ <!-- /cassandra driver -->
</dependencies>
</dependencyManagement>
<build>
@@ -1040,7 +1075,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>3.0.0-M4</version>
+ <version>3.1.2</version>
<configuration>
<classesDirectory>${project.build.outputDirectory}</classesDirectory>
</configuration>
diff --git a/pom.xml b/pom.xml
index 5e19faf..045495f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
</parent>
<groupId>org.onap.aai.traversal</groupId>
<artifactId>traversal</artifactId>
- <version>1.14.5-SNAPSHOT</version>
+ <version>1.14.6-SNAPSHOT</version>
<name>aai-traversal</name>
<packaging>pom</packaging>
<modules>
diff --git a/version.properties b/version.properties
index 0f5234a..cae43c2 100644
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
major_version=1
minor_version=14
-patch_version=5
+patch_version=6
base_version=${major_version}.${minor_version}.${patch_version}