You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2009/10/13 22:49:31 UTC

svn commit: r824920 - in /openejb/trunk/openejb3: container/openejb-core/pom.xml pom.xml

Author: jlaskowski
Date: Tue Oct 13 20:49:31 2009
New Revision: 824920

URL: http://svn.apache.org/viewvc?rev=824920&view=rev
Log:
Upgrade maven-bundle-plugin to 2.0.1

Modified:
    openejb/trunk/openejb3/container/openejb-core/pom.xml
    openejb/trunk/openejb3/pom.xml

Modified: openejb/trunk/openejb3/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/pom.xml?rev=824920&r1=824919&r2=824920&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-core/pom.xml Tue Oct 13 20:49:31 2009
@@ -190,18 +190,6 @@
           </excludes>
         </configuration>
       </plugin>
-	  <plugin>
-        <groupId>org.apache.felix</groupId>
-	    <artifactId>maven-bundle-plugin</artifactId>
-	    <configuration>
-	      <instructions>
-	        <Export-Package>${openejb.osgi.export}</Export-Package>
-	        <Import-Package>${openejb.osgi.import}</Import-Package>
-	        <Private-Package>${openejb.osgi.private.pkg}</Private-Package>
-	        <Implementation-Title>Apache OpenEJB</Implementation-Title>
-	      </instructions>
-	    </configuration>
-      </plugin>
     </plugins>
   </build>
   <dependencies>

Modified: openejb/trunk/openejb3/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/pom.xml?rev=824920&r1=824919&r2=824920&view=diff
==============================================================================
--- openejb/trunk/openejb3/pom.xml (original)
+++ openejb/trunk/openejb3/pom.xml Tue Oct 13 20:49:31 2009
@@ -128,6 +128,12 @@
           <artifactId>maven-assembly-plugin</artifactId>
           <version>2.2-beta-1</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <version>2.0.1</version>
+          <extensions>true</extensions>
+        </plugin>
       </plugins>
     </pluginManagement>
 
@@ -147,6 +153,29 @@
         </configuration>
       </plugin>
       <plugin>
+	<groupId>org.apache.felix</groupId>
+	<artifactId>maven-bundle-plugin</artifactId>
+	<configuration>
+	  <instructions>
+	    <Bundle-Name>Apache ${pom.name}</Bundle-Name>
+	    <Export-Package>${openejb.osgi.export}</Export-Package>
+	    <Import-Package>${openejb.osgi.import}</Import-Package>
+	    <Private-Package>${openejb.osgi.private.pkg}</Private-Package>
+            <Implementation-Title>Apache OpenEJB</Implementation-Title>
+            <Implementation-Version>${project.version}</Implementation-Version>
+          </instructions>
+        </configuration>
+        <executions>
+          <execution>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <groupId>org.codehaus.swizzle</groupId>
         <artifactId>dependency-report-plugin</artifactId>
         <version>1.0.2</version>
@@ -228,30 +257,6 @@
           </archive>
 	    </configuration>
       </plugin>
-	  <plugin>
-        <groupId>org.apache.felix</groupId>
-	    <artifactId>maven-bundle-plugin</artifactId>
-	    <version>2.0.0</version>
-            <extensions>true</extensions>
-	    <configuration>
-	      <instructions>
-	        <Export-Package>${openejb.osgi.export}</Export-Package>
-	        <Import-Package>${openejb.osgi.import}</Import-Package>
-	        <Private-Package>${openejb.osgi.private.pkg}</Private-Package>
-	        <Implementation-Title>Apache OpenEJB</Implementation-Title>
-	        <Implementation-Version>${project.version}</Implementation-Version>
-	      </instructions>
-	    </configuration>
-        <executions>
-          <execution>
-            <id>bundle-manifest</id>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>manifest</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>