diff options
| author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2008-08-27 22:11:13 +0000 |
|---|---|---|
| committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2008-08-27 22:11:13 +0000 |
| commit | 7afc1ec042bf421955c6a01a04ee3688cef4a57f (patch) | |
| tree | 7cf9b883ed523120454cf75f730cd674edad81af | |
| parent | e4a235bb7db97beeb5e5e5b38496dc867cc94a2b (diff) | |
Move to maven-bundle-plugin 1.4.3 and make tuscany-bundle-plugin more tolerate problematic poms
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@689642 13f79535-47bb-0310-9956-ffa450edef68
3 files changed, 10 insertions, 3 deletions
diff --git a/java/sca/modules/pom.xml b/java/sca/modules/pom.xml index 032f152fec..aaceb5af70 100644 --- a/java/sca/modules/pom.xml +++ b/java/sca/modules/pom.xml @@ -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> diff --git a/java/sca/tools/maven/maven-tuscany-bundle-plugin/pom.xml b/java/sca/tools/maven/maven-tuscany-bundle-plugin/pom.xml index b7eec4f2aa..c6e972f044 100644 --- a/java/sca/tools/maven/maven-tuscany-bundle-plugin/pom.xml +++ b/java/sca/tools/maven/maven-tuscany-bundle-plugin/pom.xml @@ -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> diff --git a/java/sca/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java b/java/sca/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java index 726188a5d5..0e23593d13 100644 --- a/java/sca/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java +++ b/java/sca/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java @@ -296,7 +296,14 @@ public class TuscanyBundlePluginMojo extends BundleAllPlugin { 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 ) { |