Bump upstreams

[aaa.git] / artifacts / pom.xml

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 3dba6440997539a539b9ca15e464634abb052f8c..6fa936e5eda93fb507f656f6ab39b4a9b7dd3d5e 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -13,44 +13,86 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>2.0.5</version>
+      <version>12.0.2</version>
       <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.aaa</groupId>
     <artifactId>aaa-artifacts</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <version>0.17.4-SNAPSHOT</version>
     <name>ODL :: aaa :: ${project.artifactId}</name>
     <packaging>pom</packaging>
 
     <dependencyManagement>
         <dependencies>
+
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-encrypt-service</artifactId>
+                <artifactId>aaa-authn-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>aaa-cert</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>aaa-cert</artifactId>
                 <version>${project.version}</version>
+                <classifier>config</classifier>
+                <type>xml</type>
             </dependency>
+
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>aaa-cli</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>aaa-cli-jar</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>aaa-encrypt-service</artifactId>
                 <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.aaa</groupId>
+                <artifactId>aaa-encrypt-service-impl</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>aaa-encrypt-service-impl</artifactId>
+                <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>config</classifier>
             </dependency>
+
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-shiro</artifactId>
+                <artifactId>aaa-filterchain</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>aaa-filterchain</artifactId>
                 <version>${project.version}</version>
                 <type>cfg</type>
                 <classifier>config</classifier>
             </dependency>
+
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-shiro</artifactId>
+                <artifactId>aaa-idm-store-h2</artifactId>
                 <version>${project.version}</version>
-                <type>cfg</type>
-                <classifier>idmtool</classifier>
             </dependency>
+
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>aaa-shiro</artifactId>
@@ -58,98 +100,134 @@
                 <type>xml</type>
                 <classifier>aaa-app-config</classifier>
             </dependency>
+
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-authn-api</artifactId>
+                <artifactId>aaa-shiro-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-authn-mdsal-api</artifactId>
+                <artifactId>aaa-shiro</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-authn-mdsal-store-impl</artifactId>
+                <artifactId>aaa-tokenauthrealm</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-shiro-api</artifactId>
+                <artifactId>repackaged-shiro</artifactId>
                 <version>${project.version}</version>
             </dependency>
+
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-shiro</artifactId>
+                <groupId>${project.groupId}.web</groupId>
+                <artifactId>web-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-shiro-act</artifactId>
+                <groupId>${project.groupId}.web</groupId>
+                <artifactId>web-jetty-impl</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-authn-store</artifactId>
+                <groupId>${project.groupId}.web</groupId>
+                <artifactId>web-osgi-impl</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.web</groupId>
+                <artifactId>servlet-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.web</groupId>
+                <artifactId>servlet-jersey2</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.web</groupId>
+                <artifactId>testutils</artifactId>
                 <version>${project.version}</version>
+                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-authn-store</artifactId>
+                <artifactId>aaa-password-service-api</artifactId>
                 <version>${project.version}</version>
-                <type>cfg</type>
-                <classifier>config</classifier>
             </dependency>
-
+            <dependency>
+                <groupId>org.opendaylight.aaa</groupId>
+                <artifactId>aaa-password-service-impl</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.aaa</groupId>
+                <artifactId>aaa-password-service-impl</artifactId>
+                <version>${project.version}</version>
+                <classifier>aaa-password-service-config</classifier>
+                <type>xml</type>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-filterchain</artifactId>
+                <artifactId>features-aaa</artifactId>
                 <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
             </dependency>
+
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-filterchain</artifactId>
+                <artifactId>odl-aaa-api</artifactId>
                 <version>${project.version}</version>
-                <type>cfg</type>
-                <classifier>config</classifier>
+                <classifier>features</classifier>
+                <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-cli</artifactId>
+                <artifactId>odl-aaa-cert</artifactId>
                 <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-cli-jar</artifactId>
+                <artifactId>odl-aaa-cli</artifactId>
                 <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-cert</artifactId>
+                <artifactId>odl-aaa-encryption-service</artifactId>
                 <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-cert</artifactId>
+                <artifactId>odl-aaa-shiro</artifactId>
                 <version>${project.version}</version>
-                <classifier>config</classifier>
+                <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>features-aaa</artifactId>
+                <artifactId>odl-aaa-web</artifactId>
                 <version>${project.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            <!-- Karaf 4 Features -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-aaa-shiro</artifactId>
+                <artifactId>odl-apache-shiro</artifactId>
                 <version>${project.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+
         </dependencies>
     </dependencyManagement>