From a7f4def785c9e169ebcb4785d7561505e47f3fc0 Mon Sep 17 00:00:00 2001 From: Sai Gandham Date: Mon, 2 Jul 2018 22:37:37 -0500 Subject: Moving Shiro modules to cadi repo Issue-ID: AAF-380 Change-Id: If1029a16958335277ff38cdbe5662b0a14ea439f Signed-off-by: Sai Gandham --- pom.xml | 569 ++++++++++++++++++++++++++++------------------------------------ 1 file changed, 251 insertions(+), 318 deletions(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index fc65a9a..f47a257 100644 --- a/pom.xml +++ b/pom.xml @@ -1,79 +1,50 @@ + 4.0.0 org.onap.aaf.cadi - parent - aaf-cadi - 1.0.0-SNAPSHOT - 2015-07-20 + cadimiscparent + 2.1.2-SNAPSHOT + CADI Misc Modules pom - https://github.com/att/AAF - CADI - - - BSD License - - - - - - Jonathan Gathman - - ATT - - - - - - org.onap.oparent - oparent - 1.1.0 - + + + org.onap.oparent + oparent + 1.1.0 + - true + UTF-8 - 1.0.0-SNAPSHOT - 1.0.0-SNAPSHOT - 3.1.200 - - - - - - - - - 1.0.0-SNAPSHOT - + 9.3.9.v20160517 + 1.5.1 0.7.7.201606060606 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 @@ -82,18 +53,68 @@ /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 @@ -106,6 +127,8 @@ + shiro + shiro-osgi-bundle @@ -113,127 +136,122 @@ - - org.mockito - mockito-all - 1.9.5 - test + + org.onap.aaf.authz + aaf-auth-client + ${project.version} + org.onap.aaf.authz - authz-client - ${project.authClientVersion} + aaf-cadi-core + ${project.version} - org.onap.aaf.cadi - cadi-core + org.onap.aaf.authz + aaf-cadi-oauth ${project.version} + + - org.onap.aaf.cadi - cadi-core + org.onap.aaf.authz + aaf-cadi-core ${project.version} tests - org.onap.aaf.cadi - cadi-cass + org.onap.aaf.authz + aaf-cadi-jetty ${project.version} - org.onap.aaf.cadi - cadi-aaf + org.onap.aaf.authz + aaf-cadi-cass ${project.version} - + - - org.onap.aaf.cadi - cadi-aaf + + org.onap.aaf.authz + aaf-cadi-aaf ${project.version} - full - org.onap.aaf.cadi - cadi-client + org.onap.aaf.authz + aaf-cadi-aaf ${project.version} + full - org.onap.aaf.cadi - cadi-tomcat + org.onap.aaf.authz + aaf-cadi-client ${project.version} - org.onap.aaf.cadi - cadi-tguard + org.onap.aaf.authz + aaf-misc-env ${project.version} - org.onap.aaf.inno - env - ${project.innoVersion} + org.onap.aaf.authz + aaf-misc-rosetta + ${project.version} - org.onap.aaf.inno - rosetta - ${project.innoVersion} + org.onap.aaf.authz + aaf-misc-log4j + ${project.version} org.eclipse.jetty jetty-servlet - 9.0.3.v20130506 + ${project.jettyVersion} + + + + org.eclipse.jetty + jetty-io + ${project.jettyVersion} + + + + org.eclipse.jetty + jetty-security + ${project.jettyVersion} org.eclipse.jetty - jetty-webapp - 9.0.3.v20130506 + jetty-http + ${project.jettyVersion} - org.eclipse.jetty.aggregate - jetty-all - 9.0.3.v20130506 + org.eclipse.jetty + jetty-util + ${project.jettyVersion} - javax.servlet - servlet-api - 2.5 + org.eclipse.jetty + jetty-server + ${project.jettyVersion} - com.att.aft - dme2 - ${project.dme2Version} - - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - - - com.att.javax.servlet - servlet-api - - - javax.mail - mail - - - + javax.servlet + javax.servlet-api + 3.0.1 @@ -250,7 +268,9 @@ src/test/java - + + + true org.apache.maven.plugins @@ -261,7 +281,7 @@ 1.7 - + org.apache.maven.plugins 2.4 @@ -275,67 +295,17 @@ - - - org.apache.maven.plugins - maven-surefire-plugin - 2.17 - - false - - **/JU*.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 - - - + maven-javadoc-plugin + 2.10 - true - cadi - /Volumes/Data/src/cadi/keys/aaf_cadi.jks - Surprise! - Surprise! - true - true + org.opendaylight.* - - + maven-release-plugin 2.5.2 @@ -343,12 +313,12 @@ -s ${mvn.settings} deploy - + maven-assembly-plugin 2.5.5 - + org.apache.maven.plugins maven-deploy-plugin @@ -356,62 +326,30 @@ false - + - + org.apache.maven.plugins maven-dependency-plugin 2.10 - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - false - - - - attach-javadocs - - jar - - - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - - - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.7 - - - html - xml - - - - - + + maven-surefire-plugin + 2.17 + + false + + **/JU*.java + + + + + + + org.eclipse.m2e @@ -443,85 +381,79 @@ - - 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 - - - - - - + + 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 @@ -538,4 +470,5 @@ dav:${nexusproxy}${sitePath} + -- cgit 1.2.3-korg