rpms/maven-shared/devel maven-ant-pom_xml.patch, NONE, 1.1 maven-shared-jpp-depmap.xml, NONE, 1.1 .cvsignore, 1.3, 1.4 maven-shared-pom.patch, 1.1, 1.2 maven-shared.spec, 1.16, 1.17 sources, 1.3, 1.4 maven-shared-8-jpp-depmap.xml, 1.2, NONE maven-shared-ant-pom.patch, 1.1, NONE maven-shared-disable-cobertura.patch, 1.1, NONE maven-shared-file-management-pom.patch, 1.1, NONE maven-shared-modelv3.patch, 1.1, NONE maven-shared-plugin-tools-pom.patch, 1.1, NONE maven-shared-pom.xml, 1.1, NONE
Yang Yong
yyang at fedoraproject.org
Fri May 28 14:26:08 UTC 2010
Author: yyang
Update of /cvs/pkgs/rpms/maven-shared/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7807
Modified Files:
.cvsignore maven-shared-pom.patch maven-shared.spec sources
Added Files:
maven-ant-pom_xml.patch maven-shared-jpp-depmap.xml
Removed Files:
maven-shared-8-jpp-depmap.xml maven-shared-ant-pom.patch
maven-shared-disable-cobertura.patch
maven-shared-file-management-pom.patch
maven-shared-modelv3.patch maven-shared-plugin-tools-pom.patch
maven-shared-pom.xml
Log Message:
Upgrade to 15
maven-ant-pom_xml.patch:
pom.xml | 5 +++++
1 file changed, 5 insertions(+)
--- NEW FILE maven-ant-pom_xml.patch ---
--- maven-ant/pom.xml.orig 2010-05-26 17:44:20.794875227 +0800
+++ maven-ant/pom.xml 2010-05-26 17:46:17.303163275 +0800
@@ -58,6 +58,11 @@
<version>1.0-alpha-13</version>
</dependency>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-classworlds</artifactId>
+ <version>1.0-alpha-13</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
<version>2.0.1</version>
--- NEW FILE maven-shared-jpp-depmap.xml ---
<dependencies>
<dependency>
<maven>
<groupId>junit-addons</groupId>
<artifactId>junit-addons</artifactId>
<version>1.4</version>
</maven>
<jpp>
<groupId>JPP/maven2</groupId>
<artifactId>empty-dep</artifactId>
<version>1.4</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>jetty</groupId>
<artifactId>org.mortbay.jetty</artifactId>
<version>5.1.10</version>
</maven>
<jpp>
<groupId>JPP/jetty5</groupId>
<artifactId>jetty5</artifactId>
<version>5.1.12</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
<version>3.0</version>
</maven>
<jpp>
<groupId>JPP/objectweb-asm</groupId>
<artifactId>asm</artifactId>
<version>3.1</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>asm</groupId>
<artifactId>asm-parent</artifactId>
<version>3.0</version>
</maven>
<jpp>
<groupId>JPP/objectweb-asm</groupId>
<artifactId>asm-parent</artifactId>
<version>3.1</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>reporting-impl</artifactId>
<version>2.0.4</version>
</maven>
<jpp>
<groupId>JPP/maven-shared</groupId>
<artifactId>reporting-impl</artifactId>
<version>2.0.4</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-test-tools</artifactId>
<version>1.0-alpha-2</version>
</maven>
<jpp>
<groupId>JPP/maven-plugin-testing</groupId>
<artifactId>maven-test-tools</artifactId>
<version>1.2</version>
</jpp>
</dependency>
<!--
<dependency>
<maven>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-plugin-testing-tools</artifactId>
<version>1.0-alpha-3</version>
</maven>
<jpp>
<groupId>JPP/maven-plugin-testing</groupId>
<artifactId>maven-plugin-testing-tools</artifactId>
<version>1.2</version>
</jpp>
</dependency>
-->
<dependency>
<maven>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>tomcat5-servlet-2.4-api</artifactId>
<version>2.4</version>
</jpp>
</dependency>
<!-- Plexus component API has been folded into containers now, and is no longer needed -->
<dependency>
<maven>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-api</artifactId>
<version>1.0-alpha-20</version>
</maven>
</dependency>
<dependency>
<maven>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
<version>1.1.0</version>
</maven>
</dependency>
<dependency>
<maven>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model-v3</artifactId>
<version>2.0</version>
</maven>
<jpp>
<groupId>JPP/maven2</groupId>
<artifactId>model</artifactId>
<version>2.0.8</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.2</version>
</maven>
</dependency>
<jpp>
<groupId>JPP</groupId>
<artifactId>easymock2</artifactId>
<version>2.5.2</version>
</jpp>
</dependencies>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven-shared/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 1 Sep 2009 11:25:13 -0000 1.3
+++ .cvsignore 28 May 2010 14:26:06 -0000 1.4
@@ -1 +1 @@
-maven-shared-components-8.tar.gz
+maven-shared-components-15.tar.gz
maven-shared-pom.patch:
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Index: maven-shared-pom.patch
===================================================================
RCS file: /cvs/pkgs/rpms/maven-shared/devel/maven-shared-pom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- maven-shared-pom.patch 31 Aug 2009 15:26:59 -0000 1.1
+++ maven-shared-pom.patch 28 May 2010 14:26:07 -0000 1.2
@@ -1,44 +1,20 @@
-diff -up ./pom.xml.sav ./pom.xml
---- ./pom.xml.sav 2007-10-22 20:16:51.000000000 -0400
-+++ ./pom.xml 2008-04-08 15:48:31.000000000 -0400
-@@ -4,7 +4,6 @@
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-parent</artifactId>
- <version>7</version>
-- <relativePath>../pom/maven/pom.xml</relativePath>
- </parent>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-shared-components</artifactId>
-@@ -35,15 +34,25 @@
- <module>maven-plugin-testing-harness</module>
- <module>maven-invoker</module>
- <module>maven-verifier</module>
-+<!--
- <module>maven-web-ui-tests</module>
-+-->
- <module>maven-app-configuration</module>
- <module>maven-plugin-testing-tools</module>
- <module>maven-test-tools</module>
- <module>maven-repository-builder</module>
-+<!--
- <module>maven-script</module>
-+-->
+--- pom.xml.orig 2010-05-27 18:23:39.228542323 +0800
++++ pom.xml 2010-05-27 18:37:56.212260995 +0800
+@@ -114,14 +114,14 @@
+ <modules>
+ <module>file-management</module>
+ <module>maven-ant</module>
+- <module>maven-archiver</module>
++ <!--<module>maven-archiver</module>-->
<module>maven-common-artifact-filters</module>
++ <module>maven-invoker</module>
<module>maven-dependency-analyzer</module>
-+ <module>maven-dependency-tree</module>
- <module>maven-shared-jar</module>
-+ <module>maven-osgi</module>
-+ <module>maven-downloader</module>
-+<!--
-+ <module>maven-enforcer-rule-api</module>
-+-->
- </modules>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-components-8</connection>
-@@ -62,4 +71,4 @@
- </plugins>
- </pluginManagement>
- </build>
--</project>
-\ No newline at end of file
-+</project>
+ <module>maven-dependency-tree</module>
+ <module>maven-downloader</module>
+- <module>maven-doxia-tools</module>
++ <!--<module>maven-doxia-tools</module>-->
+ <module>maven-filtering</module>
+- <module>maven-invoker</module>
+ <module>maven-model-converter</module>
+ <module>maven-osgi</module>
+ <module>maven-reporting-impl</module>
Index: maven-shared.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-shared/devel/maven-shared.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- maven-shared.spec 20 May 2010 11:32:59 -0000 1.16
+++ maven-shared.spec 28 May 2010 14:26:08 -0000 1.17
@@ -28,74 +28,83 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define shared_components_version 8
-%define file_management_version 1.2
+%define shared_components_version 15
+%define file_management_version 1.2.2
%define ant_version 1.0
-%define app_configuration_model_version 1.1
-%define app_configuration_web_version 1.1
-%define archiver_version 2.3
-%define common_artifact_filters_version 1.0
-%define dependency_analyzer_version 1.0
-%define dependency_tree_version 1.1
+
+%define artifact_resolver_version 1.1
+
+%define common_artifact_filters_version 1.3
+%define dependency_analyzer_version 1.2
+%define dependency_tree_version 1.3
%define downloader_version 1.2
-%define invoker_version 2.0.7
+
+%define filtering_version 1.0
+
+%define invoker_version 2.0.12
%define model_converter_version 2.3
-#%define plugin_testing_harness_version 1.2
-#%define plugin_testing_tools_version 1.0
-#%define plugin_tools_version 2.2
-#%define plugin_tools_ant_version 2.2
-#%define plugin_tools_api_version 2.2
-#%define plugin_tools_beanshell_version 2.2
-#%define plugin_tools_java_version 2.2
-#%define plugin_tools_model_version 2.2
+%define osgi_version 0.3.0
+
+#this model is not included in parent pom
+#%define reporting_api_version 3.0
+
%define reporting_impl_version 2.1
%define repository_builder_version 1.0
-%define io_version 1.1
+
+%define runtime_version 1.0
+
+%define io_version 1.2
%define jar_version 1.1
%define monitor_version 1.0
-%define osgi_version 0.2.0
-%define script_ant_version 2.1
-%define script_beanshell_version 2.1
-%define test_tools_version 1.0
+### disabled by pom.xml default
+#%define script_ant_version 2.1
+#%define script_beanshell_version 2.1
+#%define test_tools_version 1.0
#%define toolchain_version 1.0
-%define verifier_version 1.2
-#%define web_ui_tests_version 1.0
+%define verifier_version 1.3
Summary: Maven Shared Components
URL: http://maven.apache.org/shared/
Name: maven-shared
-Version: 8
-Release: 6%{?dist}
+Version: 15
+Release: 1%{?dist}
License: ASL 2.0
Group: Development/Libraries
# svn export \
-# http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-components-8/
-# tar czf maven-shared-components-8.tar.gz maven-shared-components-8
-Source0: maven-shared-components-8.tar.gz
-Source1: %{name}-8-jpp-depmap.xml
+# http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-components-14/
+# tar czf maven-shared-components-14.tar.gz maven-shared-components-14
+Source0: maven-shared-components-%{version}.tar.gz
+Source1: %{name}-jpp-depmap.xml
Patch0: %{name}-pom.patch
-Patch1: %{name}-ant-pom.patch
-Patch2: %{name}-file-management-pom.patch
-Patch3: %{name}-io-ArtifactLocatorStrategyTest.patch
-#Patch4: %{name}-plugin-tools-pom.patch
-Patch5: %{name}-disable-cobertura.patch
-Patch6: %{name}-modelv3.patch
+Patch1: maven-ant-pom_xml.patch
+#Patch1: %{name}-ant-pom.patch
+#Patch2: %{name}-file-management-pom.patch
+#Patch3: %{name}-io-ArtifactLocatorStrategyTest.patch
+#Patch5: %{name}-disable-cobertura.patch
+#Patch6: %{name}-modelv3.patch
BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: maven2 >= 0:2.0.4-9
BuildRequires: maven2-plugin-compiler
BuildRequires: maven2-plugin-install
BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-#BuildRequires: maven2-plugin-release
+BuildRequires: maven-javadoc-plugin
BuildRequires: maven2-plugin-resources
BuildRequires: maven2-plugin-source
BuildRequires: maven2-plugin-surefire
BuildRequires: maven2-plugin-surefire-report
+BuildRequires: maven-site-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-doxia
BuildRequires: maven-doxia-sitetools
+BuildRequires: maven-doxia-tools
+BuildRequires: maven-shared-reporting-impl
+BuildRequires: maven-plugin-testing-tools
+BuildRequires: maven-test-tools
BuildRequires: plexus-maven-plugin
+BuildRequires: maven-plugin-cobertura
BuildRequires: junit
BuildRequires: saxon
BuildRequires: saxon-scripts
@@ -105,11 +114,17 @@ BuildRequires: plexus-digest
BuildRequires: modello-maven-plugin
BuildRequires: tomcat5-servlet-2.4-api
BuildRequires: tomcat5
-BuildRequires: easymock
+BuildRequires: easymock2
BuildRequires: objectweb-asm
Requires: maven2 >= 0:2.0.4
Requires: plexus-utils
+Requires: saxon
+Requires: saxon-scripts
+Requires: plexus-utils
+Requires: plexus-registry
+Requires: plexus-digest
+Requires: objectweb-asm
BuildArch: noarch
@@ -158,41 +173,6 @@ Requires: plexus-containers-container-d
%description ant
Runs ant scripts embedded in the POM.
-%package app-configuration-model
-Summary: Maven Applications Shared Configuration Model
-Group: Development/Libraries/Java
-Version: %{app_configuration_model_version}
-Requires: %{name} = 0:%{shared_components_version}-%{release}
-Requires: plexus-containers
-Requires: plexus-registry
-
-%description app-configuration-model
-%{summary}.
-
-%package app-configuration-web
-Summary: Maven Applications Shared Configuration Web
-Group: Development/Libraries/Java
-Version: %{app_configuration_web_version}
-Requires: %{name} = 0:%{shared_components_version}-%{release}
-Requires: %{name}-app-configuration-model = 0:%{app_configuration_model_version}-%{release}
-Requires: maven2 >= 0:2.0.7
-Requires: maven-wagon
-Requires: plexus-containers-container-default
-
-%description app-configuration-web
-%{summary}.
-
-%package archiver
-Summary: Maven Archiver
-Group: Development/Libraries/Java
-Version: %{archiver_version}
-Requires: %{name} = 0:%{shared_components_version}-%{release}
-Requires: maven2 >= 0:2.0.7
-Requires: plexus-archiver
-
-%description archiver
-%{summary}.
-
%package common-artifact-filters
Summary: Maven Common Artifact Filters
Group: Development/Libraries/Java
@@ -264,98 +244,6 @@ Requires: plexus-utils
%description model-converter
Converts between version 3.0.0 and version 4.0.0 models.
-#%package plugin-testing-harness
-#Summary: Maven Plugin Testing Mechanism
-#Group: Development/Libraries/Java
-#Version: %{plugin_testing_harness_version}
-#Requires: %{name} = 0:%{shared_components_version}-%{release}
-#Requires: junit
-#Requires: maven2 >= 0:2.0.7
-#Requires: plexus-utils
-
-#%description plugin-testing-harness
-#%{summary}.
-
-#%package plugin-testing-tools
-#Summary: Maven Plugin Testing Tools
-#Group: Development/Libraries/Java
-#Version: %{plugin_testing_tools_version}
-#Requires: %{name} = 0:%{shared_components_version}-%{release}
-#Requires: %{name}-invoker = 0:%{invoker_version}-%{release}
-#Requires: %{name}-repository-builder = 0:%{repository_builder_version}-%{release}
-#Requires: %{name}-test-tools = 0:%{test_tools_version}-%{release}
-#Requires: junit
-#Requires: maven2 >= 0:2.0.7
-
-#%description plugin-testing-tools
-#%{summary}.
-
-#%package plugin-tools-ant
-#Summary: Maven Ant Plugin Tools
-#Group: Development/Libraries/Java
-#Version: %{plugin_tools_ant_version}
-#Requires: %{name} = 0:%{shared_components_version}-%{release}
-#Requires: %{name}-plugin-tools-api = 0:%{plugin_tools_api_version}-%{release}
-#Requires: %{name}-plugin-tools-model = 0:%{plugin_tools_model_version}-%{release}
-#Requires: ant
-#Requires: maven2 >= 0:2.0.7
-#Requires: plexus-container-default
-#Requires: plexus-utils
-
-#%description plugin-tools-ant
-#%{summary}.
-
-#%package plugin-tools-api
-#Summary: Maven Plugin Tools APIs
-#Group: Development/Libraries/Java
-#Version: %{plugin_tools_api_version}
-#Requires: %{name} = 0:%{shared_components_version}-%{release}
-#Requires: maven2 >= 0:2.0.7
-#Requires: plexus-utils
-
-#%description plugin-tools-api
-#%{summary}.
-
-#%package plugin-tools-beanshell
-#Summary: Maven Plugin Tools for Beanshell
-#Group: Development/Libraries/Java
-#Version: %{plugin_tools_beanshell_version}
-#Requires: %{name} = 0:%{shared_components_version}-%{release}
-#Requires: %{name}-plugin-tools-api = 0:%{plugin_tools_api_version}-%{release}
-#Requires: bsh
-#Requires: maven2 >= 0:2.0.7
-#Requires: plexus-container-default
-#Requires: plexus-utils
-
-#%description plugin-tools-beanshell
-#%{summary}.
-
-#%package plugin-tools-java
-#Summary: Maven Plugin Tools for Java
-#Group: Development/Libraries/Java
-#Version: %{plugin_tools_java_version}
-#Requires: %{name} = 0:%{shared_components_version}-%{release}
-#Requires: %{name}-plugin-tools-api = 0:%{plugin_tools_api_version}-%{release}
-#Requires: maven2 >= 0:2.0.7
-#Requires: plexus-container-default
-#Requires: plexus-utils
-#Requires: qdox
-
-#%description plugin-tools-java
-#%{summary}.
-
-#%package plugin-tools-model
-#Summary: Maven Plugin Metadata Model
-#Group: Development/Libraries/Java
-#Version: %{plugin_tools_model_version}
-#Requires: %{name} = 0:%{shared_components_version}-%{release}
-#Requires: maven2 >= 0:2.0.7
-#Requires: plexus-container-default
-#Requires: plexus-utils
-
-#%description plugin-tools-model
-#%{summary}.
-
%package reporting-impl
Summary: Maven Reporting Implementation
Group: Development/Libraries/Java
@@ -416,90 +304,6 @@ Requires: plexus-container-default
%description monitor
%{summary}.
-%package test-tools
-Summary: Maven Testing Tools
-Group: Development/Libraries/Java
-Version: %{test_tools_version}
-Requires: %{name} = 0:%{shared_components_version}-%{release}
-Requires: easymock
-Requires: junit
-Requires: plexus-utils
-
-%description test-tools
-%{summary}.
-
-#%package toolchain
-#Summary: Maven Toolchain
-#Group: Development/Libraries/Java
-#Requires: %{name} = 0:%{shared_components_version}-%{release}
-#Requires: junit
-#
-#%description toolchain
-#%{summary}.
-#
-#%package user-acegi
-#Summary: Maven User Management Acegi Bridge
-#Group: Development/Libraries/Java
-#Requires: %{name} = 0:%{shared_components_version}-%{release}
-#Requires: %{name}-user-model >= 0:%{user_model_version}-%{release}
-#Requires: acegi-security
-#Requires: jakarta-commons-dbcp
-#
-#%description user-acegi
-#Bridge between Maven User Management and Acegi.
-#
-#%package user-controller
-#Summary: Maven User Management Controller
-#Group: Development/Libraries/Java
-#Requires: %{name} = 0:%{shared_components_version}-%{release}
-#Requires: %{name}-user-model >= 0:%{user_model_version}-%{release}
-#Requires: plexus-xwork-integration
-#Requires: servlet_2_4_api
-#Requires: spring-core
-#
-#%description user-controller
-#User Management Controller Layer.
-#
-#%package user-example
-#Summary: Maven User Management Example Webapp
-#Group: Development/Libraries/Java
-#Requires: %{name} = 0:%{shared_components_version}-%{release}
-#Requires: %{name}-user-acegi = 0:%{user_acegi_version}-%{release}
-#Requires: %{name}-user-controller = 0:%{user_controller_version}-%{release}
-#Requires: %{name}-user-webapp = 0:%{user_webapp_version}-%{release}
-#Requires: plexus-log4j-logging
-#
-#%description user-example
-#User Management Example Webapp.
-#
-#%package user-model
-#Summary: Maven User Management Model
-#Group: Development/Libraries/Java
-#Requires: %{name} = 0:%{shared_components_version}-%{release}
-#Requires: jpox-core
-#Requires: plexus-container-default
-#Requires: plexus-jdo2
-#Requires: plexus-utils
-#
-#%description user-model
-#User Management Model Classes.
-#
-#%package user-webapp
-#Summary: Maven User Management Webapp
-#Group: Development/Libraries/Java
-#Requires: %{name} = 0:%{shared_components_version}-%{release}
-#Requires: %{name}-user-acegi = 0:%{user_acegi_version}-%{release}
-#Requires: %{name}-user-controller = 0:%{user_controller_version}-%{release}
-#Requires: jakarta-taglibs-standard
-#Requires: jpox-core
-#Requires: plexus-container-default
-#Requires: plexus-log4j-logging
-#Requires: servlet_2_4_api
-#Requires: sitemesh
-#
-#%description user-webapp
-#User Management Webapp Layer.
-
%package verifier
Summary: Maven Verifier Component
Group: Development/Libraries/Java
@@ -510,19 +314,6 @@ Requires: junit
%description verifier
%{summary}.
-#%package web-ui-tests
-#Summary: Maven Shared Web UI Tests
-#Group: Development/Libraries/Java
-#Version: %{web_ui_tests_version}
-#Requires: %{name} = 0:%{shared_components_version}-%{release}
-#Requires: junit
-#Requires: openqa-selenium-rc-java-client-driver
-#Requires: openqa-selenium-rc-server
-#Requires: plexus-utils
-
-#%description web-ui-tests
-#%{summary}.
-
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
@@ -534,17 +325,61 @@ Obsoletes: %{name}-plugin-testing-h
%description javadoc
%{summary}.
+%package artifact-resolver
+Summary: Maven Artifact Resolution API
+Group: Development/Libraries/Java
+Version: %{artifact_resolver_version}
+Requires: %{name} = 0:%{shared_components_version}-%{release}
+Requires: ant
+Requires: maven2 >= 0:2.0.7
+
+%description artifact-resolver
+Provides a component for plugins to easily resolve project dependencies.
+
+%package filtering
+Summary: Maven Filtering
+Group: Development/Libraries/Java
+Version: %{filtering_version}
+Requires: %{name} = 0:%{shared_components_version}-%{release}
+Requires: ant
+Requires: maven2 >= 0:2.0.7
+
+%description filtering
+A component to assist in filtering of resource files with properties from a Maven project.
+
+#%package reporting-api
+#Summary: Maven Reporting API
+#Group: Development/Libraries/Java
+#Version: %{reporting_api_version}
+#Requires: %{name} = 0:%{shared_components_version}-%{release}
+#Requires: ant
+#Requires: maven2 >= 0:2.0.7
+
+#%description reporting-api
+#Maven Reporting API.
+
+%package runtime
+Summary: Maven Runtime
+Group: Development/Libraries/Java
+Version: %{runtime_version}
+Requires: %{name} = 0:%{shared_components_version}-%{release}
+Requires: ant
+Requires: maven2 >= 0:2.0.7
+
+%description runtime
+Maven Runtime allows introspection of Maven project metadata at runtime. Basic artifact information or full Maven
+project metadata can be obtained for all projects within a given class loader, optionally sorted into dependency
+order, and also for a given class within a project.
+
%prep
%setup -q -n %{name}-components-%{shared_components_version}
#gzip -dc %{SOURCE4} | tar xf -
chmod -R go=u-w *
%patch0 -b .sav0
-%patch1 -b .sav1
-%patch2 -b .sav2
-%patch3 -b .sav3
-#%patch4 -b .sav4
-%patch5 -b .sav5
-%patch6 -b .sav6
+%patch1 -b .sav0
+
+# need namespace for new version modello
+sed -i "s|<model>|<model xmlns=\"http://modello.codehaus.org/MODELLO/1.3.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://modello.codehaus.org/MODELLO/1.3.0 http://modello.codehaus.org/xsd/modello-1.3.0.xsd\" xml.namespace=\"..\" xml.schemaLocation=\"..\" xsd.namespace=\"..\" xsd.targetNamespace=\"..\">|" file-management/src/main/mdo/fileset.mdo
# Remove test that needs junit-addons until that makes it into Fedora
rm -f maven-reporting-impl/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
@@ -585,22 +420,23 @@ export MAVEN_OPTS="-XX:MaxPermSize=256m"
mvn-jpp \
-e \
-Dmaven2.jpp.depmap.file=%{SOURCE1} \
+ -Dmaven.test.skip=true \
-Dmaven.test.failure.ignore=true \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- install
+ install javadoc:javadoc
# Manual iteration should not be needed, but there is a bug in the javadoc
# plugin which makes this necessary. See:
# http://jira.codehaus.org/browse/MJAVADOC-157
-for pom in `find -name pom.xml | grep -v /test | grep -v tests | grep -v maven-toolchain | sort`; do
- pushd `dirname $pom`
- mvn-jpp \
- -e \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven2.jpp.depmap.file=%{SOURCE1} \
- javadoc:javadoc
- popd
-done
+#for pom in `find -name pom.xml | grep -v /test | grep -v tests | grep -v maven-toolchain | sort`; do
+# pushd `dirname $pom`
+# mvn-jpp \
+# -e \
+# -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+# -Dmaven2.jpp.depmap.file=%{SOURCE1} \
+# javadoc:javadoc
+# popd
+#done
%install
# main package infrastructure
@@ -621,7 +457,7 @@ popd
install -pm 644 maven-dependency-analyzer/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-dependency-analyzer.pom
%add_to_maven_depmap org.apache.maven.shared maven-dependency-analyzer %{dependency_analyzer_version} JPP/maven-shared dependency-analyzer
-install -p -m 0644 maven-dependency-analyzer/target/maven-dependency-analyzer-%{dependency_analyzer_version}-alpha-3-SNAPSHOT.jar \
+install -p -m 0644 maven-dependency-analyzer/target/maven-dependency-analyzer-%{dependency_analyzer_version}-SNAPSHOT.jar \
$RPM_BUILD_ROOT%{_javadir}/maven-shared/dependency-analyzer-%{dependency_analyzer_version}.jar
pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
ln -sf dependency-analyzer-%{dependency_analyzer_version}.jar dependency-analyzer.jar
@@ -635,14 +471,6 @@ pushd $RPM_BUILD_ROOT%{_javadir}/maven-s
ln -sf dependency-tree-%{dependency_tree_version}.jar dependency-tree.jar
popd
-#install -pm 644 maven-web-ui-tests/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-web-ui-tests.pom
-#%%add_to_maven_depmap org.apache.maven.shared maven-web-ui-tests %{web_ui_tests_version} JPP/maven-shared web-ui-tests
-#install -p -m 0644 maven-web-ui-tests/target/maven-web-ui-tests-%{web_ui_tests_version}-SNAPSHOT.jar \
-# $RPM_BUILD_ROOT%{_javadir}/maven-shared/web-ui-tests-%{web_ui_tests_version}.jar
-#pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
-# ln -sf web-ui-tests-%{web_ui_tests_version}.jar web-ui-tests.jar
-#popd
-
install -pm 644 maven-verifier/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-verifier.pom
%add_to_maven_depmap org.apache.maven.shared maven-verifier %{verifier_version} JPP/maven-shared verifier
install -p -m 0644 maven-verifier/target/maven-verifier-%{verifier_version}-SNAPSHOT.jar \
@@ -651,14 +479,6 @@ pushd $RPM_BUILD_ROOT%{_javadir}/maven-s
ln -sf verifier-%{verifier_version}.jar verifier.jar
popd
-install -pm 644 maven-test-tools/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-test-tools.pom
-%add_to_maven_depmap org.apache.maven.shared maven-test-tools %{test_tools_version} JPP/maven-shared test-tools
-install -p -m 0644 maven-test-tools/target/maven-test-tools-%{test_tools_version}-alpha-2-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-shared/test-tools-%{test_tools_version}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
- ln -sf test-tools-%{test_tools_version}.jar test-tools.jar
-popd
-
install -pm 644 maven-shared-monitor/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-monitor.pom
%add_to_maven_depmap org.apache.maven.shared maven-shared-monitor %{monitor_version} JPP/maven-shared monitor
install -p -m 0644 maven-shared-monitor/target/maven-shared-monitor-%{monitor_version}-SNAPSHOT.jar \
@@ -685,7 +505,7 @@ popd
install -pm 644 maven-repository-builder/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-repository-builder.pom
%add_to_maven_depmap org.apache.maven.shared maven-repository-builder %{repository_builder_version} JPP/maven-shared repository-builder
-install -p -m 0644 maven-repository-builder/target/maven-repository-builder-%{repository_builder_version}-alpha-2-SNAPSHOT.jar \
+install -p -m 0644 maven-repository-builder/target/maven-repository-builder-%{repository_builder_version}-alpha-3-SNAPSHOT.jar \
$RPM_BUILD_ROOT%{_javadir}/maven-shared/repository-builder-%{repository_builder_version}.jar
pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
ln -sf repository-builder-%{repository_builder_version}.jar repository-builder.jar
@@ -699,65 +519,6 @@ pushd $RPM_BUILD_ROOT%{_javadir}/maven-s
ln -sf reporting-impl-%{reporting_impl_version}.jar reporting-impl.jar
popd
-#install -pm 644 maven-plugin-tools/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-plugin-tools.pom
-#%%add_to_maven_depmap org.apache.maven maven-plugin-tools %{plugin_tools_version} JPP/maven-shared plugin-tools
-
-#install -pm 644 maven-plugin-tools/maven-plugin-tools-model/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-plugin-tools-model.pom
-#%%add_to_maven_depmap org.apache.maven maven-plugin-tools-model %{plugin_tools_model_version} JPP/maven-shared plugin-tools-model
-#install -p -m 0644 maven-plugin-tools/maven-plugin-tools-model/target/maven-plugin-tools-model-%{plugin_tools_model_version}-SNAPSHOT.jar \
-# $RPM_BUILD_ROOT%{_javadir}/maven-shared/plugin-tools-model-%{plugin_tools_model_version}.jar
-#pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
-# ln -sf plugin-tools-model-%{plugin_tools_model_version}.jar plugin-tools-model.jar
-#popd
-
-#install -pm 644 maven-plugin-tools/maven-plugin-tools-java/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-plugin-tools-java.pom
-#%%add_to_maven_depmap org.apache.maven maven-plugin-tools-java %{plugin_tools_java_version} JPP/maven-shared plugin-tools-java
-#install -p -m 0644 maven-plugin-tools/maven-plugin-tools-java/target/maven-plugin-tools-java-%{plugin_tools_java_version}-SNAPSHOT.jar \
-# $RPM_BUILD_ROOT%{_javadir}/maven-shared/plugin-tools-java-%{plugin_tools_java_version}.jar
-#pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
-# ln -sf plugin-tools-java-%{plugin_tools_java_version}.jar plugin-tools-java.jar
-#popd
-
-#install -pm 644 maven-plugin-tools/maven-plugin-tools-beanshell/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-plugin-tools-beanshell.pom
-#%%add_to_maven_depmap org.apache.maven maven-plugin-tools-beanshell %{plugin_tools_beanshell_version} JPP/maven-shared plugin-tools-beanshell
-#install -p -m 0644 maven-plugin-tools/maven-plugin-tools-beanshell/target/maven-plugin-tools-beanshell-%{plugin_tools_beanshell_version}-SNAPSHOT.jar \
-# $RPM_BUILD_ROOT%{_javadir}/maven-shared/plugin-tools-beanshell-%{plugin_tools_beanshell_version}.jar
-#pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
-# ln -sf plugin-tools-beanshell-%{plugin_tools_beanshell_version}.jar plugin-tools-beanshell.jar
-#popd
-
-#install -pm 644 maven-plugin-tools/maven-plugin-tools-api/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-plugin-tools-api.pom
-#%%add_to_maven_depmap org.apache.maven maven-plugin-tools-api %{plugin_tools_api_version} JPP/maven-shared plugin-tools-api
-#install -p -m 0644 maven-plugin-tools/maven-plugin-tools-api/target/maven-plugin-tools-api-%{plugin_tools_api_version}-SNAPSHOT.jar \
-# $RPM_BUILD_ROOT%{_javadir}/maven-shared/plugin-tools-api-%{plugin_tools_api_version}.jar
-#pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
-# ln -sf plugin-tools-api-%{plugin_tools_api_version}.jar plugin-tools-api.jar
-#popd
-
-#install -pm 644 maven-plugin-tools/maven-plugin-tools-ant/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-plugin-tools-ant.pom
-#%%add_to_maven_depmap org.apache.maven maven-plugin-tools-ant %{plugin_tools_ant_version} JPP/maven-shared plugin-tools-ant
-#install -p -m 0644 maven-plugin-tools/maven-plugin-tools-ant/target/maven-plugin-tools-ant-%{plugin_tools_ant_version}-SNAPSHOT.jar \
-# $RPM_BUILD_ROOT%{_javadir}/maven-shared/plugin-tools-ant-%{plugin_tools_ant_version}.jar
-#pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
-# ln -sf plugin-tools-ant-%{plugin_tools_ant_version}.jar plugin-tools-ant.jar
-#popd
-
-#install -pm 644 maven-plugin-testing-tools/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-plugin-testing-tools.pom
-#%%add_to_maven_depmap org.apache.maven.shared maven-plugin-testing-tools %{plugin_testing_tools_version} JPP/maven-shared plugin-testing-tools
-#install -p -m 0644 maven-plugin-testing-tools/target/maven-plugin-testing-tools-%{plugin_testing_tools_version}-alpha-3-SNAPSHOT.jar \
-# $RPM_BUILD_ROOT%{_javadir}/maven-shared/plugin-testing-tools-%{plugin_testing_tools_version}.jar
-#pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
-# ln -sf plugin-testing-tools-%{plugin_testing_tools_version}.jar plugin-testing-tools.jar
-#popd
-
-#install -pm 644 maven-plugin-testing-harness/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-plugin-testing-harness.pom
-#%%add_to_maven_depmap org.apache.maven.shared maven-plugin-testing-harness %{plugin_testing_harness_version} JPP/maven-shared plugin-testing-harness
-#install -p -m 0644 maven-plugin-testing-harness/target/maven-plugin-testing-harness-%{plugin_testing_harness_version}-SNAPSHOT.jar \
-# $RPM_BUILD_ROOT%{_javadir}/maven-shared/plugin-testing-harness-%{plugin_testing_harness_version}.jar
-#pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
-# ln -sf plugin-testing-harness-%{plugin_testing_harness_version}.jar plugin-testing-harness.jar
-#popd
-
install -pm 644 maven-model-converter/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-model-converter.pom
%add_to_maven_depmap org.apache.maven.shared maven-model-converter %{model_converter_version} JPP/maven-shared model-converter
install -p -m 0644 maven-model-converter/target/maven-model-converter-%{model_converter_version}-SNAPSHOT.jar \
@@ -776,36 +537,12 @@ popd
install -pm 644 maven-common-artifact-filters/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-common-artifact-filters.pom
%add_to_maven_depmap org.apache.maven.shared maven-common-artifact-filters %{common_artifact_filters_version} JPP/maven-shared common-artifact-filters
-install -p -m 0644 maven-common-artifact-filters/target/maven-common-artifact-filters-%{common_artifact_filters_version}-alpha-2-SNAPSHOT.jar \
+install -p -m 0644 maven-common-artifact-filters/target/maven-common-artifact-filters-%{common_artifact_filters_version}-SNAPSHOT.jar \
$RPM_BUILD_ROOT%{_javadir}/maven-shared/common-artifact-filters-%{common_artifact_filters_version}.jar
pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
ln -sf common-artifact-filters-%{common_artifact_filters_version}.jar common-artifact-filters.jar
popd
-install -pm 644 maven-archiver/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-archiver.pom
-%add_to_maven_depmap org.apache.maven maven-archiver %{archiver_version} JPP/maven-shared archiver
-install -p -m 0644 maven-archiver/target/maven-archiver-%{archiver_version}-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-shared/archiver-%{archiver_version}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
- ln -sf archiver-%{archiver_version}.jar archiver.jar
-popd
-
-install -pm 644 maven-app-configuration/web/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-app-configuration-web.pom
-%add_to_maven_depmap org.apache.maven.shared maven-app-configuration-web %{app_configuration_web_version} JPP/maven-shared app-configuration-web
-install -p -m 0644 maven-app-configuration/web/target/maven-app-configuration-web-%{app_configuration_web_version}-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-shared/app-configuration-web-%{app_configuration_web_version}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
- ln -sf app-configuration-web-%{app_configuration_web_version}.jar app-configuration-web.jar
-popd
-
-install -pm 644 maven-app-configuration/model/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-app-configuration-model.pom
-%add_to_maven_depmap org.apache.maven.shared maven-app-configuration-model %{app_configuration_model_version} JPP/maven-shared app-configuration-model
-install -p -m 0644 maven-app-configuration/model/target/maven-app-configuration-model-%{app_configuration_model_version}-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-shared/app-configuration-model-%{app_configuration_model_version}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
- ln -sf app-configuration-model-%{app_configuration_model_version}.jar app-configuration-model.jar
-popd
-
install -pm 644 maven-ant/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-ant.pom
%add_to_maven_depmap org.apache.maven.shared maven-ant %{ant_version} JPP/maven-shared ant
install -p -m 0644 maven-ant/target/maven-ant-%{ant_version}-SNAPSHOT.jar \
@@ -830,6 +567,38 @@ pushd $RPM_BUILD_ROOT%{_javadir}/maven-s
ln -sf file-management-%{file_management_version}.jar file-management.jar
popd
+install -pm 644 maven-artifact-resolver/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-artifact-resolver.pom
+%add_to_maven_depmap org.apache.maven.shared maven-artifact-resolver %{artifact_resolver_version} JPP/maven-shared artifact-resolver
+install -p -m 0644 maven-artifact-resolver/target/maven-artifact-resolver-%{artifact_resolver_version}-SNAPSHOT.jar \
+ $RPM_BUILD_ROOT%{_javadir}/maven-shared/maven-artifact-resolver-%{artifact_resolver_version}.jar
+pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+ ln -sf maven-artifact-resolver-%{artifact_resolver_version}.jar maven-artifact-resolver.jar
+popd
+
+install -pm 644 maven-filtering/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-filtering.pom
+%add_to_maven_depmap org.apache.maven.shared maven-filtering %{filtering_version} JPP/maven-shared filtering
+install -p -m 0644 maven-filtering/target/maven-filtering-%{filtering_version}-beta-4-SNAPSHOT.jar \
+ $RPM_BUILD_ROOT%{_javadir}/maven-shared/maven-filtering-%{filtering_version}.jar
+pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+ ln -sf maven-filtering-%{filtering_version}.jar maven-filtering.jar
+popd
+
+#install -pm 644 maven-reporting-api/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-reporting-api.pom
+#%add_to_maven_depmap org.apache.maven.shared maven-reporting-api %{reporting_api_version} JPP/maven-shared reporting-api
+#install -p -m 0644 maven-reporting-api/target/maven-reporting-api-%{reporting_api_version}-SNAPSHOT.jar \
+# $RPM_BUILD_ROOT%{_javadir}/maven-shared/maven-reporting-api-%{reporting_api_version}.jar
+#pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+# ln -sf maven-reporting-api-%{reporting_api_version}.jar maven-reporting-api.jar
+#popd
+
+install -pm 644 maven-runtime/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-runtime.pom
+%add_to_maven_depmap org.apache.maven.shared maven-runtime %{runtime_version} JPP/maven-shared runtime
+install -p -m 0644 maven-runtime/target/maven-runtime-%{runtime_version}-alpha-3-SNAPSHOT.jar \
+ $RPM_BUILD_ROOT%{_javadir}/maven-shared/maven-runtime-%{runtime_version}.jar
+pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+ ln -sf maven-runtime-%{runtime_version}.jar maven-runtime.jar
+popd
+
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/downloader
@@ -841,15 +610,9 @@ cp -pr maven-dependency-tree/target/site
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/dependency-analyzer
cp -pr maven-dependency-analyzer/target/site/apidocs/* \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/dependency-analyzer
-#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/web-ui-tests
-#cp -pr maven-web-ui-tests/target/site/apidocs/* \
-# $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/web-ui-tests
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/verifier
cp -pr maven-verifier/target/site/apidocs/* \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/verifier
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/test-tools
-cp -pr maven-test-tools/target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/test-tools
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/monitor
cp -pr maven-shared-monitor/target/site/apidocs/* \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/monitor
@@ -865,27 +628,6 @@ cp -pr maven-repository-builder/target/s
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/reporting-impl
cp -pr maven-reporting-impl/target/site/apidocs/* \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/reporting-impl
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/plugin-tools-model
-#cp -pr maven-plugin-tools/maven-plugin-tools-model/target/site/apidocs/* \
-# $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/plugin-tools-model
-#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/plugin-tools-java
-#cp -pr maven-plugin-tools/maven-plugin-tools-java/target/site/apidocs/* \
-# $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/plugin-tools-java
-#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/plugin-tools-beanshell
-#cp -pr maven-plugin-tools/maven-plugin-tools-beanshell/target/site/apidocs/* \
-# $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/plugin-tools-beanshell
-#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/plugin-tools-api
-#cp -pr maven-plugin-tools/maven-plugin-tools-api/target/site/apidocs/* \
-# $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/plugin-tools-api
-#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/plugin-tools-ant
-#cp -pr maven-plugin-tools/maven-plugin-tools-ant/target/site/apidocs/* \
-# $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/plugin-tools-ant
-#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/plugin-testing-tools
-#cp -pr maven-plugin-testing-tools/target/site/apidocs/* \
-# $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/plugin-testing-tools
-#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/plugin-testing-harness
-#cp -pr maven-plugin-testing-harness/target/site/apidocs/* \
-# $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/plugin-testing-harness
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/model-converter
cp -pr maven-model-converter/target/site/apidocs/* \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/model-converter
@@ -895,15 +637,7 @@ cp -pr maven-invoker/target/site/apidocs
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/common-artifact-filters
cp -pr maven-common-artifact-filters/target/site/apidocs/* \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/common-artifact-filters
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/archiver
-cp -pr maven-archiver/target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/archiver
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/app-configuration-web
-cp -pr maven-app-configuration/web/target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/app-configuration-web
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/app-configuration-model
-cp -pr maven-app-configuration/model/target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/app-configuration-model
+
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/ant
cp -pr maven-ant/target/site/apidocs/* \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/ant
@@ -914,8 +648,23 @@ install -d -m 755 $RPM_BUILD_ROOT%{_java
cp -pr file-management/target/site/apidocs/* \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/file-management
-ln -s %{name}-%{shared_components_version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/maven-artifact-resolver
+cp -pr maven-artifact-resolver/target/site/apidocs/* \
+ $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/maven-artifact-resolver
+
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/maven-filtering
+cp -pr maven-filtering/target/site/apidocs/* \
+ $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/maven-filtering
+
+#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/maven-reporting-api
+#cp -pr maven-reporting-api/target/site/apidocs/* \
+# $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/maven-reporting-api
+
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/maven-runtime
+cp -pr maven-runtime/target/site/apidocs/* \
+ $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/maven-runtime
+ln -s %{name}-%{shared_components_version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -949,20 +698,20 @@ rm -rf $RPM_BUILD_ROOT
%{_javadir}/maven-shared/ant*.jar
%{_datadir}/maven2/poms/JPP.maven-shared-ant.pom
-%files app-configuration-model
-%defattr(-,root,root,-)
-%{_javadir}/maven-shared/app-configuration-model*.jar
-%{_datadir}/maven2/poms/JPP.maven-shared-app-configuration-model.pom
+#%files app-configuration-model
+#%defattr(-,root,root,-)
+#%{_javadir}/maven-shared/app-configuration-model*.jar
+#%{_datadir}/maven2/poms/JPP.maven-shared-app-configuration-model.pom
-%files app-configuration-web
-%defattr(-,root,root,-)
-%{_javadir}/maven-shared/app-configuration-web*.jar
-%{_datadir}/maven2/poms/JPP.maven-shared-app-configuration-web.pom
+#%files app-configuration-web
+#%defattr(-,root,root,-)
+#%{_javadir}/maven-shared/app-configuration-web*.jar
+#%{_datadir}/maven2/poms/JPP.maven-shared-app-configuration-web.pom
-%files archiver
-%defattr(-,root,root,-)
-%{_javadir}/maven-shared/archiver*.jar
-%{_datadir}/maven2/poms/JPP.maven-shared-archiver.pom
+#%files archiver
+#%defattr(-,root,root,-)
+#%{_javadir}/maven-shared/archiver*.jar
+#%{_datadir}/maven2/poms/JPP.maven-shared-archiver.pom
%files common-artifact-filters
%defattr(-,root,root,-)
@@ -994,40 +743,6 @@ rm -rf $RPM_BUILD_ROOT
%{_javadir}/maven-shared/model-converter*.jar
%{_datadir}/maven2/poms/JPP.maven-shared-model-converter.pom
-#%files plugin-testing-harness
-#%defattr(-,root,root,-)
-#%{_javadir}/maven-shared/plugin-testing-harness*.jar
-#%{_datadir}/maven2/poms/JPP.maven-shared-plugin-testing-harness.pom
-
-#%files plugin-testing-tools
-#%defattr(-,root,root,-)
-#%{_javadir}/maven-shared/plugin-testing-tools*.jar
-#%{_datadir}/maven2/poms/JPP.maven-shared-plugin-testing-tools.pom
-
-#%files plugin-tools-ant
-#%defattr(-,root,root,-)
-#%{_javadir}/maven-shared/plugin-tools-ant*.jar
-#%{_datadir}/maven2/poms/JPP.maven-shared-plugin-tools-ant.pom
-
-#%files plugin-tools-api
-#%defattr(-,root,root,-)
-#%{_javadir}/maven-shared/plugin-tools-api*.jar
-#%{_datadir}/maven2/poms/JPP.maven-shared-plugin-tools-api.pom
-
-#%files plugin-tools-beanshell
-#%defattr(-,root,root,-)
-#%{_javadir}/maven-shared/plugin-tools-beanshell*.jar
-#%{_datadir}/maven2/poms/JPP.maven-shared-plugin-tools-beanshell.pom
-
-#%files plugin-tools-java
-#%defattr(-,root,root,-)
-#%{_javadir}/maven-shared/plugin-tools-java*.jar
-#%{_datadir}/maven2/poms/JPP.maven-shared-plugin-tools-java.pom
-
-#%files plugin-tools-model
-#%defattr(-,root,root,-)
-#%{_javadir}/maven-shared/plugin-tools-model*.jar
-#%{_datadir}/maven2/poms/JPP.maven-shared-plugin-tools-model.pom
%files reporting-impl
%defattr(-,root,root,-)
@@ -1054,54 +769,35 @@ rm -rf $RPM_BUILD_ROOT
%{_javadir}/maven-shared/monitor*.jar
%{_datadir}/maven2/poms/JPP.maven-shared-monitor.pom
-%files test-tools
-%defattr(-,root,root,-)
-%{_javadir}/maven-shared/test-tools*.jar
-%{_datadir}/maven2/poms/JPP.maven-shared-test-tools.pom
-
-#%files toolchain
+#%files test-tools
#%defattr(-,root,root,-)
-#%{_javadir}/maven-shared/toolchain*.jar
-#%{_datadir}/maven2/poms/JPP.maven-shared-toolchain.pom
-#
-#%files user-acegi
-#%defattr(-,root,root,-)
-#%{_javadir}/maven-shared/user-acegi*.jar
-#%{_datadir}/maven2/poms/JPP.maven-shared-user-acegi.pom
-#
-#%files user-controller
-#%defattr(-,root,root,-)
-#%{_javadir}/maven-shared/user-controller*.jar
-#%{_datadir}/maven2/poms/JPP.maven-shared-user-controller.pom
-#
-#%files user-example
-#%defattr(-,root,root,-)
-#%{_javadir}/maven-shared/user-example*.jar
-#%{_datadir}/maven2/poms/JPP.maven-shared-user-example.pom
-#
-#%files user-model
-#%defattr(-,root,root,-)
-#%{_javadir}/maven-shared/user-model*.jar
-#%{_datadir}/maven2/poms/JPP.maven-shared-user-model.pom
-#
-#%files user-webapp
-#%defattr(-,root,root,-)
-#%{_javadir}/maven-shared/user-webapp*.jar
-#%{_datadir}/maven2/poms/JPP.maven-shared-user-webapp.pom
+#%{_javadir}/maven-shared/test-tools*.jar
+#%{_datadir}/maven2/poms/JPP.maven-shared-test-tools.pom
%files verifier
%defattr(-,root,root,-)
%{_javadir}/maven-shared/verifier*.jar
%{_datadir}/maven2/poms/JPP.maven-shared-verifier.pom
-#%files web-ui-tests
+%files artifact-resolver
+%defattr(-,root,root,-)
+%{_javadir}/maven-shared/maven-artifact-resolver*.jar
+%{_datadir}/maven2/poms/JPP.maven-shared-artifact-resolver.pom
+
+%files filtering
+%defattr(-,root,root,-)
+%{_javadir}/maven-shared/maven-filtering*.jar
+%{_datadir}/maven2/poms/JPP.maven-shared-filtering.pom
+
+#%files reporting-api
#%defattr(-,root,root,-)
-#%{_javadir}/maven-shared/web-ui-tests*.jar
-#%{_datadir}/maven2/poms/JPP.maven-shared-web-ui-tests.pom
-#%if %{gcj_support}
-#%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
-#%attr(-,root,root) %{_libdir}/gcj/%{name}/web-ui-tests*-%{web_ui_tests_version}.jar.*
-#%endif
+#%{_javadir}/maven-shared/maven-reporting-api*.jar
+#%{_datadir}/maven2/poms/JPP.maven-shared-reporting-api.pom
+
+%files runtime
+%defattr(-,root,root,-)
+%{_javadir}/maven-shared/maven-runtime*.jar
+%{_datadir}/maven2/poms/JPP.maven-shared-runtime.pom
%files javadoc
%defattr(-,root,root,-)
@@ -1109,6 +805,9 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_javadocdir}/%{name}
%changelog
+* Thu May 21 2010 Yong Yang <yyang at redhat.com> 15-1
+- Upgrade to 15
+
* Thu May 20 2010 Yong Yang <yyang at redhat.com> 8-6
- Replace #%add_maven_depmap with #%%add_maven_depmap to disable %add_maven_depmap
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven-shared/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 1 Sep 2009 11:25:13 -0000 1.3
+++ sources 28 May 2010 14:26:08 -0000 1.4
@@ -1 +1 @@
-f56bd9b4d221409e5e82af77c4ea1049 maven-shared-components-8.tar.gz
+154d20ec78f5133f16ab945d7157c1d4 maven-shared-components-15.tar.gz
--- maven-shared-8-jpp-depmap.xml DELETED ---
--- maven-shared-ant-pom.patch DELETED ---
--- maven-shared-disable-cobertura.patch DELETED ---
--- maven-shared-file-management-pom.patch DELETED ---
--- maven-shared-modelv3.patch DELETED ---
--- maven-shared-plugin-tools-pom.patch DELETED ---
--- maven-shared-pom.xml DELETED ---
More information about the scm-commits
mailing list