Eliminate use of bundle.plugin.version

The plugin has a managed version, remove the dependency
on its version being defined in a property.

Change-Id: I9c3fe7ee9ce11f81edad244c66050eab870af3d5
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/aaa-filterchain/pom.xml b/aaa-filterchain/pom.xml
index 2f640bc713b2f89ef8a7372e39e95faad61edc8b..eb80b3b3ac7c46fd38a950aff8d73a2421985ac6 100644 (file)
--- a/aaa-filterchain/pom.xml
+++ b/aaa-filterchain/pom.xml
@@ -46,22 +46,6 @@
     </dependency>
   </dependencies>
   <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <version>${bundle.plugin.version}</version>
-          <extensions>true</extensions>
-          <configuration>
-            <instructions>
-              <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-            </instructions>
-            <manifestLocation>${project.basedir}/META-INF</manifestLocation>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
@@ -70,14 +54,11 @@
         <configuration>
           <instructions>
             <Bundle-Activator>org.opendaylight.aaa.filterchain.Activator</Bundle-Activator>
+            <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
             <DynamicImport-Package>*</DynamicImport-Package>
           </instructions>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>

diff --git a/aaa-shiro-act/pom.xml b/aaa-shiro-act/pom.xml
index 837e3995c126ea81cbcf9f135b3b14f8311e5d6e..f2e6f424566a6fd1b939764d0bff985d9b8e132c 100644 (file)
--- a/aaa-shiro-act/pom.xml
+++ b/aaa-shiro-act/pom.xml
@@ -48,22 +48,6 @@
     </dependency>
   </dependencies>
   <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <version>${bundle.plugin.version}</version>
-          <extensions>true</extensions>
-          <configuration>
-            <instructions>
-              <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-            </instructions>
-            <manifestLocation>${project.basedir}/META-INF</manifestLocation>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
@@ -71,14 +55,11 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
+            <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
             <Bundle-Activator>org.opendaylight.aaa.shiroact.Activator</Bundle-Activator>
           </instructions>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-      </plugin>
     </plugins>
   </build>
 </project>

diff --git a/aaa-shiro/pom.xml b/aaa-shiro/pom.xml
index d39764515384095d5caee7bfa9070c2b0c25b4a4..ebf37e2ac0f96718826bbae6f02ba3778a5d5307 100644 (file)
--- a/aaa-shiro/pom.xml
+++ b/aaa-shiro/pom.xml
@@ -104,22 +104,6 @@
     </dependency>
   </dependencies>
   <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <version>${bundle.plugin.version}</version>
-          <extensions>true</extensions>
-          <configuration>
-            <instructions>
-              <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-            </instructions>
-            <manifestLocation>${project.basedir}/META-INF</manifestLocation>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
@@ -129,13 +113,10 @@
           <instructions>
             <Web-ContextPath>/moon</Web-ContextPath>
             <Bundle-Activator>org.opendaylight.aaa.shiro.Activator</Bundle-Activator>
+            <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
           </instructions>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>