[java-sig-commits] [maven-shared] Remove filtering subpackage (separate package now)

[Stanislav Ochotnicky]

commit cf969812877e10d20bb8ca1f433f243b6d243277
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com&gt;
Date:   Wed Aug 31 13:27:39 2011 +0200

    Remove filtering subpackage (separate package now)

 maven-shared.spec |   33 ++++-----------------------------
 1 files changed, 4 insertions(+), 29 deletions(-)
---
diff --git a/maven-shared.spec b/maven-shared.spec
index 36e2967..4276fba 100644
--- a/maven-shared.spec
+++ b/maven-shared.spec
@@ -39,7 +39,6 @@
 %global dependency_tree_version 1.3
 %global downloader_version 1.2
 
-%global filtering_version 1.0
 
 %global invoker_version 2.0.12
 %global model_converter_version 2.3
@@ -67,7 +66,7 @@ Summary:        Maven Shared Components
 URL:            http://maven.apache.org/shared/
 Name:           maven-shared
 Version:        15
-Release:        17%{?dist}
+Release:        18%{?dist}
 License:        ASL 2.0
 Group:          Development/Libraries
 
@@ -361,23 +360,6 @@ Requires:  maven-project
 %description artifact-resolver
 Provides a component for plugins to easily resolve project dependencies.
 
-%package filtering
-Summary:        Maven Filtering
-Group:          Development/Libraries
-Version:        %{filtering_version}
-Requires:  %{name} = 0:%{shared_components_version}-%{release}
-Requires:  ant
-Requires:  maven
-Requires:  maven-project
-# this is not shared-monitor!
-Requires:  maven-monitor
-Requires:  plexus-utils
-Requires:  plexus-build-api
-Requires:  plexus-interpolation
-
-%description filtering
-A component to assist in filtering of resource files with properties from a Maven
project.
-
 %package reporting-api
 Summary:        Maven Reporting API
 Group:          Development/Libraries
@@ -522,11 +504,6 @@ install -p -m 0644
maven-artifact-resolver/target/maven-artifact-resolver-%{arti
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/artifact-resolver.jar
 %add_maven_depmap -f artifact-resolver JPP.%{name}-artifact-resolver.pom
%{name}/artifact-resolver.jar
 
-install -pm 644 maven-filtering/pom.xml
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-filtering.pom
-install -p -m 0644
maven-filtering/target/maven-filtering-%{filtering_version}-beta-4-SNAPSHOT.jar \
-        $RPM_BUILD_ROOT%{_javadir}/maven-shared/filtering.jar
-%add_maven_depmap -f filtering JPP.%{name}-filtering.pom %{name}/filtering.jar
-
 install -pm 644 maven-reporting-api/pom.xml
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-reporting-api.pom
 install -p -m 0644
maven-reporting-api/target/maven-reporting-api-%{reporting_api_version}-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/reporting-api.jar
@@ -632,11 +609,6 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name}
|| :
 %{_mavenpomdir}/JPP.%{name}-artifact-resolver.pom
 %{_mavendepmapfragdir}/%{name}-artifact-resolver
 
-%files filtering
-%{_javadir}/%{name}/filtering.jar
-%{_mavenpomdir}/JPP.%{name}-filtering.pom
-%{_mavendepmapfragdir}/%{name}-filtering
-
 %files reporting-api
 %{_javadir}/%{name}/reporting-api.jar
 %{_mavenpomdir}/JPP.%{name}-reporting-api.pom
@@ -651,6 +623,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} ||
:
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Aug 31 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com&gt; - 15-18
+- Remove filtering subpackage (separate package now)
+
 * Mon Aug 22 2011 Jaromir Capik <jcapik(a)redhat.com&gt; - 15-17
 - Migration from plexus-maven-plugin to plexus-containers-component-metadata
 - Minor spec file changes according to the latest guidelines