You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2008/08/28 00:11:14 UTC

svn commit: r689642 - in /tuscany/java/sca: modules/pom.xml tools/maven/maven-tuscany-bundle-plugin/pom.xml tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java

Author: rfeng
Date: Wed Aug 27 15:11:13 2008
New Revision: 689642

URL: http://svn.apache.org/viewvc?rev=689642&view=rev
Log:
Move to maven-bundle-plugin 1.4.3 and make tuscany-bundle-plugin more tolerate problematic poms

Modified:
    tuscany/java/sca/modules/pom.xml
    tuscany/java/sca/tools/maven/maven-tuscany-bundle-plugin/pom.xml
    tuscany/java/sca/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java

Modified: tuscany/java/sca/modules/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/pom.xml?rev=689642&r1=689641&r2=689642&view=diff
==============================================================================
--- tuscany/java/sca/modules/pom.xml (original)
+++ tuscany/java/sca/modules/pom.xml Wed Aug 27 15:11:13 2008
@@ -214,7 +214,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.0</version>
+                <version>1.4.3</version>
                 <extensions>true</extensions>
                 <executions>
                     <execution>

Modified: tuscany/java/sca/tools/maven/maven-tuscany-bundle-plugin/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/tools/maven/maven-tuscany-bundle-plugin/pom.xml?rev=689642&r1=689641&r2=689642&view=diff
==============================================================================
--- tuscany/java/sca/tools/maven/maven-tuscany-bundle-plugin/pom.xml (original)
+++ tuscany/java/sca/tools/maven/maven-tuscany-bundle-plugin/pom.xml Wed Aug 27 15:11:13 2008
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
-            <version>1.4.1</version>
+            <version>1.4.3</version>
         </dependency>        
         
         

Modified: tuscany/java/sca/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java?rev=689642&r1=689641&r2=689642&view=diff
==============================================================================
--- tuscany/java/sca/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java (original)
+++ tuscany/java/sca/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java Wed Aug 27 15:11:13 2008
@@ -296,7 +296,14 @@
 
             artifact.setFile(getFile( artifact ));
             
-            MavenProject bundleProject = mavenProjectBuilder.buildFromRepository(artifact, remoteRepositories, localRepository, true);
+            MavenProject bundleProject;
+            try {
+                bundleProject =
+                    mavenProjectBuilder.buildFromRepository(artifact, remoteRepositories, localRepository, true);
+            } catch (Exception e) {
+                getLog().error(e);
+                continue;
+            }
             bundleProject.setArtifact(artifact);
             
             if ( bundleProject.getDependencyArtifacts() == null ) {