[java-sig-commits] [maven2] Remove code related to bootstrapping

[Mikolaj Izdebski]

commit 8925a5087b87a0b654906bb767a56dbba4b7b769
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Tue Sep 10 14:33:28 2013 +0200

    Remove code related to bootstrapping
    
    maven2 is always built with maven, so there should be no need to
    bootstrap it.

 maven2-2.2.1-enable-bootstrap-repo.patch |   38 -----------------------
 maven2-antbuild.patch                    |   27 ----------------
 maven2.spec                              |   49 ++---------------------------
 sources                                  |    1 -
 4 files changed, 4 insertions(+), 111 deletions(-)
---
diff --git a/maven2.spec b/maven2.spec
index 39109bc..a70a867 100644
--- a/maven2.spec
+++ b/maven2.spec
@@ -1,11 +1,8 @@
-%global bootstrap 0
-%global __jar_repack 0
-
 %global main_pkg maven
 
 Name:	    maven2
 Version:	2.2.1
-Release:	46%{?dist}
+Release:	47%{?dist}
 Summary:	Java project management and project comprehension tool
 
 Group:		Development/Build Tools
@@ -21,9 +18,7 @@ Source0:	%{name}-%{version}.tar.gz
 Source100:    %{name}-%{version}-settings.xml
 Source103:    %{name}-%{version}-depmap.xml
 
-Patch0:     %{name}-antbuild.patch
 Patch2:     %{name}-%{version}-update-tests.patch
-Patch3:     %{name}-%{version}-enable-bootstrap-repo.patch
 Patch4:     %{name}-%{version}-unshade.patch
 Patch5:     %{name}-%{version}-default-resolver-pool-size.patch
 Patch6:     %{name}-%{version}-strip-jackrabbit-dep.patch
@@ -32,9 +27,6 @@ Patch8:     %{name}-%{version}-migrate-to-plexus-containers-container-default.pa
 
 BuildRequires: java-devel >= 1.6.0
 
-%if %{bootstrap}
-BuildRequires: ant
-%else
 BuildRequires: apache-resource-bundles
 BuildRequires: objectweb-asm
 BuildRequires: buildnumber-maven-plugin
@@ -54,7 +46,6 @@ BuildRequires: maven-shade-plugin
 BuildRequires: maven-install-plugin
 BuildRequires: plexus-containers
 BuildRequires: plexus-containers-container-default
-%endif
 
 
 BuildArch: noarch
@@ -194,45 +185,14 @@ Javadoc for %{name}.
 %prep
 %setup -q -n apache-maven-2.2.1
 
-%patch0 -b .antbuild
 %patch2 -b .update-tests
 
-%if ! %{bootstrap}
 %patch4 -b .unshade
-%endif
-
-%if %{bootstrap}
-%patch3 -b .enable-bootstrap-repo
-%endif
 
 # set cache location
 export M2_REPO=`pwd`/.m2
 mkdir $M2_REPO
 
-# if bootstrapping, extract the dependencies
-%if %{bootstrap}
-(cd $M2_REPO
-
-  tar xzf %{SOURCE1}
-
-  # maven-remote-resources-plugin (m-r-r-p) is used side-by-side with
-  # plexus-velocity (p-v) 1.1.3 upstream.. we collapse to a single p-v version
-  # of 1.1.7. 1.1.7 however has a component descriptor that conflicts
-  # with the one in m-r-r-p. We therefore need to remove the descriptor
-  # from m-r-r-p first
-  zip -d repository/org/apache/maven/plugins/maven-remote-resources-plugin/1.0-beta-2/maven-remote-resources-plugin-1.0-beta-2.jar \
-         META-INF/plexus/components.xml
-
-  # resource bundle 1.3 is needed during build, but not when done via
-  # upstream, for some reason
-  mkdir -p repository/org/apache/apache-jar-resource-bundle/1.3
-  ln -s ../1.4/apache-jar-resource-bundle-1.4.jar \
-        repository/org/apache/apache-jar-resource-bundle/1.3/apache-jar-resource-bundle-1.3.jar
-  ln -s ../1.4/apache-jar-resource-bundle-1.4.jar.sha1 \
-        repository/org/apache/apache-jar-resource-bundle/1.3/apache-jar-resource-bundle-1.3.jar.sha1
-)
-%endif
-
 # disable parallel artifact resolution
 %patch5 -p1 -b .parallel-artifacts-resolution
 
@@ -275,15 +235,11 @@ sed -i -e s:__M2_REMOTEREPO_PLACEHOLDER__:"file\://$M2_REPO/repository":g $M2_HO
 # replace settings file location before patching
 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
 unset M2_HOME
 export M2_HOME
 mvn-rpmbuild -Dmaven.test.skip=true -P all-models \
              -Dmaven.local.depmap.file=%{SOURCE103} \
              install javadoc:aggregate
-%endif
 
 %install
 
@@ -395,6 +351,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 
 
 %changelog
+* Tue Sep 10 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.2.1-47
+- Remove code related to bootstrapping
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-46
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index c5c1e80..2c7c8cd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
 1197900ced670d0a62211f67aa8a3b68  maven2-2.2.1.tar.gz
-6f46b0e42921df6a9b1a8280d59ab80b  maven2-2.2.1-bootstrapdeps.tar.gz