You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cl...@apache.org on 2011/08/18 13:35:29 UTC

svn commit: r1159178 - in /felix/trunk/ipojo/junit4osgi: felix-command/pom.xml immediate-launcher/pom.xml junit4osgi/pom.xml swing-runner/pom.xml

Author: clement
Date: Thu Aug 18 11:35:29 2011
New Revision: 1159178

URL: http://svn.apache.org/viewvc?rev=1159178&view=rev
Log:
updated junit4osgi to use the bnd-ipojo-plugin.

Modified:
    felix/trunk/ipojo/junit4osgi/felix-command/pom.xml
    felix/trunk/ipojo/junit4osgi/immediate-launcher/pom.xml
    felix/trunk/ipojo/junit4osgi/junit4osgi/pom.xml
    felix/trunk/ipojo/junit4osgi/swing-runner/pom.xml

Modified: felix/trunk/ipojo/junit4osgi/felix-command/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/junit4osgi/felix-command/pom.xml?rev=1159178&r1=1159177&r2=1159178&view=diff
==============================================================================
--- felix/trunk/ipojo/junit4osgi/felix-command/pom.xml (original)
+++ felix/trunk/ipojo/junit4osgi/felix-command/pom.xml Thu Aug 18 11:35:29 2011
@@ -59,7 +59,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.4.3</version>
+        <version>2.3.5</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
@@ -70,23 +70,16 @@
             </Private-Package>
             <Include-Resource> META-INF/LICENSE=LICENSE,
               META-INF/NOTICE=NOTICE </Include-Resource>
+            <_plugin>org.apache.felix.ipojo.bnd.PojoizationPlugin;metadata=${basedir}/metadata.xml;use-local-schemas=true</_plugin>
           </instructions>
         </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-ipojo-plugin</artifactId>
-        <version>1.8.0</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>ipojo-bundle</goal>
-            </goals>
-            <configuration>
-              <ignoreAnnotations>true</ignoreAnnotations>
-            </configuration>
-          </execution>
-        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>bnd-ipojo-plugin</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+          </dependency>
+        </dependencies>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

Modified: felix/trunk/ipojo/junit4osgi/immediate-launcher/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/junit4osgi/immediate-launcher/pom.xml?rev=1159178&r1=1159177&r2=1159178&view=diff
==============================================================================
--- felix/trunk/ipojo/junit4osgi/immediate-launcher/pom.xml (original)
+++ felix/trunk/ipojo/junit4osgi/immediate-launcher/pom.xml Thu Aug 18 11:35:29 2011
@@ -59,7 +59,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.4.3</version>
+        <version>2.3.5</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
@@ -70,23 +70,16 @@
             </Private-Package>
             <Include-Resource> META-INF/LICENSE=LICENSE,
               META-INF/NOTICE=NOTICE </Include-Resource>
+            <_plugin>org.apache.felix.ipojo.bnd.PojoizationPlugin;metadata=${basedir}/metadata.xml;use-local-schemas=true</_plugin>
           </instructions>
         </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-ipojo-plugin</artifactId>
-        <version>1.8.0</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>ipojo-bundle</goal>
-            </goals>
-            <configuration>
-              <ignoreAnnotations>true</ignoreAnnotations>
-            </configuration>
-          </execution>
-        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>bnd-ipojo-plugin</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+          </dependency>
+        </dependencies>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

Modified: felix/trunk/ipojo/junit4osgi/junit4osgi/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/junit4osgi/junit4osgi/pom.xml?rev=1159178&r1=1159177&r2=1159178&view=diff
==============================================================================
--- felix/trunk/ipojo/junit4osgi/junit4osgi/pom.xml (original)
+++ felix/trunk/ipojo/junit4osgi/junit4osgi/pom.xml Thu Aug 18 11:35:29 2011
@@ -62,7 +62,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.4.3</version>
+        <version>2.3.5</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
@@ -93,23 +93,16 @@
               META-INF/LICENSE.junit=LICENSE.junit,
               META-INF/NOTICE=NOTICE
             </Include-Resource>
+            <_plugin>org.apache.felix.ipojo.bnd.PojoizationPlugin;metadata=${basedir}/metadata.xml;use-local-schemas=true</_plugin>
           </instructions>
         </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-ipojo-plugin</artifactId>
-        <version>1.8.0</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>ipojo-bundle</goal>
-            </goals>
-            <configuration>
-              <ignoreAnnotations>true</ignoreAnnotations>
-            </configuration>
-          </execution>
-        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>bnd-ipojo-plugin</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+          </dependency>
+        </dependencies>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

Modified: felix/trunk/ipojo/junit4osgi/swing-runner/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/junit4osgi/swing-runner/pom.xml?rev=1159178&r1=1159177&r2=1159178&view=diff
==============================================================================
--- felix/trunk/ipojo/junit4osgi/swing-runner/pom.xml (original)
+++ felix/trunk/ipojo/junit4osgi/swing-runner/pom.xml Thu Aug 18 11:35:29 2011
@@ -52,7 +52,7 @@
     <plugin>
       <groupId>org.apache.felix</groupId>
       <artifactId>maven-bundle-plugin</artifactId>
-      <version>1.4.3</version>
+      <version>2.3.5</version>
       <extensions>true</extensions>
       <configuration>
         <instructions>
@@ -62,23 +62,16 @@
           </Private-Package>
           <Import-Package>org.osgi.framework;version=1.3,*
           </Import-Package>
+          <_plugin>org.apache.felix.ipojo.bnd.PojoizationPlugin;metadata=${basedir}/metadata.xml;use-local-schemas=true</_plugin>
         </instructions>
       </configuration>
-    </plugin>
-    <plugin>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>maven-ipojo-plugin</artifactId>
-      <version>1.8.0</version>
-      <executions>
-        <execution>
-          <goals>
-            <goal>ipojo-bundle</goal>
-          </goals>
-          <configuration>
-            <ignoreAnnotations>true</ignoreAnnotations>
-          </configuration>
-        </execution>
-      </executions>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>bnd-ipojo-plugin</artifactId>
+          <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+      </dependencies>
     </plugin>
     <plugin>
       <groupId>org.codehaus.mojo</groupId>