[Jpackage-commits] rpms/free/maven-shared maven-shared-jar-pom.patch, 1.1, 1.2 maven-shared-pom.patch, 1.3, 1.4 maven-shared-toolchain-mdo.patch, NONE, 1.1 maven-shared-toolchain-pom.patch, NONE, 1.1 maven-shared.spec, 1.6, 1.7

jpackage jpackage at ryu.zarb.org
Mon Dec 13 10:50:41 CET 2010


Update of /home/projects/jpackage/cvs/rpms/free/maven-shared
In directory ryu.zarb.org:/tmp/t4fGwQZo3Y/rpms/free/maven-shared

Modified Files:
	maven-shared-jar-pom.patch maven-shared-pom.patch 
	maven-shared.spec 
Added Files:
	maven-shared-toolchain-mdo.patch 
	maven-shared-toolchain-pom.patch 
Log Message:
8-0.p8.7.jpp6

Index: maven-shared-jar-pom.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven-shared/maven-shared-jar-pom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven-shared-jar-pom.patch	5 Dec 2010 11:19:58 -0000	1.1
--- maven-shared-jar-pom.patch	13 Dec 2010 09:50:39 -0000	1.2
***************
*** 1,4 ****
! --- maven-shared-jar/pom.xml.sav	2010-11-28 02:23:49.000000000 +0100
! +++ maven-shared-jar/pom.xml	2010-11-28 02:24:09.000000000 +0100
  @@ -68,27 +68,8 @@
         <plugin>
--- 1,4 ----
! --- maven-shared-jar/pom.xml.sav8	2007-07-04 11:10:26.000000000 +0200
! +++ maven-shared-jar/pom.xml	2010-12-10 00:10:03.000000000 +0100
  @@ -68,27 +68,8 @@
         <plugin>
***************
*** 29,30 ****
--- 29,43 ----
         </plugin>
         <plugin>
+ @@ -125,6 +106,12 @@
+      </dependency>
+  
+      <dependency>
+ +      <groupId>org.codehaus.plexus</groupId>
+ +      <artifactId>plexus-utils</artifactId>
+ +      <version>1.5.8</version>
+ +    </dependency>
+ +
+ +    <dependency>
+        <groupId>org.apache.bcel</groupId>
+        <artifactId>bcel</artifactId>
+        <version>5.2</version>

Index: maven-shared-pom.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven-shared/maven-shared-pom.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** maven-shared-pom.patch	5 Dec 2010 11:19:58 -0000	1.3
--- maven-shared-pom.patch	13 Dec 2010 09:50:39 -0000	1.4
***************
*** 1,4 ****
  --- pom.xml.sav0	2007-10-23 02:16:51.000000000 +0200
! +++ pom.xml	2010-11-28 02:13:32.000000000 +0100
  @@ -4,7 +4,6 @@
       <groupId>org.apache.maven</groupId>
--- 1,4 ----
  --- pom.xml.sav0	2007-10-23 02:16:51.000000000 +0200
! +++ pom.xml	2010-12-10 09:12:30.000000000 +0100
  @@ -4,7 +4,6 @@
       <groupId>org.apache.maven</groupId>
***************
*** 9,13 ****
     <groupId>org.apache.maven.shared</groupId>
     <artifactId>maven-shared-components</artifactId>
! @@ -36,14 +35,21 @@
       <module>maven-invoker</module>
       <module>maven-verifier</module>
--- 9,13 ----
     <groupId>org.apache.maven.shared</groupId>
     <artifactId>maven-shared-components</artifactId>
! @@ -36,14 +35,23 @@
       <module>maven-invoker</module>
       <module>maven-verifier</module>
***************
*** 29,36 ****
  +    <module>maven-enforcer-rule-api</module>
  +    <module>maven-doxia-tools</module>
     </modules>
     <scm>
       <connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-components-8</connection>
! @@ -62,4 +68,4 @@
         </plugins>
       </pluginManagement>
--- 29,38 ----
  +    <module>maven-enforcer-rule-api</module>
  +    <module>maven-doxia-tools</module>
+ +    <module>maven-filtering</module>
+ +    <module>maven-toolchain</module>
     </modules>
     <scm>
       <connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-components-8</connection>
! @@ -62,4 +70,4 @@
         </plugins>
       </pluginManagement>

Index: maven-shared.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven-shared/maven-shared.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** maven-shared.spec	5 Dec 2010 11:19:58 -0000	1.6
--- maven-shared.spec	13 Dec 2010 09:50:39 -0000	1.7
***************
*** 51,55 ****
  %define downloader_version 1.2
  %define doxia_tools_version 1.0.1
! %define invoker_version 2.0.7
  %define model_converter_version 2.3
  %define plugin_testing_harness_version 1.2
--- 51,57 ----
  %define downloader_version 1.2
  %define doxia_tools_version 1.0.1
! %define filtering_version 1.0
! %define toolchain_version 1.0
! %define invoker_version 2.0.11
  %define model_converter_version 2.3
  %define plugin_testing_harness_version 1.2
***************
*** 75,79 ****
  Name:           maven-shared
  Version:        8
! Release:        0.p8.6%{?dist}
  Epoch:          0
  Summary:        Maven Shared Components
--- 77,81 ----
  Name:           maven-shared
  Version:        8
! Release:        0.p8.7%{?dist}
  Epoch:          0
  Summary:        Maven Shared Components
***************
*** 89,92 ****
--- 91,102 ----
  Source5:        maven-doxia-tools-1.0.1.tar.gz
  # svn export http://svn.apache.org/repos/asf/maven/shared/tags/maven-enforcer-rule-api-1.0-alpha-2/
+ Source6:        maven-filtering-1.0-beta-4.tar.gz
+ # svn export http://svn.apache.org/repos/asf/maven/shared/tags/maven-filtering-1.0-beta-4/
+ Source7:        maven-toolchain-1.0.tar.gz
+ # svn export http://svn.apache.org/repos/asf/maven/shared/tags/maven-toolchain-1.0/
+ Source8:        maven-invoker-2.0.11.tar.gz
+ # svn export http://svn.apache.org/repos/asf/maven/shared/tags/maven-invoker-2.0.11/^C
+ 
+ 
  Patch0:        %{name}-pom.patch
  Patch1:        %{name}-ant-pom.patch
***************
*** 99,102 ****
--- 109,114 ----
  Patch8:        %{name}-jar-pom.patch
  Patch9:        %{name}-doxia-tools-DefaultSiteTool.patch
+ Patch10:       %{name}-toolchain-pom.patch
+ Patch11:       %{name}-toolchain-mdo.patch
  Patch91:       %{name}-pom-rhat.patch
  Patch92:       %{name}-AbstractSeleniumTestCase.patch
***************
*** 127,130 ****
--- 139,143 ----
  BuildRequires:  maven2-plugin-release >= 0:2.0.5
  BuildRequires:  maven2-plugin-resources
+ BuildRequires:  maven2-plugin-shade
  BuildRequires:  maven2-plugin-source
  BuildRequires:  maven-surefire-plugin >= 0:2.3
***************
*** 186,189 ****
--- 199,229 ----
  Maven Shared Components
  
+ %package toolchain
+ Summary:        Maven Shared Toolchains
+ Group:          Development/Libraries/Java
+ Version:        %{toolchain_version}
+ Requires:  %{name} = 0:%{shared_components_version}-%{release}
+ Requires:  maven2-bootstrap
+ 
+ %description toolchain
+ The Maven Toolchains provide a way for plugins to discover 
+ what JDK (or other tools) are to be used during the build, 
+ without the need to configure them. 
+ 
+ %package filtering
+ Summary:        Maven Shared Filtering
+ Group:          Development/Libraries/Java
+ Version:        %{filtering_version}
+ Requires:  %{name} = 0:%{shared_components_version}-%{release}
+ Requires:  maven2-bootstrap
+ Requires:  plexus-build-api
+ Requires:  plexus-container-default
+ Requires:  plexus-interpolation >= 0:1.12
+ Requires:  plexus-utils
+ 
+ %description filtering
+ A component to assist in filtering of resource files with 
+ properties from a Maven project.
+ 
  %package doxia-tools
  Summary:        Maven Shared Doxia Integration Tools
***************
*** 534,537 ****
--- 574,585 ----
  %prep
  %setup -q -n %{name}-components-%{shared_components_version}
+ rm -rf maven-invoker
+ gzip -dc %{SOURCE8} | tar xf -
+ mv maven-invoker-2.0.11 maven-invoker
+ rm -rf maven-toolchain
+ gzip -dc %{SOURCE7} | tar xf -
+ mv maven-toolchain-1.0 maven-toolchain
+ gzip -dc %{SOURCE6} | tar xf -
+ mv maven-filtering-1.0-beta-4 maven-filtering
  gzip -dc %{SOURCE5} | tar xf -
  gzip -dc %{SOURCE4} | tar xf -
***************
*** 551,554 ****
--- 599,604 ----
  %patch8 -b .sav8
  %patch9 -b .sav9
+ %patch10 -b .sav10
+ %patch11 -b .sav11
  
  %if %{RHAT}
***************
*** 573,576 ****
--- 623,628 ----
  mkdir -p $MAVEN_REPO_LOCAL/bouncycastle/bcprov-jdk15/135/
  ln -sf $(build-classpath bcprov) $MAVEN_REPO_LOCAL/bouncycastle/bcprov-jdk15/135/bcprov-jdk15-135.jar
+ mkdir -p $MAVEN_REPO_LOCAL/JPP/
+ ln -sf $(build-classpath plexus-build-api-tests) $MAVEN_REPO_LOCAL/JPP/plexus-build-api-tests.jar
  
  mvn-jpp \
***************
*** 669,673 ****
  CLASSPATH=$CLASSPATH:target/classes:target/test-classes
  # Maven Shared Components 
! # Maven Enforcer Rules API 
  pushd maven-doxia-tools
  ant -Dbuild.sysclasspath=only jar javadoc
--- 721,733 ----
  CLASSPATH=$CLASSPATH:target/classes:target/test-classes
  # Maven Shared Components 
! # Maven Toolchains
! pushd maven-toolchain
! ant -Dbuild.sysclasspath=only jar javadoc
! popd
! # Maven Filtering
! pushd maven-filtering
! ant -Dbuild.sysclasspath=only jar javadoc
! popd
! # Maven Doxia Tools
  pushd maven-doxia-tools
  ant -Dbuild.sysclasspath=only jar javadoc
***************
*** 944,947 ****
--- 1004,1008 ----
  install -m 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
+ %add_to_maven_depmap org.apache.maven.plugin-testing maven-plugin-testing-harness %{plugin_testing_harness_version} JPP/maven-shared plugin-testing-harness
  install -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
***************
*** 960,964 ****
  install -m 644 maven-invoker/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-invoker.pom
  %add_to_maven_depmap org.apache.maven.shared maven-invoker %{invoker_version} JPP/maven-shared invoker
! install -m 0644 maven-invoker/target/maven-invoker-%{invoker_version}-SNAPSHOT.jar \
          $RPM_BUILD_ROOT%{_javadir}/maven-shared/invoker-%{invoker_version}.jar
  pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
--- 1021,1025 ----
  install -m 644 maven-invoker/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-invoker.pom
  %add_to_maven_depmap org.apache.maven.shared maven-invoker %{invoker_version} JPP/maven-shared invoker
! install -m 0644 maven-invoker/target/maven-invoker-%{invoker_version}.jar \
          $RPM_BUILD_ROOT%{_javadir}/maven-shared/invoker-%{invoker_version}.jar
  pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
***************
*** 1014,1017 ****
--- 1075,1095 ----
  popd
  
+ install -m 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 -m 0644 maven-filtering/target/maven-filtering-%{filtering_version}-beta-4.jar \
+         $RPM_BUILD_ROOT%{_javadir}/maven-shared/filtering-%{filtering_version}.jar
+ pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+   ln -sf filtering-%{filtering_version}.jar filtering.jar
+ popd
+ 
+ install -m 644 maven-toolchain/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-toolchain.pom
+ %add_to_maven_depmap org.apache.maven.shared maven-toolchain %{toolchain_version} JPP/maven-shared toolchain
+ %add_to_maven_depmap org.apache.maven maven-toolchain %{toolchain_version} JPP/maven-shared toolchain
+ install -m 0644 maven-toolchain/target/maven-toolchain-%{toolchain_version}.jar \
+         $RPM_BUILD_ROOT%{_javadir}/maven-shared/toolchain-%{toolchain_version}.jar
+ pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+   ln -sf toolchain-%{toolchain_version}.jar toolchain.jar
+ popd
+ 
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}
***************
*** 1099,1102 ****
--- 1177,1186 ----
  cp -pr maven-doxia-tools/target/site/apidocs/* \
           $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/doxia-tools
+ install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/filtering
+ cp -pr maven-filtering/target/site/apidocs/* \
+          $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/filtering
+ install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/toolchain
+ cp -pr maven-toolchain/target/site/apidocs/* \
+          $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/toolchain
  
  ln -s %{name}-%{shared_components_version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
***************
*** 1153,1156 ****
--- 1237,1258 ----
  %{_mavendepmapfragdir}/*
  
+ %files toolchain
+ %defattr(0644,root,root,0755)
+ %{_javadir}/maven-shared/toolchain*.jar
+ %{_datadir}/maven2/poms/JPP.maven-shared-toolchain.pom
+ %if %{gcj_support}
+ %dir %{_libdir}/gcj/%{name}
+ %attr(-,root,root) %{_libdir}/gcj/%{name}/toolchain*-%{toolchain_version}.jar.*
+ %endif
+ 
+ %files filtering
+ %defattr(0644,root,root,0755)
+ %{_javadir}/maven-shared/filtering*.jar
+ %{_datadir}/maven2/poms/JPP.maven-shared-filtering.pom
+ %if %{gcj_support}
+ %dir %{_libdir}/gcj/%{name}
+ %attr(-,root,root) %{_libdir}/gcj/%{name}/filtering*-%{filtering_version}.jar.*
+ %endif
+ 
  %files doxia-tools
  %defattr(0644,root,root,0755)
***************
*** 1159,1163 ****
  %if %{gcj_support}
  %dir %{_libdir}/gcj/%{name}
! %attr(-,root,root) %{_libdir}/gcj/%{name}/doxia-tools*-%{file_management_version}.jar.*
  %endif
  
--- 1261,1265 ----
  %if %{gcj_support}
  %dir %{_libdir}/gcj/%{name}
! %attr(-,root,root) %{_libdir}/gcj/%{name}/doxia-tools*-%{doxiatools_version}.jar.*
  %endif
  
***************
*** 1404,1407 ****
--- 1506,1514 ----
  
  %changelog
+ * Sun Dec 12 2010 Ralph Apel <r.apel at r-apel.de> 0:8-0.p8.7
+ - Add maven-filtering
+ - Add maven-toolchain
+ - Upgrade maven-invoker to 2.0.11
+ 
  * Sat Dec 04 2010 Ralph Apel <r.apel at r-apel.de> 0:8-0.p8.6
  - Prepare for JPP6

--- NEW FILE: maven-shared-toolchain-pom.patch ---
--- maven-toolchain/pom.xml.sav	2010-12-10 10:25:17.000000000 +0100
+++ maven-toolchain/pom.xml	2010-12-10 10:25:45.000000000 +0100
@@ -46,7 +46,7 @@
                 <configuration>
                     <version>1.0.0</version>
                     <packageWithVersion>false</packageWithVersion>
-                    <model>src/main/mdo/toolchains.xml</model>
+                    <models><model>src/main/mdo/toolchains.xml</model></models>
                 </configuration>
             </plugin>
                 <plugin>

--- NEW FILE: maven-shared-toolchain-mdo.patch ---
--- maven-toolchain/src/main/mdo/toolchains.xml.sav	2010-12-10 11:47:03.000000000 +0100
+++ maven-toolchain/src/main/mdo/toolchains.xml	2010-12-10 11:47:45.000000000 +0100
@@ -19,7 +19,8 @@
   under the License.
  
 -->
-<model>
+<model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
+  xml.namespace="http://maven.apache.org/MAVENTOOLCHAINS/${version}">
     <id>maven-toolchains</id>
     <name>MavenToolchains</name>
     <description><![CDATA[




More information about the JPackage-commits mailing list