X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=72f62f03dd44cfad4006c5cc290729e38b746e79;hb=ac4958ae6d30e60c5cf0bd66ce8f3c79191c6726;hp=1ce86b58e530ce270159b0b5ed2bade61e1cbe6e;hpb=8607a45287fa0377f02b8f782da5fced3c89ad09;p=clamp.git

diff --git a/pom.xml b/pom.xml
index 1ce86b58..72f62f03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,19 +20,17 @@
   ============LICENSE_END============================================
   ===================================================================
 -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 		<modelVersion>4.0.0</modelVersion>
 		<groupId>org.onap.clamp</groupId>
 		<artifactId>clds</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.3-SNAPSHOT</version>
 		<name>clamp</name>
 
 		<parent>
 				<groupId>org.onap.oparent</groupId>
 				<artifactId>oparent</artifactId>
-				<version>1.1.0</version>
+				<version>1.2.0</version>
 		</parent>
 
 		<description>
@@ -67,18 +65,23 @@
 				<project.scm.id>git-server</project.scm.id>
 				<java.version>1.8</java.version>
 
-				<swagger.jaxrs2.version>2.0.0-rc4</swagger.jaxrs2.version>
 				<eelf.core.version>1.0.0</eelf.core.version>
-				<camel.version>2.20.1</camel.version>
-				<springboot.version>1.5.14.RELEASE</springboot.version>
-
-				<sonar.language>java</sonar.language>
+				<camel.version>2.22.0</camel.version>
+				<springboot.version>2.0.6.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>
 				<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}/clamp-ui/designer</sonar.sources>
+					<sonar.javascript.lcov.reportPaths>${project.build.directory}/clamp-ui/coverage/lcov.info</sonar.javascript.lcov.reportPaths>
+				 -->
+				<sonar.exclusions>src/main/resources/**,**/clamp-ui/designer/lib/*</sonar.exclusions>
 
 				<docker.push.registry>localhost:5000</docker.push.registry>
 				<docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
@@ -86,8 +89,8 @@
 				<docker.skip.push>true</docker.skip.push>
 				<docker.skip.tag>true</docker.skip.tag>
 				<skip.staging.artifacts>false</skip.staging.artifacts>
-				<python.http.proxy.param></python.http.proxy.param>
-				<tomcat.version>8.5.28</tomcat.version>
+				<python.http.proxy.param/>
+				<tomcat.version>8.5.34</tomcat.version>
 		</properties>
 
 		<profiles>
@@ -101,6 +104,7 @@
 						</activation>
 						<properties>
 							<docker.skip.run>true</docker.skip.run>
+							<docker.skip>true</docker.skip>
 						</properties>
 				</profile>
 				<profile>
@@ -113,6 +117,7 @@
 						</activation>
 						<properties>
 							<docker.skip.run>true</docker.skip.run>
+							<docker.skip>true</docker.skip>
 						</properties>
 				</profile>
 				<profile>
@@ -125,6 +130,7 @@
 						</activation>
 						<properties>
 							<docker.skip.run>true</docker.skip.run>
+							<docker.skip>true</docker.skip>
 						</properties>
 				</profile>
 				<profile>
@@ -134,23 +140,24 @@
 								<docker.skip.build>false</docker.skip.build>
 								<docker.skip.tag>false</docker.skip.tag>
 								<docker.skip.push>false</docker.skip.push>
+								<docker.skip>false</docker.skip>
 						</properties>
 				</profile>
 		</profiles>
 
 		<distributionManagement>
 				<repository>
-						<id>ecomp-releases</id>
+						<id>onap-releases</id>
 						<name>Clamp Release Repository</name>
 						<url>https://nexus.onap.org/content/repositories/releases/</url>
 				</repository>
 				<snapshotRepository>
-						<id>ecomp-snapshots</id>
+						<id>onap-snapshots</id>
 						<name>Clamp Snapshot Repository</name>
 						<url>https://nexus.onap.org/content/repositories/snapshots/</url>
 				</snapshotRepository>
 				<site>
-						<id>ecomp-site</id>
+						<id>onap-site</id>
 						<url>dav:https://nexus.onap.org/content/sites/site/org/onap/clamp/${project.version}</url>
 				</site>
 		</distributionManagement>
@@ -162,17 +169,17 @@
 						<url>http://repo2.maven.org/maven2/</url>
 				</repository>
 				<repository>
-						<id>ecomp-releases</id>
+						<id>onap-releases</id>
 						<name>ONAP Release Repository</name>
 						<url>https://nexus.onap.org/content/repositories/releases/</url>
 				</repository>
 				<repository>
-						<id>ecomp-staging</id>
+						<id>onap-staging</id>
 						<name>ONAP Staging Repository</name>
 						<url>https://nexus.onap.org/content/repositories/staging/</url>
 				</repository>
 				<repository>
-						<id>ecomp-snapshots</id>
+						<id>onap-snapshots</id>
 						<name>ONAP Snapshot Repository</name>
 						<url>https://nexus.onap.org/content/repositories/snapshots/</url>
 						<snapshots>
@@ -192,14 +199,6 @@
 						<name>JBoss.org Maven repository</name>
 						<url>https://repository.jboss.org/nexus/content/groups/public</url>
 				</repository>
-				<repository>
-						<id>jcentral</id>
-						<name>bintray</name>
-						<url>http://jcenter.bintray.com</url>
-						<snapshots>
-								<enabled>false</enabled>
-						</snapshots>
-				</repository>
 		</repositories>
 
 		<dependencyManagement>
@@ -229,6 +228,11 @@
 						<artifactId>eelf-core</artifactId>
 						<version>${eelf.core.version}</version>
 				</dependency>
+				<dependency>
+						<groupId>org.codehaus.janino</groupId>
+						<artifactId>janino</artifactId>
+						<version>3.0.8</version>
+				</dependency>
 				<dependency>
 						<groupId>org.apache.tomcat.embed</groupId>
 						<artifactId>tomcat-embed-core</artifactId>
@@ -262,11 +266,34 @@
 						<groupId>org.apache.camel</groupId>
 						<artifactId>camel-servlet-starter</artifactId>
 				</dependency>
+				<dependency>
+					<groupId>org.apache.camel</groupId> 
+					<artifactId>camel-jackson-starter</artifactId>
+				</dependency>
+				<dependency>
+					<groupId>org.apache.camel</groupId>
+					<artifactId>camel-swagger-java-starter</artifactId>
+					<exclusions>
+						<exclusion>
+							<groupId>javax.ws.rs</groupId>
+							<artifactId>jsr311-api</artifactId>
+						</exclusion>
+						<exclusion>
+							<groupId>org.slf4j</groupId>
+							<artifactId>slf4j-ext</artifactId>
+						</exclusion>
+					</exclusions>
+				</dependency>
 				<dependency>
 						<groupId>javax.xml.bind</groupId>
 						<artifactId>jaxb-api</artifactId>
 						<version>2.3.0</version>
 				</dependency>
+				<dependency>
+					<groupId>org.glassfish.jersey.core</groupId>
+					<artifactId>jersey-common</artifactId>
+					<version>2.27</version>
+				</dependency>
 				<!-- Spring famework -->
 				<dependency>
 						<groupId>org.springframework.boot</groupId>
@@ -276,11 +303,6 @@
 						<groupId>org.springframework.boot</groupId>
 						<artifactId>spring-boot-starter-tomcat</artifactId>
 				</dependency>
-				<dependency>
-						<groupId>com.paypal.springboot</groupId>
-						<artifactId>resteasy-spring-boot-starter</artifactId>
-						<version>2.3.4-RELEASE</version>
-				</dependency>
 				<dependency>
 						<groupId>org.springframework</groupId>
 						<artifactId>spring-jdbc</artifactId>
@@ -291,7 +313,7 @@
 				</dependency>
 				<dependency>
 						<groupId>org.springframework.boot</groupId>
-						<artifactId>spring-boot-starter-actuator</artifactId>
+					<artifactId>spring-boot-autoconfigure</artifactId>
 				</dependency>
 				<dependency>
 						<groupId>org.springframework.boot</groupId>
@@ -372,20 +394,10 @@
 						<artifactId>persistence-api</artifactId>
 						<version>1.0.2</version>
 				</dependency>
-				<dependency>
-						<groupId>org.hibernate</groupId>
-						<artifactId>hibernate-annotations</artifactId>
-						<version>3.5.6-Final</version>
-				</dependency>
-				<dependency>
-						<groupId>dom4j</groupId>
-						<artifactId>dom4j</artifactId>
-				</dependency>
-
 				<dependency>
 						<groupId>org.onap.policy.engine</groupId>
 						<artifactId>PolicyEngineAPI</artifactId>
-						<version>1.2.0</version>
+						<version>1.3.1</version>
 						<exclusions>
 								<exclusion>
 										<groupId>com.google.guava</groupId>
@@ -431,12 +443,24 @@
 										<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.1.3</version>
+						<version>1.2.3</version>
 						<exclusions>
 								<exclusion>
 										<artifactId>log4j</artifactId>
@@ -453,9 +477,9 @@
 						</exclusions>
 				</dependency>
 				<dependency>
-						<groupId>org.onap.policy.drools-applications</groupId>
+						<groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
 						<artifactId>policy-yaml</artifactId>
-						<version>1.1.3</version>
+						<version>1.2.3</version>
 						<exclusions>
 								<exclusion>
 										<artifactId>log4j</artifactId>
@@ -472,9 +496,9 @@
 						</exclusions>
 				</dependency>
 				<dependency>
-						<groupId>org.onap.policy.drools-applications</groupId>
+						<groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
 						<artifactId>sdc</artifactId>
-						<version>1.1.3</version>
+						<version>1.2.3</version>
 						<exclusions>
 								<exclusion>
 										<artifactId>log4j</artifactId>
@@ -491,9 +515,9 @@
 						</exclusions>
 				</dependency>
 				<dependency>
-						<groupId>org.onap.policy.drools-applications</groupId>
+						<groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
 						<artifactId>aai</artifactId>
-						<version>1.1.3</version>
+						<version>1.2.3</version>
 						<exclusions>
 								<exclusion>
 										<artifactId>log4j</artifactId>
@@ -520,11 +544,6 @@
 						<artifactId>plexus-utils</artifactId>
 						<version>3.0.24</version>
 				</dependency>
-				<dependency>
-						<groupId>commons-fileupload</groupId>
-						<artifactId>commons-fileupload</artifactId>
-						<version>1.3.3</version>
-				</dependency>
 				<dependency>
 						<groupId>org.jboss.spec.javax.ws.rs</groupId>
 						<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
@@ -533,7 +552,6 @@
 				<dependency>
 						<groupId>com.google.guava</groupId>
 						<artifactId>guava</artifactId>
-						<version>25.1-jre</version>
 				</dependency>
 				<!-- Remove the MYSQL connector and replace it by Mariadb -->
 				<dependency>
@@ -550,26 +568,7 @@
 				<dependency>
 						<groupId>org.onap.sdc.sdc-tosca</groupId>
 						<artifactId>sdc-tosca</artifactId>
-						<version>1.3.0</version>
-				</dependency>
-				<!-- To generate Swagger.json, swagger.html and swagger.pdf -->
-				<dependency>
-						<groupId>io.springfox</groupId>
-						<artifactId>springfox-swagger2</artifactId>
-						<version>2.4.0</version>
-						<scope>test</scope>
-				</dependency>
-				<dependency>
-						<groupId>io.github.robwin</groupId>
-						<artifactId>assertj-swagger</artifactId>
-						<version>0.2.0</version>
-						<scope>test</scope>
-				</dependency>
-				<dependency>
-						<groupId>io.github.swagger2markup</groupId>
-						<artifactId>swagger2markup-spring-restdocs-ext</artifactId>
-						<version>1.2.0</version>
-						<scope>test</scope>
+						<version>1.4.1</version>
 				</dependency>
 				<!-- TESTING -->
 				<dependency>
@@ -578,13 +577,24 @@
 						<version>3.10.0</version>
 						<scope>test</scope>
 				</dependency>
+				<dependency>
+					<groupId>org.mockito</groupId>
+					<artifactId>mockito-core</artifactId>
+					<version>1.10.19</version>
+					<scope>test</scope>
+				</dependency>
 		</dependencies>
 		<pluginRepositories>
+				<pluginRepository>
+						<id>central-for-plugins</id>
+						<name>Maven 2 repository 2</name>
+						<url>http://repo2.maven.org/maven2/</url>
+				</pluginRepository>
 				<pluginRepository>
 						<snapshots>
 								<enabled>false</enabled>
 						</snapshots>
-						<id>jcenter-releases</id>
+						<id>jcenter-releases-for-plugins</id>
 						<name>jcenter</name>
 						<url>http://jcenter.bintray.com</url>
 				</pluginRepository>
@@ -617,11 +627,39 @@
 								<filtering>false</filtering>
 								<targetPath>example/sdc</targetPath>
 						</testResource>
+
+						<!-- Copy the NPM package.json for CLAMP UI javascript testing framework -->
+						<testResource>
+								<directory>src/test/javascript</directory>
+								<includes>
+										<include>**/**.json</include>
+								</includes>
+								<filtering>true</filtering>
+								<targetPath>${project.build.directory}/clamp-ui</targetPath>
+						</testResource>
+						<testResource>
+								<directory>src/main/resources/META-INF/resources/designer</directory>
+								<filtering>false</filtering>
+								<targetPath>${project.build.directory}/clamp-ui/designer</targetPath>
+						</testResource>
 				</testResources>
 				<resources>
+						<!--  For AAF folder maven should not try to filter Keystores/Truststores ... 
+							  Otherwise they will be broken and unreadable
+						-->
 						<resource>
 								<directory>src/main/resources</directory>
 								<filtering>true</filtering>
+								<excludes>
+									<exclude>clds/aaf/**</exclude>
+								</excludes>
+						</resource>
+						<resource>
+								<directory>src/main/resources</directory>
+								<filtering>false</filtering>
+								<includes>
+									<include>clds/aaf/**</include>
+								</includes>
 						</resource>
 						<resource>
 								<directory>src/main/docker</directory>
@@ -633,43 +671,23 @@
 				</resources>
 
 				<plugins>
-						<!-- Scan Clamp code and generate the swagger.json file with all the 
-								APIs -->
-						<plugin>
-								<groupId>com.sebastian-daschner</groupId>
-								<artifactId>jaxrs-analyzer-maven-plugin</artifactId>
-								<version>0.14</version>
-								<executions>
-										<execution>
-												<phase>test</phase>
-												<goals>
-														<goal>analyze-jaxrs</goal>
-												</goals>
-												<configuration>
-														<backend>swagger</backend>
-														<resourcesDir>../docs/swagger/</resourcesDir>
-												</configuration>
-										</execution>
-								</executions>
-						</plugin>
-
 						<!-- Read the swagger.json file and the definition from SwaggerConfig.java; 
-								generate a list of .adoc files containing the APIs info in more structured 
-								way -->
+							generate a list of .adoc files containing the APIs info in more structured 
+							way -->
 						<plugin>
 								<groupId>io.github.swagger2markup</groupId>
 								<artifactId>swagger2markup-maven-plugin</artifactId>
-								<version>1.3.1</version>
+								<version>1.3.3</version>
 								<dependencies>
 										<dependency>
 												<groupId>io.github.swagger2markup</groupId>
 												<artifactId>swagger2markup-import-files-ext</artifactId>
-												<version>1.3.1</version>
+												<version>1.3.3</version>
 										</dependency>
 										<dependency>
 												<groupId>io.github.swagger2markup</groupId>
 												<artifactId>swagger2markup-spring-restdocs-ext</artifactId>
-												<version>1.3.1</version>
+												<version>1.3.3</version>
 										</dependency>
 								</dependencies>
 								<configuration>
@@ -681,7 +699,7 @@
 								</configuration>
 								<executions>
 										<execution>
-												<phase>test</phase>
+												<phase>post-integration-test</phase>
 												<goals>
 														<goal>convertSwagger2markup</goal>
 												</goals>
@@ -694,7 +712,7 @@
 						<plugin>
 								<groupId>org.asciidoctor</groupId>
 								<artifactId>asciidoctor-maven-plugin</artifactId>
-								<version>1.5.3</version>
+								<version>1.5.6</version>
 								<dependencies>
 										<dependency>
 												<groupId>org.asciidoctor</groupId>
@@ -714,10 +732,10 @@
 												<doctype>book</doctype>
 												<toc>left</toc>
 												<toclevels>3</toclevels>
-												<numbered></numbered>
-												<hardbreaks></hardbreaks>
-												<sectlinks></sectlinks>
-												<sectanchors></sectanchors>
+												<numbered/>
+												<hardbreaks/>
+												<sectlinks/>
+												<sectanchors/>
 												<generated>${project.build.directory}/asciidoc/generated</generated>
 										</attributes>
 								</configuration>
@@ -725,7 +743,7 @@
 								<executions>
 										<execution>
 												<id>output-html</id>
-												<phase>test</phase>
+												<phase>post-integration-test</phase>
 												<goals>
 														<goal>process-asciidoc</goal>
 												</goals>
@@ -737,7 +755,7 @@
 										</execution>
 										<execution>
 												<id>output-pdf</id>
-												<phase>test</phase>
+												<phase>post-integration-test</phase>
 												<goals>
 														<goal>process-asciidoc</goal>
 												</goals>
@@ -935,7 +953,6 @@
 															<skip>true</skip>
 														</run>
 														<build>
-																<imagePullPolicy>never</imagePullPolicy>
 																<cleanup>true</cleanup>
 																<tags>
 																		<tag>latest</tag>
@@ -951,6 +968,38 @@
 																</assembly>
 														</build>
 												</image>
+												<image>
+														<name>onap/clamp-dashboard-logstash</name>
+														<alias>onap-clamp-dashboard-logstash</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>logstash/Dockerfile.logstash</dockerFile>
+														</build>
+												</image>
+												<image>
+														<name>onap/clamp-dashboard-kibana</name>
+														<alias>onap-clamp-dashboard-kibana</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>kibana/Dockerfile.kibana</dockerFile>
+														</build>
+												</image>
 										</images>
 								</configuration>
 
@@ -1044,6 +1093,52 @@
 								<artifactId>versions-maven-plugin</artifactId>
 								<version>1.3.1</version>
 						</plugin>
+
+					<plugin>
+						<groupId>com.github.eirslett</groupId>
+						<artifactId>frontend-maven-plugin</artifactId>
+						<version>1.6</version>
+						<configuration>
+							<installDirectory>${project.build.directory}/clamp-ui</installDirectory>
+							<workingDirectory>${project.build.directory}/clamp-ui</workingDirectory>
+							<skip>${maven.test.skip}</skip>
+						</configuration>
+
+						<executions>
+							<execution>
+								<id>install_node_and_npm</id>
+								<goals>
+									<goal>install-node-and-npm</goal>
+								</goals>
+								<phase>test</phase>
+								<configuration>
+									<nodeVersion>v8.11.1</nodeVersion>
+									<npmVersion>5.6.0</npmVersion>
+								</configuration>
+							</execution>
+							<execution>
+								<id>npm_install</id>
+								<goals>
+									<goal>npm</goal>
+								</goals>
+								<phase>test</phase>
+								<configuration>
+									<arguments>install</arguments>
+								</configuration>
+							</execution>
+							<execution>
+								<id>npm_test</id>
+								<goals>
+									<goal>npm</goal>
+								</goals>
+								<phase>test</phase>
+								<configuration>
+									<arguments>run-script test:coverage</arguments>
+								</configuration>
+							</execution>
+
+						</executions>
+					</plugin>
 				</plugins>
 		</build>
 </project>