commit 6fb838be228b617f4d9b042a2aea26ea60bd5fbb Author: Mikolaj Izdebski mizdebsk@redhat.com Date: Thu Nov 7 08:26:09 2013 +0100
Port to Commons Collections 1.10
0001-Update-to-Commons-Collections-1.10.patch | 32 +++++++++++++++++++++++++ maven-doxia.spec | 8 +++++- 2 files changed, 39 insertions(+), 1 deletions(-) --- diff --git a/0001-Update-to-Commons-Collections-1.10.patch b/0001-Update-to-Commons-Collections-1.10.patch new file mode 100644 index 0000000..769efb9 --- /dev/null +++ b/0001-Update-to-Commons-Collections-1.10.patch @@ -0,0 +1,32 @@ +From 81d4838fefbf7a87dc46eb5a55b18e77320b7884 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski mizdebsk@redhat.com +Date: Thu, 7 Nov 2013 08:24:01 +0100 +Subject: [PATCH] Update to Commons Collections 1.10 + +--- + doxia-modules/doxia-module-fo/pom.xml | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/doxia-modules/doxia-module-fo/pom.xml b/doxia-modules/doxia-module-fo/pom.xml +index 1adb4f0..75ff692 100644 +--- a/doxia-modules/doxia-module-fo/pom.xml ++++ b/doxia-modules/doxia-module-fo/pom.xml +@@ -73,7 +73,14 @@ under the License. + <dependency> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> +- <version>1.6</version> ++ <version>1.10</version> ++ </dependency> ++ <dependency> ++ <groupId>commons-collections</groupId> ++ <artifactId>commons-collections</artifactId> ++ <version>3.2.1</version> ++ <!-- runtime dep for commons-configuration --> ++ <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> +-- +1.8.1.4 + diff --git a/maven-doxia.spec b/maven-doxia.spec index da438ae..802f3d6 100644 --- a/maven-doxia.spec +++ b/maven-doxia.spec @@ -35,7 +35,7 @@
Name: maven-doxia Version: 1.4 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 0 Summary: Content generation framework License: ASL 2.0 @@ -56,6 +56,8 @@ Patch2: 0004-Fix-itext-dependency.patch
Patch3: 0001-Update-to-Plexus-Container-1.5.5.patch
+Patch4: 0001-Update-to-Commons-Collections-1.10.patch + BuildArch: noarch
BuildRequires: java >= 1:1.6.0 @@ -245,6 +247,7 @@ API documentation for %{name}. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1
# we don't have clirr-maven-plugin %pom_remove_plugin org.codehaus.mojo:clirr-maven-plugin pom.xml @@ -303,6 +306,9 @@ API documentation for %{name}.
%changelog +* Thu Nov 7 2013 Mikolaj Izdebski mizdebsk@redhat.com - 0:1.4-4 +- Port to Commons Collections 1.10 + * Wed Nov 6 2013 Mikolaj Izdebski mizdebsk@redhat.com - 0:1.4-3 - Enable tests
java-sig-commits@lists.fedoraproject.org