summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFiete Ostkamp <Fiete.Ostkamp@telekom.de>2025-01-02 14:16:10 +0100
committerFiete Ostkamp <Fiete.Ostkamp@telekom.de>2025-01-02 14:27:48 +0100
commit6d04920afb813d9e3c79744f0a9f43b6f46e6c8e (patch)
treef21de9c50a0fe89c8e4e58e9bffecc9b85eec4cd
parent45973a4c967e589dd119da9990047257f695f424 (diff)
Use aai-common 1.15.4 in resources1.15.4
- use aai-common 1.15.4 that contains dependency updates - do not declare jnr-ffi as explicit dependency since it is only used transitively - change org.json dependency scope to test - remove freemarker and hamcrest-junit dependencies since they are not used Issue-ID: AAI-4094 Change-Id: I0c4fdee7d0f4ab2ae12dd92bb5b079bf3281054f Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
-rw-r--r--aai-resources/pom.xml20
-rw-r--r--pom.xml4
2 files changed, 3 insertions, 21 deletions
diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml
index 6692e75..e3dd9ce 100644
--- a/aai-resources/pom.xml
+++ b/aai-resources/pom.xml
@@ -430,10 +430,6 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>com.github.jnr</groupId>
- <artifactId>jnr-ffi</artifactId>
- </dependency>
- <dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
</dependency>
@@ -455,10 +451,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
- </dependency>
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
@@ -529,17 +522,6 @@
<version>3.21.0</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-junit</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.skyscreamer</groupId>
diff --git a/pom.xml b/pom.xml
index 1cc88dc..c1d916a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-parent</artifactId>
- <version>1.15.3</version>
+ <version>1.15.4</version>
</parent>
<groupId>org.onap.aai.resources</groupId>
<artifactId>resources</artifactId>
@@ -49,7 +49,7 @@
<staging.path>/content/repositories/staging/</staging.path>
<!-- GMaven plugin uses this property to figure out the name of the docker tag -->
<aai.project.version>${project.version}</aai.project.version>
- <aai.common.version>1.15.3</aai.common.version>
+ <aai.common.version>1.15.4</aai.common.version>
<aai.schema.service.version>1.12.7</aai.schema.service.version>
</properties>
<build>