X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=45459741a0a3e06c9ae837db8190f3261f27684c;hb=4dc849f66bf9c8749ca8d2ef228fceee4d358ca1;hp=e419c31b24aa26d8f74caddf800677afa63c0091;hpb=e77e0ff6c8655d8afe20d9e333ebff5833b08d52;p=clamp.git

diff --git a/pom.xml b/pom.xml
index e419c31b..45459741 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.2-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,14 +75,12 @@
 		<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>
@@ -97,7 +95,7 @@
 		<sonar.javascript.lcov.reportPaths>${project.build.directory}/${ui.react.src}/coverage/lcov.info</sonar.javascript.lcov.reportPaths>
 
 		<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/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 +103,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>
@@ -276,6 +274,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>
@@ -397,7 +405,7 @@
 		<dependency>
 			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
-			<version>2.1.10</version>
+			<version>2.1.15</version>
 			<exclusions>
 				<exclusion>
 					<groupId>javax.servlet</groupId>
@@ -462,149 +470,6 @@
 			<artifactId>persistence-api</artifactId>
 			<version>1.0.2</version>
 		</dependency>
-		<dependency>
-			<groupId>org.onap.policy.engine</groupId>
-			<artifactId>PolicyEngineAPI</artifactId>
-			<version>1.3.3</version>
-			<exclusions>
-				<exclusion>
-					<groupId>com.google.guava</groupId>
-					<artifactId>guava</artifactId>
-				</exclusion>
-				<exclusion>
-					<artifactId>log4j</artifactId>
-					<groupId>log4j</groupId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>slf4j-log4j12</artifactId>
-				</exclusion>
-				<exclusion>
-					<artifactId>apache-log4j-extras</artifactId>
-					<groupId>log4j</groupId>
-				</exclusion>
-				<exclusion>
-					<groupId>mysql</groupId>
-					<artifactId>mysql-connector-java</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>commons-io</groupId>
-					<artifactId>commons-io</artifactId>
-				</exclusion>
-				<exclusion>
-					<artifactId>grizzly-http-server</artifactId>
-					<groupId>org.glassfish.grizzly</groupId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
-					<artifactId>dmaapClient</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.onap.policy.common</groupId>
-					<artifactId>integrity-monitor</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.onap.policy.common</groupId>
-					<artifactId>integrity-audit</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.fasterxml.jackson.core</groupId>
-					<artifactId>jackson-databind</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.onap.aaf.cadi</groupId>
-					<artifactId>cadi-aaf</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>javax.jms</groupId>
-					<artifactId>jms</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>commons-fileupload</groupId>
-					<artifactId>commons-fileupload</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.att.research.xacml</groupId>
-					<artifactId>xacml</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.onap.policy.common</groupId>
-			<artifactId>ONAP-Logging</artifactId>
-			<version>1.2.3</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>log4j</artifactId>
-					<groupId>log4j</groupId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>slf4j-log4j12</artifactId>
-				</exclusion>
-				<exclusion>
-					<artifactId>apache-log4j-extras</artifactId>
-					<groupId>log4j</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-			<artifactId>policy-yaml</artifactId>
-			<version>1.2.3</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>log4j</artifactId>
-					<groupId>log4j</groupId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>slf4j-log4j12</artifactId>
-				</exclusion>
-				<exclusion>
-					<artifactId>apache-log4j-extras</artifactId>
-					<groupId>log4j</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-			<artifactId>sdc</artifactId>
-			<version>1.2.3</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>log4j</artifactId>
-					<groupId>log4j</groupId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>slf4j-log4j12</artifactId>
-				</exclusion>
-				<exclusion>
-					<artifactId>apache-log4j-extras</artifactId>
-					<groupId>log4j</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-			<artifactId>aai</artifactId>
-			<version>1.2.3</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>log4j</artifactId>
-					<groupId>log4j</groupId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>slf4j-log4j12</artifactId>
-				</exclusion>
-				<exclusion>
-					<artifactId>apache-log4j-extras</artifactId>
-					<groupId>log4j</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-csv</artifactId>
@@ -658,7 +523,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>
@@ -861,6 +738,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>
@@ -938,7 +831,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>
@@ -950,7 +843,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>
@@ -972,12 +865,11 @@
 						</configuration>
 					</execution>
 				</executions>
-
 			</plugin>
 			<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>
@@ -999,17 +891,23 @@
 								<hostname>mariadb</hostname>
 								<volumes>
 									<bind>
-										<volume>${project.basedir}/extra/sql/:/docker-entrypoint-initdb.d</volume>
+										<volume>${project.basedir}/extra/sql/:/docker-entrypoint-initdb.d:rw</volume>
 										<volume>${project.basedir}/extra/docker/mariadb/conf1:/etc/mysql/conf.d</volume>
 									</bind>
 								</volumes>
 								<wait>
 									<log>socket: '/var/run/mysqld/mysqld.sock'  port: 3306  mariadb.org binary distribution</log>
 									<time>600000</time>
+									<exec>
+										<preStop>/docker-entrypoint-initdb.d/dump/backup-data-only.sh</preStop>
+									</exec>
 								</wait>
 								<ports>
 									<port>${docker.mariadb.port.host}:3306</port>
 								</ports>
+								<network>
+									<mode>bridge</mode>
+								</network>
 							</run>
 						</image>
 						<image>
@@ -1040,6 +938,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>
@@ -1086,22 +987,6 @@
 								</assembly>
 							</build>
 						</image>
-						<image>
-							<name>onap/clamp-dashboard-elasticsearch</name>
-							<alias>onap-clamp-dashboard-elasticsearch</alias>
-							<run>
-								<skip>true</skip>
-							</run>
-							<build>
-								<cleanup>true</cleanup>
-								<tags>
-									<tag>latest</tag>
-									<tag>${project.docker.latesttagtimestamp.version}</tag>
-									<tag>${project.docker.latesttag.version}</tag>
-								</tags>
-								<dockerFile>elasticsearch/Dockerfile</dockerFile>
-							</build>
-						</image>
 						<image>
 							<name>onap/clamp-dashboard-logstash</name>
 							<alias>onap-clamp-dashboard-logstash</alias>
@@ -1172,7 +1057,7 @@
 			<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>
@@ -1248,8 +1133,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>
@@ -1279,12 +1164,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>13</source>
+					<target>13</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>