Derive all code sub-projects from aaa-parent

We can then centralize configs for CS and findbugs etc.

Change-Id: Iecca472fb7de14b34cf88b34765f7741d4e3c60b
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

diff --git a/aaa-authn-api/pom.xml b/aaa-authn-api/pom.xml
index 690b067ed201c195448a0c73d3fd80a8a7640369..0764b8ae0f8364ddb248ec5e6b417f41bc974221 100644 (file)
--- a/aaa-authn-api/pom.xml
+++ b/aaa-authn-api/pom.xml
@@ -10,10 +10,10 @@
   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.mdsal</groupId>
-    <artifactId>binding-parent</artifactId>
-    <version>0.13.0-SNAPSHOT</version>
-    <relativePath />
+    <groupId>org.opendaylight.aaa</groupId>
+    <artifactId>aaa-parent</artifactId>
+    <version>0.8.0-SNAPSHOT</version>
+    <relativePath>../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.aaa</groupId>

diff --git a/aaa-cert/pom.xml b/aaa-cert/pom.xml
index 4a6173de62af976b62da7a1d990b3b798652db13..8b174ef5ec66e76e884797a6294f85a61b606c01 100644 (file)
--- a/aaa-cert/pom.xml
+++ b/aaa-cert/pom.xml
@@ -9,10 +9,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
-    <groupId>org.opendaylight.mdsal</groupId>
-    <artifactId>binding-parent</artifactId>
-    <version>0.13.0-SNAPSHOT</version>
-    <relativePath />
+    <groupId>org.opendaylight.aaa</groupId>
+    <artifactId>aaa-parent</artifactId>
+    <version>0.8.0-SNAPSHOT</version>
+    <relativePath>../parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -22,18 +22,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <name>ODL :: aaa :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.opendaylight.aaa</groupId>
-        <artifactId>aaa-artifacts</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.aaa</groupId>

diff --git a/aaa-cli/pom.xml b/aaa-cli/pom.xml
index 12e410dfa26a048765cb706dd6c13bf7357ab3cf..c4a0ef21af24f6621cf4c25ef677763878332b02 100644 (file)
--- a/aaa-cli/pom.xml
+++ b/aaa-cli/pom.xml
@@ -10,10 +10,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>bundle-parent</artifactId>
-    <version>3.0.2</version>
-    <relativePath />
+    <groupId>org.opendaylight.aaa</groupId>
+    <artifactId>aaa-parent</artifactId>
+    <version>0.8.0-SNAPSHOT</version>
+    <relativePath>../parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/aaa-encrypt-service/pom.xml b/aaa-encrypt-service/pom.xml
index 7083a151bdb04b4c0d0589d036781d83783a07d6..add00787ccb4f60ec6cfaaeb11417af821159c4b 100644 (file)
--- a/aaa-encrypt-service/pom.xml
+++ b/aaa-encrypt-service/pom.xml
@@ -3,10 +3,10 @@
   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.mdsal</groupId>
-    <artifactId>binding-parent</artifactId>
-    <version>0.13.0-SNAPSHOT</version>
-    <relativePath />
+    <groupId>org.opendaylight.aaa</groupId>
+    <artifactId>aaa-parent</artifactId>
+    <version>0.8.0-SNAPSHOT</version>
+    <relativePath>../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.aaa</groupId>
@@ -15,18 +15,6 @@
   <name>ODL :: aaa :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>aaa-parent</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
         <!--Yang Binding -->
     <dependency>

diff --git a/aaa-shiro-act/impl/pom.xml b/aaa-shiro-act/impl/pom.xml
index 16c08b468af72496095f68fb73c3308f35c608d7..fe6c8fad46fc08b0fbe7672b62edba470f5af0ca 100644 (file)
--- a/aaa-shiro-act/impl/pom.xml
+++ b/aaa-shiro-act/impl/pom.xml
@@ -12,10 +12,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>bundle-parent</artifactId>
-        <version>3.0.2</version>
-        <relativePath/>
+        <groupId>org.opendaylight.aaa</groupId>
+        <artifactId>aaa-parent</artifactId>
+        <version>0.8.0-SNAPSHOT</version>
+        <relativePath>../../parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.aaa</groupId>

diff --git a/aaa-shiro/api/pom.xml b/aaa-shiro/api/pom.xml
index 4ae140cfd59e7ec83c3da3309c948930c5839c18..e20eef385dd5ae93f9daab0b839bcd8f71588f6a 100644 (file)
--- a/aaa-shiro/api/pom.xml
+++ b/aaa-shiro/api/pom.xml
@@ -11,10 +11,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.mdsal</groupId>
-    <artifactId>binding-parent</artifactId>
-    <version>0.13.0-SNAPSHOT</version>
-    <relativePath />
+    <groupId>org.opendaylight.aaa</groupId>
+    <artifactId>aaa-parent</artifactId>
+    <version>0.8.0-SNAPSHOT</version>
+    <relativePath>../../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.aaa</groupId>

diff --git a/aaa-shiro/impl/pom.xml b/aaa-shiro/impl/pom.xml
index 7997fe84c08b3e0a3df228f9ff20c2bd10fd5f6e..980a4f5db4463bd501b4f9911f1d0312bfb1c616 100644 (file)
--- a/aaa-shiro/impl/pom.xml
+++ b/aaa-shiro/impl/pom.xml
@@ -12,10 +12,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>bundle-parent</artifactId>
-        <version>3.0.2</version>
-        <relativePath/>
+        <groupId>org.opendaylight.aaa</groupId>
+        <artifactId>aaa-parent</artifactId>
+        <version>0.8.0-SNAPSHOT</version>
+        <relativePath>../../parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.aaa</groupId>
@@ -24,25 +24,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <name>ODL :: aaa :: ${project.artifactId}</name>
     <packaging>bundle</packaging>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-parent</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-artifacts</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/parent/pom.xml b/parent/pom.xml
index 4cf342814d736366be85f81a09f6f06b118bc996..84bd834bde3ef1a3ff9606334bbd8d2ed5058033 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -16,18 +16,8 @@
   <packaging>pom</packaging>
 
   <properties>
-    <!-- AuthZ -->
-    <controller.mdsal.version>1.8.0-SNAPSHOT</controller.mdsal.version>
-
     <!-- AuthN -->
-    <glassfish.json.version>1.0.4</glassfish.json.version>
-    <ehcache.version>2.8.3</ehcache.version>
     <oltu.version>1.0.2</oltu.version>
-
-    <!-- Test -->
-    <javax.inject.version>1</javax.inject.version>
-    <servlet.tester.version>7.0.0.pre5</servlet.tester.version>
-    <features.test.version>3.0.2</features.test.version>
   </properties>
 
   <dependencyManagement>
@@ -43,7 +33,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>${controller.mdsal.version}</version>
+        <version>1.8.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -52,7 +42,7 @@
       <dependency>
         <groupId>org.glassfish</groupId>
         <artifactId>javax.json</artifactId>
-        <version>${glassfish.json.version}</version>
+        <version>1.0.4</version>
       </dependency>
       <dependency>
         <groupId>org.apache.felix</groupId>
@@ -61,7 +51,7 @@
       <dependency>
         <groupId>net.sf.ehcache</groupId>
         <artifactId>ehcache</artifactId>
-        <version>${ehcache.version}</version>
+        <version>2.8.3</version>
       </dependency>
       <dependency>
         <groupId>org.apache.oltu.oauth2</groupId>
@@ -97,19 +87,12 @@
       <dependency>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>features-test</artifactId>
-        <version>${features.test.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>javax.inject</groupId>
-        <artifactId>javax.inject</artifactId>
-        <version>${javax.inject.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>jetty-servlet-tester</artifactId>
-        <version>${servlet.tester.version}</version>
+        <version>7.0.0.pre5</version>
         <scope>test</scope>
       </dependency>
     </dependencies>

diff --git a/web/api/pom.xml b/web/api/pom.xml
index 4b660ebf9b47f9ccc34c252bce9918aac4496397..e959b1911cf8a12ff8c74feb72b8d902e7bf9b07 100644 (file)
--- a/web/api/pom.xml
+++ b/web/api/pom.xml
@@ -11,16 +11,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>bundle-parent</artifactId>
-    <version>3.0.2</version>
-    <relativePath />
+    <groupId>org.opendaylight.aaa</groupId>
+    <artifactId>aaa-parent</artifactId>
+    <version>0.8.0-SNAPSHOT</version>
+    <relativePath>../../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.aaa.web</groupId>
   <artifactId>web-api</artifactId>
   <version>0.8.0-SNAPSHOT</version>
-  <name>ODL :: infrautils :: ${project.artifactId}</name>
+  <name>ODL :: aaa :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/web/impl-osgi/pom.xml b/web/impl-osgi/pom.xml
index 350e255ce44f981d0701b60de4519ac5c7a534d4..76e3b58e82685b7cfb2db7205fcb070a0ca08606 100644 (file)
--- a/web/impl-osgi/pom.xml
+++ b/web/impl-osgi/pom.xml
@@ -11,16 +11,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>bundle-parent</artifactId>
-    <version>3.0.2</version>
-    <relativePath />
+    <groupId>org.opendaylight.aaa</groupId>
+    <artifactId>aaa-parent</artifactId>
+    <version>0.8.0-SNAPSHOT</version>
+    <relativePath>../../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.aaa.web</groupId>
   <artifactId>web-osgi-impl</artifactId>
   <version>0.8.0-SNAPSHOT</version>
-  <name>ODL :: infrautils :: ${project.artifactId}</name>
+  <name>ODL :: aaa :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/web/pom.xml b/web/pom.xml
index 243f7dee83fc18371c1d9966804bfd3cbc833d34..33c3599cefae2ec31756df419deabecb1e263bb1 100644 (file)
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -22,7 +22,7 @@
   <artifactId>web-aggregator</artifactId>
   <version>0.8.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <name>ODL :: infrautils :: ${project.artifactId}</name>
+  <name>ODL :: aaa :: ${project.artifactId}</name>
 
   <modules>
     <module>api</module>