From c403601628649a274e1909e4e9b3cd7f1734f612 Mon Sep 17 00:00:00 2001
From: Jaromir Capik <jcapik@redhat.com>
Date: Wed, 21 Dec 2011 16:34:55 +0100
Subject: [PATCH] Update to 2.3.6

---
 .gitignore                                    |  1 +
 ...ndle-plugin-exception-already-thrown.patch | 22 -------------------
 maven-plugin-bundle.spec                      | 17 ++++++++------
 sources                                       |  2 +-
 4 files changed, 12 insertions(+), 30 deletions(-)
 delete mode 100644 maven-bundle-plugin-exception-already-thrown.patch

diff --git a/.gitignore b/.gitignore
index b3009a6..8f08f15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 maven-bundle-plugin-2.0.0-project.tar.gz
 /maven-bundle-plugin-2.3.5-source-release.tar.gz
+/maven-bundle-plugin-2.3.6-source-release.tar.gz
diff --git a/maven-bundle-plugin-exception-already-thrown.patch b/maven-bundle-plugin-exception-already-thrown.patch
deleted file mode 100644
index 85fd62a..0000000
--- a/maven-bundle-plugin-exception-already-thrown.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur maven-bundle-plugin-2.3.5.orig/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java maven-bundle-plugin-2.3.5/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java
---- maven-bundle-plugin-2.3.5.orig/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java	2011-07-05 13:56:06.000000000 +0200
-+++ maven-bundle-plugin-2.3.5/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java	2011-10-26 13:11:10.904188217 +0200
-@@ -271,14 +271,14 @@
-                     childProject.setDependencyArtifacts( childProject.createArtifacts( m_factory, null, null ) );
-                 }
-             }
--            catch ( ProjectBuildingException e )
--            {
--                throw new MojoExecutionException( "Unable to build project object for artifact " + artifact, e );
--            }
-             catch ( InvalidDependencyVersionException e )
-             {
-                 throw new MojoExecutionException( "Invalid dependency version for artifact " + artifact );
-             }
-+            catch ( ProjectBuildingException e )
-+            {
-+                throw new MojoExecutionException( "Unable to build project object for artifact " + artifact, e );
-+            }
- 
-             childProject.setArtifact( artifact );
-             getLog().debug( "Child project artifact location: " + childProject.getArtifact().getFile() );
diff --git a/maven-plugin-bundle.spec b/maven-plugin-bundle.spec
index 3e6f2f5..e296369 100644
--- a/maven-plugin-bundle.spec
+++ b/maven-plugin-bundle.spec
@@ -1,8 +1,8 @@
 %global site_name maven-bundle-plugin
 
 Name:           maven-plugin-bundle
-Version:        2.3.5
-Release:        3%{?dist}
+Version:        2.3.6
+Release:        1%{?dist}
 Summary:        Maven Bundle Plugin
 
 Group:          Development/Tools
@@ -11,10 +11,9 @@ URL:            http://felix.apache.org
 Source0:        http://apache.tradebit.com/pub/felix/%{site_name}-%{version}-source-release.tar.gz
 
 Patch0:         %{site_name}-unbundling.patch
-Patch1:         %{site_name}-exception-already-thrown.patch
-Patch2:         %{site_name}-unreported-exception.patch
+Patch1:         %{site_name}-unreported-exception.patch
 
-BuildRequires: aqute-bndlib >= 1.43.0-2
+BuildRequires: aqute-bndlib >= 1.50.0
 BuildRequires: plexus-utils >= 1.4.5
 BuildRequires: felix-osgi-obr
 BuildRequires: kxml
@@ -34,7 +33,7 @@ BuildRequires: maven-shared-osgi
 BuildRequires: felix-parent
 BuildRequires: felix-bundlerepository
 
-Requires: aqute-bndlib >= 1.43.0-2
+Requires: aqute-bndlib >= 1.50.0
 Requires: plexus-utils >= 1.4.5
 Requires: felix-osgi-obr
 Requires: kxml
@@ -69,7 +68,6 @@ API documentation for %{name}.
 
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 # remove bundled stuff
 rm -rf src/main/java/org/apache/maven
@@ -95,14 +93,19 @@ rm -rf target/site/api*
 %add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 %files
+%doc LICENSE NOTICE DEPENDENCIES
 %{_javadir}/%{name}.jar
 %{_mavenpomdir}/JPP-%{name}.pom
 %{_mavendepmapfragdir}/%{name}
 
 %files javadoc
+%doc LICENSE
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Dec 21 2011 Jaromir Capik <jcapik@redhat.com> 2.3.6-1
+- Update to 2.3.6
+
 * Mon Dec 19 2011 Jaromir Capik <jcapik@redhat.com> 2.3.5-3
 - Minimal aqute-bndlib VR set to 1.43.0-2 (older ones are broken)
 
diff --git a/sources b/sources
index fcc129f..a585c7d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-051b3096fa2a5ab98320b61b27cf38b3  maven-bundle-plugin-2.3.5-source-release.tar.gz
+dfcff705fd35b5a96d95752134d9c493  maven-bundle-plugin-2.3.6-source-release.tar.gz