From e9a899f1866f225bddab5f08f7847b8417c5f1da Mon Sep 17 00:00:00 2001
From: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Date: Sun, 13 Oct 2024 11:59:38 +0200
Subject: [PATCH] Remove groovy dependency from aai-common

- remove org.codehaus.groovy declaration

Issue-ID: AAI-3941
Change-Id: I28480671031b81813e151202531dd08995bf42b3
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
---
 aai-core/pom.xml          | 13 -------------
 aai-parent/pom.xml        | 41 -----------------------------------------
 aai-schema-ingest/pom.xml |  7 -------
 3 files changed, 61 deletions(-)

diff --git a/aai-core/pom.xml b/aai-core/pom.xml
index c42450db..0fcddcd6 100644
--- a/aai-core/pom.xml
+++ b/aai-core/pom.xml
@@ -36,7 +36,6 @@ limitations under the License.
 		<springframework.version>4.3.24.RELEASE</springframework.version>
 
 		<jacoco.line.coverage.limit>0.50</jacoco.line.coverage.limit>
-		<groovy.version>2.5.15</groovy.version>
 		<mockito.core.version>3.4.0</mockito.core.version>
 		<!-- Start of Default ONAP Schema Properties -->
 		<aai.wiki.link>https://wiki.onap.org/</aai.wiki.link>
@@ -300,12 +299,6 @@ limitations under the License.
 			<groupId>com.github.fge</groupId>
 			<artifactId>json-patch</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy</artifactId>
-            <version>${groovy.version}</version>
-			<classifier>indy</classifier>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
@@ -354,12 +347,6 @@ limitations under the License.
 		<dependency>
 			<groupId>org.apache.tinkerpop</groupId>
 			<artifactId>gremlin-groovy</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>org.codehaus.groovy</groupId>
-					<artifactId>groovy</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/aai-parent/pom.xml b/aai-parent/pom.xml
index 82fd3135..52bedfda 100644
--- a/aai-parent/pom.xml
+++ b/aai-parent/pom.xml
@@ -63,13 +63,11 @@ limitations under the License.
     <google.guava.version>31.1-jre</google.guava.version>
     <gremlin.version>3.7.1</gremlin.version>
     <janusgraph.version>1.0.0</janusgraph.version>
-    <groovy.version>2.5.15</groovy.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>
-    <old.jaxb.version>2.3.0.1</old.jaxb.version>
     <jaxrs.version>2.1.1</jaxrs.version>
     <jcommander.version>1.78</jcommander.version>
     <jnr.ffi.version>2.2.12</jnr.ffi.version>
@@ -323,13 +321,6 @@ limitations under the License.
         <version>${gremlin.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>org.codehaus.groovy</groupId>
-        <artifactId>groovy</artifactId>
-        <version>${groovy.version}</version>
-        <classifier>indy</classifier>
-      </dependency>
-
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-all</artifactId>
@@ -376,38 +367,6 @@ limitations under the License.
         <artifactId>jakarta.xml.bind-api</artifactId>
         <version>2.3.3</version>
       </dependency>
-
-      <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-broker</artifactId>
-        <version>${activemq.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-client</artifactId>
-        <version>${activemq.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-openwire-legacy</artifactId>
-        <version>${activemq.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.easymock</groupId>
-        <artifactId>easymock</artifactId>
-        <version>${easy.mock.version}</version>
-        <scope>test</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-xjc</artifactId>
-        <version>${old.jaxb.version}</version>
-      </dependency>
-
       <dependency>
         <groupId>org.glassfish.jaxb</groupId>
         <artifactId>jaxb-runtime</artifactId>
diff --git a/aai-schema-ingest/pom.xml b/aai-schema-ingest/pom.xml
index af58202a..b619cec7 100644
--- a/aai-schema-ingest/pom.xml
+++ b/aai-schema-ingest/pom.xml
@@ -35,7 +35,6 @@ limitations under the License.
 
 	<properties>
 		<httpclient.version>4.5.13</httpclient.version>
-        <groovy.version>2.5.15</groovy.version>
 		<springframework.version>4.3.24.RELEASE</springframework.version>
 	</properties>
 	<build>
@@ -66,12 +65,6 @@ limitations under the License.
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy</artifactId>
-            <version>${groovy.version}</version>
-			<classifier>indy</classifier>
-		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-- 
2.16.6