Do not override managed version

We are getting project versions from artifacts, do not override
them.

Change-Id: Ib26ce6f26a4dbad2e607f873925ca1ca8e78291d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/aaa-cli/pom.xml b/aaa-cli/pom.xml
index 8eb0b638f75f955f6a9a75644a90f30e3b3ba534..aa0371eac8d5cb90011e580ef1a52474babdf53d 100644 (file)
--- a/aaa-cli/pom.xml
+++ b/aaa-cli/pom.xml
@@ -24,9 +24,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.opendaylight.aaa</groupId>
       <artifactId>aaa-cert</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.aaa</groupId>

diff --git a/aaa-password-service/impl/pom.xml b/aaa-password-service/impl/pom.xml
index 6a470bcff224d802dc5a8c3fb1a487ed30d31510..cd65e90f6c7cfb1999695aa371f7624186752a08 100644 (file)
--- a/aaa-password-service/impl/pom.xml
+++ b/aaa-password-service/impl/pom.xml
@@ -26,7 +26,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.aaa</groupId>
       <artifactId>aaa-password-service-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.shiro</groupId>

diff --git a/aaa-shiro/api/pom.xml b/aaa-shiro/api/pom.xml
index ec71b7581a2960a681da61a0966b5ac7c8f3e0f7..eba71f826745a7ba3af59a7dd9c08011dee65509 100644 (file)
--- a/aaa-shiro/api/pom.xml
+++ b/aaa-shiro/api/pom.xml
@@ -26,7 +26,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.aaa</groupId>
       <artifactId>aaa-authn-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
   </dependencies>
 

diff --git a/web/impl-jetty/pom.xml b/web/impl-jetty/pom.xml
index 0a64f0e8813c47ada9af385a0bcf050a8926dba6..5d2712a5896e7000688e53be953bde90f6911ec1 100644 (file)
--- a/web/impl-jetty/pom.xml
+++ b/web/impl-jetty/pom.xml
@@ -29,9 +29,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.opendaylight.aaa.web</groupId>
       <artifactId>web-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>

diff --git a/web/impl-osgi/pom.xml b/web/impl-osgi/pom.xml
index c5bc471b406c0cf2901d9f2688439f4774cdbb1e..c69712311810254eb49f5de455ce77a601199648 100644 (file)
--- a/web/impl-osgi/pom.xml
+++ b/web/impl-osgi/pom.xml
@@ -24,9 +24,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.opendaylight.aaa.web</groupId>
       <artifactId>web-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.web</groupId>

diff --git a/web/testutils/pom.xml b/web/testutils/pom.xml
index 35611348c4b28eafbb9a0eac1fcee864a2aeb4ea..d2e7d7b7fdae5c505400af80d54c43f4fa6a8b05 100644 (file)
--- a/web/testutils/pom.xml
+++ b/web/testutils/pom.xml
@@ -36,14 +36,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.opendaylight.aaa.web</groupId>
       <artifactId>web-jetty-impl</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.opendaylight.aaa.web</groupId>
       <artifactId>servlet-jersey2</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>