[maven-shared] Require maven not maven2 now.
Alexander Kurtakov
akurtakov at fedoraproject.org
Fri Jun 3 12:34:17 UTC 2011
commit 16ed1f8674b7619099b1862b75fb37dfc323343a
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Fri Jun 3 15:33:41 2011 +0300
Require maven not maven2 now.
Adapt to current guidelines.
maven-shared-jpp-depmap.xml | 24 ----------------
maven-shared.spec | 65 +++++++++++++++++++-----------------------
2 files changed, 29 insertions(+), 60 deletions(-)
---
diff --git a/maven-shared-jpp-depmap.xml b/maven-shared-jpp-depmap.xml
index a94a89b..bcb8517 100644
--- a/maven-shared-jpp-depmap.xml
+++ b/maven-shared-jpp-depmap.xml
@@ -25,28 +25,4 @@
<version>2.0.8</version>
</jpp>
</dependency>
- <dependency>
- <maven>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.6.5</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>ant</artifactId>
- <version>1.8.1</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>ant</groupId>
- <artifactId>ant-launcher</artifactId>
- <version>1.6.5</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>ant-launcher</artifactId>
- <version>1.8.1</version>
- </jpp>
- </dependency>
</dependencies>
diff --git a/maven-shared.spec b/maven-shared.spec
index 3dbb4b9..dc4c4ac 100644
--- a/maven-shared.spec
+++ b/maven-shared.spec
@@ -67,13 +67,13 @@ Summary: Maven Shared Components
URL: http://maven.apache.org/shared/
Name: maven-shared
Version: 15
-Release: 14%{?dist}
+Release: 15%{?dist}
License: ASL 2.0
Group: Development/Libraries
# svn export \
# http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-components-15/
-# tar czf maven-shared-components-14.tar.gz maven-shared-components-15
+# tar czf maven-shared-components-15.tar.gz maven-shared-components-15
Source0: maven-shared-components-%{version}.tar.gz
Source1: %{name}-jpp-depmap.xml
@@ -88,8 +88,7 @@ Patch7: maven-artifact-resolver-pom.patch
BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: ant
-BuildRequires: ant-nodeps
-BuildRequires: maven2 >= 0:2.0.4-9
+BuildRequires: maven
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
@@ -122,8 +121,7 @@ BuildRequires: aqute-bndlib
BuildRequires: maven-wagon
Requires: ant
-Requires: ant-nodeps
-Requires: maven2 >= 0:2.0.4
+Requires: maven
Requires: plexus-utils
Requires: saxon
Requires: saxon-scripts
@@ -136,8 +134,6 @@ Requires: maven-wagon
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
Requires(post): jpackage-utils >= 0:1.7.2
Requires(postun): jpackage-utils >= 0:1.7.2
@@ -150,7 +146,7 @@ Group: Development/Libraries
Version: %{file_management_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: %{name}-io >= 0:%{io_version}
-Requires: maven2
+Requires: maven
Requires: plexus-container-default
Requires: plexus-utils
@@ -164,7 +160,7 @@ Group: Development/Libraries
Version: %{osgi_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: aqute-bndlib
-Requires: maven2 >= 0:2.0.7
+Requires: maven
%description osgi
Library for Maven-OSGi integration
@@ -175,7 +171,7 @@ Group: Development/Libraries
Version: %{ant_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: ant
-Requires: maven2 >= 0:2.0.7
+Requires: maven
Requires: plexus-containers-container-default
%description ant
@@ -188,7 +184,7 @@ Version: %{common_artifact_filters_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: %{name}-test-tools >= 0:%{test_tools_version}-%{release}
Requires: junit
-Requires: maven2 >= 0:2.0.7
+Requires: maven
Requires: plexus-container-default
%description common-artifact-filters
@@ -200,7 +196,7 @@ 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: maven2 >= 0:2.0.7
+Requires: maven
%description dependency-tree
%{summary}.
@@ -210,7 +206,7 @@ Summary: Maven Downloader
Group: Development/Libraries
Version: %{downloader_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
-Requires: maven2 >= 0:2.0.7
+Requires: maven
%description downloader
Provide a super simple interface for downloading a
@@ -221,7 +217,7 @@ Summary: Maven Dependency Analyzer
Group: Development/Libraries
Version: %{dependency_analyzer_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
-Requires: maven2 >= 0:2.0.7
+Requires: maven
Requires: objectweb-asm
%description dependency-analyzer
@@ -233,7 +229,7 @@ Group: Development/Libraries
Version: %{invoker_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: %{name}-monitor >= 0:%{monitor_version}-%{release}
-Requires: maven2 >= 0:2.0.7
+Requires: maven
Requires: plexus-utils
%description invoker
@@ -245,7 +241,7 @@ Group: Development/Libraries
Version: %{model_converter_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: dom4j
-Requires: maven2 >= 0:2.0.7
+Requires: maven
Requires: plexus-container-default
Requires: plexus-utils
@@ -259,7 +255,7 @@ Version: %{reporting_impl_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: jakarta-commons-validator
Requires: jakarta-oro
-Requires: maven2 >= 0:2.0.7
+Requires: maven
Requires: maven-doxia
%description reporting-impl
@@ -271,7 +267,7 @@ 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: maven2 >= 0:2.0.7
+Requires: maven
%description repository-builder
%{summary}.
@@ -281,7 +277,7 @@ Summary: Maven Shared I/O API
Group: Development/Libraries
Version: %{io_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
-Requires: maven2 >= 0:2.0.7
+Requires: maven
Requires: maven-wagon
Requires: plexus-utils
Requires: plexus-container-default
@@ -294,7 +290,7 @@ Summary: Maven Shared Jar
Group: Development/Libraries
Version: %{jar_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
-Requires: maven2 >= 0:2.0.7
+Requires: maven
%description jar
Utilities that help identify the contents of a JAR,
@@ -306,7 +302,7 @@ Summary: Maven Shared Monitor API
Group: Development/Libraries
Version: %{monitor_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
-Requires: maven2 >= 0:2.0.7
+Requires: maven
Requires: plexus-container-default
%description monitor
@@ -339,7 +335,7 @@ Group: Development/Libraries
Version: %{artifact_resolver_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: ant
-Requires: maven2 >= 0:2.0.7
+Requires: maven
%description artifact-resolver
Provides a component for plugins to easily resolve project dependencies.
@@ -350,7 +346,7 @@ Group: Development/Libraries
Version: %{filtering_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: ant
-Requires: maven2 >= 0:2.0.7
+Requires: maven
%description filtering
A component to assist in filtering of resource files with properties from a Maven project.
@@ -361,7 +357,7 @@ Group: Development/Libraries
Version: %{reporting_api_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: ant
-Requires: maven2 >= 0:2.0.7
+Requires: maven
%description reporting-api
Maven Reporting API.
@@ -372,7 +368,7 @@ Group: Development/Libraries
Version: %{runtime_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: ant
-Requires: maven2 >= 0:2.0.7
+Requires: maven
%description runtime
Maven Runtime allows introspection of Maven project metadata at runtime. Basic artifact information or full Maven
@@ -394,6 +390,7 @@ chmod -R go=u-w *
# need namespace for new version modello
sed -i "s|<model>|<model xmlns=\"http://modello.codehaus.org/MODELLO/1.3.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://modello.codehaus.org/MODELLO/1.3.0 http://modello.codehaus.org/xsd/modello-1.3.0.xsd\" xml.namespace=\"..\" xml.schemaLocation=\"..\" xsd.namespace=\"..\" xsd.targetNamespace=\"..\">|" file-management/src/main/mdo/fileset.mdo
+sed -i "s|<groupId>ant|<groupId>org.apache.ant|g" maven-ant/pom.xml
# Remove test that needs junit-addons until that makes it into Fedora
rm -f maven-reporting-impl/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
@@ -403,20 +400,15 @@ rm -f maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency
rm -f maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/AbstractFileTest.java
%build
-export MAVEN_REPO_LOCAL=$(pwd)/m2_repo/repository
-
export MAVEN_OPTS="-XX:MaxPermSize=256m"
-mvn-jpp \
- -e \
- -Dmaven2.jpp.depmap.file=%{SOURCE1} \
+mvn-rpmbuild \
+ -Dmaven.local.depmap.file=%{SOURCE1} \
-Dmaven.test.skip=true \
-Dmaven.test.failure.ignore=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
install javadoc:aggregate
%install
-rm -rf $RPM_BUILD_ROOT
# main package infrastructure
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/maven-shared
install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir}
@@ -527,9 +519,6 @@ cp -pr target/site/apidocs/* \
ln -s %{name}-%{shared_components_version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post
%update_maven_depmap
@@ -645,6 +634,10 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_javadocdir}/%{name}
%changelog
+* Fri Jun 3 2011 Alexander Kurtakov <akurtako at redhat.com> 1.0-15
+- Require maven not maven2 now.
+- Adapt to current guidelines.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 15-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list