X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=c66f2cfc906c8cb217be749d068502b044ec016d;hb=933f75fb5c4934c0e304c91d011a07a672555483;hp=7aa4cca44e1663373420400381861d6253d366d8;hpb=d0f1475f3d0dcec0f0e7bd0b6d08eedd0ded3f19;p=clamp.git

diff --git a/pom.xml b/pom.xml
index 7aa4cca4..c66f2cfc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,14 +26,14 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.onap.clamp</groupId>
 	<artifactId>clds</artifactId>
-	<version>4.1.4-SNAPSHOT</version>
+	<version>4.2.0-SNAPSHOT</version>
 	<name>clamp</name>
 
 
 	<parent>
 		<groupId>org.onap.oparent</groupId>
 		<artifactId>oparent</artifactId>
-		<version>2.0.0</version>
+		<version>2.1.0</version>
 	</parent>
 
 	<description>
@@ -75,29 +75,31 @@
 		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
 		<clamp.project.version>${project.version}</clamp.project.version>
 		<clamp.build.timestamp>${maven.build.timestamp}</clamp.build.timestamp>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<eelf.core.version>1.0.0</eelf.core.version>
 		<camel.version>2.24.0</camel.version>
-		<springboot.version>2.1.5.RELEASE</springboot.version>
+		<springboot.version>2.2.0.RELEASE</springboot.version>
 
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
-		<sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
-		<sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
+		<!-- The value below comes from the jacoco maven plugin output, sonar now takes xml only -->
+		<sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/jacoco-html-xml-reports/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+		<!-- <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
+		<sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath> -->
 		<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
 		<sonar.projectVersion>${project.version}</sonar.projectVersion>
 		<!-- Enable language to disable javascript analysis -->
 		<!-- <sonar.language>java</sonar.language> -->
 		<!-- Parameters for Javascript coverage -->
-		<sonar.sources>src/main,${project.build.directory}/${ui.react.src}/src</sonar.sources>
-		<sonar.javascript.lcov.reportPaths>${project.build.directory}/${ui.react.src}/coverage/lcov.info</sonar.javascript.lcov.reportPaths>
-
+		<sonar.verbose>true</sonar.verbose>
+		<sonar.sources>.</sonar.sources>
+		<sonar.inclusions>src/main/**,{ui.react.src}/src/**</sonar.inclusions>
 		<sonar.exclusions>src/main/resources/**</sonar.exclusions>
-		<sonar.coverage.exclusions>src/main/resources/**,target/ui-react/src/**/*.test.js,target/ui-react/src/setupTests.js,src/main/docker/*.py</sonar.coverage.exclusions>
+		<sonar.scm.exclusions.disabled>true</sonar.scm.exclusions.disabled>
+		<sonar.javascript.lcov.reportPaths>${project.build.directory}/${ui.react.src}/coverage/lcov.info</sonar.javascript.lcov.reportPaths>
+		<sonar.coverage.exclusions>src/main/resources/**,target/ui-react/src/**/*.test.js,target/ui-react/src/setupTests.js,src/main/docker/kibana/*.py</sonar.coverage.exclusions>
 		<docker.push.registry>localhost:5000</docker.push.registry>
 		<docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
 		<docker.skip.build>true</docker.skip.build>
@@ -105,9 +107,9 @@
 		<docker.skip.tag>true</docker.skip.tag>
 		<skip.staging.artifacts>false</skip.staging.artifacts>
 		<python.http.proxy.param />
-		<tomcat.version>9.0.20</tomcat.version>
+		<tomcat.version>9.0.27</tomcat.version>
 		<ui.react.src>ui-react</ui.react.src>
-		<npm.publish.url>https://nexus3.onap.org/repository/npm.snapshot/</npm.publish.url>
+		<npm.publish.url>https://nexus3.onap.org/repository/npm.release/</npm.publish.url>
 	</properties>
 
 	<profiles>
@@ -261,6 +263,12 @@
 			<groupId>org.apache.xmlgraphics</groupId>
 			<artifactId>batik-svggen</artifactId>
 			<version>1.11</version>
+			<exclusions>
+			<exclusion>
+				<groupId>xml-apis</groupId>
+				<artifactId>xml-apis</artifactId>
+			</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.xmlgraphics</groupId>
@@ -276,6 +284,16 @@
 			<groupId>com.att.eelf</groupId>
 			<artifactId>eelf-core</artifactId>
 			<version>${eelf.core.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.powermock</groupId>
+					<artifactId>powermock-module-junit4</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.powermock</groupId>
+					<artifactId>powermock-api-mockito</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.janino</groupId>
@@ -515,7 +533,19 @@
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>1.10.19</version>
+			<version>2.28.2</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-api-mockito2</artifactId>
+			<version>2.0.4</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-module-junit4</artifactId>
+			<version>2.0.4</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -581,9 +611,9 @@
 
 		<plugins>
 			<plugin>
-				<groupId>de.jpdigital</groupId>
-				<artifactId>hibernate52-ddl-maven-plugin</artifactId>
-				<version>2.2.0</version>
+					<groupId>de.jpdigital</groupId>
+					<artifactId>hibernate52-ddl-maven-plugin</artifactId>
+					<version>2.2.0</version>
 				<dependencies>
 					<dependency>
 						<groupId>javax.xml.bind</groupId>
@@ -599,7 +629,7 @@
 						</goals>
 						<configuration>
 							<packages>
-								<param>org.onap.clamp.dao.model</param>
+								<param>org.onap.clamp</param>
 							</packages>
 							<dialects>
 								<param>MARIADB53</param>
@@ -718,6 +748,22 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.codehaus.groovy.maven</groupId>
+				<artifactId>gmaven-plugin</artifactId>
+				<version>1.0</version>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>execute</goal>
+						</goals>
+						<configuration>
+							<source>${project.basedir}/src/main/script/SelectNpmRepo.groovy</source>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
@@ -795,7 +841,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.22.1</version>
+				<version>2.22.2</version>
 				<configuration>
 					<forkCount>1C</forkCount>
 					<reuseForks>true</reuseForks>
@@ -807,7 +853,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-failsafe-plugin</artifactId>
-				<version>2.22.1</version>
+				<version>2.22.2</version>
 				<executions>
 					<execution>
 						<id>integration-tests</id>
@@ -833,7 +879,7 @@
 			<plugin>
 				<groupId>io.fabric8</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
-				<version>0.27.2</version>
+				<version>0.31.0</version>
 				<dependencies>
 					<dependency>
 						<groupId>org.apache.httpcomponents</groupId>
@@ -869,6 +915,9 @@
 								<ports>
 									<port>${docker.mariadb.port.host}:3306</port>
 								</ports>
+								<network>
+									<mode>bridge</mode>
+								</network>
 							</run>
 						</image>
 						<image>
@@ -899,6 +948,9 @@
 									<shell>./start_http_cache.sh ${python.http.proxy.param}
 										--python_proxyaddress=localhost:${docker.http-cache.port.host}</shell>
 								</cmd>
+								<network>
+									<mode>bridge</mode>
+								</network>
 							</run>
 						</image>
 						<image>
@@ -1015,12 +1067,12 @@
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.2</version>
+				<version>0.8.5</version>
 				<configuration>
 					<dumpOnExit>true</dumpOnExit>
 					<append>true</append>
 					<includes>
-						<include>org.onap.clamp.*</include>
+						<include>org/onap/clamp/**</include>
 					</includes>
 				</configuration>
 				<executions>
@@ -1062,7 +1114,18 @@
 									</includes>
 								</fileSet>
 							</fileSets>
-							<destFile>${project.build.directory}/jacoco-dev.exec</destFile>
+							<destFile>${project.build.directory}/jacoco.exec</destFile>
+						</configuration>
+					</execution>
+					<execution>
+						<id>report-xml</id>
+						<goals>
+							<goal>report</goal>
+						</goals>
+						<configuration>
+							<!-- Setting explicit path, so that we remember where it picks them up from -->
+							<dataFile>${project.build.directory}/jacoco.exec</dataFile>
+							<outputDirectory>${project.build.directory}/jacoco-html-xml-reports</outputDirectory>
 						</configuration>
 					</execution>
 				</executions>
@@ -1091,8 +1154,8 @@
 						</goals>
 						<phase>generate-sources</phase>
 						<configuration>
-							<nodeVersion>v12.10.0</nodeVersion>
-							<npmVersion>6.10.3</npmVersion>
+						<nodeVersion>v12.13.0</nodeVersion>
+						<npmVersion>6.13.0</npmVersion>
 						</configuration>
 					</execution>
 					<execution>
@@ -1102,7 +1165,7 @@
 						</goals>
 						<phase>compile</phase>
 						<configuration>
-							<arguments>install --registry https://registry.npmjs.com/</arguments>
+							<arguments>install</arguments>
 						</configuration>
 					</execution>
 					<execution>
@@ -1122,12 +1185,25 @@
 						</goals>
 						<phase>deploy</phase>
 						<configuration>
-							<skip>true</skip>
-							<arguments>publish --registry ${npm.publish.url}</arguments>
+							<arguments>publish</arguments>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.8.1</version>
+				<configuration>
+					<source>11</source>
+					<target>11</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.sonarsource.scanner.maven</groupId>
+				<artifactId>sonar-maven-plugin</artifactId>
+				<version>3.7.0.1746</version>
+			</plugin>
 		</plugins>
 	</build>
 </project>