]> git.pld-linux.org Git - packages/maven.git/blobdiff - maven.spec
- PLDized some dependencies. Still a lot to do.
[packages/maven.git] / maven.spec
index 0df3ffaf2c4a621432f943c21a193d19f5b528f6..38abb2131490f1982021c60173192fd7aca5bd33 100644 (file)
@@ -18,33 +18,32 @@ Group:              Development/Languages/Java
 License:       Apache v2
 URL:           http://maven.apache.org/
 
-%define        srcurl  http://execve.pl/PLD/maven
-# svn export http://svn.apache.org/repos/asf/maven/components/tags/maven-%{version} maven2
-# tar czf maven2-src.tar.gz maven2
-Source0:               %{srcurl}%{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:               %{srcurl}%{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:              %{srcurl}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:               %{srcurl}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:               %{srcurl}m2_jar_repo.tar.gz
+Source4:               http://execve.pl/PLD/maven/m2_jar_repo.tar.gz
 # Source4-md5: 00976d79948c93be23cdda62300dc8c2
 Source5:               %{name}-script
 
@@ -52,8 +51,8 @@ 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:       %{srcurl}%{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
@@ -118,6 +117,7 @@ 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-junit >= 3.8.2
 BuildRequires: java-oro >= 2.0.8
@@ -194,7 +194,6 @@ BuildRequires:      aqute-bndlib
 BuildRequires: checkstyle4 >= 4.1
 BuildRequires: checkstyle4-optional >= 4.1
 BuildRequires: classworlds >= 1.1
-BuildRequires: jaxen >= 1.1
 #BuildRequires:        jmock >= 1.0.1
 BuildRequires: jline >= 0.8.1
 BuildRequires: jsch >= 0.1.20
@@ -332,8 +331,6 @@ 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
 
 %description    javadoc
 %{summary}.
@@ -351,10 +348,10 @@ Group:    Development/Build Tools
 Requires:      ant >= 1.6.5
 Requires:      ant-junit
 Requires:      ant-nodeps
-Requires:      junit >= 3.8.2
+Requires:      java-junit >= 3.8.2
 Requires:      maven-wagon >= 1.0-0.1.b2
 Requires:      plexus-utils >= 1.2
-Requires:      xalan-j2 >= 2.6.0
+Requires:      java-xalan >= 2.6.0
 Requires:              xml-commons-apis >= 1.3.02
 Requires:              plexus-container-default
 Requires:              %{name} = %{version}-%{release}
@@ -411,10 +408,10 @@ 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:      java-jdom >= 1.0
+Requires:      java-jaxen >= 1.1
 Requires:              saxpath
-Requires:      junit >= 3.8.2
+Requires:      java-junit >= 3.8.2
 
 %description    plugin-assembly
 Builds an assembly (distribution) of sources and/or binaries.
@@ -450,7 +447,7 @@ Requires:   commons-httpclient
 Requires:      plexus-velocity >= 1.1.2
 Requires:      plexus-mail-sender
 Requires:      glassfish-javamail
-Requires:      jakarta-commons-lang
+Requires:      java-commons-lang
 Requires:      velocity
 Requires:              maven-shared-reporting-impl
 
@@ -477,7 +474,7 @@ Generates a checkstyle report.
 %package        plugin-clean
 Summary:       Clean plugin for maven
 Group: Development/Build Tools
-Requires:      junit >= 3.8.2
+Requires:      java-junit >= 3.8.2
 Requires:              %{name} = %{version}-%{release}
 Requires(postun):              %{name} = %{version}-%{release}
 Requires:      plexus-utils >= 1.2
@@ -504,7 +501,7 @@ Requires(postun):           %{name} = %{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:      java-junit >= 3.8.2
 Requires:      plexus-container-default
 Requires:      maven-shared-dependency-analyzer
 Requires:      maven-shared-dependency-tree
@@ -545,7 +542,7 @@ 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:      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
@@ -562,7 +559,7 @@ Requires:           %{name} = %{version}-%{release}
 Requires(postun):              %{name} = %{version}-%{release}
 Requires:      plexus-utils >= 1.2
 Requires:      maven-shared-verifier
-Requires:      xmlunit
+Requires:      java-xmlunit
 
 %description    plugin-ear
 Generates an EAR from the current project.
@@ -576,8 +573,8 @@ Requires(postun):           %{name} = %{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:      java-jdom >= 1.0
+Requires:      java-jaxen >= 1.1
 Requires:              saxpath
 Requires:      plexus-interactivity >= 1.0
 Requires:              maven-shared-plugin-testing-tools
@@ -603,10 +600,10 @@ Summary:  GPG plugin for maven
 Group: Development/Build Tools
 Requires:              %{name} = %{version}-%{release}
 Requires(postun):              %{name} = %{version}-%{release}
-Requires:      jakarta-commons-lang
+Requires:      java-commons-lang
 Requires:      plexus-utils
-Requires:      jakarta-commons-lang
-Requires:      junit >= 3.8.2
+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.
@@ -626,7 +623,7 @@ 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:      java-dom4j >= 1.6.1
 Requires:              %{name} = %{version}-%{release}
 Requires(postun):              %{name} = %{version}-%{release}
 Requires:      maven-wagon >= 1.0-0.1.b2
@@ -659,7 +656,7 @@ 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 
@@ -669,7 +666,7 @@ 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:      java-commons-lang >= 2.1
 Requires:              %{name} = %{version}-%{release}
 Requires:      maven-shared-archiver >= 2.3
 Requires(postun):              %{name} = %{version}-%{release}
@@ -682,7 +679,7 @@ 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:      java-commons-lang >= 2.1
 Requires:              %{name} = %{version}-%{release}
 Requires(postun):              %{name} = %{version}-%{release}
 %if %{without bootstrap}
@@ -698,12 +695,12 @@ Generates Javadoc for the project.
 %package        plugin-one
 Summary:       One plugin for maven
 Group: Development/Build Tools
-Requires:      junit >= 3.8.2
+Requires:      java-junit >= 3.8.2
 Requires:              %{name} = %{version}-%{release}
 Requires(postun):              %{name} = %{version}-%{release}
 Requires:      plexus-archiver >= 1.0
 Requires:      plexus-utils >= 1.2
-Requires:      junit >= 3.8.2
+Requires:      java-junit >= 3.8.2
 Requires:      maven-shared-model-converter
 
 %description    plugin-one
@@ -735,8 +732,8 @@ Requires(postun):           %{name} = %{version}-%{release}
 Requires:      plexus-utils >= 1.2
 Requires:      plexus-resources
 Requires:      pmd >= 3.3
-Requires:      jaxen >= 1.1
-Requires:      xom
+Requires:      java-jaxen >= 1.1
+Requires:      java-xom
 Requires:              maven-shared-reporting-impl
 
 %description    plugin-pmd
@@ -746,8 +743,8 @@ 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:      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
@@ -775,7 +772,7 @@ 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:      java-junit >= 3.8.2
 Requires:              %{name} = %{version}-%{release}
 Requires(postun):              %{name} = %{version}-%{release}
 Requires:      plexus-container-default
@@ -796,7 +793,7 @@ into JARs built with maven.
 %package        plugin-repository
 Summary:       Repository plugin for maven
 Group: Development/Build Tools
-Requires:      junit >= 3.8.2
+Requires:      java-junit >= 3.8.2
 Requires:              %{name} = %{version}-%{release}
 Requires(postun):              %{name} = %{version}-%{release}
 Requires:      plexus-archiver >= 1.0
@@ -807,7 +804,7 @@ 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:     java-commons-io >= 1.1
 Requires:      plexus-utils >= 1.2
 Requires:              %{name} = %{version}-%{release}
 Requires(postun):              %{name} = %{version}-%{release}
@@ -837,7 +834,7 @@ Requires(postun):           %{name} = %{version}-%{release}
 Requires:      plexus-archiver >= 1.0
 Requires:      plexus-utils >= 1.2
 Requires:      plexus-container-default >= 1.0
-Requires:      junit >= 3.8.2
+Requires:      java-junit >= 3.8.2
 
 %description    plugin-source
 Builds a JAR of sources for use in IDEs and distribution to the repository.
@@ -850,7 +847,7 @@ Requires:           %{name} = %{version}-%{release}
 Requires(postun):              %{name} = %{version}-%{release}
 Requires:      maven-wagon
 Requires:      plexus-utils
-Requires:      junit >= 3.8.2
+Requires:      java-junit >= 3.8.2
 
 %description    plugin-stage
 Maven Stage Plugin copies artifacts from one repository to another.
@@ -859,7 +856,7 @@ 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:      java-junit >= 3.8.2
 Requires:              %{name} = %{version}-%{release}
 Requires(postun):              %{name} = %{version}-%{release}
 %if %{without bootstrap}
@@ -876,7 +873,7 @@ Group:      Development/Build Tools
 Requires:              %{name} = %{version}-%{release}
 Requires(postun):              %{name} = %{version}-%{release}
 Requires:      plexus-utils >= 1.2
-Requires:      junit >= 3.8.2
+Requires:      java-junit >= 3.8.2
 
 %description    plugin-war
 Builds a WAR from the current project.
@@ -902,14 +899,14 @@ 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
-tar xzf %{SOURCE22} -C maven2-plugins
+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
@@ -929,19 +926,19 @@ tar xzf %{SOURCE22} -C maven2-plugins
 # 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
@@ -981,19 +978,19 @@ done
 
 # 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}
@@ -1009,14 +1006,14 @@ 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}
@@ -1026,49 +1023,49 @@ sed -i -e "s|<url>__EXTERNAL_REPO_PLACEHOLDER__</url>|<url>file://`pwd`/external
 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
+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
 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 %{SOURCE13} m2_repo/repository/JPP/maven2/default_poms/JPP.maven-empty-dep.pom
 cp -p %{SOURCE14} m2_repo/repository/JPP/maven2/empty-dep.jar
 
 %build
 # 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/mavenjpp-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/mavenjpp-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/mavenjpp-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/mavenjpp-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
+# 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-%{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"
@@ -1111,7 +1108,7 @@ build-jar-repository -s -p $M2_HOME/lib jdom maven-wagon/file maven-wagon/http-l
 %endif
 
 # Build plugins
-cd maven2-plugins # {{{
+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. 
@@ -1136,7 +1133,7 @@ cd - # }}}
 
 %if %{without bootstrap}
 # Build model-all JAR  (for model-v3 classes)
-cd maven2/maven-model # {{{
+cd maven/maven-model # {{{
 
 $M2_HOME/bin/mvn -e -s %{maven_settings_file} $MAVEN_OPTS -P all-models package
 
@@ -1147,7 +1144,7 @@ cd - # }}}
 
 %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 
@@ -1182,7 +1179,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
@@ -1198,7 +1195,7 @@ for dir in `find -maxdepth 1 -type d`; do
     cd - # }}}
 done
 )
-(cd maven2-plugins
+(cd maven-plugins
 for dir in `find -maxdepth 1 -type d`; do
 
     if [ "$dir" == "./maven-clover-plugin" ]; then
@@ -1218,7 +1215,7 @@ done
 %install
 rm -rf $RPM_BUILD_ROOT
 
-export M2_HOME=`pwd`/maven2/home/apache-%{name}-%{version}
+export M2_HOME=`pwd`/maven/home/apache-%{name}-%{version}
 
 # Repository
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/repository
@@ -1318,7 +1315,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/
 
-cd maven2-plugins # {{{
+cd maven-plugins # {{{
     for targetdir in `find -mindepth 2 -maxdepth 2 -type d -name target`; do
 
         # Find the version version
@@ -1341,24 +1338,24 @@ cd - # }}}
 # 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
@@ -1367,7 +1364,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
This page took 0.067522 seconds and 4 git commands to generate.