X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=57fcfe5580486f4004666b4e08c7954e605c6043;hb=c4a4603dbf10567112fe90c9feb5b3a633234dce;hp=42182a31243336ef069445b7d47f5f479d67f127;hpb=b330d5d99fa66969401af5fba96a071c6b1c8315;p=aai%2Fbabel.git

diff --git a/pom.xml b/pom.xml
index 42182a3..57fcfe5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,12 +28,12 @@
 	<parent>
 		<groupId>org.onap.aai.aai-common</groupId>
 		<artifactId>aai-parent</artifactId>
-		<version>1.9.0</version>
+		<version>1.9.4</version>
 	</parent>
 
 	<groupId>org.onap.aai</groupId>
 	<artifactId>babel</artifactId>
-	<version>1.9.0-SNAPSHOT</version>
+	<version>1.12.3-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>aai-babel</name>
@@ -79,34 +79,36 @@
 		<docker.fabric.version>0.28.0</docker.fabric.version>
 		<aai.docker.version>1.0.0</aai.docker.version>
 		<aai.build.directory>${project.build.directory}/${project.artifactId}-${project.version}-build/
-		</aai.build.directory>
+        </aai.build.directory>
 		<aai.docker.namespace>onap</aai.docker.namespace>
 		<aai.base.image>alpine</aai.base.image>
 		<aai.base.image.version>1.9.0</aai.base.image.version>
 
 		<!-- Dependency Versions -->
-		<sdc.tosca.version>1.5.1</sdc.tosca.version>
+		<sdc.tosca.version>1.6.5</sdc.tosca.version>
 
-		<aai.common.version>1.9.0</aai.common.version>
-		<aaf.version>2.1.21</aaf.version>
-		<common.logging.version>1.2.2</common.logging.version>
+		<aai.common.version>1.9.4</aai.common.version>
+		<aaf.version>2.7.4</aaf.version>
+		<logback.core.version>1.2.11</logback.core.version>
+		<groovy.version>3.0.13</groovy.version>
 
-		<commons.compress.version>1.19</commons.compress.version>
+		<commons.compress.version>1.22</commons.compress.version>
+		<commons.codec.version>1.15</commons.codec.version>
 
-		<javax.ws.rs.version>2.1</javax.ws.rs.version>
-		<mvn.jaxb2.version>0.13.3</mvn.jaxb2.version>
+		<javax.ws.rs.version>2.1.1</javax.ws.rs.version>
+		<mvn.jaxb2.version>0.15.1</mvn.jaxb2.version>
 		<aai-schema.group.id>org.onap.aai.schema-service</aai-schema.group.id>
 
-		<aai-schema.version>1.9.0</aai-schema.version>
-		<apache.lang3.version>3.7</apache.lang3.version>
-		<aai.rest.client.version>1.2.1</aai.rest.client.version>
+		<aai-schema.version>1.12.3</aai-schema.version>
+		<commons.lang3.version>3.12.0</commons.lang3.version>
+		<aai.rest.client.version>1.6.4</aai.rest.client.version>
 
-		<sdc.distribution.client.version>1.4.1</sdc.distribution.client.version>
+		<sdc.distribution.client.version>1.4.5</sdc.distribution.client.version>
+		<!-- TODO: use xml-legacy -->
 		<xmlunit.version>1.6</xmlunit.version>
 
-		<antrun.version>1.8</antrun.version>
-
-		<javax.activation.version>1.1.1</javax.activation.version>
+		<antrun.version>3.1.0</antrun.version>
+		<jakarta.activation.version>1.2.2</jakarta.activation.version>
 		<!-- This will be used for the docker images as the default format of maven build has issues -->
 		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
 
@@ -114,7 +116,6 @@
 
 	<profiles>
 		<!-- Docker profile to be used for building docker image and pushing to nexus -->
-
 		<profile>
 			<id>docker</id>
 			<build>
@@ -122,7 +123,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>build-helper-maven-plugin</artifactId>
-						<version>3.0.0</version>
+						<version>3.3.0</version>
 						<executions>
 							<execution>
 								<phase>pre-clean</phase>
@@ -134,31 +135,33 @@
 						</executions>
 					</plugin>
 					<plugin>
-						<groupId>org.codehaus.groovy.maven</groupId>
-						<artifactId>gmaven-plugin</artifactId>
-						<version>1.0</version>
+						<groupId>org.codehaus.gmavenplus</groupId>
+						<artifactId>gmavenplus-plugin</artifactId>
+						<version>1.13.1</version>
 						<executions>
 							<execution>
 								<phase>pre-clean</phase>
 								<goals>
 									<goal>execute</goal>
 								</goals>
-								<configuration>
-									<source>
-										def userAaiBaseImage = session.userProperties['aai.base.image'];
-										def userAaiCommonVersion = session.userProperties['aai.base.image.version'];
-										if (userAaiCommonVersion != null) {
-											project.properties['aai.base.image.version'] = userAaiCommonVersion;
-										}
-										if (userAaiBaseImage != null) {
-											project.properties['aai.base.image'] = userAaiBaseImage;
-										}
-										log.info 'Base image flavour: ' + project.properties['aai.base.image'];
-										log.info 'Base image version: ' + project.properties['aai.base.image.version'];
-									</source>
-								</configuration>
 							</execution>
 						</executions>
+						<configuration>
+							<scripts>
+								<script>
+									def userAaiBaseImage = session.userProperties['aai.base.image'];
+									def userAaiCommonVersion = session.userProperties['aai.base.image.version'];
+									if (userAaiCommonVersion != null) {
+										project.properties['aai.base.image.version'] = userAaiCommonVersion;
+									}
+									if (userAaiBaseImage != null) {
+										project.properties['aai.base.image'] = userAaiBaseImage;
+									}
+									log.info 'Base image flavour: ' + project.properties['aai.base.image'];
+									log.info 'Base image version: ' + project.properties['aai.base.image.version'];
+								</script>
+							</scripts>
+						</configuration>
 					</plugin>
 					<plugin>
 						<groupId>io.fabric8</groupId>
@@ -169,8 +172,7 @@
 							<apiVersion>1.23</apiVersion>
 							<images>
 								<image>
-									<name>${docker.push.registry}/${aai.docker.namespace}/${project.artifactId}:%l
-									</name>
+									<name>${docker.push.registry}/${aai.docker.namespace}/${project.artifactId}:%l</name>
 									<build>
 										<filter>@</filter>
 										<tags>
@@ -281,27 +283,32 @@
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-core</artifactId>
+			<version>${logback.core.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
+			<version>${commons.codec.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-compress</artifactId>
+			<version>${commons.compress.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
+			<version>${commons.lang3.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.ws.rs</groupId>
 			<artifactId>javax.ws.rs-api</artifactId>
-			<version>2.1</version>
+			<version>${javax.ws.rs.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy</artifactId>
+			<version>${groovy.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.onap.sdc.sdc-tosca</groupId>
@@ -398,9 +405,9 @@
 			<artifactId>jaxb-impl</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>activation</artifactId>
-			<version>${javax.activation.version}</version>
+			<groupId>jakarta.activation</groupId>
+			<artifactId>jakarta.activation-api</artifactId>
+			<version>${jakarta.activation.version}</version>
 		</dependency>
 	</dependencies>
 
@@ -517,7 +524,8 @@
 				<groupId>org.codehaus.mojo</groupId>
 				<version>1.5.0</version>
 				<executions>
-					<execution><!-- Run our script to get latest xsd version -->
+					<execution>
+						<!-- Run our script to get latest xsd version -->
 						<id>Get latest xsd version</id>
 						<phase>generate-sources</phase>
 						<goals>
@@ -612,7 +620,7 @@
 
 
 			<!-- once we connect aai-parent or oparent 3.0+ we can take out this
-			     whole section -->
+                 whole section -->
 
 			<plugin>
 				<groupId>org.jacoco</groupId>
@@ -760,9 +768,8 @@
 				<artifactId>sonar-maven-plugin</artifactId>
 				<version>${sonar.scanner.version}</version>
 			</plugin>
-			<!-- end removable sonar config, note the additional exclusion for babel above
-			     -->
+			<!-- end removable sonar config, note the additional exclusion for babel above -->
 		</plugins>
 	</build>
 
-</project>
+</project>
\ No newline at end of file