[java-sig-commits] [maven-plugin-bundle] OBR plugin readded (it's been merged to the bundle plugin)

[Jaromír Cápík]

commit f6ba1c6fc6be1c226c2f57cc091ae3511b7396a5
Author: Jaromir Capik <jcapik at redhat.com>
Date:   Mon Nov 14 18:37:27 2011 +0100

    OBR plugin readded (it's been merged to the bundle plugin)

 maven-bundle-plugin-unreported-exception.patch |   13 +++++++++++++
 maven-plugin-bundle.spec                       |    8 ++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/maven-bundle-plugin-unreported-exception.patch b/maven-bundle-plugin-unreported-exception.patch
new file mode 100644
index 0000000..9b6014f
--- /dev/null
+++ b/maven-bundle-plugin-unreported-exception.patch
@@ -0,0 +1,13 @@
+diff -Naur maven-bundle-plugin-2.3.5.orig/src/main/java/org/apache/felix/obrplugin/RemoteFileManager.java maven-bundle-plugin-2.3.5/src/main/java/org/apache/felix/obrplugin/RemoteFileManager.java
+--- maven-bundle-plugin-2.3.5.orig/src/main/java/org/apache/felix/obrplugin/RemoteFileManager.java	2011-07-05 13:56:05.000000000 +0200
++++ maven-bundle-plugin-2.3.5/src/main/java/org/apache/felix/obrplugin/RemoteFileManager.java	2011-11-14 18:21:26.878801248 +0100
+@@ -125,6 +125,9 @@
+         {
+             throw new MojoExecutionException( "Unable to configure Wagon: '" + repository.getProtocol() + "'", e );
+         }
++        catch ( Exception e )
++        {
++        }
+ 
+         try
+         {
diff --git a/maven-plugin-bundle.spec b/maven-plugin-bundle.spec
index e3bf9d5..351aba7 100644
--- a/maven-plugin-bundle.spec
+++ b/maven-plugin-bundle.spec
@@ -2,7 +2,7 @@
 
 Name:           maven-plugin-bundle
 Version:        2.3.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Maven Bundle Plugin
 
 Group:          Development/Tools
@@ -12,6 +12,7 @@ Source0:        http://apache.tradebit.com/pub/felix/%{site_name}-%{version}-sou
 
 Patch0:         %{site_name}-unbundling.patch
 Patch1:         %{site_name}-exception-already-thrown.patch
+Patch2:         %{site_name}-unreported-exception.patch
 
 BuildRequires: aqute-bndlib >= 1.43.0
 BuildRequires: plexus-utils >= 1.4.5
@@ -68,10 +69,10 @@ API documentation for %{name}.
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # remove bundled stuff
 rm -rf src/main/java/org/apache/maven
-rm -rf src/main/java/org/apache/felix/obrplugin
 
 %build
 # tests can't be built (seems like a MavenProjectStub incompatibility with MavenProject)
@@ -102,6 +103,9 @@ rm -rf target/site/api*
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Nov 14 2011 Jaromir Capik <jcapik at redhat.com> 2.3.5-2
+- OBR plugin readded (it's been merged to the bundle plugin)
+
 * Mon Oct 24 2011 Jaromir Capik <jcapik at redhat.com> 2.3.5-1
 - Update to 2.3.5