X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=d1b17b75813b6f247627cf9407dc0b6776ecb7b2;hb=c06db6e74139422b874ce0365842624ecde81f8d;hp=a0b5053665363a46f47e95ce5b226950cef55f9b;hpb=6c9759e89572f9fbe40eb30ce15fcfe6efa11bc8;p=clamp.git
diff --git a/pom.xml b/pom.xml
index a0b50536..d1b17b75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,10 +27,10 @@
4.0.0
org.onap.clamp
clds
- 1.0.1-SNAPSHOT
- ONAP CLAMP
+ 1.1.0
+ clamp
-
+
org.onap.oparent
oparent
1.0.0-SNAPSHOT
@@ -57,6 +57,9 @@
+ yyyy.MM.dd'T'hh.mm.ss'Z'
+ ${project.version}
+ ${maven.build.timestamp}
1.8
1.8
UTF-8
@@ -82,28 +85,22 @@
true
true
false
-
- https://nexus.onap.org
- /content/repositories/snapshots/
- /content/repositories/releases/
- /content/repositories/staging/
- /content/sites/site/org/onap/clamp/${project.version}
ecomp-releases
Clamp Release Repository
- ${nexusproxy}/${releaseNexusPath}
+ https://nexus.onap.org/content/repositories/releases/
ecomp-snapshots
Clamp Snapshot Repository
- ${nexusproxy}/${snapshotNexusPath}
+ https://nexus.onap.org/content/repositories/snapshots/
ecomp-site
- dav:${nexusproxy}${sitePath}
+ dav:https://nexus.onap.org/content/sites/site/org/onap/clamp/${project.version}
@@ -116,17 +113,17 @@
ecomp-releases
ONAP Release Repository
- ${nexusproxy}/${releaseNexusPath}
+ https://nexus.onap.org/content/repositories/releases/
ecomp-staging
ONAP Staging Repository
- ${nexusproxy}/${stagingNexusPath}
+ https://nexus.onap.org/content/repositories/staging/
ecomp-snapshots
ONAP Snapshot Repository
- ${nexusproxy}/${snapshotNexusPath}
+ https://nexus.onap.org/content/repositories/snapshots/
true
@@ -319,6 +316,12 @@
com.att.ajsc
sdk-java-camunda-core
${sdk.camunda.core}
+
+
+ mysql
+ mysql-connector-java
+
+
@@ -345,7 +348,7 @@
org.onap.policy.engine
PolicyEngineAPI
- 1.1.0-SNAPSHOT
+ 1.1.0
log4j
@@ -363,31 +366,16 @@
jackson-databind
com.fasterxml.jackson.core
-
-
-
- org.onap.policy.common
- ONAP-Logging
- 1.1.0-SNAPSHOT
-
- log4j
- log4j
-
-
- org.slf4j
- slf4j-log4j12
-
-
- apache-log4j-extras
- log4j
+ mysql
+ mysql-connector-java
- org.onap.policy.engine
- ControlloopPolicy
- 1.1.0-SNAPSHOT
+ org.onap.policy.common
+ ONAP-Logging
+ 1.1.0
log4j
@@ -403,6 +391,45 @@
+
+
+ org.onap.policy.drools-applications
+ policy-yaml
+ 1.1.0
+
+
+ log4j
+ log4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ apache-log4j-extras
+ log4j
+
+
+
+
+ org.onap.policy.drools-applications
+ sdc
+ 1.1.0
+
+
+ log4j
+ log4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ apache-log4j-extras
+ log4j
+
+
+
com.fasterxml.jackson.core
jackson-databind
@@ -434,6 +461,12 @@
2.1.7
+
+
+ org.mariadb.jdbc
+ mariadb-java-client
+ 2.1.1
+
@@ -471,6 +504,22 @@
+
+ org.codehaus.groovy.maven
+ gmaven-plugin
+ 1.0
+
+
+ validate
+
+ execute
+
+
+ ${project.basedir}/src/main/script/TagVersion.groovy
+
+
+
+
org.apache.maven.plugins
maven-jar-plugin
@@ -578,7 +627,7 @@
1.6.7
true
- ${nexusproxy}
+ https://nexus.onap.org
176c31dfe190a
ecomp-staging
${skip.staging.artifacts}
@@ -593,8 +642,9 @@
src/main/docker
docker-hub
- ${project.version}
latest
+ ${project.docker.latesttagtimestamp.version}
+ ${project.docker.latesttag.version}
true
@@ -630,6 +680,53 @@
+
+
+ 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
@@ -638,7 +735,7 @@
onap/clamp
- ${docker.push.registry}/onap/clamp
+ ${docker.push.registry}/onap/clamp:latest
${skip.docker.push}
@@ -649,7 +746,7 @@
push
- ${docker.push.registry}/onap/clamp
+ ${docker.push.registry}/onap/clamp:latest
${skip.docker.push}
@@ -717,6 +814,7 @@
+ ${skipITs}
@@ -776,22 +874,22 @@
-
- merge
-
- post-integration-test
-
-
-
- ${project.build.directory}/coverage-reports
-
- *.exec
-
-
-
- ${project.build.directory}/jacoco-dev.exec
-
-
+
+ merge
+
+ post-integration-test
+
+
+
+ ${project.build.directory}/coverage-reports
+
+ *.exec
+
+
+
+ ${project.build.directory}/jacoco-dev.exec
+
+