diff options
| author |   Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2024-08-15 08:03:43 +0200 |
|---|---|---|
| committer | Fiete Ostkamp <fiete.ostkamp@telekom.de> | 2024-08-15 06:17:26 +0000 |
| commit | c7cb468ab9303db88d27ad96a20b0840a5d58f43 (patch) | |
| tree | 21eb2879a90dd5e2dde8e3cc60cd17bf2d5a83bf | |
| parent | 412d236404aa0ef9aebec658a1aeca80ab968fcd (diff) | |
Update Janusgraph to 0.6.4 in resources1.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)
[0] since spring-boot would otherwise downgrade the driver version to a
(much) older version
Issue-ID: AAI-3966
Change-Id: Ic8d28ee0965a79aa83ec57a5de8dcc676d66dee5
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
| -rw-r--r-- | aai-resources/pom.xml | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml index 0c615b5..893bee4 100644 --- a/aai-resources/pom.xml +++ b/aai-resources/pom.xml @@ -81,8 +81,8 @@ <!-- End of Default ONAP Schema Properties --> <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> <javax.servlet.version>4.0.1</javax.servlet.version> <keycloak.version>11.0.2</keycloak.version> @@ -96,7 +96,13 @@ <skipITs>true</skipITs> <swagger.version>1.6.8</swagger.version> - <spring-cloud.version>2020.0.2</spring-cloud.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> </properties> <profiles> <!-- Docker profile to be used for building docker image and pushing to nexus --> @@ -747,13 +753,23 @@ <artifactId>guava</artifactId> <version>25.0-jre</version> </dependency> - <!-- https://docs.datastax.com/en/developer/java-driver/3.5/manual/metrics/index.html#metrics-4-compatibility --> - <!-- remove this for janusgraph >= 0.6.0 --> + <!-- cassandra driver --> <dependency> - <groupId>io.dropwizard.metrics</groupId> - <artifactId>metrics-core</artifactId> - <version>3.2.6</version> + <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> |