X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=0b0236a5f80ea7e78f28b14630ec51ce9fcd4622;hb=7c662851d664e394ff197e9968864b53f1853f5b;hp=fb4c29048c74204b3cf1da09f8aea194394f6095;hpb=38cf246b1dae28d8a7d52d35f4d0f0cf90f31bec;p=clamp.git
diff --git a/pom.xml b/pom.xml
index fb4c2904..0b0236a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,13 +24,13 @@
4.0.0
org.onap.clamp
clds
- 3.0.0-SNAPSHOT
+ 4.0.0-SNAPSHOT
clamp
org.onap.oparent
oparent
- 1.2.0
+ 1.2.3
@@ -60,22 +60,26 @@
UTF-8
UTF-8
- 3306
- 8085
git-server
1.8
1.0.0
- 2.22.0
- 2.0.3.RELEASE
+ 2.23.1
+ 2.1.4.RELEASE
- java
jacoco
${project.build.directory}/surefire-reports
${project.build.directory}/coverage-reports/jacoco.exec
${project.build.directory}/coverage-reports/jacoco-it.exec
true
${project.version}
+
+ java
+
+ src/main/resources/**,**/clamp-ui/designer/lib/*
localhost:5000
nexus3.onap.org:10001
@@ -84,7 +88,7 @@
true
false
- 8.5.32
+ 9.0.16
@@ -158,9 +162,15 @@
- central
- Maven 2 repository 2
- http://repo2.maven.org/maven2/
+ onap-public
+ onap-public
+ https://nexus.onap.org/content/repositories/public/
+
+ true
+
+
+ false
+
ecomp-releases
@@ -184,16 +194,27 @@
- spring-repo
- Spring repo
- https://artifacts.alfresco.com/nexus/content/repositories/public/
-
-
- repository.jboss.org-public
- JBoss.org Maven repository
- https://repository.jboss.org/nexus/content/groups/public
+ central
+ http://repo1.maven.org/maven2/
+
+
+ onap-public
+ onap-public
+ https://nexus.onap.org/content/repositories/public/
+
+ true
+
+
+ false
+
+
+
+ central
+ http://repo1.maven.org/maven2/
+
+
@@ -217,6 +238,21 @@
+
+ org.apache.xmlgraphics
+ batik-svggen
+ 1.11
+
+
+ org.apache.xmlgraphics
+ batik-svg-dom
+ 1.11
+
+
+ org.apache.xmlgraphics
+ batik-transcoder
+ 1.11
+
com.att.eelf
eelf-core
@@ -248,6 +284,10 @@
${tomcat.version}
+
+ org.apache.camel
+ camel-http4
+
org.apache.camel
camel-spring-boot-starter
@@ -261,8 +301,8 @@
camel-servlet-starter
- org.apache.camel
- camel-jackson-starter
+ org.apache.camel
+ camel-gson-starter
org.apache.camel
@@ -276,6 +316,10 @@
org.slf4j
slf4j-ext
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
@@ -292,6 +336,12 @@
org.springframework.boot
spring-boot-starter-web
+
+
+ org.springframework.boot
+ spring-boot-starter-json
+
+
org.springframework.boot
@@ -320,11 +370,15 @@
+
+ org.springframework.boot
+ spring-boot-starter-data-jpa
+
org.onap.aaf.authz
aaf-cadi-aaf
- 2.1.1
+ 2.1.10
javax.servlet
@@ -355,6 +409,7 @@
com.googlecode.json-simple
json-simple
+ 1.1.1
org.apache.commons
@@ -391,7 +446,7 @@
org.onap.policy.engine
PolicyEngineAPI
- 1.2.0
+ 1.3.3
com.google.guava
@@ -433,6 +488,10 @@
org.onap.policy.common
integrity-audit
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
org.onap.aaf.cadi
cadi-aaf
@@ -441,12 +500,20 @@
javax.jms
jms
+
+ commons-fileupload
+ commons-fileupload
+
+
+ com.att.research.xacml
+ xacml
+
org.onap.policy.common
ONAP-Logging
- 1.1.3
+ 1.2.3
log4j
@@ -463,9 +530,9 @@
- org.onap.policy.drools-applications
+ org.onap.policy.drools-applications.controlloop.common
policy-yaml
- 1.1.3
+ 1.2.3
log4j
@@ -482,9 +549,9 @@
- org.onap.policy.drools-applications
+ org.onap.policy.drools-applications.controlloop.common.model-impl
sdc
- 1.1.3
+ 1.2.3
log4j
@@ -501,9 +568,9 @@
- org.onap.policy.drools-applications
+ org.onap.policy.drools-applications.controlloop.common.model-impl
aai
- 1.1.3
+ 1.2.3
log4j
@@ -530,11 +597,6 @@
plexus-utils
3.0.24
-
- commons-fileupload
- commons-fileupload
- 1.3.3
-
org.jboss.spec.javax.ws.rs
jboss-jaxrs-api_2.0_spec
@@ -543,7 +605,6 @@
com.google.guava
guava
-
@@ -560,7 +621,7 @@
org.onap.sdc.sdc-tosca
sdc-tosca
- 1.4.1
+ 1.5.1
@@ -576,21 +637,7 @@
test
-
-
- central-for-plugins
- Maven 2 repository 2
- http://repo2.maven.org/maven2/
-
-
-
- false
-
- jcenter-releases-for-plugins
- jcenter
- http://jcenter.bintray.com
-
-
+
clamp
@@ -619,9 +666,24 @@
false
example/sdc
+
+
+
+ src/test/javascript
+
+ **/**.json
+
+ true
+ ${project.build.directory}/clamp-ui
+
+
+ src/main/resources/META-INF/resources/designer
+ false
+ ${project.build.directory}/clamp-ui/designer
+
-
@@ -648,8 +710,37 @@
-
+ true
+
+
+
+
+
+
io.github.swagger2markup
@@ -684,23 +775,18 @@
-
org.asciidoctor
asciidoctor-maven-plugin
- 1.5.6
+ 1.5.7.1
org.asciidoctor
asciidoctorj-pdf
1.5.0-alpha.10.1
-
- org.jruby
- jruby-complete
- 1.7.21
-
${project.basedir}/src/main/resources/asciidoc
@@ -799,6 +885,22 @@
+
+ reserve-port-for-tests
+ process-resources
+
+ reserve-network-port
+
+
+
+ docker.mariadb.port.host
+ docker.http-cache.port.host
+ clamp.it.tests.http-redirected
+ clamp.it.tests.https
+ clamp.it.tests.http
+
+
+
@@ -833,18 +935,19 @@
org.apache.maven.plugins
maven-surefire-plugin
- 2.19.1
+ 2.22.1
- 1
- false
+ 1C
+ true
+ false
+ ${surefireArgLine}
org.apache.maven.plugins
maven-failsafe-plugin
- 2.17
-
+ 2.22.1
integration-tests
@@ -853,11 +956,16 @@
verify
+
+ ${project.build.directory}/classes
+
**/*ItCase.java
1
- false
+ true
+ false
+ ${failsafeArgLine}
@@ -866,13 +974,20 @@
io.fabric8
docker-maven-plugin
- 0.26.0
+ 0.27.2
+
+
+ org.apache.httpcomponents
+ httpclient
+ 4.5.5
+
+
true
- 1.23
+ 1.35
- library/mariadb:10.1.11
+ library/mariadb:10.3.12
mariadb
@@ -936,7 +1051,7 @@
${project.docker.latesttagtimestamp.version}
${project.docker.latesttag.version}
-
Dockerfile
@@ -945,6 +1060,38 @@
+
+ onap/clamp-dashboard-logstash
+ onap-clamp-dashboard-logstash
+
+ true
+
+
+ true
+
+ latest
+ ${project.docker.latesttagtimestamp.version}
+ ${project.docker.latesttag.version}
+
+ logstash/Dockerfile.logstash
+
+
+
+ onap/clamp-dashboard-kibana
+ onap-clamp-dashboard-kibana
+
+ true
+
+
+ true
+
+ latest
+ ${project.docker.latesttagtimestamp.version}
+ ${project.docker.latesttag.version}
+
+ kibana/Dockerfile.kibana
+
+
@@ -983,9 +1130,10 @@
org.jacoco
jacoco-maven-plugin
- 0.7.7.201606060606
+ 0.8.2
true
+ true
org.onap.clamp.*
@@ -998,6 +1146,7 @@
${project.build.directory}/coverage-reports/jacoco.exec
+ surefireArgLine
@@ -1009,6 +1158,7 @@
${project.build.directory}/coverage-reports/jacoco-it.exec
+ failsafeArgLine
@@ -1038,6 +1188,52 @@
versions-maven-plugin
1.3.1
+
+
+ com.github.eirslett
+ frontend-maven-plugin
+ 1.6
+
+ ${project.build.directory}/clamp-ui
+ ${project.build.directory}/clamp-ui
+ ${maven.test.skip}
+
+
+
+
+ install_node_and_npm
+
+ install-node-and-npm
+
+ test
+
+ v8.11.1
+ 5.6.0
+
+
+
+ npm_install
+
+ npm
+
+ test
+
+ install
+
+
+
+ npm_test
+
+ npm
+
+ test
+
+ run-script test:coverage
+
+
+
+
+