Change Beijing Release to 2.1.1

[aaf/authz.git] / cadi / shiro / pom.xml

diff --git a/cadi/shiro/pom.xml b/cadi/shiro/pom.xml
index 91503e2..01c89dd 100644 (file)
--- a/cadi/shiro/pom.xml
+++ b/cadi/shiro/pom.xml
@@ -22,9 +22,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <parent>
-               <groupId>org.onap.aaf.authz.cadi</groupId>
-               <artifactId>parent</artifactId>
-               <version>1.5.0-SNAPSHOT</version>
+               <groupId>org.onap.aaf.authz</groupId>
+               <artifactId>cadiparent</artifactId>
+               <version>2.1.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
 
@@ -89,21 +89,27 @@
 
        <dependencies>
                <dependency>
-                       <groupId>org.onap.aaf.authz.cadi</groupId>
+                       <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-aaf</artifactId>
                </dependency>
+               <!--<dependency>
+                       <groupId>org.apache.shiro</groupId>
+                       <artifactId>shiro-core</artifactId>
+                       <version>1.4.0</version>
+               </dependency> -->
+               
                <dependency>
                        <groupId>org.apache.shiro</groupId>
                        <artifactId>shiro-core</artifactId>
                        <version>1.3.2</version>
                </dependency>
+               
        </dependencies>
        <build>
                <plugins>
                        <plugin>
                                <groupId>org.sonatype.plugins</groupId>
                                <artifactId>nexus-staging-maven-plugin</artifactId>
-                               <version>1.6.7</version>
                                <extensions>true</extensions>
                                <configuration>
                                        <nexusUrl>${nexusproxy}</nexusUrl>
@@ -114,7 +120,6 @@
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-deploy-plugin</artifactId>
-                               <version>2.8.1</version>
                                <configuration>
                                        <skip>false</skip>
                                </configuration>
@@ -122,7 +127,6 @@
                        <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>${jacoco.version}</version>
                                <configuration>
                                        <excludes>
                                                <exclude>**/gen/**</exclude>