X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Fpom.xml;h=b6f12625d0741c713497d820df3ade431c696896;hb=c83c633d7a5f8ae8a7f84a15e3824c46ced305fe;hp=81708a4da94fcfe4d3a07b4af473fc1a0f209262;hpb=67bac2c1c44beab7752b39584553449e1c8a4e94;p=aaf%2Fauthz.git
diff --git a/cadi/pom.xml b/cadi/pom.xml
index 81708a4d..b6f12625 100644
--- a/cadi/pom.xml
+++ b/cadi/pom.xml
@@ -24,19 +24,23 @@
org.onap.aaf.authz.cadi
parent
AAF CADI Parent (Code, Access, Data, Identity)
- 1.5.0-SNAPSHOT
+ 2.1.0-SNAPSHOT
2015-07-20
ONAP
pom
+
+ org.onap.oparent
+ oparent
+ 1.1.0
+
-
true
UTF-8
- 1.3.0-SNAPSHOT
+ 2.1.0-SNAPSHOT
2.10-SNAPSHOT
9.3.9.v20160517
1.5.1
@@ -45,8 +49,8 @@
3.2
jacoco
- target/code-coverage/jacoco-ut.exec
- target/code-coverage/jacoco-it.exec
+ target/code-coverage/jacoco-ut.exec
+ target/code-coverage/jacoco-it.exec
**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**
https://nexus.onap.org
@@ -100,10 +104,10 @@
org.mockito
mockito-all
- 1.9.5
+ 1.9.5
test
-
+
org.powermock
powermock-module-junit4
@@ -223,31 +227,31 @@
jetty-servlet
${project.jettyVersion}
-
+
org.eclipse.jetty
jetty-io
${project.jettyVersion}
-
+
org.eclipse.jetty
jetty-security
${project.jettyVersion}
-
+
org.eclipse.jetty
jetty-http
${project.jettyVersion}
-
+
org.eclipse.jetty
jetty-util
${project.jettyVersion}
-
+
org.eclipse.jetty
jetty-server
@@ -259,7 +263,7 @@
servlet-api
2.5
-
+
org.slf4j
slf4j-api
@@ -275,7 +279,7 @@
src/test/java
-
+
true
@@ -287,7 +291,7 @@
1.7
-
+
org.apache.maven.plugins
2.4
@@ -311,7 +315,7 @@
org.opendaylight.*
-
+
maven-release-plugin
2.5.2
@@ -319,37 +323,43 @@
-s ${mvn.settings} deploy
-
+
maven-assembly-plugin
2.5.5
-
+
org.apache.maven.plugins
maven-deploy-plugin
2.8.1
- true
+ false
-
+
-
+
org.apache.maven.plugins
maven-dependency-plugin
2.10
-
+
maven-surefire-plugin
2.17
+ false
+
+ **/JU*.java
+
+
+
-
-
org.eclipse.m2e
@@ -381,73 +391,79 @@
-
- org.sonatype.plugins
- nexus-staging-maven-plugin
- 1.6.7
- true
-
- ${nexusproxy}
- 176c31dfe190a
- ecomp-staging
-
-
-
- org.jacoco
- jacoco-maven-plugin
- 0.7.7.201606060606
-
- true
-
- org.onap.aaf.*
-
-
-
-
- pre-unit-test
-
- prepare-agent
-
-
- ${project.build.directory}/coverage-reports/jacoco.exec
-
-
-
-
- pre-integration-test
- pre-integration-test
-
- prepare-agent
-
-
- ${project.build.directory}/coverage-reports/jacoco-it.exec
-
-
-
-
-
- merge
-
- post-integration-test
-
-
-
- ${project.build.directory}/coverage-reports
-
- *.exec
-
-
-
- ${project.build.directory}/jacoco-dev.exec
-
-
-
-
+
+ org.sonatype.plugins
+ nexus-staging-maven-plugin
+ 1.6.7
+ true
+
+ ${nexusproxy}
+ 176c31dfe190a
+ ecomp-staging
+
+
+
+ org.jacoco
+ jacoco-maven-plugin
+ ${jacoco.version}
+
+
+ **/gen/**
+ **/generated-sources/**
+ **/yang-gen/**
+ **/pax/**
+
+
+
+
+ pre-unit-test
+
+ prepare-agent
+
+
+ ${project.build.directory}/code-coverage/jacoco-ut.exec
+ surefireArgLine
+
+
+
+ post-unit-test
+ test
+
+ report
+
+
+ ${project.build.directory}/code-coverage/jacoco-ut.exec
+ ${project.reporting.outputDirectory}/jacoco-ut
+
+
+
+ pre-integration-test
+ pre-integration-test
+
+ prepare-agent
+
+
+ ${project.build.directory}/code-coverage/jacoco-it.exec
+ failsafeArgLine
+
+
+
+ post-integration-test
+ post-integration-test
+
+ report
+
+
+ ${project.build.directory}/code-coverage/jacoco-it.exec
+ ${project.reporting.outputDirectory}/jacoco-it
+
+
+
+
-
+
-
ecomp-releases
@@ -464,5 +480,5 @@
dav:${nexusproxy}${sitePath}
-
+