felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mccu...@apache.org
Subject svn commit: r579144 - in /felix/trunk/bundleplugin: pom.xml src/main/resources/META-INF/plexus/components.xml
Date Tue, 25 Sep 2007 09:15:04 GMT
Author: mcculls
Date: Tue Sep 25 02:15:04 2007
New Revision: 579144

URL: http://svn.apache.org/viewvc?rev=579144&view=rev
Log:
Temporarily rollback FELIX-370 changes, as this is causing major build breakage

Modified:
    felix/trunk/bundleplugin/pom.xml
    felix/trunk/bundleplugin/src/main/resources/META-INF/plexus/components.xml

Modified: felix/trunk/bundleplugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/pom.xml?rev=579144&r1=579143&r2=579144&view=diff
==============================================================================
--- felix/trunk/bundleplugin/pom.xml (original)
+++ felix/trunk/bundleplugin/pom.xml Tue Sep 25 02:15:04 2007
@@ -43,12 +43,14 @@
  </description>
  
  <dependencies>
+<!--
   <dependency>
    <groupId>org.apache.felix</groupId>
    <artifactId>maven-obr-plugin</artifactId>
    <version>0.1.0-SNAPSHOT</version>
    <scope>runtime</scope>
   </dependency>
+-->
   <dependency>
    <groupId>biz.aQute</groupId>
    <artifactId>bndlib</artifactId>

Modified: felix/trunk/bundleplugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/resources/META-INF/plexus/components.xml?rev=579144&r1=579143&r2=579144&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/resources/META-INF/plexus/components.xml (original)
+++ felix/trunk/bundleplugin/src/main/resources/META-INF/plexus/components.xml Tue Sep 25
02:15:04 2007
@@ -35,18 +35,20 @@
               <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
               <package>org.apache.felix:maven-bundle-plugin:bundle</package>
               <install>
-                org.apache.maven.plugins:maven-install-plugin:install,
-                org.apache.felix:maven-obr-plugin:repository
+                org.apache.maven.plugins:maven-install-plugin:install<!--,
+REMOVED         org.apache.felix:maven-obr-plugin:repository-->
               </install>
               <deploy>
-                org.apache.maven.plugins:maven-deploy-plugin:deploy,
-                org.apache.felix:maven-obr-plugin:deployment
+                org.apache.maven.plugins:maven-deploy-plugin:deploy<!--,
+REMOVED         org.apache.felix:maven-obr-plugin:deployment-->
               </deploy>
             </phases>
+<!--
             <optional-mojos>
               <optional-mojo>org.apache.felix:maven-obr-plugin:repository</optional-mojo>
               <optional-mojo>org.apache.felix:maven-obr-plugin:deployment</optional-mojo>
             </optional-mojos>
+-->
             <!-- END SNIPPET: bundle-lifecycle -->
           </lifecycle>
         </lifecycles>



Mime
View raw message