X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=fe9e68b4e96e95233afc194647d9cf69187a6347;hb=refs%2Fheads%2Fmaster;hp=2d45047efe94c669d2eb20107a92f53ea681cd6d;hpb=4a51a8f96715ffb2a42189b93b9fa91b453b8530;p=aaf%2Fcadi.git diff --git a/pom.xml b/pom.xml index 2d45047..fe9e68b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,82 +1,126 @@ - - + + + 4.0.0 - com.att.cadi + org.onap.aaf.cadi parent - CADI Parent POM (Code, Access, Data, Identity) - 1.3.2 - 2015-07-20 + 2.1.19-SNAPSHOT + CADI Plugins Parent pom - https://github.com/att/AAF - CADI - - - BSD License - - - - - - Jonathan Gathman - - ATT - - - + + + org.onap.oparent + oparent + 2.0.0 + + - true + + 2.7.4 + UTF-8 - 1.2.13 - 2.6 - 3.1.200 - - - - - - - - + + 1.5.1 + + 0.7.7.201606060606 + 3.2 + jacoco + + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec + + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** + https://nexus.onap.org + /content/repositories/snapshots/ + /content/repositories/releases/ + /content/repositories/staging/ + /content/sites/site/org/onap/aaf/cadi/${project.artifactId}/${project.version} - - + + Jonathan Gathman - - CST - - + jonathan.gathman@att.com + ATT + + Architect + Lead Developer + + + + Gabe Maurer + gabe.maurer@att.com + ATT + + Developer + + + + Ian Howell + ian.howell@att.com + ATT + + Developer + + + + Sai Gandham + sai.gandham@att.com + ATT + + Developer + + + + + + org.mockito + mockito-all + 1.9.5 + test + + + + org.powermock + powermock-module-junit4 + ${powermock.version} + test + + + org.powermock + powermock-api-mockito + ${powermock.version} + test + + junit junit - 4.10 + 4.12 test @@ -85,14 +129,9 @@ - core - client - aaf - cass - - - - + shiro + shiro-osgi-bundle + sidecar @@ -101,122 +140,131 @@ - com.att.authz - authz-client - ${project.authClientVersion} + org.onap.aaf.authz + aaf-auth-client + ${cadi.version} + + + + org.onap.aaf.authz + aaf-cadi-core + ${cadi.version} - com.att.cadi - cadi-core - ${project.version} + org.onap.aaf.authz + aaf-cadi-oauth + ${cadi.version} + - com.att.cadi - cadi-core - ${project.version} + org.onap.aaf.authz + aaf-cadi-core + ${cadi.version} tests - com.att.cadi - cadi-cass - ${project.version} + org.onap.aaf.authz + aaf-cadi-jetty + ${cadi.version} - com.att.cadi - cadi-aaf - ${project.version} - - - - com.att.cadi - cadi-aaf - ${project.version} - full + org.onap.aaf.authz + aaf-cadi-cass + ${cadi.version} - com.att.cadi - cadi-client - ${project.version} + org.onap.aaf.authz + aaf-cadi-aaf + ${cadi.version} - com.att.cadi - cadi-tomcat - ${project.version} + org.onap.aaf.authz + aaf-cadi-aaf + ${cadi.version} + full - com.att.cadi - cadi-tguard - ${project.version} + org.onap.aaf.authz + aaf-cadi-client + ${cadi.version} - com.att.inno - env - ${project.innoVersion} + org.onap.aaf.authz + aaf-misc-env + ${cadi.version} - com.att.inno - rosetta - ${project.innoVersion} + org.onap.aaf.authz + aaf-misc-rosetta + ${cadi.version} + + org.onap.aaf.authz + aaf-misc-log4j + ${cadi.version} + + + + org.apache.shiro + shiro-core + 1.3.2 + + + + ch.qos.logback + logback-classic + 1.2.3 + test + + + org.slf4j slf4j-api @@ -231,18 +279,20 @@ src/test/java - + + + true org.apache.maven.plugins maven-compiler-plugin 2.3.2 - 1.7 - 1.7 + ${maven.compiler.source} + ${maven.compiler.target} - + org.apache.maven.plugins 2.4 @@ -256,78 +306,17 @@ - - - org.apache.maven.plugins - maven-surefire-plugin - 2.17 - - false - - **/JU*.java - - - **/JU_LocalLur.java - **/JU_BufferedServletInputStream.java - **/JU_Passcode.java - **/JU_XReader.java - **/JU_CASS.java - **/JU_PropertyLocator.java - **/JU_PermEval.java - **/JU_JMeter.java - **/JU_Lur2_0Call.java - - - - - org.apache.maven.plugins - maven-jarsigner-plugin - 1.2 - - - sign - - sign - - - - target/${project.artifactId}-${project.version}.jar - - - - verify - - verify - - - target/${project.artifactId}-${project.version}.jar - - - - - true - cadi - /Volumes/Data/src/cadi/keys/aaf_cadi.jks - Surprise! - Surprise! - true - true - - - - - - - + + maven-release-plugin 2.5.2 @@ -335,12 +324,12 @@ -s ${mvn.settings} deploy - + maven-assembly-plugin 2.5.5 - + org.apache.maven.plugins maven-deploy-plugin @@ -348,79 +337,29 @@ false - + - + org.apache.maven.plugins maven-dependency-plugin 2.10 - - - org.apache.maven.plugins - maven-javadoc-plugin - - false - - - - attach-javadocs - - jar - - - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ossrhdme - https://oss.sonatype.org/ - true - - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.7 - - - html - xml - - - - + maven-surefire-plugin 2.17 + + false + + **/JU*.java + + + + - - - + @@ -453,28 +392,83 @@ - - + + 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 + + + + + + - - - - - - - https://github.com/att/AAF.git - ${project.scm.connection} - http://github.com/att/AAF/tree/master - - - - ossrhdme - https://oss.sonatype.org/content/repositories/snapshots - - - ossrhdme - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - + + + ecomp-releases + AAF Release Repository + ${nexusproxy}${releaseNexusPath} + + + ecomp-snapshots + AAF Snapshot Repository + ${nexusproxy}${snapshotNexusPath} + + + ecomp-site + dav:${nexusproxy}${sitePath} + +