Add project info to name in pom files

[netvirt.git] / vpnservice / aclservice / impl / pom.xml

diff --git a/vpnservice/aclservice/impl/pom.xml b/vpnservice/aclservice/impl/pom.xml
index 284ea60b091cde5c8a37c63beaec962e0ede3d00..6e1966f0a1753deb7a322d48d14981630d22d1cb 100644 (file)
--- a/vpnservice/aclservice/impl/pom.xml
+++ b/vpnservice/aclservice/impl/pom.xml
@@ -17,9 +17,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <relativePath>../../commons/config-parent</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.netvirt</groupId>
   <artifactId>aclservice-impl</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
+  <name>ODL :: netvirt :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
 
   <dependencies>
@@ -36,11 +35,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-broker-impl</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.neutron</groupId>
-      <artifactId>model</artifactId>
-      <version>${neutron.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
       <artifactId>mdsalutil-api</artifactId>
@@ -51,16 +45,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>interfacemanager-api</artifactId>
       <version>${genius.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>southbound-api</artifactId>
-      <version>${vpns.ovsdb.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>neutronvpn-api</artifactId>
-      <version>${vpnservices.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>utils.config</artifactId>
@@ -71,18 +55,27 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>elanmanager-api</artifactId>
       <version>${vpnservices.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>idmanager-api</artifactId>
+      <version>${genius.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>inject</artifactId>
       <version>${infrautils.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.googlecode.java-ipv6</groupId>
+      <artifactId>java-ipv6</artifactId>
+      <version>0.16</version>
+    </dependency>
 
     <!-- Dependencies used only by code under src/test (<scope>test) -->
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>aclservice-api</artifactId>
-      <version>${project.version}</version>
-      <type>test-jar</type>
+      <groupId>org.opendaylight.infrautils</groupId>
+      <artifactId>inject.guice.testutils</artifactId>
+      <version>${infrautils.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -93,27 +86,16 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>testutils</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.xtend</groupId>
-      <artifactId>org.eclipse.xtend.lib</artifactId>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>mdsalutil-testutils</artifactId>
+      <version>${genius.version}</version>
       <scope>test</scope>
     </dependency>
-<!--
     <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>testutils</artifactId>
       <scope>test</scope>
     </dependency>
- -->
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-broker-impl</artifactId>
@@ -121,29 +103,16 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <scope>test</scope>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-test-utils</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.inject</groupId>
-      <artifactId>guice</artifactId>
-      <!-- TODO Remove <version> once TBD https://git.opendaylight.org/gerrit/#/c/?/ has been merged -->
-      <!-- Must use 4.0 instead of 4.1.0 due incomp. with to mycila-guice-jsr250 3.6.ga, see https://github.com/mycila/guice/issues/11 (below)  -->
-      <version>4.0</version>
-      <scope>test</scope>
+      <groupId>org.immutables</groupId>
+      <artifactId>value</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.mycila.guice.extensions</groupId>
-      <artifactId>mycila-guice-jsr250</artifactId>
-      <version>3.6.ga</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.sonatype.sisu</groupId>
-          <artifactId>sisu-guice</artifactId>
-        </exclusion>
-      </exclusions>
+        <groupId>com.google.truth</groupId>
+        <artifactId>truth</artifactId>
     </dependency>
   </dependencies>
 
@@ -160,17 +129,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
           <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Embed-Dependency>utils.config;type=!pom;inline=false</Embed-Dependency>
-            <Embed-Transitive>true</Embed-Transitive>
-          </instructions>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
@@ -194,52 +152,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         </executions>
       </plugin>
       <plugin>
-        <!-- TODO If overall proposed direction of this Gerrit is +1 by everyone,
-             then move both the blueprint-maven-plugin and the maven-antrun-plugin to odl-parent and remove from here -->
         <groupId>org.apache.aries.blueprint</groupId>
         <artifactId>blueprint-maven-plugin</artifactId>
-        <version>1.4.0</version>
-        <configuration>
-          <scanPaths>
-            <scanPath>org.opendaylight</scanPath>
-          </scanPaths>
-        </configuration>
-        <dependencies>
-          <dependency>
-            <!-- https://stackoverflow.com/questions/38825386/blueprint-maven-plugin-runtimeexception -->
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-finder-shaded</artifactId>
-            <version>4.5</version>
-          </dependency>
-        </dependencies>
-        <executions>
-          <execution>
-            <goals>
-              <goal>blueprint-generate</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- Remove then when upgrading blueprint-maven-plugin to 1.5.0,
-           and use <configuration><generatedDir>org/opendaylight/blueprint/
-           see https://issues.apache.org/jira/browse/ARIES-1597 -->
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <tasks>
-                <echo>Moving autowire.xml to org/opendaylight/blueprint</echo>
-                <move file="${basedir}/target/generated-resources/OSGI-INF/blueprint/autowire.xml"
-                      todir="${basedir}/target/generated-resources/org/opendaylight/blueprint" />
-              </tasks>
-            </configuration>
-          </execution>
-        </executions>
       </plugin>
     </plugins>
   </build>