commit 0f0b663c2b4416988d5f28b31c11d7319c64626b
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Dec 10 13:22:46 2010 +0100
Remove jackrabbit dependency from pom files
- Add conditional BRs to enable ff merge between f14 and f15
maven2-2.2.1-strip-jackrabbit-dep.patch | 38 +++++++++++++++++++++++++++++++
maven2.spec | 28 ++++++++++++++++++----
2 files changed, 61 insertions(+), 5 deletions(-)
---
diff --git a/maven2-2.2.1-strip-jackrabbit-dep.patch
b/maven2-2.2.1-strip-jackrabbit-dep.patch
new file mode 100644
index 0000000..110e8d9
--- /dev/null
+++ b/maven2-2.2.1-strip-jackrabbit-dep.patch
@@ -0,0 +1,38 @@
+diff --git a/maven-core/pom.xml b/maven-core/pom.xml
+index e1bcb30..d0d0a7d 100644
+--- a/maven-core/pom.xml
++++ b/maven-core/pom.xml
+@@ -63,17 +63,6 @@
+ </exclusions>
+ </dependency>
+ <dependency>
+- <groupId>org.apache.maven.wagon</groupId>
+- <artifactId>wagon-webdav-jackrabbit</artifactId>
+- <scope>runtime</scope>
+- <exclusions>
+- <exclusion>
+- <groupId>commons-logging</groupId>
+- <artifactId>commons-logging</artifactId>
+- </exclusion>
+- </exclusions>
+- </dependency>
+- <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <scope>runtime</scope>
+diff --git a/pom.xml b/pom.xml
+index 3fe31f5..e2f7bdb 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -442,11 +442,6 @@ under the License.
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+- <artifactId>wagon-webdav-jackrabbit</artifactId>
+- <version>${wagonVersion}</version>
+- </dependency>
+- <dependency>
+- <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http</artifactId>
+ <version>${wagonVersion}</version>
+ </dependency>
diff --git a/maven2.spec b/maven2.spec
index fa9014c..0d1acc0 100644
--- a/maven2.spec
+++ b/maven2.spec
@@ -3,7 +3,7 @@
Name: maven2
Version: 2.2.1
-Release: 16%{?dist}
+Release: 17%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Build Tools
@@ -58,6 +58,7 @@ Patch2: %{name}-%{version}-update-tests.patch
Patch3: %{name}-%{version}-enable-bootstrap-repo.patch
Patch4: %{name}-%{version}-unshade.patch
Patch5: %{name}-%{version}-default-resolver-pool-size.patch
+Patch6: %{name}-%{version}-strip-jackrabbit-dep.patch
BuildRequires: java-devel >= 1.6.0
BuildRequires: classworlds
@@ -72,14 +73,19 @@ BuildRequires: backport-util-concurrent
BuildRequires: buildnumber-maven-plugin
BuildRequires: bsh
BuildRequires: jsch
-BuildRequires: apache-commons-cli
BuildRequires: apache-commons-codec
-BuildRequires: apache-commons-collections
BuildRequires: jakarta-commons-httpclient
BuildRequires: apache-commons-io
BuildRequires: apache-commons-lang
BuildRequires: apache-commons-logging
+%if ! (0%{?fedora} > 14 || 0%{?rhel} > 6)
+BuildRequires: jakarta-commons-cli
+BuildRequires: jakarta-commons-collections
+%else
+BuildRequires: apache-commons-cli
+BuildRequires: apache-commons-collections
BuildRequires: apache-commons-parent
+%endif
BuildRequires: easymock
BuildRequires: junit
BuildRequires: nekohtml
@@ -151,14 +157,19 @@ Requires: objectweb-asm
Requires: backport-util-concurrent
Requires: bsh
Requires: jsch
-Requires: apache-commons-cli
Requires: apache-commons-codec
-Requires: apache-commons-collections
Requires: jakarta-commons-httpclient
Requires: apache-commons-io
Requires: apache-commons-lang
Requires: apache-commons-logging
+%if ! (0%{?fedora} > 14 || 0%{?rhel} > 6)
+Requires: jakarta-commons-cli
+Requires: jakarta-commons-collections
+%else
+Requires: apache-commons-cli
+Requires: apache-commons-collections
Requires: apache-commons-parent
+%endif
Requires: easymock
Requires: junit
Requires: nekohtml
@@ -270,6 +281,9 @@ cp %{SOURCE102}
maven-artifact/src/main/java/org/apache/maven/artifact/repositor
# disable parallel artifact resolution
%patch5 -p1 -b .parallel-artifacts-resolution
+# remove unneeded jackrabbit dependency
+%patch6 -p1 -b .strip-jackrabbit-dep
+
# test case is incorrectly assuming that target executed by antcall
# can propagate references to its parent (stopped working with ant 1.8)
rm
maven-script/maven-script-ant/src/test/java/org/apache/maven/script/ant/AntMojoWrapperTest.java
@@ -504,6 +518,10 @@ rm -rf $RPM_BUILD_ROOT
%doc
%changelog
+* Fri Dec 10 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.1-17
+- Add conditional BRs to enable ff merge between f14 and f15
+- Remove jackrabbit dependency from pom files
+
* Fri Dec 10 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.1-16
- Fix installation of pom files for artifact jars
Show replies by date