[maven-plugin-bundle] Add kxml2 to pom as a dependency

Stanislav Ochotnicky sochotni at fedoraproject.org
Mon May 21 12:17:33 UTC 2012


commit ae1504eea019e498b2993f62735aa28e46a86b1b
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Mon May 21 13:54:46 2012 +0200

    Add kxml2 to pom as a dependency

 maven-bundle-plugin-dependency.patch |   16 ++++++++++++++++
 maven-plugin-bundle.spec             |    9 ++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)
---
diff --git a/maven-bundle-plugin-dependency.patch b/maven-bundle-plugin-dependency.patch
new file mode 100644
index 0000000..ecb7076
--- /dev/null
+++ b/maven-bundle-plugin-dependency.patch
@@ -0,0 +1,16 @@
+diff --git a/pom.xml b/pom.xml
+index 16880b5..cd5e6ec 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -65,6 +65,11 @@
+     <version>1.50.0</version>
+   </dependency>
+   <dependency>
++    <groupId>net.sf.kxml</groupId>
++    <artifactId>kxml2</artifactId>
++    <version>2.2.2</version>
++  </dependency>
++  <dependency>
+     <groupId>org.apache.felix</groupId>
+     <artifactId>org.apache.felix.bundlerepository</artifactId>
+     <version>1.6.6</version>
diff --git a/maven-plugin-bundle.spec b/maven-plugin-bundle.spec
index 7f8f7a8..75aa0b5 100644
--- a/maven-plugin-bundle.spec
+++ b/maven-plugin-bundle.spec
@@ -2,7 +2,7 @@
 
 Name:           maven-plugin-bundle
 Version:        2.3.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Maven Bundle Plugin
 
 Group:          Development/Tools
@@ -10,7 +10,7 @@ License:        ASL 2.0
 URL:            http://felix.apache.org
 Source0:        http://apache.tradebit.com/pub/felix/%{site_name}-%{version}-source-release.tar.gz
 
-#Patch0:         %{site_name}-unbundling.patch
+Patch0:         %{site_name}-dependency.patch
 Patch1:         %{site_name}-unreported-exception.patch
 
 BuildRequires: aqute-bndlib >= 1.50.0
@@ -69,7 +69,7 @@ API documentation for %{name}.
 %prep
 %setup -q -n %{site_name}-%{version}
 
-#%%patch0 -p1
+%patch0 -p1
 %patch1 -p1
 
 # remove bundled stuff
@@ -106,6 +106,9 @@ rm -rf target/site/api*
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon May 21 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.3.7-3
+- Add kxml2 to pom as a dependency
+
 * Mon Apr 30 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.3.7-2
 - Add missing BuildRequires
 


More information about the scm-commits mailing list