Code Review / aai / aai-common.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: b1eefc6)
Upgrade Janusgraph to 1.1.0 03/139803/2
authorFiete Ostkamp <Fiete.Ostkamp@telekom.de>
Thu, 2 Jan 2025 15:11:05 +0000 (16:11 +0100)
committerFiete Ostkamp <Fiete.Ostkamp@telekom.de>
Thu, 2 Jan 2025 15:15:14 +0000 (16:15 +0100)
- upgrade janusgraph (1.0.1->1.1.0)
- upgrade guava (33.3.1-jre->33.4.0-jre)
- remove some version declarations in aai-parent that are not in use anymore
- bump snapshot version to 1.15.5-SNAPSHOT

Issue-ID: AAI-4097
Change-Id: Ied18c84ad4de81ddc2d968881590c1145a52618f
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
15 files changed:
aai-annotations/pom.xml patch | blob | history
aai-auth/pom.xml patch | blob | history
aai-common-docker/aai-common-images/pom.xml patch | blob | history
aai-common-docker/aai-haproxy-image/pom.xml patch | blob | history
aai-common-docker/pom.xml patch | blob | history
aai-core/pom.xml patch | blob | history
aai-els-onap-logging/pom.xml patch | blob | history
aai-failover/pom.xml patch | blob | history
aai-parent/pom.xml patch | blob | history
aai-rest/pom.xml patch | blob | history
aai-schema-abstraction/pom.xml patch | blob | history
aai-schema-ingest/pom.xml patch | blob | history
aai-utils/pom.xml patch | blob | history
pom.xml patch | blob | history
version.properties patch | blob | history

diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml
index 3adefbe..761caab 100644 (file)
--- a/aai-annotations/pom.xml
+++ b/aai-annotations/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.15.4-SNAPSHOT</version>
+        <version>1.15.5-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-annotations</artifactId>
diff --git a/aai-auth/pom.xml b/aai-auth/pom.xml
index 7d6d13f..f2bfe03 100644 (file)
--- a/aai-auth/pom.xml
+++ b/aai-auth/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.15.4-SNAPSHOT</version>
+        <version>1.15.5-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-auth</artifactId>
diff --git a/aai-common-docker/aai-common-images/pom.xml b/aai-common-docker/aai-common-images/pom.xml
index e45ee66..381877c 100644 (file)
--- a/aai-common-docker/aai-common-images/pom.xml
+++ b/aai-common-docker/aai-common-images/pom.xml
@@ -25,11 +25,11 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-common-docker</artifactId>
-        <version>1.15.4-SNAPSHOT</version>
+        <version>1.15.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>aai-common-images</artifactId>
-    <version>1.15.4-SNAPSHOT</version>
+    <version>1.15.5-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>aai-aai-common-images</name>
     <description>Contains dockerfiles for aai-common images (alpine and ubuntu based).</description>
diff --git a/aai-common-docker/aai-haproxy-image/pom.xml b/aai-common-docker/aai-haproxy-image/pom.xml
index a15e01f..8baed27 100644 (file)
--- a/aai-common-docker/aai-haproxy-image/pom.xml
+++ b/aai-common-docker/aai-haproxy-image/pom.xml
@@ -25,11 +25,11 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-common-docker</artifactId>
-        <version>1.15.4-SNAPSHOT</version>
+        <version>1.15.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>aai-haproxy-image</artifactId>
-    <version>1.15.4-SNAPSHOT</version>
+    <version>1.15.5-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>aai-aai-haproxy-image</name>
     <description>Contains dockerfiles for aai-haproxy image.</description>
diff --git a/aai-common-docker/pom.xml b/aai-common-docker/pom.xml
index cbe1c58..f5e702e 100644 (file)
--- a/aai-common-docker/pom.xml
+++ b/aai-common-docker/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.15.4-SNAPSHOT</version>
+        <version>1.15.5-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/aai-core/pom.xml b/aai-core/pom.xml
index 9ffae3c..3a993fe 100644 (file)
--- a/aai-core/pom.xml
+++ b/aai-core/pom.xml
@@ -26,7 +26,7 @@ limitations under the License.
        <parent>
                <groupId>org.onap.aai.aai-common</groupId>
                <artifactId>aai-parent</artifactId>
-               <version>1.15.4-SNAPSHOT</version>
+               <version>1.15.5-SNAPSHOT</version>
                <relativePath>../aai-parent/pom.xml</relativePath>
        </parent>
        <artifactId>aai-core</artifactId>
@@ -288,10 +288,6 @@ limitations under the License.
                        <groupId>ch.qos.logback</groupId>
                        <artifactId>logback-access</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>org.freemarker</groupId>
-                       <artifactId>freemarker</artifactId>
-               </dependency>
                <dependency>
                        <groupId>com.github.fge</groupId>
                        <artifactId>json-patch</artifactId>
diff --git a/aai-els-onap-logging/pom.xml b/aai-els-onap-logging/pom.xml
index 50319a0..31802ea 100644 (file)
--- a/aai-els-onap-logging/pom.xml
+++ b/aai-els-onap-logging/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.15.4-SNAPSHOT</version>
+        <version>1.15.5-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-els-onap-logging</artifactId>
diff --git a/aai-failover/pom.xml b/aai-failover/pom.xml
index a3c55df..300feea 100644 (file)
--- a/aai-failover/pom.xml
+++ b/aai-failover/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.15.4-SNAPSHOT</version>
+        <version>1.15.5-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/aai-parent/pom.xml b/aai-parent/pom.xml
index f56e132..d4a608b 100644 (file)
--- a/aai-parent/pom.xml
+++ b/aai-parent/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
   <parent>
     <groupId>org.onap.aai.aai-common</groupId>
     <artifactId>aai-common</artifactId>
-    <version>1.15.4-SNAPSHOT</version>
+    <version>1.15.5-SNAPSHOT</version>
   </parent>
   <artifactId>aai-parent</artifactId>
   <name>aai-parent</name>
@@ -41,12 +41,9 @@ limitations under the License.
     <maven.compiler.release>11</maven.compiler.release>
     <!-- update this just prior to release or figure out something with version.properties -->
     <aai.release.version>${aai.common.version}</aai.release.version>
-    <aai.common.logging.version>1.8.0</aai.common.logging.version>
-    <aai.rest.client.version>1.6.4</aai.rest.client.version>
-    <aai.schema.service.version>1.9.6</aai.schema.service.version>
+    <aai.schema.service.version>1.12.7</aai.schema.service.version>
 
     <antlr.version>4.11.1</antlr.version>
-    <activemq.version>5.16.1</activemq.version>
     <commons.beanutils.version>1.9.4</commons.beanutils.version>
     <commons.cli.version>1.5.0</commons.cli.version>
     <commons.compress.version>1.27.0</commons.compress.version>
@@ -56,17 +53,13 @@ limitations under the License.
     <commons.net.version>3.8.0</commons.net.version>
     <commons.text.version>1.10.0</commons.text.version>
     <docker.fabric.version>0.40.2</docker.fabric.version>
-    <easy.mock.version>5.0.0</easy.mock.version>
     <eclipse.persistence.version>2.7.15</eclipse.persistence.version>
-    <eelf.core.version>2.0.0-oss</eelf.core.version>
-    <freemarker.version>2.3.31</freemarker.version>
-    <google.guava.version>33.3.1-jre</google.guava.version>
+    <google.guava.version>33.4.0-jre</google.guava.version>
     <gremlin.version>3.7.3</gremlin.version>
-    <janusgraph.version>1.0.1</janusgraph.version>
+    <janusgraph.version>1.1.0</janusgraph.version>
     <gson.version>2.9.1</gson.version>
     <hamcrest.junit.version>2.0.0.0</hamcrest.junit.version>
     <hamcrest.core.version>2.2</hamcrest.core.version>
-    <javatuples.version>1.2</javatuples.version>
     <jaxb.version>2.3.1</jaxb.version>
     <jaxrs.version>2.1.1</jaxrs.version>
     <jcommander.version>1.78</jcommander.version>
@@ -398,12 +391,6 @@ limitations under the License.
         <version>${json.path.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>org.javatuples</groupId>
-        <artifactId>javatuples</artifactId>
-        <version>${javatuples.version}</version>
-      </dependency>
-
       <dependency>
         <groupId>com.google.code.gson</groupId>
         <artifactId>gson</artifactId>
diff --git a/aai-rest/pom.xml b/aai-rest/pom.xml
index 542db41..c59ddbe 100644 (file)
--- a/aai-rest/pom.xml
+++ b/aai-rest/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.15.4-SNAPSHOT</version>
+        <version>1.15.5-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-rest</artifactId>
diff --git a/aai-schema-abstraction/pom.xml b/aai-schema-abstraction/pom.xml
index 3eb22df..36654f7 100644 (file)
--- a/aai-schema-abstraction/pom.xml
+++ b/aai-schema-abstraction/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.onap.aai.aai-common</groupId>
     <artifactId>aai-parent</artifactId>
-    <version>1.15.4-SNAPSHOT</version>
+    <version>1.15.5-SNAPSHOT</version>
     <relativePath>../aai-parent/pom.xml</relativePath>
   </parent>
 
diff --git a/aai-schema-ingest/pom.xml b/aai-schema-ingest/pom.xml
index 43c3c64..f8ffe0c 100644 (file)
--- a/aai-schema-ingest/pom.xml
+++ b/aai-schema-ingest/pom.xml
@@ -26,7 +26,7 @@ limitations under the License.
        <parent>
                <groupId>org.onap.aai.aai-common</groupId>
                <artifactId>aai-parent</artifactId>
-               <version>1.15.4-SNAPSHOT</version>
+               <version>1.15.5-SNAPSHOT</version>
                <relativePath>../aai-parent/pom.xml</relativePath>
        </parent>
        <artifactId>aai-schema-ingest</artifactId>
diff --git a/aai-utils/pom.xml b/aai-utils/pom.xml
index c39cda6..a5ae25d 100644 (file)
--- a/aai-utils/pom.xml
+++ b/aai-utils/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.15.4-SNAPSHOT</version>
+        <version>1.15.5-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-utils</artifactId>
diff --git a/pom.xml b/pom.xml
index f8697d3..0b42adc 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.onap.aai.aai-common</groupId>
     <artifactId>aai-common</artifactId>
-    <version>1.15.4-SNAPSHOT</version>
+    <version>1.15.5-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>aai-aai-common</name>
     <description>Contains all of the common code for resources and traversal repos</description>
diff --git a/version.properties b/version.properties
index 6129e4a..73ddb41 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
 
 major_version=1
 minor_version=15
-patch_version=4
+patch_version=5
 
 base_version=${major_version}.${minor_version}.${patch_version}
 
This holds the model, annotations and common modules used across the Resources and Traversal micro services