[maven-shared/f18: 2/2] Removed ant, artifact-resolver, common-artifact-filters, dependency-tree, model-converter, runtime

Tomas Radej tradej at fedoraproject.org
Mon Dec 3 15:37:50 UTC 2012 

commit 9a749fa410677d3293eb521d0364cbb38cae6b3c
Author: Tomas Radej <tradej at redhat.com>
Date:   Fri Nov 30 14:05:12 2012 +0100

    Removed ant, artifact-resolver, common-artifact-filters, dependency-tree, model-converter, runtime

 maven-runtime-XMLMavenRuntimeVisitor.patch         |   13 -
 ...hared-Add-container-default-to-shared-jar.patch |   29 ---
 maven-shared-maven-model-v3-removal.patch          |   22 --
 maven-shared-maven3.patch                          |  169 --------------
 maven-shared-migration-to-component-metadata.patch |  233 --------------------
 maven-shared-pom.patch                             |   21 --
 maven-shared.spec                                  |  195 +++--------------
 7 files changed, 31 insertions(+), 651 deletions(-)
---
diff --git a/maven-shared.spec b/maven-shared.spec
index 7723429..3688126 100644
--- a/maven-shared.spec
+++ b/maven-shared.spec
@@ -30,18 +30,11 @@
 
 %global shared_components_version 15
 %global file_management_version 1.2.2
-%global ant_version 1.0
 
-%global artifact_resolver_version 1.1
-
-%global common_artifact_filters_version 1.3
 %global dependency_analyzer_version 1.2
-%global dependency_tree_version 1.3
 %global downloader_version 1.2
 
-
 %global invoker_version 2.0.12
-%global model_converter_version 2.3
 %global osgi_version 0.3.0
 %global plugin_testing_harness_version 1.2
 
@@ -51,8 +44,6 @@
 %global reporting_impl_version 2.1
 %global repository_builder_version 1.0
 
-%global runtime_version 1.0
-
 %global io_version 1.2
 %global jar_version 1.1
 %global monitor_version 1.0
@@ -67,7 +58,7 @@ Summary:        Maven Shared Components
 URL:            http://maven.apache.org/shared/
 Name:           maven-shared
 Version:        15
-Release:        26%{?dist}
+Release:        27%{?dist}
 License:        ASL 2.0
 Group:          Development/Libraries
 
@@ -77,13 +68,6 @@ Group:          Development/Libraries
 Source0:        maven-shared-components-%{version}.tar.gz
 Source1:        %{name}-jpp-depmap.xml
 
-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
-Patch7:         maven-shared-Add-container-default-to-shared-jar.patch
-
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  ant
 BuildRequires:  maven
@@ -168,46 +152,6 @@ Requires:  maven-project
 %description osgi
 Library for Maven-OSGi integration
 
-%package ant
-Summary:        Maven Ant
-Group:          Development/Libraries
-Version:        %{ant_version}
-Requires:  %{name} = 0:%{shared_components_version}-%{release}
-Requires:  ant
-Requires:  plexus-containers-container-default
-Requires:  maven-project
-Requires:  maven
-
-%description ant
-Runs ant scripts embedded in the POM.
-
-%package common-artifact-filters
-Summary:        Maven Common Artifact Filters
-Group:          Development/Libraries
-Version:        %{common_artifact_filters_version}
-Requires:  %{name} = 0:%{shared_components_version}-%{release}
-Requires:  %{name}-test-tools >= 0:%{test_tools_version}-%{release}
-Requires:  junit
-Requires:  plexus-containers-container-default
-Requires:  plexus-utils
-Requires:  maven-project
-Requires:  maven
-
-%description common-artifact-filters
-%{summary}.
-
-%package dependency-tree
-Summary:        Maven Dependency Tree
-Group:          Development/Libraries
-Version:        %{dependency_tree_version}
-Requires:  %{name} = 0:%{shared_components_version}-%{release}
-Requires:  %{name}-plugin-testing-harness >= 0:%{plugin_testing_harness_version}-%{release}
-Requires:  maven
-Requires:  maven-project
-
-%description dependency-tree
-%{summary}.
-
 %package downloader
 Summary:        Maven Downloader
 Group:          Development/Libraries
@@ -245,20 +189,6 @@ Requires:  plexus-utils
 %description invoker
 %{summary}.
 
-%package model-converter
-Summary:        Maven Model Converter
-Group:          Development/Libraries
-Version:        %{model_converter_version}
-Requires:  %{name} = 0:%{shared_components_version}-%{release}
-Requires:  dom4j
-Requires:  maven
-Requires:  maven-model
-Requires:  plexus-containers-container-default
-Requires:  plexus-utils
-
-%description model-converter
-Converts between version 3.0.0 and version 4.0.0 models.
-
 %package reporting-impl
 Summary:        Maven Reporting Implementation
 Group:          Development/Libraries
@@ -350,19 +280,6 @@ Obsoletes:      %{name}-plugin-testing-harness-javadoc < %{epoch}:%{plugin_testi
 %description javadoc
 %{summary}.
 
-%package artifact-resolver
-Summary:        Maven Artifact Resolution API
-Group:          Development/Libraries
-Version:        %{artifact_resolver_version}
-Requires:  %{name} = 0:%{shared_components_version}-%{release}
-Requires:  ant
-Requires:  maven
-Requires:  maven-artifact-manager
-Requires:  maven-project
-
-%description artifact-resolver
-Provides a component for plugins to easily resolve project dependencies.
-
 %package reporting-api
 Summary:        Maven Reporting API
 Group:          Development/Libraries
@@ -375,29 +292,35 @@ Requires:  maven-doxia
 %description reporting-api
 Maven Reporting API.
 
-%package runtime
-Summary:        Maven Runtime
-Group:          Development/Libraries
-Version:        %{runtime_version}
-Requires:  %{name} = 0:%{shared_components_version}-%{release}
-Requires:  ant
-Requires:  maven
-Requires:  maven-project
-
-%description runtime
-Maven Runtime allows introspection of Maven project metadata at runtime.  Basic artifact information or full Maven
-project metadata can be obtained for all projects within a given class loader, optionally sorted into dependency
-order, and also for a given class within a project.
-
 %prep
 %setup -q -n %{name}-components-%{shared_components_version}
 chmod -R go=u-w *
-%patch0 -b .sav0
-%patch1 -p1 -b .sav1
-%patch6 -b .sav6
-%patch2 -p1
-%patch3 -p1
-%patch7 -p1
+
+# Disable plugins that are not needed or are packaged separately
+%pom_disable_module maven-ant
+%pom_disable_module maven-archiver
+%pom_disable_module maven-artifact-resolver
+%pom_disable_module maven-dependency-tree
+%pom_disable_module maven-doxia-tools
+%pom_disable_module maven-filtering
+%pom_disable_module maven-model-converter
+%pom_disable_module maven-runtime
+
+# Adding maven-reporting-api because otherwise it wouldn't build
+%pom_xpath_inject pom:modules '<module>maven-reporting-api</module>'
+
+# Adding missing dependencies to poms
+%pom_add_dep org.apache.maven:maven-core:3.0.3              maven-downloader/pom.xml
+%pom_add_dep org.apache.maven:maven-compat:3.0.3            maven-downloader/pom.xml
+%pom_add_dep org.apache.maven:maven-compat:3.0.3            maven-repository-builder/pom.xml
+%pom_add_dep org.apache.maven:maven-compat:3.0.3            maven-shared-io/pom.xml
+%pom_add_dep org.codehaus.plexus:plexus-container-default   maven-shared-jar/pom.xml
+
+# Replace plexus-maven-plugin with plexus-component-metadata
+find -name 'pom.xml' -exec sed \
+    -i 's/<artifactId>plexus-maven-plugin<\/artifactId>/<artifactId>plexus-component-metadata<\/artifactId>/' '{}' ';'
+find -name 'pom.xml' -exec sed \
+    -i 's/<goal>descriptor<\/goal>/<goal>generate-metadata<\/goal>/' '{}' ';'
 
 # Fix aqute-bnd dependency
 sed -i "s|<artifactId>bndlib|<artifactId>bnd|g" maven-osgi/pom.xml
@@ -441,11 +364,6 @@ install -p -m 0644 maven-dependency-analyzer/target/maven-dependency-analyzer-%{
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/dependency-analyzer.jar
 %add_maven_depmap -f dependency-analyzer JPP.%{name}-dependency-analyzer.pom %{name}/dependency-analyzer.jar
 
-install -pm 644 maven-dependency-tree/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-dependency-tree.pom
-install -p -m 0644 maven-dependency-tree/target/maven-dependency-tree-%{dependency_tree_version}-SNAPSHOT.jar \
-        $RPM_BUILD_ROOT%{_javadir}/maven-shared/dependency-tree.jar
-%add_maven_depmap -f dependency-tree JPP.%{name}-dependency-tree.pom %{name}/dependency-tree.jar
-
 install -pm 644 maven-verifier/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-verifier.pom
 install -p -m 0644 maven-verifier/target/maven-verifier-%{verifier_version}-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/verifier.jar
@@ -476,26 +394,11 @@ install -p -m 0644 maven-reporting-impl/target/maven-reporting-impl-%{reporting_
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/reporting-impl.jar
 %add_maven_depmap -f reporting-impl JPP.%{name}-reporting-impl.pom %{name}/reporting-impl.jar
 
-install -pm 644 maven-model-converter/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-model-converter.pom
-install -p -m 0644 maven-model-converter/target/maven-model-converter-%{model_converter_version}-SNAPSHOT.jar \
-        $RPM_BUILD_ROOT%{_javadir}/maven-shared/model-converter.jar
-%add_maven_depmap -f model-converter JPP.%{name}-model-converter.pom %{name}/model-converter.jar
-
 install -pm 644 maven-invoker/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-invoker.pom
 install -p -m 0644 maven-invoker/target/maven-invoker-%{invoker_version}-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/invoker.jar
 %add_maven_depmap -f invoker JPP.%{name}-invoker.pom %{name}/invoker.jar
 
-install -pm 644 maven-common-artifact-filters/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-common-artifact-filters.pom
-install -p -m 0644 maven-common-artifact-filters/target/maven-common-artifact-filters-%{common_artifact_filters_version}-SNAPSHOT.jar \
-        $RPM_BUILD_ROOT%{_javadir}/maven-shared/common-artifact-filters.jar
-%add_maven_depmap -f common-artifact-filters JPP.%{name}-common-artifact-filters.pom %{name}/common-artifact-filters.jar
-
-install -pm 644 maven-ant/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-ant.pom
-install -p -m 0644 maven-ant/target/maven-ant-%{ant_version}-SNAPSHOT.jar \
-        $RPM_BUILD_ROOT%{_javadir}/maven-shared/ant.jar
-%add_maven_depmap -f ant JPP.%{name}-ant.pom %{name}/ant.jar
-
 install -pm 644 maven-osgi/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-osgi.pom
 install -p -m 0644 maven-osgi/target/maven-osgi-%{osgi_version}-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/osgi.jar
@@ -506,21 +409,11 @@ install -p -m 0644 file-management/target/file-management-%{file_management_vers
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/file-management.jar
 %add_maven_depmap -f file-management JPP.%{name}-file-management.pom %{name}/file-management.jar
 
-install -pm 644 maven-artifact-resolver/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-artifact-resolver.pom
-install -p -m 0644 maven-artifact-resolver/target/maven-artifact-resolver-%{artifact_resolver_version}-SNAPSHOT.jar \
-        $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-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
 %add_maven_depmap -f reporting-api -a "org.apache.maven.reporting:maven-reporting-api" JPP.%{name}-reporting-api.pom %{name}/reporting-api.jar
 
-install -pm 644 maven-runtime/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-runtime.pom
-install -p -m 0644 maven-runtime/target/maven-runtime-%{runtime_version}-alpha-3-SNAPSHOT.jar \
-        $RPM_BUILD_ROOT%{_javadir}/maven-shared/runtime.jar
-%add_maven_depmap -f runtime JPP.%{name}-runtime.pom %{name}/runtime.jar
-
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr target/site/apidocs/* \
@@ -547,26 +440,11 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %{_mavenpomdir}/JPP.%{name}-osgi.pom
 %{_mavendepmapfragdir}/%{name}-osgi
 
-%files ant
-%{_javadir}/%{name}/ant.jar
-%{_mavenpomdir}/JPP.%{name}-ant.pom
-%{_mavendepmapfragdir}/%{name}-ant
-
-%files common-artifact-filters
-%{_javadir}/%{name}/common-artifact-filters.jar
-%{_mavenpomdir}/JPP.%{name}-common-artifact-filters.pom
-%{_mavendepmapfragdir}/%{name}-common-artifact-filters
-
 %files dependency-analyzer
 %{_javadir}/%{name}/dependency-analyzer.jar
 %{_mavenpomdir}/JPP.%{name}-dependency-analyzer.pom
 %{_mavendepmapfragdir}/%{name}-dependency-analyzer
 
-%files dependency-tree
-%{_javadir}/%{name}/dependency-tree.jar
-%{_mavenpomdir}/JPP.%{name}-dependency-tree.pom
-%{_mavendepmapfragdir}/%{name}-dependency-tree
-
 %files downloader
 %{_javadir}/%{name}/downloader.jar
 %{_mavenpomdir}/JPP.%{name}-downloader.pom
@@ -577,11 +455,6 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %{_mavenpomdir}/JPP.%{name}-invoker.pom
 %{_mavendepmapfragdir}/%{name}-invoker
 
-%files model-converter
-%{_javadir}/%{name}/model-converter.jar
-%{_mavenpomdir}/JPP.%{name}-model-converter.pom
-%{_mavendepmapfragdir}/%{name}-model-converter
-
 %files reporting-impl
 %{_javadir}/%{name}/reporting-impl.jar
 %{_mavenpomdir}/JPP.%{name}-reporting-impl.pom
@@ -612,26 +485,20 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %{_mavenpomdir}/JPP.%{name}-verifier.pom
 %{_mavendepmapfragdir}/%{name}-verifier
 
-%files artifact-resolver
-%{_javadir}/%{name}/artifact-resolver.jar
-%{_mavenpomdir}/JPP.%{name}-artifact-resolver.pom
-%{_mavendepmapfragdir}/%{name}-artifact-resolver
-
 %files reporting-api
 %{_javadir}/%{name}/reporting-api.jar
 %{_mavenpomdir}/JPP.%{name}-reporting-api.pom
 %{_mavendepmapfragdir}/%{name}-reporting-api
 
-%files runtime
-%{_javadir}/%{name}/runtime.jar
-%{_mavenpomdir}/JPP.%{name}-runtime.pom
-%{_mavendepmapfragdir}/%{name}-runtime
-
 %files javadoc
 %doc LICENSE.txt NOTICE.txt
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Nov 30 2012 Tomas Radej <tradej at redhat.com> - 15-27
+- Removed ant, artifact-resolver, common-artifact-filters, dependency-tree, model-converter, runtime
+- Replaced patches with pom macros
+
 * Thu Nov 22 2012 Jaromir Capik <jcapik at redhat.com> - 15-26
 - Migration to plexus-containers-container-default

More information about the scm-commits mailing list