update to 2.3.5

.gitignore

@@ -1 +1,2 @@
 maven-bundle-plugin-2.0.0-project.tar.gz
+/maven-bundle-plugin-2.3.5-source-release.tar.gz

maven-bundle-plugin-exception-already-thrown.patch

@@ -0,0 +1,22 @@
+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() );

maven-bundle-plugin-unbundling.patch

@@ -0,0 +1,15 @@
+diff -Naur maven-bundle-plugin-2.3.5.orig/pom.xml maven-bundle-plugin-2.3.5/pom.xml
+--- maven-bundle-plugin-2.3.5.orig/pom.xml	2011-07-05 13:56:06.000000000 +0200
++++ maven-bundle-plugin-2.3.5/pom.xml	2011-10-25 17:29:47.237943990 +0200
+@@ -85,6 +85,11 @@
+    <version>1.2</version>
+   </dependency>
+   <dependency>
++   <groupId>org.apache.maven.shared</groupId>
++   <artifactId>maven-osgi</artifactId>
++   <version>0.3.0</version>
++  </dependency>
++  <dependency>
+    <groupId>org.codehaus.plexus</groupId>
+    <artifactId>plexus-utils</artifactId>
+    <version>2.1</version>

maven-plugin-bundle.spec

@@ -1,13 +1,19 @@
+%global site_name maven-bundle-plugin
+
 Name:           maven-plugin-bundle
-Version:        2.0.0
+Version:        2.3.5
-Release:        11%{?dist}
+Release:        1%{?dist}
 Summary:        Maven Bundle Plugin
 
 Group:          Development/Tools
 License:        ASL 2.0
 URL:            http://felix.apache.org
-Source0:        http://www.apache.org/dist/felix/maven-bundle-plugin-2.0.0-project.tar.gz
+Source0:        http://apache.tradebit.com/pub/felix/%{site_name}-%{version}-source-release.tar.gz
-BuildRequires: aqute-bnd >= 0.0.363
+
+Patch0:         %{site_name}-unbundling.patch
+Patch1:         %{site_name}-exception-already-thrown.patch
+
+BuildRequires: aqute-bndlib >= 1.43.0
 BuildRequires: plexus-utils >= 1.4.5
 BuildRequires: felix-osgi-obr
 BuildRequires: kxml
@@ -23,8 +29,11 @@ BuildRequires: maven-resources-plugin
 BuildRequires: maven-surefire-plugin >= 2.3
 BuildRequires: maven-surefire-provider-junit4 >= 2.3
 BuildRequires: maven-doxia-sitetools
+BuildRequires: maven-shared-osgi
 BuildRequires: felix-parent
-Requires: aqute-bnd >= 0.0.363
+BuildRequires: felix-bundlerepository
+
+Requires: aqute-bndlib >= 1.43.0
 Requires: plexus-utils >= 1.4.5
 Requires: felix-osgi-obr
 Requires: kxml
@@ -32,9 +41,11 @@ Requires: maven
 Requires: maven-archiver
 Requires: maven-shared-dependency-tree
 Requires: maven-wagon
+Requires: maven-shared-osgi
 Requires: plexus-archiver
 Requires: plexus-containers-container-default
 Requires: felix-parent
+Requires: felix-bundlerepository
 
 BuildArch: noarch
 
@@ -53,40 +64,47 @@ Requires:       jpackage-utils
 API documentation for %{name}.
 
 %prep
-%setup -q -n maven-bundle-plugin-%{version}
+%setup -q -n %{site_name}-%{version}
 
-sed -i 's/<artifactId>bndlib/<artifactId>bnd/g' pom.xml
+%patch0 -p1
+%patch1 -p1
+
+# remove bundled stuff
+rm -rf src/main/java/org/apache/maven
+rm -rf src/main/java/org/apache/felix/obrplugin
 
 %build
-mvn-rpmbuild install javadoc:javadoc
+# tests can't be built (seems like a MavenProjectStub incompatibility with MavenProject)
+mvn-rpmbuild install javadoc:aggregate -Dmaven.test.skip=true
 
 %install
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/maven-bundle-plugin-%{version}.jar \
+install -m 644 target/maven-bundle-plugin-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-  $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-%add_to_maven_depmap org.apache.felix maven-bundle-plugin %{version} JPP %{name}
 
 # poms
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml \
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-    %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
 # javadoc
 install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 rm -rf target/site/api*
 
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
 %files
-%{_javadir}/*
+%{_javadir}/%{name}.jar
-%{_mavenpomdir}/*
+%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/*
+%{_mavendepmapfragdir}/%{name}
 
 %files javadoc
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Oct 24 2011 Jaromir Capik <jcapik@redhat.com> 2.3.5-1
+- Update to 2.3.5
+
 * Tue Oct 17 2011 Jaromir Capik <jcapik@redhat.com> 2.0.0-11
 - aqute-bndlib renamed to aqute-bnd
 

sources

@@ -1 +1 @@
-de97b6f6b92b7ebef33000f4ed31ebb1  maven-bundle-plugin-2.0.0-project.tar.gz
+051b3096fa2a5ab98320b61b27cf38b3  maven-bundle-plugin-2.3.5-source-release.tar.gz