commit 94228042524a5a070468a45aac966f4b21069daa Author: Stanislav Ochotnicky sochotnicky@redhat.com Date: Wed Jul 25 16:25:09 2012 +0200
Move artifacts together with maven-3 files
- Provide compatibility versions for maven-model
maven2.spec | 99 +++++++++++++++++++++++++++++++--------------------------- 1 files changed, 53 insertions(+), 46 deletions(-) --- diff --git a/maven2.spec b/maven2.spec index be48174..4097aaa 100644 --- a/maven2.spec +++ b/maven2.spec @@ -1,9 +1,11 @@ %global bootstrap 0 %global __jar_repack 0
+%global main_pkg maven + Name: maven2 Version: 2.2.1 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Java project management and project comprehension tool
Group: Development/Build Tools @@ -103,7 +105,6 @@ Group: Development/Libraries Summary: Compatibility Maven plugin registry artifact Requires: jpackage-utils Requires: plexus-utils -Requires: plexus-interpolation Requires: plexus-containers-container-default
%description -n maven-plugin-registry @@ -113,6 +114,7 @@ Maven plugin registry artifact Group: Development/Libraries Summary: Compatibility Maven profile artifact Requires: jpackage-utils +Requires: maven-model = %{epoch}:%{version}-%{release} Requires: plexus-utils Requires: plexus-interpolation Requires: plexus-containers-container-default @@ -124,10 +126,10 @@ Maven profile artifact Group: Development/Libraries Summary: Compatibility Maven project artifact Requires: jpackage-utils -Requires: maven-artifact-manager -Requires: maven-profile -Requires: maven-plugin-registry -Requires: maven-model +Requires: maven-artifact-manager = %{epoch}:%{version}-%{release} +Requires: maven-profile = %{epoch}:%{version}-%{release} +Requires: maven-plugin-registry = %{epoch}:%{version}-%{release} +Requires: maven-model = %{epoch}:%{version}-%{release} Requires: plexus-interpolation Requires: plexus-utils Requires: plexus-containers-container-default @@ -205,13 +207,12 @@ mkdir $M2_REPO
%patch7 -p1 -b .classworlds
-# 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 - -# FIXIT: look why these tests are failing with maven-surefire 2.6 -rm maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java -rm maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java +for nobuild in apache-maven maven-artifact-test \ + maven-compat maven-core maven-plugin-api \ + maven-plugin-parameter-documenter maven-reporting \ + maven-script;do + %pom_disable_module $nobuild +done
%build export M2_REPO=`pwd`/.m2 @@ -231,33 +232,35 @@ sed -i -s s:__M2_SETTINGS_FILE__:$M2_HOME/conf/settings.xml:g build.xml %if %{bootstrap} ant -Dmaven.repo.local=$M2_REPO/cache %else -# FIXME: These tests fail when building with maven for an unknown reason -rm -f maven-core/src/test/java/org/apache/maven/WagonSelectorTest.java -rm -f maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java -for nobuild in apache-maven maven-artifact-test \ - maven-compat maven-core maven-plugin-api \ - maven-plugin-parameter-documenter maven-reporting \ - maven-script;do - sed -i "s:<module>$nobuild</module>::" pom.xml -done -mvn-rpmbuild -X -Dmaven.test.skip=true -P all-models -Dmaven.repo.local=$(pwd)/.m2 -Dmaven.local.depmap.file=%{SOURCE103} install +mvn-rpmbuild -X -Dmaven.local.debug=true -Dmaven.test.skip=true -P all-models -Dmaven.repo.local=$(pwd)/.m2 -Dmaven.local.depmap.file=%{SOURCE103} install %endif
%install
# maven2 directory in /usr/share/java -install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{name} +install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{main_pkg} install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir}
# parts of maven2 now go into separate subpackages for subdir in maven-artifact-manager maven-error-diagnostics \ - maven-model maven-monitor maven-plugin-registry \ + maven-monitor maven-plugin-registry \ maven-profile maven-project maven-toolchain maven-plugin-descriptor ;do pushd $subdir - install -m 644 target/$subdir-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$subdir.jar - install -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-$subdir.pom - %add_maven_depmap JPP.%{name}-$subdir.pom %{name}/$subdir.jar -f $subdir + install -m 644 target/$subdir-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{main_pkg}/$subdir.jar + install -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{main_pkg}-$subdir.pom + %add_maven_depmap JPP.%{main_pkg}-$subdir.pom %{main_pkg}/$subdir.jar -f $subdir + popd +done + +# these parts are compatibility versions which are available in +# maven-3.x as well. We default to maven-3, but if someone asks for +# 2.x we provide few compat versions +for subdir in maven-model;do + pushd $subdir + install -m 644 target/$subdir-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{main_pkg}/$subdir.jar + install -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{main_pkg}-$subdir.pom + %add_maven_depmap JPP.%{main_pkg}-$subdir.pom %{main_pkg}/$subdir.jar -f $subdir -v "2.0.2,2.0.6,2.0.7,2.0.8" popd done
@@ -266,51 +269,55 @@ done
%files -n maven-artifact-manager %{_mavendepmapfragdir}/%{name}-maven-artifact-manager -%{_javadir}/%{name}/maven-artifact-manager.jar -%{_mavenpomdir}/JPP.%{name}-maven-artifact-manager.pom +%{_javadir}/%{main_pkg}/maven-artifact-manager.jar +%{_mavenpomdir}/JPP.%{main_pkg}-maven-artifact-manager.pom
%files -n maven-error-diagnostics %{_mavendepmapfragdir}/%{name}-maven-error-diagnostics -%{_javadir}/%{name}/maven-error-diagnostics.jar -%{_mavenpomdir}/JPP.%{name}-maven-error-diagnostics.pom +%{_javadir}/%{main_pkg}/maven-error-diagnostics.jar +%{_mavenpomdir}/JPP.%{main_pkg}-maven-error-diagnostics.pom
%files -n maven-model %{_mavendepmapfragdir}/%{name}-maven-model -%{_javadir}/%{name}/maven-model.jar -%{_mavenpomdir}/JPP.%{name}-maven-model.pom +%{_javadir}/%{main_pkg}/maven-model-*.jar +%{_mavenpomdir}/JPP.%{main_pkg}-maven-model-*.pom
%files -n maven-monitor %{_mavendepmapfragdir}/%{name}-maven-monitor -%{_javadir}/%{name}/maven-monitor.jar -%{_mavenpomdir}/JPP.%{name}-maven-monitor.pom +%{_javadir}/%{main_pkg}/maven-monitor.jar +%{_mavenpomdir}/JPP.%{main_pkg}-maven-monitor.pom
%files -n maven-plugin-registry %{_mavendepmapfragdir}/%{name}-maven-plugin-registry -%{_javadir}/%{name}/maven-plugin-registry.jar -%{_mavenpomdir}/JPP.%{name}-maven-plugin-registry.pom +%{_javadir}/%{main_pkg}/maven-plugin-registry.jar +%{_mavenpomdir}/JPP.%{main_pkg}-maven-plugin-registry.pom
%files -n maven-profile %{_mavendepmapfragdir}/%{name}-maven-profile -%{_javadir}/%{name}/maven-profile.jar -%{_mavenpomdir}/JPP.%{name}-maven-profile.pom +%{_javadir}/%{main_pkg}/maven-profile.jar +%{_mavenpomdir}/JPP.%{main_pkg}-maven-profile.pom
%files -n maven-project %{_mavendepmapfragdir}/%{name}-maven-project -%{_javadir}/%{name}/maven-project.jar -%{_mavenpomdir}/JPP.%{name}-maven-project.pom +%{_javadir}/%{main_pkg}/maven-project.jar +%{_mavenpomdir}/JPP.%{main_pkg}-maven-project.pom
%files -n maven-toolchain %{_mavendepmapfragdir}/%{name}-maven-toolchain -%{_javadir}/%{name}/maven-toolchain.jar -%{_mavenpomdir}/JPP.%{name}-maven-toolchain.pom +%{_javadir}/%{main_pkg}/maven-toolchain.jar +%{_mavenpomdir}/JPP.%{main_pkg}-maven-toolchain.pom
%files -n maven-plugin-descriptor %{_mavendepmapfragdir}/%{name}-maven-plugin-descriptor -%{_javadir}/%{name}/maven-plugin-descriptor.jar -%{_mavenpomdir}/JPP.%{name}-maven-plugin-descriptor.pom +%{_javadir}/%{main_pkg}/maven-plugin-descriptor.jar +%{_mavenpomdir}/JPP.%{main_pkg}-maven-plugin-descriptor.pom
%changelog +* Wed Jul 25 2012 Stanislav Ochotnicky sochotnicky@redhat.com - 2.2.1-35 +- Move artifacts together with maven-3 files +- Provide compatibility versions for maven-model + * Thu Jul 19 2012 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 2.2.1-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
java-sig-commits@lists.fedoraproject.org