Clean up artifacts

This removes a number of obsolete artifacts from aaa-artifacts, adds
some new ones, and adds a new module to verify that listed artifacts
are actually available.

Change-Id: I2ab9600a5ffb1b99c1dee00b0b6ac456cae49f57
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/aaa-shiro-act/impl/pom.xml b/aaa-shiro-act/impl/pom.xml
index a3c68e8d2d09b3de3901c4eee98b53364d32d0be..3dc23e756ab20cc47fa645ec0006c2c11a0775e1 100644 (file)
--- a/aaa-shiro-act/impl/pom.xml
+++ b/aaa-shiro-act/impl/pom.xml
@@ -21,6 +21,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <groupId>org.opendaylight.aaa</groupId>
     <artifactId>aaa-shiro-act</artifactId>
     <version>0.7.0-SNAPSHOT</version>
+    <name>ODL :: aaa :: ${project.artifactId}</name>
     <packaging>bundle</packaging>
 
     <dependencies>

diff --git a/aaa-shiro-act/pom.xml b/aaa-shiro-act/pom.xml
index 5d5bb0a263116af9552ff2bb6ad63719de1bcedb..ee40029b988c84d50a19d18cdbcc9341a3b302f7 100644 (file)
--- a/aaa-shiro-act/pom.xml
+++ b/aaa-shiro-act/pom.xml
@@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <groupId>org.opendaylight.aaa</groupId>
   <artifactId>aaa-shiro-act-aggregator</artifactId>
   <version>0.7.0-SNAPSHOT</version>
-  <name>aaa-shiro-act</name>
+  <name>ODL :: aaa :: ${project.artifactId}</name>
   <packaging>pom</packaging>
 
   <scm>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 5fdd75d3b1440c8e7acfb67e3e7a1ef747a981ad..ac0428323b3ee43c3dbce0b19723ee18380ed492 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -25,124 +25,124 @@
 
     <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-encrypt-service</artifactId>
+                <artifactId>aaa-cert</artifactId>
                 <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>config</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-shiro</artifactId>
+                <artifactId>aaa-cert</artifactId>
                 <version>${project.version}</version>
-                <type>cfg</type>
                 <classifier>config</classifier>
+                <type>xml</type>
             </dependency>
+
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-shiro</artifactId>
+                <artifactId>aaa-cli</artifactId>
                 <version>${project.version}</version>
-                <type>cfg</type>
-                <classifier>idmtool</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-shiro</artifactId>
+                <artifactId>aaa-cli-jar</artifactId>
                 <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>aaa-app-config</classifier>
             </dependency>
+
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-authn-api</artifactId>
+                <artifactId>aaa-encrypt-service</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-authn-mdsal-api</artifactId>
+                <artifactId>aaa-encrypt-service</artifactId>
                 <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>config</classifier>
             </dependency>
+
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-authn-mdsal-store-impl</artifactId>
+                <artifactId>aaa-filterchain</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-shiro-api</artifactId>
+                <artifactId>aaa-filterchain</artifactId>
                 <version>${project.version}</version>
+                <type>cfg</type>
+                <classifier>config</classifier>
             </dependency>
+
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>aaa-shiro</artifactId>
                 <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>aaa-app-config</classifier>
             </dependency>
+
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>aaa-shiro-act</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-authn-store</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-authn-store</artifactId>
-                <version>${project.version}</version>
-                <type>cfg</type>
-                <classifier>config</classifier>
-            </dependency>
 
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-filterchain</artifactId>
+                <artifactId>aaa-shiro-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-filterchain</artifactId>
+                <artifactId>aaa-shiro</artifactId>
                 <version>${project.version}</version>
-                <type>cfg</type>
-                <classifier>config</classifier>
             </dependency>
+
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-cli</artifactId>
+                <artifactId>features-aaa</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-api</artifactId>
                 <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-cert</artifactId>
+                <artifactId>odl-aaa-cert</artifactId>
                 <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-cert</artifactId>
+                <artifactId>odl-aaa-cli</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-encryption-service</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>
@@ -150,6 +150,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+
         </dependencies>
     </dependencyManagement>
 

diff --git a/dependency-check/pom.xml b/dependency-check/pom.xml
new file mode 100644 (file)
index 0000000..8dca5c0
--- /dev/null
+++ b/dependency-check/pom.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2018 Red Hat, Inc. and others.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.opendaylight.aaa</groupId>
+        <artifactId>aaa-artifacts</artifactId>
+        <version>0.7.0-SNAPSHOT</version>
+        <relativePath>../artifacts</relativePath>
+    </parent>
+
+    <groupId>org.opendaylight.aaa</groupId>
+    <artifactId>dependency-check</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <name>ODL :: aaa :: ${project.artifactId}</name>
+
+    <!--
+    This POM serves to check that all the dependencies in AAA’s dependency management are available.
+    It should contain all the dependencies in management.
+    -->
+
+    <!--
+    To simplify maintenance, all dependencies are listed in alphabetical order of groupId and artifactId.
+    This list of dependencies can be updated using the update-dependencies script.
+    -->
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>aaa-authn-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>aaa-cert</artifactId>
+            <classifier>config</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>aaa-cert</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>aaa-cli</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>aaa-cli-jar</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>aaa-encrypt-service</artifactId>
+            <classifier>config</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>aaa-encrypt-service</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>aaa-filterchain</artifactId>
+            <classifier>config</classifier>
+            <type>cfg</type>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>aaa-filterchain</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>aaa-shiro-act</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>aaa-shiro-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>aaa-shiro</artifactId>
+            <classifier>aaa-app-config</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>aaa-shiro</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>features-aaa</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-aaa-api</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-aaa-cert</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-aaa-cli</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-aaa-encryption-service</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-aaa-shiro</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

diff --git a/dependency-check/update-dependencies b/dependency-check/update-dependencies
new file mode 100755 (executable)
index 0000000..00daf36
--- /dev/null
+++ b/dependency-check/update-dependencies
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+# Copyright © 2017, 2018 Red Hat, Inc. and others.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v1.0 which accompanies this distribution,
+# and is available at http://www.eclipse.org/legal/epl-v10.html
+
+xmlstarlet sel -N "maven=http://maven.apache.org/POM/4.0.0" -t \
+-m "maven:project/maven:dependencyManagement/maven:dependencies/maven:dependency" \
+-v maven:groupId -o " " -v maven:artifactId -o " classifier=" -v maven:classifier -o " type=" -v maven:type -n \
+../artifacts/pom.xml |
+sort |
+awk '
+BEGIN { predeps = 1 }
+FNR == NR && predeps && /<dependencies>/ {
+  print
+  predeps = 0
+}
+FNR == NR && !predeps && /<\/dependencies>/ {
+  postdeps=1
+}
+FNR == NR && predeps
+FNR == NR && postdeps {
+  footer=footer "\n" $0
+}
+FNR < NR && !/org.opendaylight/ {
+  printf "        <dependency>\n"
+  printf "            <groupId>%s</groupId>\n", $1
+  printf "            <artifactId>%s</artifactId>\n", $2
+  for (i = 3; i <= NF; i++) {
+    equalidx = index($i, "=")
+    if (equalidx != length($i)) {
+      element = substr($i, 1, equalidx - 1)
+      value = substr($i, equalidx + 1)
+      printf "            <%s>%s</%s>\n", element, value, element
+    }
+  }
+  printf "        </dependency>\n"
+}
+END { print footer }
+' pom.xml - > pom.xml.new
+mv pom.xml.new pom.xml

diff --git a/pom.xml b/pom.xml
index 89c2b9550b37444237d62bbb2d5e8180efadc48b..f824fd1cc2b2adec2d51bae57d164e530b234ef9 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -33,6 +33,7 @@
     <module>parent</module>
     <module>aaa-shiro</module>
     <module>aaa-shiro-act</module>
+    <module>dependency-check</module>
   </modules>
 
   <build>