]> git.pld-linux.org Git - packages/maven.git/blobdiff - maven.spec
- empty-dep.pom must be named maven2-empty-dep.pom. I have no idea where this name...
[packages/maven.git] / maven.spec
index 255d4f7a647b7c1b1c0dcbd508570aedcf46de34..043b41b280089fe818ff27e69c534028bb625d1a 100644 (file)
 %define repodirlib %{repodir}/lib
 %define repodirsrc %{repodir}/src
 
-%define maven_version   2.0.8
-
-%define base_name maven
-%define name maven2
-
 %define repo_dir m2_home_local/repository
 %define maven_settings_file %{_builddir}/%{name}/settings.xml
 
-Name:           %{name}
-Version:        %{maven_version}
-Release:        26%{?dist}
-Epoch:          0
-Summary:        Java project management and project comprehension tool
+### preamble {{{
+Name:          maven
+Version:       2.0.8
+Release:       %{bootstrap_release %rel}
+Summary:       Java project management and project comprehension tool
 
-Group:          Development/Build Tools
-License:        Apache Software License
-URL:            http://maven.apache.org/
+Group:         Development/Languages/Java
+License:       Apache v2
+URL:           http://maven.apache.org/
 
-# svn export http://svn.apache.org/repos/asf/maven/components/tags/maven-%{version} maven2
-# tar czf maven2-src.tar.gz maven2
-Source0:        %{name}-src.tar.gz
+# svn export http://svn.apache.org/repos/asf/maven/components/tags/maven-%{version} maven
+# tar czf maven-src.tar.gz maven
+Source0:               http://execve.pl/PLD/maven/%{name}-src.tar.gz
+# Source0-md5: 8db6e8515fe317f635befa39b074016a
 
-# svn export -r {2007-03-31} http://svn.apache.org/repos/asf/maven/plugins/trunk maven2-plugins
-# tar czf maven2-plugins-070331-src.tar.gz maven2-plugins
-Source2:        %{name}-plugins-070705-src.tar.gz
+# svn export -r {2007-03-31} http://svn.apache.org/repos/asf/maven/plugins/trunk maven-plugins
+# tar czf maven-plugins-070331-src.tar.gz maven-plugins
+Source2:               http://execve.pl/PLD/maven/%{name}-plugins-070705-src.tar.gz
+# Source2-md5: 7e9d3175131910d64c95fdf4d60651fa
 
 # We need to replace the javadoc plugin as the 2.3-SNAPSHOT included above 
 # has several bugs
 # svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-2.4 maven-javadoc-plugin
-Source22: maven-javadoc-plugin-2.4-src.tar.gz
+Source22:              http://execve.pl/PLD/maven/maven-javadoc-plugin-2.4-src.tar.gz
+# Source22-md5:        c3c1014b8548f94f91f3b679a5500e4b
 
 # No source location for these. They are ascii files generated from maven
 # repositories, and are not in cvs/svn
 # The files were originally aquired from: http://repo1.maven.org/maven2/
-Source3:        m2_pom_repo.tar.gz
+Source3:               http://execve.pl/PLD/maven/m2_pom_repo.tar.gz
+# Source3-md5: a4b18868658fe3e3c58d0f4e9bf66bee
 
 # As with above, these files are from the maven repositories, and are not in 
 # cvs/svn
 # The files were originally aquired from: http://repo1.maven.org/maven2/
-Source4:        m2_jar_repo.tar.gz
-Source5:        %{name}-script
+Source4:               http://execve.pl/PLD/maven/m2_jar_repo.tar.gz
+# Source4-md5: 00976d79948c93be23cdda62300dc8c2
+Source5:               %{name}-script
 
-Source6:        maven2-JPackageRepositoryLayout.java
-Source7:        maven2-settings.xml
+Source6:               maven-JPackageRepositoryLayout.java
+Source7:               maven-settings.xml
 
 # svn export -r '{2006-03-08}' http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin maven-site-plugin
-# tar czf maven2-maven-site-plugin.tar.gz maven-site-plugin 
-Source8:        %{name}-maven-site-plugin.tar.gz
+# tar czf maven-maven-site-plugin.tar.gz maven-site-plugin 
+Source8:       http://execve.pl/PLD/maven/%{name}-maven-site-plugin.tar.gz
+# Source8-md5: 2ba3a4baeb3d4d9d7b8121a6ae05578d
 
-Source9:          %{name}-run-it-tests.sh
+Source9:       %{name}-run-it-tests.sh
 
 # svn export http://svn.apache.org/repos/asf/maven/components/tags/maven-2.0.8/maven-model
 # cd maven-model
 # mvn -P all-models package 
 # Find model jar in target/maven-model-2.0.8.jar
-Source10:       %{name}-model-v3.jar
-Source11:       %{name}-MavenJPackageDepmap.java
-Source12:       %{name}-addjdom-depmap.xml
-Source13:       %{name}-empty-dep.pom
+Source10:      %{name}-model-v3.jar
+Source11:      %{name}-MavenJPackageDepmap.java
+Source12:      %{name}-addjdom-depmap.xml
+Source13:      %{name}-empty-dep.pom
 
 # Empty jar file with just a manifest. No source destination to specify
-Source14:       %{name}-empty-dep.jar
-Source15:       %{name}-jpp-script
-Source16:       %{name}-jpp-readme.html
-Source17:       %{name}-versionless-depmap.xml
-
-Source99:       maven-doxia-modules.pom
-Source100:      maven2-component-info.xml
-
-Patch0:         maven2-addjdomtobootstrappath.patch
-Patch1:         %{name}-jpprepolayout.patch
-Patch2:         %{name}-fastjar-manifest-fix.patch
-Patch3:         %{name}-plugins-doxiaupdatefix.patch
-Patch4:         %{name}-plugins-catch-uncaught-exceptions.patch
-Patch5:         %{name}-plugins-dependency-plugin-import-fix.patch
-Patch6:         %{name}-%{version}-excludeexternaljars.patch
-Patch7:         %{name}-site-plugin-addservletdep.patch
-Patch8:         %{name}-enable-bootstrap-repository.patch
-Patch9:         %{name}-use-unversioned-classworlds.patch
-Patch10:        %{name}-plugins-disablecobertura.patch
-Patch11:        %{name}-shade-plugin-replacement.patch
-Patch12:        %{name}-sourcetarget.patch
-Patch13:        %{name}-plugins-MJAVADOC-137-AbstractJavadocMojo.patch
+Source14:      %{name}-empty-dep.jar
+Source15:      %{name}-jpp-script
+Source16:      %{name}-jpp-readme.html
+Source17:      %{name}-versionless-depmap.xml
+
+Source99:              maven-doxia-modules.pom
+Source100:             maven-component-info.xml
+
+Patch0:                maven-addjdomtobootstrappath.patch
+Patch1:                %{name}-jpprepolayout.patch
+Patch2:                %{name}-fastjar-manifest-fix.patch
+Patch3:                %{name}-plugins-doxiaupdatefix.patch
+Patch4:                %{name}-plugins-catch-uncaught-exceptions.patch
+Patch5:                %{name}-plugins-dependency-plugin-import-fix.patch
+Patch6:                %{name}-%{version}-excludeexternaljars.patch
+Patch7:                %{name}-site-plugin-addservletdep.patch
+Patch8:                %{name}-enable-bootstrap-repository.patch
+Patch9:                %{name}-use-unversioned-classworlds.patch
+Patch10:       %{name}-plugins-disablecobertura.patch
+Patch11:       %{name}-shade-plugin-replacement.patch
+Patch12:       %{name}-sourcetarget.patch
+Patch13:       %{name}-plugins-MJAVADOC-137-AbstractJavadocMojo.patch
 # The maven javadoc plugin 2.5 pre-reqs maven 2.0.9, we lower to 2.0.8
-Patch14:        %{name}-javadoc-plugin-pom.patch
+Patch14:       %{name}-javadoc-plugin-pom.patch
 # javadoc 2.4 uses an old doxia method
-Patch15:        %{name}-plugins-javadoc-newdoxia.patch
+Patch15:       %{name}-plugins-javadoc-newdoxia.patch
 # This plugin can't cope with a JAR without a JDK version on it
-Patch16:        %{name}-plugins-project-info-reports-jdkversion.patch
-Patch17:        %{name}-MNG-3139.patch
+Patch16:       %{name}-plugins-project-info-reports-jdkversion.patch
+Patch17:       %{name}-MNG-3139.patch
 Patch18:       %{name}-plugins-jpprepolayout.patch
 Patch19:       %{name}-plugins-disableenforcer.patch
-Patch20:        %{name}-commons-cli-1.1.patch
-
-Provides:       %{name}-bootstrap = %{epoch}:%{version}-%{release}
-
-BuildRequires:    java-devel
-BuildRequires:    jpackage-utils >= 0:1.7.2
-BuildRequires:    /bin/ls,/usr/bin/head,/usr/bin/find,/usr/bin/awk,/bin/grep,/bin/sed
-
-BuildRequires:    ant >= 1.6.5
-BuildRequires:    ant-nodeps
-BuildRequires:    ant-junit
-BuildRequires:    antlr >= 2.7.4
-BuildRequires:    aqute-bndlib
-BuildRequires:    bsh >= 1.3.0
-#BuildRequires:   cglib >= 2.1.0
-BuildRequires:    checkstyle4 >= 4.1
-BuildRequires:    checkstyle4-optional >= 4.1
-BuildRequires:    classworlds >= 1.1
-BuildRequires:    dom4j >= 1.6.1
-#BuildRequires:    tomcat5-parent
-BuildRequires:    tomcat5-servlet-2.4-api
-BuildRequires:    glassfish-javamail
-BuildRequires:    gnu.regexp >= 1.1.4
-BuildRequires:    httpunit >= 1.6
-BuildRequires:    jakarta-commons-beanutils >= 1.7.0
-BuildRequires:    jakarta-commons-cli >= 1.0
-BuildRequires:    jakarta-commons-collections >= 3.1
-BuildRequires:    jakarta-commons-io >= 1.1
-BuildRequires:    jakarta-commons-lang >= 2.1
-BuildRequires:    jakarta-commons-logging >= 1.0.4
-BuildRequires:    jakarta-commons-validator >= 1.1.4
-BuildRequires:    jaxen >= 1.1
-BuildRequires:    jdom >= 1.0
-#BuildRequires:   jmock >= 1.0.1
-BuildRequires:    jline >= 0.8.1
-BuildRequires:    jsch >= 0.1.20
-BuildRequires:    jtidy >= 1.0
-BuildRequires:    junit >= 3.8.2
-BuildRequires:    maven2-common-poms >= 1.0-5
-BuildRequires:    maven-jxr >= 1.0-2
-BuildRequires:    maven-wagon >= 1.0-0.1.b2
-BuildRequires:    maven-doxia >= 1.0-0.a9
-BuildRequires:    nekohtml >= 0.9.3
-BuildRequires:    oro >= 2.0.8
-BuildRequires:    plexus-ant-factory >= 1.0-0.a1.2
-BuildRequires:    plexus-bsh-factory >= 1.0-0.a7s.2
-BuildRequires:    plexus-archiver >= 1.0-0.1.a8
-BuildRequires:    plexus-compiler >= 1.5.1
-BuildRequires:    plexus-container-default >= 1.0
-BuildRequires:    plexus-i18n >= 1.0
-BuildRequires:    plexus-interactivity >= 1.0
-BuildRequires:    plexus-utils >= 1.2
-BuildRequires:    plexus-velocity >= 1.1.2
-BuildRequires:    pmd >= 3.6
-BuildRequires:    qdox >= 1.5
-BuildRequires:    rhino >= 1.5
-BuildRequires:    saxon-scripts
-BuildRequires:    saxpath
-BuildRequires:    velocity >= 1.4
-BuildRequires:    xerces-j2 >= 2.7.1
-BuildRequires:    xalan-j2 >= 2.6.0
-BuildRequires:    xmlrpc
-BuildRequires:    xmlunit
-BuildRequires:    xom
-
-%if %with itests
-BuildRequires:    log4j >= 1.2.13
-BuildRequires:    xml-commons-apis >= 1.3.02
+Patch20:       %{name}-commons-cli-1.1.patch
+
+# Patches added by PLD
+Patch100:      %{name}-no-easymock.patch
+
+### PLDIZED DEPENDENCIES {{{
+### BRs {{{
+BuildRequires: ant >= 1.6.5
+BuildRequires: ant-junit
+BuildRequires: antlr >= 2.7.4
+BuildRequires: ant-nodeps
+BuildRequires: java(servlet)
+BuildRequires: java-bsh >= 1.3.0
+BuildRequires: java-classworlds >= 1.1
+BuildRequires: java-commons-beanutils >= 1.7.0
+BuildRequires: java-commons-cli >= 1.0
+BuildRequires: java-commons-collections >= 3.1
+BuildRequires: java-commons-io >= 1.1
+BuildRequires: java-commons-lang >= 2.1
+BuildRequires: java-commons-logging >= 1.0.4
+BuildRequires: java-commons-validator >= 1.1.4
+BuildRequires: java-dom4j >= 1.6.1
+BuildRequires: java-gnu-regexp >= 1.1.4
+BuildRequires: java-httpunit >= 1.6
+BuildRequires: java-jaxen >= 1.1
+BuildRequires: java-jdom >= 1.0
+BuildRequires: java-jsch >= 0.1.20
+BuildRequires: java-jtidy >= 1.0
+BuildRequires: java-junit >= 3.8.2
+BuildRequires: java-oro >= 2.0.8
+BuildRequires: java-plexus-utils >= 1.2
+BuildRequires: java-qdox >= 1.5
+BuildRequires: java-rhino >= 1.5
+BuildRequires: java-velocity >= 1.4
+BuildRequires: java-xalan >= 2.6.0
+BuildRequires: java-xerces >= 2.7.1
+BuildRequires: java-xmlunit
+BuildRequires: java-xom
+%{buildrequires_jdk}
+BuildRequires: jpackage-utils >= 0:1.7.2
+BuildRequires: maven-common-poms
+BuildRequires: rpmbuild(macros) >= 1.557
+BuildRequires: sed >= 4.0
+%if %{with itests}
+BuildRequires: java-log4j >= 1.2.13
+BuildRequires: java(xml-commons-apis) >= 1.3.02
+BuildRequires: saxon
 %endif
-
-%if %without bootstrap
-BuildRequires:    %{name} = %{epoch}:%{version}
-BuildRequires:    maven2-plugin-ant
-BuildRequires:    maven2-plugin-assembly
-BuildRequires:    maven2-plugin-clean
-BuildRequires:    maven2-plugin-compiler
-BuildRequires:    maven2-plugin-install
-BuildRequires:    maven2-plugin-jar
-BuildRequires:    maven2-plugin-javadoc
-BuildRequires:    maven2-plugin-plugin
-BuildRequires:    maven2-plugin-resources
-BuildRequires:    maven2-plugin-shade
-BuildRequires:    maven2-plugin-site
-BuildRequires:    maven2-plugin-surefire
-BuildRequires:    maven-shared-archiver
-BuildRequires:    maven-doxia-sitetools
-BuildRequires:    maven-embedder
-BuildRequires:    maven-scm >= 0:1.0-0.b3.2
-BuildRequires:    maven-scm-test >= 0:1.0-0.b3.2
-BuildRequires:    maven-shared-common-artifact-filters
-BuildRequires:    maven-shared-dependency-analyzer
-BuildRequires:    maven-shared-dependency-tree
-BuildRequires:    maven-shared-downloader
-BuildRequires:    maven-shared-file-management >= 1.0
-BuildRequires:   maven-shared-io
-BuildRequires:    maven-shared-plugin-testing-harness >= 1.0
-BuildRequires:    maven-shared-repository-builder
-BuildRequires:    maven-shared-invoker
-BuildRequires:    maven-shared-jar
-BuildRequires:    maven-shared-model-converter
-BuildRequires:    maven-shared-plugin-testing-tools
-BuildRequires:    maven-shared-plugin-tools-api
-BuildRequires:    maven-shared-plugin-tools-beanshell
-BuildRequires:    maven-shared-plugin-tools-java
-BuildRequires:    maven-shared-reporting-impl
-BuildRequires:    maven-shared-verifier
-BuildRequires:    maven-surefire >= 2.0
-BuildRequires:    maven-surefire-provider-junit
-BuildRequires:    maven-surefire-booter >= 2.0
-BuildRequires:    modello >= 1.0-0.a8.3
-BuildRequires:    modello-maven-plugin >= 1.0-0.a8.3
-BuildRequires:    plexus-digest
-BuildRequires:    plexus-maven-plugin >= 1.3.5
-BuildRequires:    plexus-mail-sender
-BuildRequires:    plexus-resources
+### }}}
+
+### Rs {{{
+Requires:      ant >= 1.6.5
+Requires:      antlr >= 2.7.4
+Requires:      java(servlet)
+Requires:      java-bsh >= 1.3.0
+Requires:      java-classworlds >= 1.
+Requires:      java-commons-beanutils >= 1.7.0
+Requires:      java-commons-cli >= 1.0
+Requires:      java-commons-collections >= 3.1
+Requires:      java-commons-io >= 1.1
+Requires:      java-commons-lang >= 2.1
+Requires:      java-commons-logging >= 1.0.4
+Requires:      java-commons-validator >= 1.1.4
+Requires:      java-dom4j >= 1.6.1
+Requires:      java-gnu-regexp >= 1.1.4
+Requires:      java-httpunit >= 1.6
+Requires:      java-jdom >= 1.0
+Requires:      java-junit >= 3.8.2
+Requires:      java-jsch >= 0.1.20
+Requires:      java-jtidy >= 1.0
+Requires:      java-oro >= 2.0.8
+Requires:      java-plexus-utils >= 1.2
+Requires:      java-qdox >= 1.5
+Requires:      java-rhino >= 1.5
+Requires:      java-xalan >= 2.6.0
+Requires:      java-xerces >= 2.7.1
+Requires:      java-xmlunit
+Requires:      java-xom
+Requires:      maven-common-poms
+Requires(post):        java-classworlds >= 1.1
+Requires(post):        java-commons-cli >= 1.0
+Requires(post):        java-commons-lang >= 2.1
+Requires(post):        java-commons-logging >= 1.0.4
+Requires(post):        java-jdom >= 1.0
+Requires(post):        java-jsch >= 0.1.20
+Requires(post):        java-plexus-utils >= 1.2
+Requires(post):        jpackage-utils >= 0:1.7.2
+Requires(postun):      jpackage-utils >= 0:1.7.2
+### }}}
+### END OF PLDIZED DEPENDENCIES }}}
+
+### DEPENDENCIES THAT NEEDS INVESTIGATION {{{
+# Is java(mail) enough?
+BuildRequires: glassfish-javamail
+Requires:              glassfish-javamail
+# C library??? Or some java bindings?
+BuildRequires: xmlrpc
+Requires:              xmlrpc
+# WTF is that?
+BuildRequires: aqute-bndlib
+### }}}
+
+### OLD JPP DEPENDENCIES {{{
+### BRs {{{
+#BuildRequires:        cglib >= 2.1.0
+BuildRequires: checkstyle4 >= 4.1
+BuildRequires: checkstyle4-optional >= 4.1
+#BuildRequires:        jmock >= 1.0.1
+BuildRequires: jline >= 0.8.1
+BuildRequires: maven-jxr >= 1.0-2
+BuildRequires: maven-wagon >= 1.0-0.1.b2
+BuildRequires: maven-doxia >= 1.0-0.a9
+BuildRequires: nekohtml >= 0.9.3
+BuildRequires: plexus-ant-factory >= 1.0-0.a1.2
+BuildRequires: plexus-bsh-factory >= 1.0-0.a7s.2
+BuildRequires: plexus-archiver >= 1.0-0.1.a8
+BuildRequires: plexus-compiler >= 1.5.1
+BuildRequires: plexus-container-default >= 1.0
+BuildRequires: plexus-i18n >= 1.0
+BuildRequires: plexus-interactivity >= 1.0
+BuildRequires: plexus-velocity >= 1.1.2
+BuildRequires: pmd >= 3.6
+BuildRequires: saxpath
+
+%if %{without bootstrap}
+BuildRequires: %{name} = %{version}
+BuildRequires: maven2-plugin-ant
+BuildRequires: maven2-plugin-assembly
+BuildRequires: maven2-plugin-clean
+BuildRequires: maven2-plugin-compiler
+BuildRequires: maven2-plugin-install
+BuildRequires: maven2-plugin-jar
+BuildRequires: maven2-plugin-javadoc
+BuildRequires: maven2-plugin-plugin
+BuildRequires: maven2-plugin-resources
+BuildRequires: maven2-plugin-shade
+BuildRequires: maven2-plugin-site
+BuildRequires: maven2-plugin-surefire
+BuildRequires: maven-shared-archiver
+BuildRequires: maven-doxia-sitetools
+BuildRequires: maven-embedder
+BuildRequires: maven-scm >= 0:1.0-0.b3.2
+BuildRequires: maven-scm-test >= 0:1.0-0.b3.2
+BuildRequires: maven-shared-common-artifact-filters
+BuildRequires: maven-shared-dependency-analyzer
+BuildRequires: maven-shared-dependency-tree
+BuildRequires: maven-shared-downloader
+BuildRequires: maven-shared-file-management >= 1.0
+BuildRequires: maven-shared-io
+BuildRequires: maven-shared-plugin-testing-harness >= 1.0
+BuildRequires: maven-shared-repository-builder
+BuildRequires: maven-shared-invoker
+BuildRequires: maven-shared-jar
+BuildRequires: maven-shared-model-converter
+BuildRequires: maven-shared-plugin-testing-tools
+BuildRequires: maven-shared-plugin-tools-api
+BuildRequires: maven-shared-plugin-tools-beanshell
+BuildRequires: maven-shared-plugin-tools-java
+BuildRequires: maven-shared-reporting-impl
+BuildRequires: maven-shared-verifier
+BuildRequires: maven-surefire >= 2.0
+BuildRequires: maven-surefire-provider-junit
+BuildRequires: maven-surefire-booter >= 2.0
+BuildRequires: modello >= 1.0-0.a8.3
+BuildRequires: modello-maven-plugin >= 1.0-0.a8.3
+BuildRequires: plexus-digest
+BuildRequires: plexus-maven-plugin >= 1.3.5
+BuildRequires: plexus-mail-sender
+BuildRequires: plexus-resources
 %endif
-
-Requires:        ant >= 1.6.5
-Requires:        antlr >= 2.7.4
-Requires:       aqute-bndlib
-Requires:        bsh >= 1.3.0
-#Requires:       cglib >= 2.1.0
-Requires:        checkstyle4 >= 4.1
-Requires:        classworlds >= 1.
-Requires(post):  classworlds >= 1.1
-Requires:        dom4j >= 1.6.1
-#Requires:        tomcat5-parent
-Requires:        tomcat5-servlet-2.4-api
-Requires:        glassfish-javamail
-Requires:        gnu.regexp >= 1.1.4
-Requires:        httpunit >= 1.6
-Requires:        jakarta-commons-beanutils >= 1.7.0
-Requires:        jakarta-commons-cli >= 1.0
-Requires(post):  jakarta-commons-cli >= 1.0
-Requires:        jakarta-commons-collections >= 3.1
-Requires:        jakarta-commons-io >= 1.1
-Requires:        jakarta-commons-lang >= 2.1
-Requires(post):  jakarta-commons-lang >= 2.1
-Requires:        jakarta-commons-logging >= 1.0.4
-Requires(post):  jakarta-commons-logging >= 1.0.4
-Requires:        jakarta-commons-validator >= 1.1.4
-Requires:        jaxen >= 1.1
-Requires:        jdom >= 1.0
-Requires(post):  jdom >= 1.0
-#Requires:       jmock >= 1.0.1
-Requires:        jline >= 0.8.1
-Requires:        jsch >= 0.1.20
-Requires(post):  jsch >= 0.1.20
-Requires:        jtidy >= 1.0
-Requires:        junit >= 3.8.2
-Requires:        maven2-common-poms >= 1.0-5
-Requires:        maven-jxr >= 1.0
-Requires:        maven-wagon >= 1.0-0.1.b2
-Requires(post):  maven-wagon >= 1.0-0.1.b2
-Requires:        nekohtml >= 0.9.3
-Requires:        oro >= 2.0.8
-Requires:        plexus-ant-factory >= 1.0-0.a1.2
-Requires:        plexus-bsh-factory >= 1.0-0.a7s.2
-Requires:        plexus-archiver >= 1.0-0.a6
-Requires:        plexus-compiler >= 1.5.1
-Requires:        plexus-container-default >= 1.0
-Requires(post):  plexus-container-default >= 1.0
-Requires:        plexus-i18n >= 1.0
-Requires:        plexus-interactivity >= 1.0
-Requires(post):  plexus-interactivity >= 1.0
-Requires:        plexus-utils >= 1.2
-Requires(post):  plexus-utils >= 1.2
-Requires:        plexus-velocity >= 1.1.2
-Requires:        pmd >= 3.6
-Requires:        qdox >= 1.5
-Requires:        rhino >= 1.5
-Requires:        velocity >= 1.4
-Requires:        xerces-j2 >= 2.7.1
-Requires:        xalan-j2 >= 2.6.0
-Requires:        xmlrpc
-Requires:        xmlunit
-Requires:        xom
-
-%if %without bootstrap
-Requires:        %{name} = %{epoch}:%{version}
-Requires:        maven-doxia >= 1.0-0.a9
-Requires(post):  maven-doxia >= 1.0-0.a9
-Requires:        maven-scm >= 0:1.0-0.b3.2
-Requires:        maven-scm-test >= 0:1.0-0.b3.2
-Requires:        maven-shared-invoker
-Requires:       maven-shared-io
-Requires:        maven-shared-file-management >= 1.0-4
-Requires:        maven-shared-jar
-Requires:        maven-shared-model-converter
-Requires:        maven-shared-verifier
-Requires:        maven-surefire >= 2.0
-Requires:        maven-surefire-booter >= 2.0
-Requires:        modello >= 1.0-0.a8.3
-Requires:        modello-maven-plugin >= 1.0-0.a8.3
+# }}}
+
+### Rs {{{
+Requires:      aqute-bndlib
+#Requires:     cglib >= 2.1.0
+Requires:      checkstyle4 >= 4.1
+#Requires:     tomcat5-parent
+Requires:      jaxen >= 1.1
+#Requires:     jmock >= 1.0.1
+Requires:      jline >= 0.8.1
+Requires:      maven-jxr >= 1.0
+Requires:      maven-wagon >= 1.0-0.1.b2
+Requires(post):        maven-wagon >= 1.0-0.1.b2
+Requires:      nekohtml >= 0.9.3
+Requires:      plexus-ant-factory >= 1.0-0.a1.2
+Requires:      plexus-bsh-factory >= 1.0-0.a7s.2
+Requires:      plexus-archiver >= 1.0-0.a6
+Requires:      plexus-compiler >= 1.5.1
+Requires:      plexus-container-default >= 1.0
+Requires(post):        plexus-container-default >= 1.0
+Requires:      plexus-i18n >= 1.0
+Requires:      plexus-interactivity >= 1.0
+Requires(post):        plexus-interactivity >= 1.0
+Requires:      plexus-velocity >= 1.1.2
+Requires:      pmd >= 3.6
+
+### Bootstrap {{{
+%if %{without bootstrap}
+Requires:              %{name} = %{version}
+Requires:      maven-doxia >= 1.0-0.a9
+Requires(post):        maven-doxia >= 1.0-0.a9
+Requires:      maven-scm >= 0:1.0-0.b3.2
+Requires:      maven-scm-test >= 0:1.0-0.b3.2
+Requires:      maven-shared-invoker
+Requires:               maven-shared-io
+Requires:      maven-shared-file-management >= 1.0-4
+Requires:      maven-shared-jar
+Requires:      maven-shared-model-converter
+Requires:      maven-shared-verifier
+Requires:      maven-surefire >= 2.0
+Requires:      maven-surefire-booter >= 2.0
+Requires:      modello >= 1.0-0.a8.3
+Requires:      modello-maven-plugin >= 1.0-0.a8.3
 %endif
+### }}}
 
-Obsoletes:       maven2-plugin-jxr <= 0:2.0.4 
-Obsoletes:       maven2-plugin-surefire <= 0:2.0.4 
-Obsoletes:       maven2-plugin-surefire-report <= 0:2.0.4 
-Obsoletes:       maven2-plugin-release <= 0:2.0.4 
-Obsoletes:      maven2-plugin-enforcer < %{epoch}:%{version}-%{release}
+### }}}
+### END OF OLD JPP DEPENDENCIES }}}
 
-Requires(post):    jpackage-utils >= 0:1.7.2
-Requires(postun):  jpackage-utils >= 0:1.7.2, /bin/rmdir
+BuildRoot:             %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-
-BuildArch:      noarch
+BuildArch:     noarch
+### }}}
 
+### descriptions and subpackages {{{
 %description
 Maven is a software project management and comprehension tool. Based on the 
 concept of a project object model (POM), Maven can manage a project's build,
 reporting and documentation from a central piece of information.
 
 %package        javadoc
-Summary:        Javadoc for %{name}
-Group:          Development/Documentation
-Requires(post):   /bin/rm,/bin/ln
-Requires(postun): /bin/rm
+Summary:       Javadoc for %{name}
+Group: Development/Documentation
 
 %description    javadoc
 %{summary}.
 
 %package        manual
-Summary:        Documents for %{name}
-Group:          Development/Documentation
+Summary:       Documents for %{name}
+Group: Development/Documentation
 
 %description    manual
 %{summary}.
 
 %package        plugin-ant
-Summary:        Ant plugin for maven
-Group:          Development/Build Tools
-Requires:       ant >= 1.6.5
-Requires:       ant-junit
-Requires:       ant-nodeps
-Requires:       junit >= 3.8.2
-Requires:       maven-wagon >= 1.0-0.1.b2
-Requires:       plexus-utils >= 1.2
-Requires:       xalan-j2 >= 2.6.0
-Requires:      xml-commons-apis >= 1.3.02
-Requires:      plexus-container-default
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
+Summary:       Ant plugin for maven
+Group: Development/Build Tools
+Requires:      ant >= 1.6.5
+Requires:      ant-junit
+Requires:      ant-nodeps
+Requires:      java-junit >= 3.8.2
+Requires:      maven-wagon >= 1.0-0.1.b2
+Requires:      java-plexus-utils >= 1.2
+Requires:      java-xalan >= 2.6.0
+Requires:              xml-commons-apis >= 1.3.02
+Requires:              plexus-container-default
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
 
 %description    plugin-ant
 Generates an Ant build file for the project.
 
 %package        plugin-antlr
-Summary:        Antlr plugin for maven
-Group:          Development/Build Tools
-Requires:       antlr >= 2.7.4
-Requires:      plexus-container-default
-Requires:       plexus-i18n >= 1.0
-%if %without bootstrap
-Requires:       maven-doxia >= 1.0-0.a9
-Requires:       maven-doxia-sitetools >= 1.0
+Summary:       Antlr plugin for maven
+Group: Development/Build Tools
+Requires:      antlr >= 2.7.4
+Requires:              plexus-container-default
+Requires:      plexus-i18n >= 1.0
+%if %{without bootstrap}
+Requires:      maven-doxia >= 1.0-0.a9
+Requires:      maven-doxia-sitetools >= 1.0
 %endif
-Requires:       plexus-utils >= 1.2
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
+Requires:      java-plexus-utils >= 1.2
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
 
 %description    plugin-antlr
 Generates sources from an Antlr grammar.
 
 %package        plugin-antrun
-Summary:        Antrun plugin for maven
-Group:          Development/Build Tools
-Requires:       ant >= 1.6.5
-Requires:      maven-embedder
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires:      maven-shared-reporting-impl
+Summary:       Antrun plugin for maven
+Group: Development/Build Tools
+Requires:      ant >= 1.6.5
+Requires:              maven-embedder
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
+Requires:              maven-shared-reporting-impl
 
 %description    plugin-antrun
 Runs a set of ant tasks from a phase of the build.
 
 
 %package        plugin-assembly
-Summary:        Assembly plugin for maven
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-%if %without bootstrap
-Requires:       modello >= 1.0-0.a8.3
+Summary:       Assembly plugin for maven
+Group: Development/Build Tools
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
+%if %{without bootstrap}
+Requires:      modello >= 1.0-0.a8.3
 %endif
-Requires:       plexus-archiver >= 1.0
-Requires:       plexus-utils >= 1.2
-Requires:      maven-shared-file-management >= 1.0
-Requires:      maven-shared-archiver
-Requires:      plexus-container-default
-Requires:      maven-shared-repository-builder
-Requires:      maven-shared-common-artifact-filters
-Requires:      maven-shared-plugin-testing-tools
-Requires:      maven-shared-test-tools
-Requires:       jmock >= 1.0.1
-Requires:       jdom >= 1.0
-Requires:       jaxen >= 1.1
-Requires:      saxpath
-Requires:       junit >= 3.8.2
+Requires:      plexus-archiver >= 1.0
+Requires:      java-plexus-utils >= 1.2
+Requires:              maven-shared-file-management >= 1.0
+Requires:              maven-shared-archiver
+Requires:              plexus-container-default
+Requires:              maven-shared-repository-builder
+Requires:              maven-shared-common-artifact-filters
+Requires:              maven-shared-plugin-testing-tools
+Requires:              maven-shared-test-tools
+Requires:      jmock >= 1.0.1
+Requires:      java-jdom >= 1.0
+Requires:      java-jaxen >= 1.1
+Requires:              saxpath
+Requires:      java-junit >= 3.8.2
 
 %description    plugin-assembly
 Builds an assembly (distribution) of sources and/or binaries.
 
 %package        plugin-changelog
-Summary:        Changelog plugin for maven
-Group:          Development/Build Tools
-%if %without bootstrap
-Requires:       maven-scm
+Summary:       Changelog plugin for maven
+Group: Development/Build Tools
+%if %{without bootstrap}
+Requires:      maven-scm
 %endif
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires:       maven-doxia >= 1.0-0.a9
-Requires:       maven-doxia-sitetools >= 1.0
-Requires:       maven-scm >= 0:1.0-0.b3.2
-Requires:      maven-shared-reporting-impl
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
+Requires:      maven-doxia >= 1.0-0.a9
+Requires:      maven-doxia-sitetools >= 1.0
+Requires:      maven-scm >= 0:1.0-0.b3.2
+Requires:              maven-shared-reporting-impl
 
 %description    plugin-changelog
 The Maven Changelog Plugin generates reports regarding the recent changes in
 your Software Configuration Management or SCM.
 
 %package        plugin-changes
-Summary:        Changes plugin for maven
-Group:          Development/Build Tools
-%if %without bootstrap
-Requires:       maven-doxia
-Requires:       maven-doxia-sitetools >= 1.0
+Summary:       Changes plugin for maven
+Group: Development/Build Tools
+%if %{without bootstrap}
+Requires:      maven-doxia
+Requires:      maven-doxia-sitetools >= 1.0
 %endif
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires:       velocity
-Requires:       commons-httpclient
-Requires:       plexus-velocity >= 1.1.2
-Requires:       plexus-mail-sender
-Requires:       glassfish-javamail
-Requires:       jakarta-commons-lang
-Requires:       velocity
-Requires:      maven-shared-reporting-impl
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
+Requires:      velocity
+Requires:      commons-httpclient
+Requires:      plexus-velocity >= 1.1.2
+Requires:      plexus-mail-sender
+Requires:      glassfish-javamail
+Requires:      java-commons-lang
+Requires:      velocity
+Requires:              maven-shared-reporting-impl
 
 %description    plugin-changes
 The Maven Changes Plugin is used to inform users of the changes that have 
 occured between different releases of your project.  
 
 %package        plugin-checkstyle
-Summary:        Checkstyle plugin for maven
-Group:          Development/Build Tools
-Requires:       checkstyle4 >= 4.1
-Requires:      checkstyle4-optional >= 4.1
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires:       plexus-utils >= 1.2
-Requires:       plexus-velocity >= 1.1.2
-Requires:       plexus-resources
-Requires:      maven-shared-reporting-impl
+Summary:       Checkstyle plugin for maven
+Group: Development/Build Tools
+Requires:      checkstyle4 >= 4.1
+Requires:              checkstyle4-optional >= 4.1
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
+Requires:      java-plexus-utils >= 1.2
+Requires:      plexus-velocity >= 1.1.2
+Requires:      plexus-resources
+Requires:              maven-shared-reporting-impl
 
 %description    plugin-checkstyle
 Generates a checkstyle report.
 
 
 %package        plugin-clean
-Summary:        Clean plugin for maven
-Group:          Development/Build Tools
-Requires:       junit >= 3.8.2
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires:       plexus-utils >= 1.2
+Summary:       Clean plugin for maven
+Group: Development/Build Tools
+Requires:      java-junit >= 3.8.2
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
+Requires:      java-plexus-utils >= 1.2
 
 %description    plugin-clean
 Cleans up files generated during build.
 
 %package        plugin-compiler
-Summary:        Compiler plugin for maven
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires:       plexus-compiler >= 1.5.1
-Requires:       plexus-utils >= 1.2
+Summary:       Compiler plugin for maven
+Group: Development/Build Tools
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
+Requires:      plexus-compiler >= 1.5.1
+Requires:      java-plexus-utils >= 1.2
 
 %description    plugin-compiler
 Compiles Java sources.
 
 %package        plugin-dependency
-Summary:        Dependency plugin for maven
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires:       plexus-archiver >= 1.0
-Requires:       plexus-utils >= 1.2
-Requires:       maven-shared-file-management >= 1.0-4
-Requires:       junit >= 3.8.2
-Requires:       plexus-container-default
-Requires:       maven-shared-dependency-analyzer
-Requires:       maven-shared-dependency-tree
+Summary:       Dependency plugin for maven
+Group: Development/Build Tools
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
+Requires:      plexus-archiver >= 1.0
+Requires:      java-plexus-utils >= 1.2
+Requires:      maven-shared-file-management >= 1.0-4
+Requires:      java-junit >= 3.8.2
+Requires:      plexus-container-default
+Requires:      maven-shared-dependency-analyzer
+Requires:      maven-shared-dependency-tree
 
 %description    plugin-dependency
 The dependency plugin provides the capability to manipulate artifacts. It can
@@ -498,21 +513,21 @@ copy and/or unpack artifacts from local or remote repositories to a specified
 location.
 
 %package        plugin-deploy
-Summary:        Deploy plugin for maven
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
+Summary:       Deploy plugin for maven
+Group: Development/Build Tools
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
 
 %description    plugin-deploy
 Deploys the built artifacts to a remote repository.
 
 
 %package        plugin-doap
-Summary:        Description of a Project (DOAP) plugin for maven
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires:       plexus-utils
+Summary:       Description of a Project (DOAP) plugin for maven
+Group: Development/Build Tools
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
+Requires:      java-plexus-utils
 
 %description    plugin-doap
 The Maven DOAP Plugin generates a Description of a Project (DOAP) file from
@@ -520,18 +535,18 @@ a POM.
 
 
 %package        plugin-docck
-Summary:        DOCCK plugin for maven
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires:       plexus-utils
-Requires:       maven-shared-plugin-tools-beanshell >= 2.2
-Requires:       maven-shared-plugin-tools-java >= 2.2
-Requires:       commons-httpclient
-Requires:       jakarta-commons-logging >= 1.0.4
-Requires:       maven-shared-file-management >= 1.0-4
-Requires:       maven-shared-plugin-tools-api
-Requires:      maven-shared-reporting-impl
+Summary:       DOCCK plugin for maven
+Group: Development/Build Tools
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
+Requires:      java-plexus-utils
+Requires:      maven-shared-plugin-tools-beanshell >= 2.2
+Requires:      maven-shared-plugin-tools-java >= 2.2
+Requires:      commons-httpclient
+Requires:      java-commons-logging >= 1.0.4
+Requires:      maven-shared-file-management >= 1.0-4
+Requires:      maven-shared-plugin-tools-api
+Requires:              maven-shared-reporting-impl
 
 %description    plugin-docck
 The Maven DOCCK Plugin checks that a project complies with the 
@@ -539,82 +554,82 @@ Plugin Documentation Standard.
 
 
 %package        plugin-ear
-Summary:        Ear plugin for maven
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires:       plexus-utils >= 1.2
-Requires:       maven-shared-verifier
-Requires:       xmlunit
+Summary:       Ear plugin for maven
+Group: Development/Build Tools
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
+Requires:      java-plexus-utils >= 1.2
+Requires:      maven-shared-verifier
+Requires:      java-xmlunit
 
 %description    plugin-ear
 Generates an EAR from the current project.
 
 
 %package        plugin-eclipse
-Summary:        Eclipse plugin for maven
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires:       plexus-utils >= 1.2
-Requires:       plexus-archiver >= 1.0
-Requires:       jmock >= 1.0.1
-Requires:       jdom >= 1.0
-Requires:       jaxen >= 1.1
-Requires:      saxpath
-Requires:       plexus-interactivity >= 1.0
-Requires:      maven-shared-plugin-testing-tools
-Requires:      maven-shared-test-tools
-Requires:       aqute-bndlib
+Summary:       Eclipse plugin for maven
+Group: Development/Build Tools
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
+Requires:      java-plexus-utils >= 1.2
+Requires:      plexus-archiver >= 1.0
+Requires:      jmock >= 1.0.1
+Requires:      java-jdom >= 1.0
+Requires:      java-jaxen >= 1.1
+Requires:              saxpath
+Requires:      plexus-interactivity >= 1.0
+Requires:              maven-shared-plugin-testing-tools
+Requires:              maven-shared-test-tools
+Requires:      aqute-bndlib
 
 %description    plugin-eclipse
 Generates an Eclipse project file for the current project.
 
 
 %package        plugin-ejb
-Summary:        EJB plugin for maven
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
+Summary:       EJB plugin for maven
+Group: Development/Build Tools
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
 
 %description    plugin-ejb
 Builds an EJB (and optional client) from the current project.
 
 
 %package        plugin-gpg
-Summary:        GPG plugin for maven
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires:       jakarta-commons-lang
-Requires:       plexus-utils
-Requires:       jakarta-commons-lang
-Requires:       junit >= 3.8.2
+Summary:       GPG plugin for maven
+Group: Development/Build Tools
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
+Requires:      java-commons-lang
+Requires:      java-plexus-utils
+Requires:      java-commons-lang
+Requires:      java-junit >= 3.8.2
 
 %description    plugin-gpg
 The Maven GPG Plugin signs all of the project's attached artifacts with GnuPG.
 
 
 %package        plugin-help
-Summary:        Help plugin for maven
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires:       maven-shared-plugin-tools-api
+Summary:       Help plugin for maven
+Group: Development/Build Tools
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
+Requires:      maven-shared-plugin-tools-api
 
 %description    plugin-help
 Gets information about the working environment for the project.
 
 
 %package        plugin-idea
-Summary:        Idea plugin for maven
-Group:          Development/Build Tools
-Requires:       dom4j >= 1.6.1
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires:       maven-wagon >= 1.0-0.1.b2
-Requires:       plexus-utils >= 1.2
-Requires:       jmock >= 1.0.1
+Summary:       Idea plugin for maven
+Group: Development/Build Tools
+Requires:      java-dom4j >= 1.6.1
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
+Requires:      maven-wagon >= 1.0-0.1.b2
+Requires:      java-plexus-utils >= 1.2
+Requires:      jmock >= 1.0.1
 
 %description    plugin-idea
 Creates/updates an IDEA workspace for the current project 
@@ -622,27 +637,27 @@ Creates/updates an IDEA workspace for the current project
 
 
 %package        plugin-install
-Summary:        Install plugin for maven
-Group:          Development/Build Tools
-Requires:       plexus-digest >= 1.0
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
+Summary:       Install plugin for maven
+Group: Development/Build Tools
+Requires:      plexus-digest >= 1.0
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
 
 %description    plugin-install
 Installs the built artifact into the local repository.
 
 %package        plugin-invoker
-Summary:        Invoker plugin for maven
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-%if %without bootstrap
-Requires:       maven-shared
-Requires:       maven-shared-invoker
-Requires:       maven-shared-file-management >= 1.0-4
-Requires:      maven-shared-io
+Summary:       Invoker plugin for maven
+Group: Development/Build Tools
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
+%if %{without bootstrap}
+Requires:      maven-shared
+Requires:      maven-shared-invoker
+Requires:      maven-shared-file-management >= 1.0-4
+Requires:              maven-shared-io
 %endif
-Requires:       bsh
+Requires:      java-bsh
 
 %description    plugin-invoker
 The Maven Invoker Plugin is used to run a set of Maven projects and makes 
@@ -650,60 +665,60 @@ sure that each project execution is successful, and optionally verifies
 the output from a given project execution.
 
 %package        plugin-jar
-Summary:        Jar plugin for maven
-Group:          Development/Build Tools
-Requires:       jakarta-commons-lang >= 2.1
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       maven-shared-archiver >= 2.3
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires:       plexus-utils >= 1.2
+Summary:       Jar plugin for maven
+Group: Development/Build Tools
+Requires:      java-commons-lang >= 2.1
+Requires:              %{name} = %{version}-%{release}
+Requires:      maven-shared-archiver >= 2.3
+Requires(postun):              %{name} = %{version}-%{release}
+Requires:      java-plexus-utils >= 1.2
 
 %description    plugin-jar
 Builds a JAR from the current project.
 
 
 %package        plugin-javadoc
-Summary:        Javadoc plugin for maven
-Group:          Development/Build Tools
-Requires:       jakarta-commons-lang >= 2.1
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-%if %without bootstrap
-Requires:       modello >= 1.0-0.a8.3
+Summary:       Javadoc plugin for maven
+Group: Development/Build Tools
+Requires:      java-commons-lang >= 2.1
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
+%if %{without bootstrap}
+Requires:      modello >= 1.0-0.a8.3
 %endif
-Requires:       plexus-archiver >= 1.0
-Requires:       plexus-utils >= 1.2
-Requires:      maven-shared-reporting-impl
+Requires:      plexus-archiver >= 1.0
+Requires:      java-plexus-utils >= 1.2
+Requires:              maven-shared-reporting-impl
 
 %description    plugin-javadoc
 Generates Javadoc for the project.
 
 %package        plugin-one
-Summary:        One plugin for maven
-Group:          Development/Build Tools
-Requires:       junit >= 3.8.2
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires:       plexus-archiver >= 1.0
-Requires:       plexus-utils >= 1.2
-Requires:       junit >= 3.8.2
-Requires:       maven-shared-model-converter
+Summary:       One plugin for maven
+Group: Development/Build Tools
+Requires:      java-junit >= 3.8.2
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
+Requires:      plexus-archiver >= 1.0
+Requires:      java-plexus-utils >= 1.2
+Requires:      java-junit >= 3.8.2
+Requires:      maven-shared-model-converter
 
 %description    plugin-one
 A plugin for interacting with legacy Maven 1.x repositories and builds.
 
 
 %package        plugin-plugin
-Summary:        Plugin plugin for maven
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires:       maven-shared-plugin-tools-beanshell >= 2.2
-Requires:       maven-shared-plugin-tools-java >= 2.2
-Requires:      maven-shared-reporting-impl
-Requires:       maven-doxia >= 1.0-0.a9
-Requires:       plexus-utils >= 1.2
-Requires:       plexus-container-default
+Summary:       Plugin plugin for maven
+Group: Development/Build Tools
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
+Requires:      maven-shared-plugin-tools-beanshell >= 2.2
+Requires:      maven-shared-plugin-tools-java >= 2.2
+Requires:              maven-shared-reporting-impl
+Requires:      maven-doxia >= 1.0-0.a9
+Requires:      java-plexus-utils >= 1.2
+Requires:      plexus-container-default
 
 %description    plugin-plugin
 Creates a Maven plugin descriptor for any Mojo's found in the source tree, 
@@ -711,64 +726,64 @@ to include in the JAR.
 
 
 %package        plugin-pmd
-Summary:        Pmd plugin for maven
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires:       plexus-utils >= 1.2
-Requires:       plexus-resources
-Requires:       pmd >= 3.3
-Requires:       jaxen >= 1.1
-Requires:       xom
-Requires:      maven-shared-reporting-impl
+Summary:       Pmd plugin for maven
+Group: Development/Build Tools
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
+Requires:      java-plexus-utils >= 1.2
+Requires:      plexus-resources
+Requires:      pmd >= 3.3
+Requires:      java-jaxen >= 1.1
+Requires:      java-xom
+Requires:              maven-shared-reporting-impl
 
 %description    plugin-pmd
 Generates a PMD report.
 
 
 %package        plugin-project-info-reports
-Summary:        Project-info-reports plugin for maven
-Group:          Development/Build Tools
-Requires:       httpunit >= 1.6
-Requires:       jakarta-commons-validator >= 1.1.4
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires:       plexus-i18n >= 1.0
-Requires:      maven-shared-reporting-impl
-Requires:       maven-shared-jar
-Requires:       maven-shared-dependency-tree
-Requires:       maven-wagon
-Requires:       maven-scm >= 0:1.0-0.b3.2
-Requires:       maven-doxia >= 1.0-0.a9
-Requires:       maven-doxia-sitetools >= 1.0
+Summary:       Project-info-reports plugin for maven
+Group: Development/Build Tools
+Requires:      java-httpunit >= 1.6
+Requires:      java-commons-validator >= 1.1.4
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
+Requires:      plexus-i18n >= 1.0
+Requires:              maven-shared-reporting-impl
+Requires:      maven-shared-jar
+Requires:      maven-shared-dependency-tree
+Requires:      maven-wagon
+Requires:      maven-scm >= 0:1.0-0.b3.2
+Requires:      maven-doxia >= 1.0-0.a9
+Requires:      maven-doxia-sitetools >= 1.0
 
 %description    plugin-project-info-reports
 Generates standard project reports.
 
 %package        plugin-rar
-Summary:        Rar plugin for maven
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
+Summary:       Rar plugin for maven
+Group: Development/Build Tools
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
 
 %description    plugin-rar
 Builds a RAR from the current project.
 
 
 %package        plugin-remote-resources
-Summary:        Remote Resources plugin for maven
-Group:          Development/Build Tools
-Requires:       junit >= 3.8.2
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires:       plexus-container-default
-Requires:       plexus-utils
-Requires:       plexus-velocity
-Requires:       velocity
-%if %without bootstrap
-Requires:       maven-shared
-Requires:       maven-shared-downloader
-Requires:       plexus-resources
+Summary:       Remote Resources plugin for maven
+Group: Development/Build Tools
+Requires:      java-junit >= 3.8.2
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
+Requires:      plexus-container-default
+Requires:      java-plexus-utils
+Requires:      plexus-velocity
+Requires:      velocity
+%if %{without bootstrap}
+Requires:      maven-shared
+Requires:      maven-shared-downloader
+Requires:      plexus-resources
 %endif
 
 %description    plugin-remote-resources
@@ -777,104 +792,106 @@ from remote repositories, processes those resources, and incorporate them
 into JARs built with maven.
 
 %package        plugin-repository
-Summary:        Repository plugin for maven
-Group:          Development/Build Tools
-Requires:       junit >= 3.8.2
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires:       plexus-archiver >= 1.0
+Summary:       Repository plugin for maven
+Group: Development/Build Tools
+Requires:      java-junit >= 3.8.2
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
+Requires:      plexus-archiver >= 1.0
 
 %description    plugin-repository
 Plugin to help with repository-based tasks.
 
 %package        plugin-resources
-Summary:        Resources plugin for maven
-Group:          Development/Build Tools
-#Requires:       jakarta-commons-io >= 1.1
-Requires:       plexus-utils >= 1.2
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
+Summary:       Resources plugin for maven
+Group: Development/Build Tools
+#Requires:     java-commons-io >= 1.1
+Requires:      java-plexus-utils >= 1.2
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
 
 %description    plugin-resources
 Copies the resources to the output directory for including in the JAR.
 
 %package        plugin-site
-Summary:        Site plugin for maven
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-%if %without bootstrap
-Requires:       maven-doxia >= 1.0-0.a9
-Requires:       maven-doxia-sitetools >= 1.0
+Summary:       Site plugin for maven
+Group: Development/Build Tools
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
+%if %{without bootstrap}
+Requires:      maven-doxia >= 1.0-0.a9
+Requires:      maven-doxia-sitetools >= 1.0
 %endif
-Requires:       plexus-utils >= 1.2
+Requires:      java-plexus-utils >= 1.2
 
 %description    plugin-site
 Generates a site for the current project.
 
 %package        plugin-source
-Summary:        Source plugin for maven
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires:       plexus-archiver >= 1.0
-Requires:       plexus-utils >= 1.2
-Requires:       plexus-container-default >= 1.0
-Requires:       junit >= 3.8.2
+Summary:       Source plugin for maven
+Group: Development/Build Tools
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
+Requires:      plexus-archiver >= 1.0
+Requires:      java-plexus-utils >= 1.2
+Requires:      plexus-container-default >= 1.0
+Requires:      java-junit >= 3.8.2
 
 %description    plugin-source
 Builds a JAR of sources for use in IDEs and distribution to the repository.
 
 
 %package        plugin-stage
-Summary:        Stage plugin for maven
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires:       maven-wagon
-Requires:       plexus-utils
-Requires:       junit >= 3.8.2
+Summary:       Stage plugin for maven
+Group: Development/Build Tools
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
+Requires:      maven-wagon
+Requires:      java-plexus-utils
+Requires:      java-junit >= 3.8.2
 
 %description    plugin-stage
 Maven Stage Plugin copies artifacts from one repository to another.
 
 
 %package        plugin-verifier
-Summary:        Verifier plugin for maven
-Group:          Development/Build Tools
-Requires:       junit >= 3.8.2
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-%if %without bootstrap
-Requires:       modello >= 1.0-0.a8.3
+Summary:       Verifier plugin for maven
+Group: Development/Build Tools
+Requires:      java-junit >= 3.8.2
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
+%if %{without bootstrap}
+Requires:      modello >= 1.0-0.a8.3
 %endif
-Requires:       plexus-utils >= 1.2
+Requires:      java-plexus-utils >= 1.2
 
 %description    plugin-verifier
 Useful for integration tests - verifies the existence of certain conditions.
 
 %package        plugin-war
-Summary:        War plugin for maven
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires:       plexus-utils >= 1.2
-Requires:       junit >= 3.8.2
+Summary:       War plugin for maven
+Group: Development/Build Tools
+Requires:              %{name} = %{version}-%{release}
+Requires(postun):              %{name} = %{version}-%{release}
+Requires:      java-plexus-utils >= 1.2
+Requires:      java-junit >= 3.8.2
 
 %description    plugin-war
 Builds a WAR from the current project.
 
-%if %with repolib
+%if %{with repolib}
 %package repolib
-Summary:        Artifacts to be uploaded to a repository library
-Group:          Development/Libraries/Java
+Summary:       Artifacts to be uploaded to a repository library
+Group: Development/Libraries/Java
 
 %description repolib
 Artifacts to be uploaded to a repository library.
 This package is not meant to be installed but so its contents
 can be extracted through rpm2cpio.
 %endif
+### }}}
 
+### prep {{{
 %prep
 #rpm -ql maven-surefire
 
@@ -885,48 +902,46 @@ tar xzf %{SOURCE2}
 
 # We need to replace the javadoc plugin as the 2.3-SNAPSHOT included above 
 # has several bugs
-rm -rf maven2-plugins/maven-javadoc-plugin
-rm -rf maven2-plugins/maven-enforcer-plugin
-pushd maven2-plugins
-tar xzf %{SOURCE22}
-popd
+rm -rf maven-plugins/maven-javadoc-plugin
+rm -rf maven-plugins/maven-enforcer-plugin
+tar xzf %{SOURCE22} -C maven-plugins
 
 # Use an older version of site plugin because newer one requires newer doxia 
 # (1.0a8) which is not compatible with the older one (1.0a7) which is needed 
 # by other parts of maven
-#rm -rf maven2-plugins/maven-site-plugin
+#rm -rf maven-plugins/maven-site-plugin
 #tar xzf %{SOURCE8}
 
 # javadoc 2.4 uses an old doxia method
-%patch15 -b .sav
+%patch15
 
 # This plugin can't cope with a JAR without a JDK version on it
-%patch16 -b .sav
+%patch16
 
-%patch17 -b .sav
+%patch17
 
-%patch18 -b .sav
-%patch19 -b .sav
+%patch18
+%patch19
 
-%patch20 -b .sav
+%patch20
 
 # Remove dependencies on org.codehaus.doxia.* (it is now
 # org.apache.maven.doxia, and in the interest of maintaining just one
 # doxia jar, we substitute things accordingly)
 
-for i in    maven2-plugins/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/FileActivityReport.java \
-            maven2-plugins/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java \
-            maven2-plugins/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/DeveloperActivityReport.java \
-            maven2-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java \
-            maven2-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java \
-            maven2/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java \
-            maven2-plugins/maven-antlr-plugin/src/main/java/org/apache/maven/plugin/antlr/AntlrHtmlReport.java \
-            maven2-plugins/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java \
-            maven2-plugins/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReportGenerator.java \
-            maven2-plugins/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java \
-            maven2-plugins/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportListener.java \
-            maven2-plugins/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java \
-            maven2-plugins/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java; do
+for i in    maven-plugins/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/FileActivityReport.java \
+            maven-plugins/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java \
+            maven-plugins/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/DeveloperActivityReport.java \
+            maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java \
+            maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java \
+            maven/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java \
+            maven-plugins/maven-antlr-plugin/src/main/java/org/apache/maven/plugin/antlr/AntlrHtmlReport.java \
+            maven-plugins/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java \
+            maven-plugins/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReportGenerator.java \
+            maven-plugins/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java \
+            maven-plugins/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportListener.java \
+            maven-plugins/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java \
+            maven-plugins/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java; do
 
     sed -i -e s:org.codehaus.doxia.sink.Sink:org.apache.maven.doxia.sink.Sink:g $i
     sed -i -e s:org.codehaus.doxia.site.renderer.SiteRenderer:org.apache.maven.doxia.siterenderer.Renderer:g $i
@@ -936,55 +951,55 @@ done
 # Remove existing binaries from source trees
 #find . -name "*.jar" -exec rm -f '{}' \;
 
-%patch0 -b .sav
-%patch1 -b .sav
-%patch2 -b .sav
-%patch3 -b .sav
-%patch4 -b .sav
-%patch5 -b .sav
+%patch0
+%patch1
+%patch2
+%patch3
+%patch4
+%patch5
 
 # keep external jars out of uber jar only in non-bootstrap mode
-%if %without bootstrap
-%patch6 -b .sav
+%if %{without bootstrap}
+%patch6
 %endif
 
 
-%patch7 -b .sav
+%patch7
 
-%if %with bootstrap
-%patch8 -b .sav
+%if %{with bootstrap}
+%patch8
 %endif
 
-%patch9 -b .sav
-%patch10 -b .sav
-%patch11 -b .sav
-%patch12 -b .sav
+%patch9
+%patch10
+%patch11
+%patch12
 # javadoc 2.5 no longer needs this patch
-#%patch13 -b .sav
+#%patch13
 # javadoc 2.5 pre-reqs maven 2.0.9 by default
-#%patch14 -b .sav
+#%patch14
 
 # FIXME: Maven eclipse plugin tests are disabled for now, until a way
 # is found to stop it from connecting to the web despite offline mode.
-rm -rf maven2-plugins/maven-eclipse-plugin/src/test/*
+rm -rf maven-plugins/maven-eclipse-plugin/src/test/*
 
 # FIXME: Disabled items:
 
 #Disabled goal (because we don't want a jetty dependency)
-rm -f maven2-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
+rm -f maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
 
 # Disabled test because it needs cglib
-rm -f maven2-plugins/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java
+rm -f maven-plugins/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java
 
 # Disabled test because it needs mock
-rm -f maven2/maven-artifact-manager/src/test/java/org/apache/maven/artifact/testutils/MockManager.java 
-rm -f maven2/maven-artifact-manager/src/test/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadataTest.java
+rm -f maven/maven-artifact-manager/src/test/java/org/apache/maven/artifact/testutils/MockManager.java 
+rm -f maven/maven-artifact-manager/src/test/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadataTest.java
 
 # extract poms and jars (if any)
 tar xzf %{SOURCE3}
 
 # extract jars iff in bootstrap mode
-%if %with bootstrap
+%if %{with bootstrap}
 tar xzf %{SOURCE4}
 %endif
 
@@ -994,29 +1009,29 @@ cp -p %{SOURCE10} m2_repo/repository/JPP/maven2/model-v3.jar
 mkdir external_repo
 ln -s %{_javadir} external_repo/JPP
 
-cp -p %{SOURCE6} maven2/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/JPackageRepositoryLayout.java
-cp -p %{SOURCE11} maven2/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/MavenJPackageDepmap.java
+cp -p %{SOURCE6} maven/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/JPackageRepositoryLayout.java
+cp -p %{SOURCE11} maven/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/MavenJPackageDepmap.java
 
 # FIXME: bootstrap-mini has no dependencies, so we copy the file there 
 # (for now). Since bootstrap classes are not in the final package, there 
 # will be no duplicates.
-mkdir -p maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/artifact/repository/layout/
-cp -p %{SOURCE11} maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/artifact/repository/layout/MavenJPackageDepmap.java
+mkdir -p maven/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/artifact/repository/layout/
+cp -p %{SOURCE11} maven/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/artifact/repository/layout/MavenJPackageDepmap.java
 
 cp -p %{SOURCE7} %{maven_settings_file}
-sed -i -e "s|<url>__INTERNAL_REPO_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" %{maven_settings_file}
-%if %with bootstrap
-sed -i -e "s|<url>__EXTERNAL_REPO_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" %{maven_settings_file}
+sed -i -e "s|<url>__INTERNAL_REPO_PLACEHOLDER__</url>|<url>file://$(pwd)/m2_repo/repository</url>|g" %{maven_settings_file}
+%if %{with bootstrap}
+sed -i -e "s|<url>__EXTERNAL_REPO_PLACEHOLDER__</url>|<url>file://$(pwd)/external_repo</url>|g" %{maven_settings_file}
 %else
 sed -i -e "s|<url>__EXTERNAL_REPO_PLACEHOLDER__</url>|<url>file://%{_datadir}/%{name}/repository</url>|g" %{maven_settings_file}
 %endif
 
-sed -i -e "s|__INTERNAL_REPO_PLACEHOLDER__|file://`pwd`/m2_repo/repository|g" maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/download/OnlineArtifactDownloader.java
+sed -i -e "s|__INTERNAL_REPO_PLACEHOLDER__|file://$(pwd)/m2_repo/repository|g" maven/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/download/OnlineArtifactDownloader.java
 
-%if %with bootstrap
-sed -i -e "s|__EXTERNAL_REPO_PLACEHOLDER__|file://`pwd`/external_repo|g" maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/download/OnlineArtifactDownloader.java
+%if %{with bootstrap}
+sed -i -e "s|__EXTERNAL_REPO_PLACEHOLDER__|file://$(pwd)/external_repo|g" maven/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/download/OnlineArtifactDownloader.java
 %else
-sed -i -e "s|__EXTERNAL_REPO_PLACEHOLDER__|file://%{_datadir}/%{name}/repository|g" maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/download/OnlineArtifactDownloader.java
+sed -i -e "s|__EXTERNAL_REPO_PLACEHOLDER__|file://%{_datadir}/%{name}/repository|g" maven/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/download/OnlineArtifactDownloader.java
 %endif
 
 # Copy the empty dependency jar/pom in place
@@ -1024,57 +1039,65 @@ mkdir -p m2_repo/repository/JPP/maven2/default_poms
 cp -p %{SOURCE13} m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-empty-dep.pom
 cp -p %{SOURCE14} m2_repo/repository/JPP/maven2/empty-dep.jar
 
+# Patches added by PLD
+find -name pom.xml -o -name '*.pom' | xargs sed -i 's#<version>1\.2_Java1\.3</version>#<version>1.2</version>#g'
+%patch100 -p1
+### }}}
+
+### build {{{
 %build
+
+export JAVA_HOME=%{java_home}
+
 # Fix maven-remote-resources-plugin
 # we now use plexus-velocity 1.1.7 which has the correct descriptor with a hint.
-rm -f maven2-plugins/maven-remote-resources-plugin/src/main/resources/META-INF/plexus/components.xml
+rm -f maven-plugins/maven-remote-resources-plugin/src/main/resources/META-INF/plexus/components.xml
 
 # Wire in jdom dependency
-cp -p maven2/maven-artifact/pom.xml maven2/maven-artifact/pom.xml.withoutjdom
-saxon -o maven2/maven-artifact/pom.xml maven2/maven-artifact/pom.xml.withoutjdom /usr/share/java-utils/xml/maven2jpp-mapdeps.xsl map=%{SOURCE12}
-saxon -o m2_repo/repository/JPP/maven2/poms/JPP.maven2-artifact.pom maven2/maven-artifact/pom.xml.withoutjdom /usr/share/java-utils/xml/maven2jpp-mapdeps.xsl map=%{SOURCE12}
+cp -p maven/maven-artifact/pom.xml maven/maven-artifact/pom.xml.withoutjdom
+saxon -o maven/maven-artifact/pom.xml maven/maven-artifact/pom.xml.withoutjdom /usr/share/java-utils/xml/maven2jpp-mapdeps.xsl map=%{SOURCE12}
+saxon -o m2_repo/repository/JPP/maven2/poms/JPP.maven2-artifact.pom maven/maven-artifact/pom.xml.withoutjdom /usr/share/java-utils/xml/maven2jpp-mapdeps.xsl map=%{SOURCE12}
 
 # for uber jar
-cp -p maven2/maven-core/pom.xml maven2/maven-core/pom.xml.withoutjdom
-saxon -o maven2/maven-core/pom.xml maven2/maven-core/pom.xml.withoutjdom /usr/share/java-utils/xml/maven2jpp-mapdeps.xsl map=%{SOURCE12}
+cp -p maven/maven-core/pom.xml maven/maven-core/pom.xml.withoutjdom
+saxon -o maven/maven-core/pom.xml maven/maven-core/pom.xml.withoutjdom /usr/share/java-utils/xml/maven2jpp-mapdeps.xsl map=%{SOURCE12}
 
-cp -p maven2/bootstrap/bootstrap-installer/pom.xml maven2/bootstrap/bootstrap-installer/pom.xml.withoutjdom
-saxon -o maven2/bootstrap/bootstrap-installer/pom.xml maven2/bootstrap/bootstrap-installer/pom.xml.withoutjdom /usr/share/java-utils/xml/maven2jpp-mapdeps.xsl map=%{SOURCE12}
+cp -p maven/bootstrap/bootstrap-installer/pom.xml maven/bootstrap/bootstrap-installer/pom.xml.withoutjdom
+saxon -o maven/bootstrap/bootstrap-installer/pom.xml maven/bootstrap/bootstrap-installer/pom.xml.withoutjdom /usr/share/java-utils/xml/maven2jpp-mapdeps.xsl map=%{SOURCE12}
 
-mkdir -p maven2/maven2-plugins/maven-assembly-plugin/target/generated-resources/plexus/META-INF/plexus/components.xml
-touch maven2/maven2-plugins/maven-assembly-plugin/target/generated-resources/plexus/META-INF/plexus/components.xml
+mkdir -p maven/maven-plugins/maven-assembly-plugin/target/generated-resources/plexus/META-INF/plexus/components.xml
+touch maven/maven-plugins/maven-assembly-plugin/target/generated-resources/plexus/META-INF/plexus/components.xml
 
-# Build maven2
-export MAVEN_REPO_LOCAL=`pwd`/%{repo_dir}
+# Build maven
+export MAVEN_REPO_LOCAL=$(pwd)/%{repo_dir}
 export M2_SETTINGS_FILE=%{maven_settings_file}
 
 # In bootstrap mode, we want it looking at default poms only (controlled via 
-# maven2-common-poms). This enables us to change naming structures without 
+# maven-common-poms). This enables us to change naming structures without 
 # breaking build.
 
 export MAVEN_OPTS="$MAVEN_OPTS -Dmaven.repo.local=$MAVEN_REPO_LOCAL -Dmaven2.ignore.versions -Dmaven2.offline.mode -Dmaven.test.failure.ignore=true -Dmaven2.jpp.depmap.file=%{SOURCE17}"
-export M2_HOME=`pwd`/maven2/home/apache-%{base_name}-%{version}
+export M2_HOME=$(pwd)/maven/home/apache-%{name}-%{version}
 
-%if %with bootstrap
-export MAVEN_OPTS="$MAVEN_OPTS -Dmaven2.jpp.default.repo=`pwd`/external_repo"
+%if %{with bootstrap}
+export MAVEN_OPTS="$MAVEN_OPTS -Dmaven2.jpp.default.repo=$(pwd)/external_repo"
 %else
 export MAVEN_OPTS="$MAVEN_OPTS -Dmaven2.jpp.default.repo=%{_datadir}/%{name}/repository"
 %endif
 
-# pushd maven2/ ...
-pushd %{name} >& /dev/null
+cd %{name} # {{{
 
 [ -z "$JAVA_HOME" ] && JAVA_HOME=%{_jvmdir}/java
 export JAVA_HOME
 
-mkdir bootstrap/lib
-ln -s $(build-classpath jdom) bootstrap/lib/jdom.jar
-export CLASSPATH=`pwd`/bootstrap/lib/jdom.jar
+mkdir -p bootstrap/lib
+ln -sf $(build-classpath jdom) bootstrap/lib/jdom.jar
+export CLASSPATH=$(pwd)/bootstrap/lib/jdom.jar
 export JDOMCLASS=$CLASSPATH
-./bootstrap.sh --prefix=`pwd`/home  --settings=%{maven_settings_file}
+sh -x ./bootstrap.sh --prefix=$(pwd)/home  --settings=%{maven_settings_file}
 unset CLASSPATH
 
-popd >& /dev/null
+cd - # cd %{name} }}}
 
 # Update the classworlds jar name in the mvn script
 sed -i -e s:"/core/boot/classworlds-\*.jar":/core/boot/classworlds\*.jar:g $M2_HOME/bin/mvn
@@ -1082,7 +1105,7 @@ sed -i -e s:"/core/boot/classworlds-\*.jar":/core/boot/classworlds\*.jar:g $M2_H
 # In non-bootstrap mode, external jars are kept out of the uber jar. Copy those
 # jars in for now (linked in %%post)
 
-%if %without bootstrap
+%if %{without bootstrap}
 (cd $M2_HOME/lib
 cp ../../../../m2_home_local/repository/com/jcraft/jsch/0.1.24/jsch-0.1.24.jar jsch.jar
 cp ../../../../m2_home_local/repository/org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.jar plexus-utils.jar
@@ -1097,7 +1120,7 @@ build-jar-repository -s -p $M2_HOME/lib jdom maven-wagon/file maven-wagon/http-l
 %endif
 
 # Build plugins
-pushd maven2-plugins >& /dev/null
+cd maven-plugins # {{{
 
 # Build the plugin-plugin first, as it is needed to build itself later on
 # NOTE: Build of this plugin for the first time is expected to cause errors. 
@@ -1118,22 +1141,22 @@ sed -i -e s:"<module>maven-clover-plugin</module>"::g pom.xml
 $M2_HOME/bin/mvn -e --batch-mode -s %{maven_settings_file} $MAVEN_OPTS -Dmaven.test.skip=true -npu --no-plugin-registry verify  
 $M2_HOME/bin/mvn -e --batch-mode -s %{maven_settings_file} $MAVEN_OPTS -Dmaven.test.skip=true -npu --no-plugin-registry --fail-at-end jar:jar install:install
 
-popd >& /dev/null
+cd - # }}}
 
-%if %without bootstrap
+%if %{without bootstrap}
 # Build model-all JAR  (for model-v3 classes)
-pushd maven2/maven-model >& /dev/null
+cd maven/maven-model # {{{
 
 $M2_HOME/bin/mvn -e -s %{maven_settings_file} $MAVEN_OPTS -P all-models package
 
-popd >& /dev/null
+cd - # }}}
 %endif
 
 # Build complete. Run it tests.
 
-%if %with itests
+%if %{with itests}
 
-(cd maven2
+(cd maven
 
 # One of the tests (#63) needs tools.jar. Fix the path for it
 sed -i -e s:"<systemPath>\${java.home}/../lib/tools.jar</systemPath>":"<systemPath>$JAVA_HOME/lib/tools.jar</systemPath>":g maven-core-it/it0063/pom.xml 
@@ -1144,9 +1167,9 @@ $M2_HOME/bin/mvn -s %{maven_settings_file} $MAVEN_OPTS org.apache.maven.plugins:
 )
 
 for i in `find integration-tests/maven-core-it-support -name pom.xml`; do
-    pushd `dirname $i`
+    cd `dirname $i` # {{{
         $M2_HOME/bin/mvn -s %{maven_settings_file} $MAVEN_OPTS org.apache.maven.plugins:maven-plugin-plugin:2.1.1-SNAPSHOT::descriptor org.apache.maven.plugins:maven-resources-plugin:2.2-SNAPSHOT:resources org.apache.maven.plugins:maven-compiler-plugin:2.1-SNAPSHOT:compile  org.apache.maven.plugins:maven-jar-plugin:2.1-SNAPSHOT:jar org.apache.maven.plugins:maven-install-plugin:2.2-SNAPSHOT:install
-    popd
+    cd - # }}}
 done
 
 # Test 41 expects core-it-support 1.2 to be packed as a coreit-artifact
@@ -1168,7 +1191,7 @@ export MAVEN_OPTS=$OLD_MAVEN_OPTS
 # plugin which makes this necessary. See: 
 # http://jira.codehaus.org/browse/MJAVADOC-157
 
-(cd maven2
+(cd maven # {{{
 for dir in `find -maxdepth 1 -type d`; do
 
     if [ "$dir" == "./maven-core-it-runner" ]; then
@@ -1179,12 +1202,13 @@ for dir in `find -maxdepth 1 -type d`; do
         continue
     fi 
 
-    pushd $dir
+    cd $dir # {{{
     $M2_HOME/bin/mvn -s %{maven_settings_file} $MAVEN_OPTS -Dmaven2.usejppjars org.apache.maven.plugins:maven-javadoc-plugin:2.3-SNAPSHOT:javadoc
-    popd
+    cd - # }}}
 done
-)
-(cd maven2-plugins
+) # }}}
+
+(cd maven-plugins # {{{
 for dir in `find -maxdepth 1 -type d`; do
 
     if [ "$dir" == "./maven-clover-plugin" ]; then
@@ -1195,16 +1219,18 @@ for dir in `find -maxdepth 1 -type d`; do
         continue
     fi
 
-    pushd $dir
+    cd $dir # {{{
     $M2_HOME/bin/mvn -s %{maven_settings_file} $MAVEN_OPTS -Dmaven2.usejppjars org.apache.maven.plugins:maven-javadoc-plugin:2.3-SNAPSHOT:javadoc
-    popd
+    cd - # }}}
 done
-)
+) # }}}
+### }}}
 
+### install {{{
 %install
 rm -rf $RPM_BUILD_ROOT
 
-export M2_HOME=`pwd`/maven2/home/apache-%{base_name}-%{version}
+export M2_HOME=$(pwd)/maven/home/apache-%{name}-%{version}
 
 # Repository
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/repository
@@ -1221,7 +1247,7 @@ cp -p $M2_HOME/bin/* $RPM_BUILD_ROOT%{_datadir}/%{name}/bin
 
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/boot
 
-%if %with bootstrap
+%if %{with bootstrap}
 cp -p $M2_HOME/boot/classworlds* $RPM_BUILD_ROOT%{_datadir}/%{name}/boot/classworlds.jar
 %endif
 
@@ -1239,7 +1265,7 @@ done
 
 # Install component poms and jars
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/poms
-pushd %{name}
+cd %{name} # {{{
     for project in maven-artifact \
         maven-artifact-manager \
         maven-artifact-test \
@@ -1264,14 +1290,14 @@ pushd %{name}
 
         install -m 644 $project/target/$project-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$artifactname-%{version}.jar
 
-%if %without bootstrap
+%if %{without bootstrap}
         if [ "$project" == "maven-model" ]; then
           install -m 644 $project/target/$project-%{version}-all.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$artifactname-all-%{version}.jar
         fi
 %endif
 
     done
-popd
+cd - # }}}
 
 # reporting api
 cp -p %{name}/maven-reporting/maven-reporting-api/pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-reporting-api.pom
@@ -1304,7 +1330,7 @@ cp -p %{name}/pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven.
 # plugins
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/
 
-pushd maven2-plugins
+cd maven-plugins # {{{
     for targetdir in `find -mindepth 2 -maxdepth 2 -type d -name target`; do
 
         # Find the version version
@@ -1321,30 +1347,30 @@ pushd maven2-plugins
         %add_to_maven_depmap org.apache.maven.plugins $pluginname $pluginversion JPP/%{name}/plugins $artifactname
 
     done
-popd
+cd - # }}}
 
 # g=org.apache.maven.plugins a=maven-plugins needs to be copied manually, as 
 # it get's changed to a=plugins (a=plugins and a=maven-plugins is the same 
 # file, but the former is needed for compatiblity while newer projects use 
 # the latter)
-cp -p maven2-plugins/target/*jar $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/maven-plugins.jar
-cp -p maven2-plugins/pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.maven2.plugins-maven-plugins.pom
+cp -p maven-plugins/target/*jar $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/maven-plugins.jar
+cp -p maven-plugins/pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.maven.plugins-maven-plugins.pom
 %add_to_maven_depmap org.apache.maven.plugins maven-plugins 9-SNAPSHOT JPP/%{name}/plugins maven-plugins
 
 # The empty dependencies
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/poms
 mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
-cp -p %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.maven2-empty-dep.pom
+cp -p %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.maven-empty-dep.pom
 cp -p %{SOURCE14} $RPM_BUILD_ROOT%{_javadir}/%{name}/empty-dep.jar
 
 # For backwards compatibility
-ln -s JPP.maven2-core.pom $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.maven2-mavencore.pom
+ln -s JPP.maven-core.pom $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.maven-mavencore.pom
 
 # javadocs
 install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
-(cd maven2
+(cd maven
     for doc_dir in `find . -type d -name apidocs`; do 
         module=`echo $doc_dir | sed -e s:"^\\./"::g -e s:"/target/site/apidocs$"::g`
         targetdir=$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$module
@@ -1353,7 +1379,7 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
     done
 )
 
-(cd maven2-plugins
+(cd maven-plugins
     for doc_dir in `find . -type d -name apidocs`; do 
         module=`echo $doc_dir | sed -e s:"^\\./"::g -e s:"/target/site/apidocs$"::g`
         targetdir=$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$module
@@ -1364,7 +1390,7 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
 # manual and jpp readme
 install -dm 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -p %{name}/home/apache-%{base_name}-%{version}/*.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+cp -p %{name}/home/apache-%{name}-%{version}/*.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 cp -p %{SOURCE16} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 # create appropriate links in /usr/share/java
@@ -1375,14 +1401,14 @@ ln -sf %{_datadir}/%{name}/plugins $RPM_BUILD_ROOT%{_javadir}/%{name}
 ln -s %{_javadir} $RPM_BUILD_ROOT%{_datadir}/%{name}/repository/JPP
 
 # Create the bootstrap repo
-%if %with bootstrap
+%if %{with bootstrap}
 install -dm 755  $RPM_BUILD_ROOT%{_datadir}/%{name}/bootstrap_repo
 tar xzf %{SOURCE4}
 mv m2_repo/repository/JPP $RPM_BUILD_ROOT%{_datadir}/%{name}/bootstrap_repo/
 rmdir -p m2_repo/repository
 %endif
 
-%if %with repolib
+%if %{with repolib}
 install -d -m 755 $RPM_BUILD_ROOT%{repodir}
 install -d -m 755 $RPM_BUILD_ROOT%{repodirlib}
 install -p -m 644 %{SOURCE100} $RPM_BUILD_ROOT%{repodir}/component-info.xml
@@ -1428,6 +1454,7 @@ for jar in project.jar settings.jar model.jar profile.jar artifact-manager.jar r
     cp -p %{buildroot}%{_javadir}/%{name}/${jar} %{buildroot}%{repodirlib}/maven-${jar}
 done
 %endif
+### }}}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -1438,7 +1465,7 @@ rm -rf $RPM_BUILD_ROOT
 find %{_datadir}/%{name}/boot/ -type l -exec rm -f '{}' \;
 find %{_datadir}/%{name}/lib/ -type l -exec rm -f '{}' \;
 
-%if %without bootstrap
+%if %{without bootstrap}
 build-jar-repository -s -p %{_datadir}/%{name}/boot classworlds
 
 build-jar-repository -s -p %{_datadir}/%{name}/lib \
@@ -1500,7 +1527,7 @@ if [ -d %{_javadir}/%{name} ] ; then rmdir --ignore-fail-on-non-empty %{_javadir
 %{_mavendepmapfragdir}
 %{_javadir}/%{name}
 
-%if %with bootstrap
+%if %{with bootstrap}
 %{_datadir}/%{name}/bootstrap_repo
 %endif
 
@@ -1692,153 +1719,8 @@ if [ -d %{_javadir}/%{name} ] ; then rmdir --ignore-fail-on-non-empty %{_javadir
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/war-plugin*.jar
 
-%if %with repolib
+%if %{with repolib}
 %files repolib
 %defattr(0644,root,root,0755)
 %{_javadir}/repository.jboss.com
 %endif
-
-%changelog
-* Fri Mar 12 2010 David Walluck <dwalluck@redhat.com> 0:2.0.8-26
-- more merging with RHEL-4-EP-5 0:2.0.8-10.40
-
-* Fri Mar 12 2010 David Walluck <dwalluck@redhat.com> 0:2.0.8-25
-- update java source files from RHEL-4-EP-5 0:2.0.8-10.40
-
-* Thu Mar 11 2010 David Walluck <dwalluck@redhat.com> 0:2.0.8-24
-- merge some patches from RHEL-4-EP-5 0:2.0.8-10.40
-
-* Wed Sep 02 2009 Ralph Apel <r.apel@r-apel.de> 0:2.0.8-23
-- rebuild without_bootstrap
-
-* Wed Sep 02 2009 Ralph Apel <r.apel@r-apel.de> 0:2.0.8-22
-- try to relax maven-surefire requirements
-- drop excessive BRs in bootstrap mode
-
-* Thu Jun 11 2009 David Walluck <dwalluck@redhat.com> 0:2.0.8-21
-- add repolib
-
-* Fri May 22 2009 David Walluck <dwalluck@redhat.com> 0:2.0.8-20
-- update maven-surefire BuildRequires
-
-* Mon May 04 2009 Yong Yang <yyang@redhat.com> - 0:2.0.8-19
-- Rebuild
-
-* Tue Apr 21 2009 Yong Yang <yyang@redhat.com> - 0:2.0.8-18
-- Build model-all.jar for model-v3 needed by maven-shared-model-converter, Merged from RHEL-4-EP-5 0:2.0.8-10.17
-
-* Tue Apr 21 2009 Yong Yang <yyang@redhat.com> - 0:2.0.8-17
-- rebuild in non-bootstrap mode with plexus-cdc alpha10
-
-* Tue Apr 21 2009 Yong Yang <yyang@redhat.com> - 0:2.0.8-16
-- rebuild in bootstrap mode with plexus-cdc alpha10
-
-* Thu Apr 02 2009 Yong Yang <yyang@redhat.com> - 0:2.0.8-15
-- fix jpp depmap issues of maven-shared-plugin-tools-api, maven-shared-plugin-tools-beanshell, maven-shared-plugin-tools-java
-- cp maven-assembly-plugin/../components.xml manually to fix java.io.FileNotFoundException
-- rebuild in non-bootstrap mode
-
-* Thu Apr 02 2009 Yong Yang <yyang@redhat.com> - 0:2.0.8-14
-- rebuild in bootstrap mode to fix PluginDescriptor issue
-
-* Wed Apr 01 2009 Fernando Nasser <fnasser@redhat.com> - 0:2.0.8-13
-- Build in bootstrap mode
-
-* Mon Mar 23 2009 Yong Yang <yyang@redhat.com> - 0:2.0.8-12
-- add maven2-plugins-jpprepolayout.patch
-
-* Mon Mar 23 2009 Yong Yang <yyang@redhat.com> - 0:2.0.8-11
-- rebuild in non-bootstrap mode
-
-* Mon Mar 23 2009 Yong Yang <yyang@redhat.com> - 0:2.0.8-10
-- remove Obsoletes: maven-surefire-plugin
-
-* Tue Mar 16 2009 Yong Yang <yyang@redhat.com> - 0:2.0.8-9
-- Merge from RHEL-4-EP-5, add missing BRs/Reqs, add patches
-
-* Tue Mar 11 2009 Yong Yang <yyang@redhat.com> - 0:2.0.8-8
-- Add missing Requires: maven-shared-plugin-tools-java, maven-shared-plugin-tools-beanshell for subpackage plugin-plugin
-
-* Tue Mar 10 2009 Yong Yang <yyang@redhat.com> - 0:2.0.8-7
-- Add Requires: tomcat5, excalibur-avalon-logkit, excalibur-avalon-framework
-
-* Wed Mar 05 2009 Yong Yang <yyang@redhat.com> - 0:2.0.8-6
-- Provides: maven2-bootstrap >= 2.0.7
-
-* Wed Mar 05 2009 Yong Yang <yyang@redhat.com> - 0:2.0.8-5
-- Add Obsoletes maven2-bootstrap <= 2.0.7, maven-release, maven-surefire-plugin
-
-* Wed Mar 04 2009 Deepak Bhole <dbhole@redhat.com> - 0:2.0.8-4
-- Add patch for commons-cli 1.1
-
-* Fri Feb 20 2009 Yong Yang <yyang@redhat.com> 2.0.8-3
-- add new maven-parent jpp depmap
-
-* Wed Feb 18 2009 Yong Yang <yyang@redhat.com> 2.0.8-2
-- Import from dbhloes maven2 2.0.8 list, Initializing build with bootstrap mode on JPP6
-- Fix many BRs, jpp depmaps
-
-* Tue Mar 20 2007 Deepak Bhole <dbhole@redhat.com> 0:2.0.4-10jpp.6
-- Build without bootstrap
-
-* Tue Mar 20 2007 Deepak Bhole <dbhole@redhat.com> 2.0.4-10jpp.5
-- Force gcj_support to 0
-
-* Tue Mar 20 2007 Deepak Bhole <dbhole@redhat.com> 2.0.4-10jpp.4
-- Build without gcj for now
-
-* Fri Mar 16 2007 Deepak Bhole <dbhole@redhat.com> 0:2.0.4-10jpp.3
-- Added gcj support
-- Fix up per Fedora spec
-- Added source locations/generation methods for binary %%SOURCEes
-- Added workaround for gcj bug that causes plugin reload to fail
-
-* Wed Dec 13 2006 Deepak Bhole <dbhole@redhat.com> 2.0.4-10jpp.2
-- Build without bootstrap
-
-* Mon Dec 04 2006 Deepak Bhole <dbhole@redhat.com> 2.0.4-10jpp.1
-- Synch with jpp
-- From dbhole@redhat:
-  - Added a new mapping system
-  - Added a jpp howto
-  - Added support for plugin mixing
-  - Wired in /usr/share/maven2/repository as one of the default repos
-  - Moved poms over to maven2-common-poms
-  - Reverted to original plugin groupid's
-  - Installer maven-{artifact-ant,embedder,meeper,script}
-- From r.apel@r-apel.de:
-  - Fix maven-site-plugin pom in maven2-jpp-mapping.patch
-  - Add maven-shared-file-management to plugin-assembly Requires 
-  - Add post/postun Requires for javadoc
-
-* Wed Jul 12 2006 Fernando Nasser <fnasser@redhat.com> - 0:2.0.4-4jpp_1rh
-- Merge with upstream
-
-* Mon Jul 10 2006 Deepak Bhole <dbhole@redhat.com> - 0:2.0.4-4jpp
-- Additional fixes (mostly to the dependency transformer xsl) for itests.
-- Added a --with regereratedpoms switch.
-
-* Wed Jul 05 2006 Deepak Bhole <dbhole@redhat.com> - 0:2.0.4-3jpp
-- Added partial support for it tests, and appropriate fixes.
-
-* Thu Jun 29 2006 Fernando Nasser <fnasser@redhat.com> - 0:2.0.4-2jpp_2rh
-- Rebuild
-
-* Tue Jun 27 2006 Fernando Nasser <fnasser@redhat.com> - 0:2.0.4-2jpp_1rh
-- Full build
-
-* Mon Jun 26 2006 Fernando Nasser <fnasser@redhat.com> - 0:2.0.4-2jpp_0rh
-- Merge with upstream
-- Bootstrap building
-
-* Thu Jun 22 2006 Deepak Bhole <dbhole@redhat.com> - 0:2.0.4-2jpp
-- Fixes for Tuscany building
-
-* Fri Jun 02 2006 Deepak Bhole <dbhole@redhat.com> - 0:2.0.4-1jpp
-- Upgrade to 2.0.4
-
-* Wed May 31 2006 Fernando Nasser <fnasser@redhat.com> - 0:2.0.2-1jpp_1rh
-- First Red Hat build
-
-* Wed Feb 22 2006 Deepak Bhole <dbhole@redhat.com> - 0:2.0.2-1jpp
-- Initial build.
This page took 0.183886 seconds and 4 git commands to generate.