X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=1ce86b58e530ce270159b0b5ed2bade61e1cbe6e;hb=13f214648ad4a9f75cc2d303d9acf268b715e0d8;hp=6990dcae917bd71e04958b8312d2a75b55480000;hpb=30cece48b7e8acc218f95f2593cabc3e04b03bc5;p=clamp.git
diff --git a/pom.xml b/pom.xml
index 6990dcae..1ce86b58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
4.0.0
org.onap.clamp
clds
- 2.0.1-SNAPSHOT
+ 3.0.0-SNAPSHOT
clamp
@@ -68,10 +68,9 @@
1.8
2.0.0-rc4
- 20.0
1.0.0
2.20.1
- 1.5.12.RELEASE
+ 1.5.14.RELEASE
java
jacoco
@@ -82,12 +81,63 @@
${project.version}
localhost:5000
- true
- true
+ nexus3.onap.org:10001
+ true
+ true
+ true
false
+ 8.5.28
+
+
+ without-test
+
+
+ maven.test.skip
+ true
+
+
+
+ true
+
+
+
+ without-IT-only
+
+
+ skipITs
+ true
+
+
+
+ true
+
+
+
+ without-IT-only2
+
+
+ skipTests
+ true
+
+
+
+ true
+
+
+
+ docker
+
+ true
+ false
+ false
+ false
+
+
+
+
ecomp-releases
@@ -143,12 +193,12 @@
https://repository.jboss.org/nexus/content/groups/public
- jcentral
- bintray
- http://jcenter.bintray.com
-
- false
-
+ jcentral
+ bintray
+ http://jcenter.bintray.com
+
+ false
+
@@ -179,6 +229,26 @@
eelf-core
${eelf.core.version}
+
+ org.apache.tomcat.embed
+ tomcat-embed-core
+ ${tomcat.version}
+
+
+ org.apache.tomcat.embed
+ tomcat-embed-el
+ ${tomcat.version}
+
+
+ org.apache.tomcat.embed
+ tomcat-embed-websocket
+ ${tomcat.version}
+
+
+ org.apache.tomcat
+ tomcat-annotations-api
+ ${tomcat.version}
+
org.apache.camel
@@ -196,7 +266,7 @@
javax.xml.bind
jaxb-api
2.3.0
-
+
org.springframework.boot
@@ -235,6 +305,17 @@
+
+ org.onap.aaf.authz
+ aaf-cadi-aaf
+ 2.1.1
+
+
+ javax.servlet
+ servlet-api
+
+
+
ch.qos.logback
logback-core
@@ -331,33 +412,30 @@
commons-io
- grizzly-http
+ grizzly-http-server
org.glassfish.grizzly
-
-
-
- org.onap.policy.common
- ONAP-Logging
- 1.1.3
-
- log4j
- log4j
+ org.onap.dmaap.messagerouter.dmaapclient
+ dmaapClient
- org.slf4j
- slf4j-log4j12
+ org.onap.policy.common
+ integrity-monitor
- apache-log4j-extras
- log4j
+ org.onap.policy.common
+ integrity-audit
+
+
+ org.onap.aaf.cadi
+ cadi-aaf
- org.onap.policy.engine
- PolicyEngineUtils
+ org.onap.policy.common
+ ONAP-Logging
1.1.3
@@ -372,18 +450,6 @@
apache-log4j-extras
log4j
-
- mysql
- mysql-connector-java
-
-
- org.mariadb.jdbc
- mariadb-java-client
-
-
- com.att.nsa
- dmaapClient
-
@@ -448,31 +514,26 @@
commons-csv
1.3
+
- com.sun.faces
- jsf-api
- 2.1.7
+ org.codehaus.plexus
+ plexus-utils
+ 3.0.24
- com.sun.faces
- jsf-impl
- 2.1.7
+ commons-fileupload
+ commons-fileupload
+ 1.3.3
-
- org.codehaus.plexus
- plexus-utils
- 3.0.24
+ org.jboss.spec.javax.ws.rs
+ jboss-jaxrs-api_2.0_spec
+ 1.0.1.Final
- commons-fileupload
- commons-fileupload
- 1.3.3
-
-
- org.jboss.spec.javax.ws.rs
- jboss-jaxrs-api_2.0_spec
- 1.0.1.Final
+ com.google.guava
+ guava
+ 25.1-jre
@@ -487,40 +548,47 @@
1.3.0
- org.onap.sdc.sdc-tosca
- sdc-tosca
- 1.3.0
+ org.onap.sdc.sdc-tosca
+ sdc-tosca
+ 1.3.0
-
- io.springfox
- springfox-swagger2
- 2.4.0
- test
+
+ io.springfox
+ springfox-swagger2
+ 2.4.0
+ test
+
+
+ io.github.robwin
+ assertj-swagger
+ 0.2.0
+ test
-
- io.github.robwin
- assertj-swagger
- 0.2.0
- test
-
- io.github.swagger2markup
- swagger2markup-spring-restdocs-ext
- 1.2.0
- test
+ io.github.swagger2markup
+ swagger2markup-spring-restdocs-ext
+ 1.2.0
+ test
-
-
+
+
+ org.assertj
+ assertj-core
+ 3.10.0
+ test
+
+
+
-
- false
-
- jcenter-releases
- jcenter
- http://jcenter.bintray.com
+
+ false
+
+ jcenter-releases
+ jcenter
+ http://jcenter.bintray.com
-
+
clamp
@@ -541,7 +609,7 @@
false
https
-
+
src/test/resources/example/sdc
**.csar
@@ -565,192 +633,121 @@
+
- org.codehaus.mojo
- exec-maven-plugin
- 1.6.0
-
-
- docker_info0
- validate
-
- exec
-
-
- env
-
-
-
- docker_info2
- validate
-
- exec
-
-
- ls
-
- -latr
- /var/run/docker.sock
-
-
-
-
-
- docker_info3
- validate
-
- exec
-
-
- cat
-
- /etc/hosts
-
-
-
-
- docker_info4
- validate
-
- exec
-
-
- curl
-
- -v
- http://127.0.0.1:2375/info
-
-
-
-
- docker_info5
- validate
-
- exec
-
-
- netstat
-
- -tulnp
-
-
-
-
-
-
-
-
- com.sebastian-daschner
- jaxrs-analyzer-maven-plugin
- 0.14
-
-
- test
-
- analyze-jaxrs
-
-
- swagger
- ../docs/swagger/
-
-
-
-
+ com.sebastian-daschner
+ jaxrs-analyzer-maven-plugin
+ 0.14
+
+
+ test
+
+ analyze-jaxrs
+
+
+ swagger
+ ../docs/swagger/
+
+
+
+
-
-
- io.github.swagger2markup
- swagger2markup-maven-plugin
- 1.3.1
-
-
- io.github.swagger2markup
- swagger2markup-import-files-ext
- 1.3.1
-
-
+
+
io.github.swagger2markup
- swagger2markup-spring-restdocs-ext
+ swagger2markup-maven-plugin
1.3.1
-
-
-
- ${project.basedir}/docs/swagger/swagger.json
- ${project.build.directory}/asciidoc/generated
-
- ASCIIDOC
-
-
-
-
- test
-
- convertSwagger2markup
-
-
-
-
-
-
-
- org.asciidoctor
- asciidoctor-maven-plugin
- 1.5.3
-
-
- org.asciidoctor
- asciidoctorj-pdf
- 1.5.0-alpha.10.1
-
-
- org.jruby
- jruby-complete
- 1.7.21
-
-
-
- ${project.basedir}/src/main/resources/asciidoc
- swagger.adoc
-
- book
- left
- 3
-
-
-
-
- ${project.build.directory}/asciidoc/generated
-
-
-
-
-
- output-html
- test
-
- process-asciidoc
-
+
+
+ io.github.swagger2markup
+ swagger2markup-import-files-ext
+ 1.3.1
+
+
+ io.github.swagger2markup
+ swagger2markup-spring-restdocs-ext
+ 1.3.1
+
+
- html5
- ${project.basedir}/docs/swagger
- ${project.basedir}/src/main/resources/META-INF/resources/
+ ${project.basedir}/docs/swagger/swagger.json
+ ${project.build.directory}/asciidoc/generated
+
+ ASCIIDOC
+
-
-
- output-pdf
- test
-
- process-asciidoc
-
+
+
+ test
+
+ convertSwagger2markup
+
+
+
+
+
+
+
+ org.asciidoctor
+ asciidoctor-maven-plugin
+ 1.5.3
+
+
+ org.asciidoctor
+ asciidoctorj-pdf
+ 1.5.0-alpha.10.1
+
+
+ org.jruby
+ jruby-complete
+ 1.7.21
+
+
- pdf
- ${project.basedir}/docs/swagger
+ ${project.basedir}/src/main/resources/asciidoc
+ swagger.adoc
+
+ book
+ left
+ 3
+
+
+
+
+ ${project.build.directory}/asciidoc/generated
+
-
-
-
+
+
+
+ output-html
+ test
+
+ process-asciidoc
+
+
+ html5
+ ${project.basedir}/docs/swagger
+ ${project.basedir}/src/main/resources/META-INF/resources/
+
+
+
+ output-pdf
+ test
+
+ process-asciidoc
+
+
+ pdf
+ ${project.basedir}/docs/swagger
+
+
+
+
org.codehaus.groovy.maven
gmaven-plugin
@@ -813,7 +810,9 @@
org.springframework.boot
spring-boot-maven-plugin
- ${springboot.version}
+
+ 1.5.13.RELEASE
+
@@ -835,127 +834,7 @@
${skip.staging.artifacts}
-
- com.spotify
- docker-maven-plugin
- 1.1.0
-
-
- http://127.0.0.1:2375
- onap/clamp
- src/main/docker
- docker-hub
-
- latest
- ${project.docker.latesttagtimestamp.version}
- ${project.docker.latesttag.version}
-
- true
-
-
- /
- ${project.build.directory}
- ${project.build.finalName}.jar
-
-
- /
- ${project.build.directory}
- etc/config/**
-
-
- /
- ${project.build.directory}
- etc/keystore/**
-
-
-
-
-
- build-image
- package
-
- build
-
-
- ${skip.docker.build}
-
- ${env.HTTP_PROXY}
- ${env.HTTPS_PROXY}
-
-
-
-
- tag-image-latest-timestamp
- package
-
- tag
-
-
- onap/clamp
- ${docker.push.registry}/onap/clamp:${project.docker.latesttagtimestamp.version}
- ${skip.docker.push}
-
-
-
- push-image-latest-timestamp
- deploy
-
- push
-
-
- ${docker.push.registry}/onap/clamp:${project.docker.latesttagtimestamp.version}
- ${skip.docker.push}
-
-
-
- tag-image-latest
- package
-
- tag
-
-
- onap/clamp
- ${docker.push.registry}/onap/clamp:${project.docker.latesttag.version}
- ${skip.docker.push}
-
-
-
- push-image-latest
- deploy
-
- push
-
-
- ${docker.push.registry}/onap/clamp:${project.docker.latesttag.version}
- ${skip.docker.push}
-
-
-
- tag-image
- package
-
- tag
-
-
- onap/clamp
- ${docker.push.registry}/onap/clamp:latest
- ${skip.docker.push}
-
-
-
- push-image
- deploy
-
- push
-
-
- ${docker.push.registry}/onap/clamp:latest
- ${skip.docker.push}
-
-
-
-
org.apache.maven.plugins
maven-surefire-plugin
@@ -969,7 +848,7 @@
org.apache.maven.plugins
maven-failsafe-plugin
- 2.16
+ 2.17
@@ -992,13 +871,13 @@
io.fabric8
docker-maven-plugin
- 0.16.5
+ 0.26.0
true
1.23
- mariadb:10.1.11
+ library/mariadb:10.1.11
mariadb
@@ -1021,7 +900,7 @@
- python:2-slim
+ library/python:2-slim
python
python
@@ -1049,20 +928,53 @@
+
+ onap/clamp
+ onap-clamp
+
+ true
+
+
+ never
+ true
+
+ latest
+ ${project.docker.latesttagtimestamp.version}
+ ${project.docker.latesttag.version}
+
+
+ Dockerfile
+
+ assembly/clamp-files.xml
+ onap-clamp
+
+
+
- ${skipITs}
+
+ generate-images
+ install
+
+ build
+
+
+
+ push-images
+ deploy
+
+ push
+
+
docker-start-for-it
pre-integration-test
start
-
- ${skipITs}
-
docker-stop-for-it
@@ -1070,9 +982,6 @@
stop
-
- ${skipITs}
-
@@ -1137,15 +1046,4 @@
-
-
- docker
-
- true
- false
- false
- false
-
-
-