[java-sig-commits] [maven-shared] Remove exact version dependency on artifact-filters

[Stanislav Ochotnicky]

commit 104380130fc4cd9fa4e605e8ffae3ec7fc832fbb
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Wed Feb 29 11:48:01 2012 +0100

    Remove exact version dependency on artifact-filters

 ...hared-Add-container-default-to-shared-jar.patch |   29 ++++++++++++++++++++
 maven-shared.spec                                  |   14 +++++++---
 2 files changed, 39 insertions(+), 4 deletions(-)
---
diff --git a/maven-shared-Add-container-default-to-shared-jar.patch b/maven-shared-Add-container-default-to-shared-jar.patch
new file mode 100644
index 0000000..fc74b05
--- /dev/null
+++ b/maven-shared-Add-container-default-to-shared-jar.patch
@@ -0,0 +1,29 @@
+From 2d3b2c4f68b985027d2734aef7eda17ce00315b1 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Wed, 29 Feb 2012 16:02:15 +0100
+Subject: [PATCH 5/5] Add container default to shared-jar
+
+---
+ maven-shared-jar/pom.xml |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/maven-shared-jar/pom.xml b/maven-shared-jar/pom.xml
+index 1cc0937..6e829dc 100644
+--- a/maven-shared-jar/pom.xml
++++ b/maven-shared-jar/pom.xml
+@@ -61,6 +61,12 @@
+ 
+     <dependency>
+       <groupId>org.codehaus.plexus</groupId>
++      <artifactId>plexus-container-default</artifactId>
++      <version>1.0</version>
++    </dependency>
++
++    <dependency>
++      <groupId>org.codehaus.plexus</groupId>
+       <artifactId>plexus-digest</artifactId>
+       <version>1.0</version>
+     </dependency>
+-- 
+1.7.7.6
+
diff --git a/maven-shared.spec b/maven-shared.spec
index 04f1aec..2936db9 100644
--- a/maven-shared.spec
+++ b/maven-shared.spec
@@ -67,7 +67,7 @@ Summary:        Maven Shared Components
 URL:            http://maven.apache.org/shared/
 Name:           maven-shared
 Version:        15
-Release:        22%{?dist}
+Release:        23%{?dist}
 License:        ASL 2.0
 Group:          Development/Libraries
 
@@ -81,7 +81,8 @@ Patch0:        %{name}-pom.patch
 Patch1:        %{name}-maven3.patch
 Patch2:        %{name}-maven-model-v3-removal.patch
 Patch3:        %{name}-migration-to-component-metadata.patch
-Patch6:        maven-runtime-XMLMavenRuntimeVisitor.patch
+Patch6:         maven-runtime-XMLMavenRuntimeVisitor.patch
+Patch7:         maven-shared-Add-container-default-to-shared-jar.patch
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  ant
@@ -279,7 +280,7 @@ Summary:        Maven Repository Builder
 Group:          Development/Libraries
 Version:        %{repository_builder_version}
 Requires:  %{name} = 0:%{shared_components_version}-%{release}
-Requires:  %{name}-common-artifact-filters = 0:%{common_artifact_filters_version}-%{release}
+Requires:  %{name}-common-artifact-filters >= 0:%{common_artifact_filters_version}-%{release}
 Requires:  maven
 Requires:  maven-artifact-manager
 Requires:  maven-project
@@ -322,7 +323,7 @@ Group:          Development/Libraries
 Version:        %{monitor_version}
 Requires:  %{name} = 0:%{shared_components_version}-%{release}
 Requires:  maven
-Requires:  plexus-container-default
+Requires:  plexus-containers-container-default
 
 %description monitor
 %{summary}.
@@ -395,6 +396,7 @@ chmod -R go=u-w *
 %patch6 -b .sav6
 %patch2 -p1
 %patch3 -p1
+%patch7 -p1
 
 # Fix aqute-bnd dependency
 sed -i "s|<artifactId>bndlib|<artifactId>bnd|g" maven-osgi/pom.xml
@@ -627,6 +629,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Feb 29 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> 15-23
+- Remove exact version dependency on artifact-filters
+- Fix missing plexus-container-default in pom for shared-jar
+
 * Sat Jan 14 2012 Ville Skyttä <ville.skytta at iki.fi> - 15-22
 - Require apache-commons-validator instead of jakarta-* in reporting-impl.