summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFiete Ostkamp <Fiete.Ostkamp@telekom.de>2024-06-17 09:34:22 +0200
committerFiete Ostkamp <Fiete.Ostkamp@telekom.de>2024-06-18 08:06:06 +0200
commita2019cc4edeea1ec4b10bb1b6345bd8ad0268e5c (patch)
tree961a31629c7711491b902b80d67f8015413e4124
parent655f38daf1a2c758aef2a615ea0fe8e34a949f16 (diff)
Update aai-common to 1.14.1 in graphadmin1.14.1
- includes tinkerpop update from 3.3.0 to 3.3.11 - update guava from 18 to 25.0-jre Issue-ID: AAI-3880 Change-Id: I73b412eee3954163ce9fb31dd9eb7430f3d44bdc Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
-rwxr-xr-xpom.xml53
-rw-r--r--version.properties2
2 files changed, 22 insertions, 33 deletions
diff --git a/pom.xml b/pom.xml
index 8d17076..a6acab9 100755
--- a/pom.xml
+++ b/pom.xml
@@ -26,11 +26,11 @@
<parent>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-parent</artifactId>
- <version>1.14.0</version>
+ <version>1.14.1</version>
</parent>
<groupId>org.onap.aai.graphadmin</groupId>
<artifactId>aai-graphadmin</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.14.1-SNAPSHOT</version>
<properties>
@@ -55,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.4</aai.schema.service.version>
- <aai.common.version>1.14.0</aai.common.version>
+ <aai.common.version>1.14.1</aai.common.version>
<aai.build.directory>${project.build.directory}/${project.artifactId}-${project.version}-build/
</aai.build.directory>
<aai.docker.namespace>onap</aai.docker.namespace>
@@ -108,7 +108,6 @@
<micrometer.jersey2.version>1.8.1</micrometer.jersey2.version>
<activemq.version>5.16.7</activemq.version>
<antlr.version>4.9.3</antlr.version>
- <gremlin.version>3.3.3</gremlin.version>
<!-- End of graphadmin metric collection Properties -->
</properties>
@@ -345,13 +344,10 @@
<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>
+ <version>25.0-jre</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -863,30 +859,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.6</version>
- <configuration>
- <reportPlugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- </configuration>
- <reports>
- <report>dependencies</report>
- </reports>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8</version>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </reportPlugins>
- </configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
@@ -1111,6 +1083,23 @@
<useStandardDocletOptions>true</useStandardDocletOptions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+ <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8</version>
+ <configuration>
+ <additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
+ </plugin>
</plugins>
</reporting>
diff --git a/version.properties b/version.properties
index 5dfb2dd..654a031 100644
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
major_version=1
minor_version=14
-patch_version=0
+patch_version=1
base_version=${major_version}.${minor_version}.${patch_version}