X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=52796a8f8fc3037944abeabf82ba76cbb7cab4a6;hb=35e3de3f0d5b2b02fc6ef92ec577fe6b7cd05e3c;hp=745615cc27e1dab70eb64a3b97ab23628520347c;hpb=b285db3aa9b126ed7856d3dc8a74aa1795ea256c;p=aai%2Fmodel-loader.git

diff --git a/pom.xml b/pom.xml
index 745615c..52796a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
 	<groupId>org.onap.aai.model-loader</groupId>
 	<artifactId>model-loader</artifactId>
 	<name>aai-model-loader</name>
-	<version>1.6.2-SNAPSHOT</version>
+	<version>1.8.1-SNAPSHOT</version>
 
 	<dependencyManagement>
 		<dependencies>
@@ -55,9 +55,9 @@
 		<apache.commons-text.version>1.8</apache.commons-text.version>
 		<commons-compress.version>1.19</commons-compress.version>
 		<hamcrest-all.version>1.3</hamcrest-all.version>
-		<babel.version>1.6.2</babel.version>
+		<babel.version>1.8.0</babel.version>
 		<aai.rest.client.version>1.2.1</aai.rest.client.version>
-		<sdc-distribution-client.version>1.3.0</sdc-distribution-client.version>
+		<sdc-distribution-client.version>1.4.1</sdc-distribution-client.version>
 		<logback.version>1.2.3</logback.version>
 		<!-- docker related properties -->
 		<docker.fabric.version>0.28.0</docker.fabric.version>
@@ -65,14 +65,14 @@
 		<aai.build.directory>${project.build.directory}/${project.artifactId}-${project.version}-build/</aai.build.directory>
 		<aai.docker.namespace>onap</aai.docker.namespace>
 		<aai.base.image>alpine</aai.base.image>
-		<aai.base.image.version>1.6.0</aai.base.image.version>
+		<aai.base.image.version>1.8.1</aai.base.image.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>
 
 		<sonar.jacoco.reportPath />
 		<sonar.jacoco.itReportPath />
 		<sonar.jacoco.reportMissing.force.zero />
-		
+
 		<jacoco.line.coverage.limit>0.75</jacoco.line.coverage.limit>
 		<jacoco.version>0.8.5</jacoco.version>
 		<sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
@@ -82,6 +82,12 @@
 
 		<sonar.scanner.version>3.7.0.1746</sonar.scanner.version>
 
+		<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
+		<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+		<maven-compiler-plugin.source>11</maven-compiler-plugin.source>
+		<maven-compiler-plugin.target>11</maven-compiler-plugin.target>
+		<maven-compiler-plugin.test.source>11</maven-compiler-plugin.test.source>
+		<maven-compiler-plugin.test.target>11</maven-compiler-plugin.test.target>
 	</properties>
 
 	<distributionManagement>
@@ -372,6 +378,18 @@
 
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>${maven-compiler-plugin.version}</version>
+				<inherited>true</inherited>
+				<configuration>
+					<source>${maven-compiler-plugin.source}</source>
+					<target>${maven-compiler-plugin.target}</target>
+					<testSource>${maven-compiler-plugin.test.source}</testSource>
+					<testTarget>${maven-compiler-plugin.test.target}</testTarget>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
@@ -415,7 +433,7 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>
 				<configuration>
-					<skip>true</skip>
+					<classifier>client</classifier>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -436,7 +454,7 @@
 				</executions>
 			</plugin>
 
-			<!-- once we connect aai-parent or oparent 3.0+ we can take out this 
+			<!-- once we connect aai-parent or oparent 3.0+ we can take out this
 			     whole section -->
 
 			<plugin>
@@ -444,7 +462,7 @@
 			  <artifactId>jacoco-maven-plugin</artifactId>
 			  <version>${jacoco.version}</version>
 			  <configuration>
-			    <!-- Note: This exclusion list should match <sonar.exclusions> property 
+			    <!-- Note: This exclusion list should match <sonar.exclusions> property
 				 above -->
 			    <excludes>
 			      <exclude>**/gen/**</exclude>
@@ -454,7 +472,7 @@
 			    </excludes>
 			  </configuration>
 			  <executions>
-			    <!-- Prepares the property pointing to the JaCoCo runtime agent which 
+			    <!-- Prepares the property pointing to the JaCoCo runtime agent which
 				 is passed as VM argument when Maven the Surefire plugin is executed. -->
 			    <execution>
 			      <id>pre-unit-test</id>
@@ -462,15 +480,15 @@
 				<goal>prepare-agent</goal>
 			      </goals>
 			      <configuration>
-				<!-- Sets the path to the file which contains the execution data 
+				<!-- Sets the path to the file which contains the execution data
 				     . -->
 				<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-				<!-- Sets the name of the property containing the settings for JaCoCo 
+				<!-- Sets the name of the property containing the settings for JaCoCo
 				     runtime agent. -->
 				<propertyName>surefireArgLine</propertyName>
 			      </configuration>
 			    </execution>
-			    <!-- Ensures that the code coverage report for unit tests is created 
+			    <!-- Ensures that the code coverage report for unit tests is created
 				 after unit tests have been run. -->
 			    <execution>
 			      <id>post-unit-test</id>
@@ -479,7 +497,7 @@
 				<goal>report</goal>
 			      </goals>
 			      <configuration>
-				<!-- Sets the path to the file which contains the execution data 
+				<!-- Sets the path to the file which contains the execution data
 				     . -->
 				<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
 				<!-- Sets the output directory for the code coverage report. -->
@@ -493,15 +511,15 @@
 				<goal>prepare-agent</goal>
 			      </goals>
 			      <configuration>
-				<!-- Sets the path to the file which contains the execution data 
+				<!-- Sets the path to the file which contains the execution data
 				     . -->
 				<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-				<!-- Sets the name of the property containing the settings for JaCoCo 
+				<!-- Sets the name of the property containing the settings for JaCoCo
 				     runtime agent. -->
 				<propertyName>failsafeArgLine</propertyName>
 			      </configuration>
 			    </execution>
-			    <!-- Ensures that the code coverage report for integration tests after 
+			    <!-- Ensures that the code coverage report for integration tests after
 				 integration tests have been run. -->
 			    <execution>
 			      <id>post-integration-test</id>
@@ -510,7 +528,7 @@
 				<goal>report</goal>
 			      </goals>
 			      <configuration>
-				<!-- Sets the path to the file which contains the execution data 
+				<!-- Sets the path to the file which contains the execution data
 				     . -->
 				<dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
 				<!-- Sets the output directory for the code coverage report. -->
@@ -558,7 +576,7 @@
 			  <artifactId>maven-failsafe-plugin</artifactId>
 			  <version>3.0.0-M4</version>
 			  <executions>
-			    <!-- Ensures that both integration-test and verify goals of the Failsafe 
+			    <!-- Ensures that both integration-test and verify goals of the Failsafe
 				 Maven plugin are executed. -->
 			    <execution>
 			      <id>integration-tests</id>