[Jpackage-commits] rpms/free/maven-shared maven-shared-8-jpp-depmap.xml, 1.4, 1.5 maven-shared-AbstractSeleniumTestCase.patch, NONE, 1.1 maven-shared-ant-pom.patch, 1.2, 1.3 maven-shared-asm.patch, 1.2, 1.3 maven-shared-disable-cobertura.patch, 1.1, NONE maven-shared-doxia-tools-DefaultSiteTool.patch, NONE, 1.1 maven-shared-file-management-pom.patch, 1.2, 1.3 maven-shared-fileset-mdo.patch, NONE, 1.1 maven-shared-jar-pom.patch, NONE, 1.1 maven-shared-plugin-tools-model-pom.patch, NONE, 1.1 maven-shared-pom-rhat.patch, 1.1, 1.2 maven-shared-pom.patch, 1.2, 1.3 maven-shared-settings.xml, 1.3, 1.4 maven-shared.spec, 1.5, 1.6

jpackage jpackage at ryu.zarb.org
Sun Dec 5 12:20:00 CET 2010


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

Modified Files:
	maven-shared-8-jpp-depmap.xml maven-shared-ant-pom.patch 
	maven-shared-file-management-pom.patch maven-shared-pom.patch 
	maven-shared.spec 
Added Files:
	maven-shared-AbstractSeleniumTestCase.patch 
	maven-shared-asm.patch 
	maven-shared-doxia-tools-DefaultSiteTool.patch 
	maven-shared-fileset-mdo.patch maven-shared-jar-pom.patch 
	maven-shared-plugin-tools-model-pom.patch 
	maven-shared-pom-rhat.patch maven-shared-settings.xml 
Removed Files:
	maven-shared-disable-cobertura.patch 
Log Message:
8-0.p8.6.jpp6

--- maven-shared-disable-cobertura.patch DELETED ---

--- NEW FILE: maven-shared-fileset-mdo.patch ---
--- file-management/src/main/mdo/fileset.mdo.sav	2010-11-28 01:40:33.000000000 +0100
+++ file-management/src/main/mdo/fileset.mdo	2010-11-28 01:40:55.000000000 +0100
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 
-<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.or
+g/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
+  xml.namespace="http://maven.apache.org/FILESET/${version}">
   <id>fileset</id>
   <name>FileSet</name>
   <description>

Index: maven-shared-file-management-pom.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven-shared/maven-shared-file-management-pom.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** maven-shared-file-management-pom.patch	22 Jan 2008 19:18:20 -0000	1.2
--- maven-shared-file-management-pom.patch	5 Dec 2010 11:19:58 -0000	1.3
***************
*** 1,4 ****
! --- file-management/pom.xml.sav	2007-11-27 19:06:50.000000000 +0100
! +++ file-management/pom.xml	2007-11-27 19:07:12.000000000 +0100
  @@ -69,7 +69,7 @@
       <dependency>
--- 1,20 ----
! --- file-management/pom.xml.sav2	2007-06-14 08:41:58.000000000 +0200
! +++ file-management/pom.xml	2010-11-28 01:33:28.000000000 +0100
! @@ -49,12 +49,12 @@
!                <goal>java</goal>
!                <goal>xsd</goal>
!              </goals>
! -            <configuration>
! -              <model>src/main/mdo/fileset.mdo</model>
! -            </configuration>
!            </execution>
!          </executions>
!          <configuration>
! +          <models>
! +            <model>src/main/mdo/fileset.mdo</model>
! +          </models>
!            <version>1.1.0</version>
!          </configuration>
!        </plugin>
  @@ -69,7 +69,7 @@
       <dependency>

--- NEW FILE: maven-shared-pom-rhat.patch ---
--- pom.xml.rhat	2008-11-13 21:38:39.000000000 +0100
+++ pom.xml	2008-11-13 21:38:54.000000000 +0100
@@ -34,7 +34,9 @@
     <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>

--- NEW FILE: maven-shared-doxia-tools-DefaultSiteTool.patch ---
--- maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java.sav	2010-11-28 02:31:12.000000000 +0100
+++ maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java	2010-11-28 02:36:57.000000000 +0100
@@ -664,7 +664,11 @@
 
         interpolator.addValueSource( new MapBasedValueSource( project.getProperties() ) );
 
-        siteDescriptorContent = interpolator.interpolate( siteDescriptorContent, "project" );
+	try {
+            siteDescriptorContent = interpolator.interpolate( siteDescriptorContent, "project" );
+	} catch (Exception e) {
+            throw new SiteToolException( "cannot interpolate site descriptor: " + e.getMessage(), e );
+	}
 
         props.put( "inputEncoding", inputEncoding );
 

--- NEW FILE: maven-shared-jar-pom.patch ---
--- 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>
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>2.2</version>
-        <!-- TODO: move configuration to parent POM -->
         <configuration>
-          <!-- TODO: not needed under javadoc plugin 2.3, once released -->
           <overview>${basedir}/src/main/javadoc/overview.html</overview>
-          <tags>
-            <tag>
-              <name>todo</name>
-              <placement>a</placement>
-              <head>TODO:</head>
-            </tag>
-            <tag>
-              <name>plexus.requirement</name>
-              <placement>f</placement>
-              <head>Plexus Requirement:</head>
-            </tag>
-            <tag>
-              <name>plexus.component</name>
-              <placement>t</placement>
-              <head>Plexus Component:</head>
-            </tag>
-          </tags>
         </configuration>
       </plugin>
       <plugin>

--- NEW FILE: maven-shared-asm.patch ---
--- maven-shared-components-8/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java.orig	2008-08-05 16:33:53.657092175 -0400
+++ maven-shared-components-8/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java	2008-08-05 16:34:06.852092297 -0400
@@ -60,7 +60,7 @@
             ClassReader reader = new ClassReader( in );
             DependencyVisitor visitor = new DependencyVisitor();
 
-            reader.accept( visitor, 0 );
+            reader.accept( visitor, false );
 
             dependencies.addAll( visitor.getClasses() );
         }

--- NEW FILE: maven-shared-AbstractSeleniumTestCase.patch ---
--- maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/AbstractSeleniumTestCase.java.sav	2010-11-26 10:03:47.000000000 +0100
+++ maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/AbstractSeleniumTestCase.java	2010-11-26 10:05:17.000000000 +0100
@@ -24,6 +24,7 @@
 import junit.framework.TestCase;
 import org.codehaus.plexus.util.StringUtils;
 import org.openqa.selenium.server.SeleniumServer;
+import org.openqa.selenium.server.RemoteControlConfiguration;
 
 import java.io.File;
 import java.util.Calendar;
@@ -61,7 +62,7 @@
             browser = "*firefox";
         }
 
-        sel = new DefaultSelenium( "localhost", SeleniumServer.DEFAULT_PORT, browser, getBaseUrl() );
+        sel = new DefaultSelenium( "localhost", RemoteControlConfiguration.DEFAULT_PORT, browser, getBaseUrl() );
         sel.start();
         initialize();
     }

Index: maven-shared-pom.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven-shared/maven-shared-pom.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** maven-shared-pom.patch	9 Mar 2009 05:14:24 -0000	1.2
--- maven-shared-pom.patch	5 Dec 2010 11:19:58 -0000	1.3
***************
*** 1,5 ****
! 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>
--- 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>
***************
*** 10,21 ****
     <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>
--- 9,17 ----
     <groupId>org.apache.maven.shared</groupId>
     <artifactId>maven-shared-components</artifactId>
! @@ -36,14 +35,21 @@
       <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>
***************
*** 30,40 ****
  +    <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>
--- 26,36 ----
  +    <module>maven-osgi</module>
  +    <module>maven-downloader</module>
! +
  +    <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>

--- NEW FILE: maven-shared-plugin-tools-model-pom.patch ---
--- ./maven-plugin-tools/maven-plugin-tools-model/pom.xml.sav6	2007-03-10 23:48:08.000000000 +0100
+++ ./maven-plugin-tools/maven-plugin-tools-model/pom.xml	2010-11-28 01:30:33.000000000 +0100
@@ -34,7 +34,9 @@
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
         <configuration>
-          <model>src/main/mdo/plugin-metadata.mdo</model>
+          <models>
+            <model>src/main/mdo/plugin-metadata.mdo</model>
+          </models>
           <version>1.0.0</version>
         </configuration>
         <executions>

Index: maven-shared-ant-pom.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven-shared/maven-shared-ant-pom.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** maven-shared-ant-pom.patch	9 Mar 2009 05:14:24 -0000	1.2
--- maven-shared-ant-pom.patch	5 Dec 2010 11:19:58 -0000	1.3
***************
*** 1,15 ****
! diff -up ./maven-ant/pom.xml.sav ./maven-ant/pom.xml
! --- ./maven-ant/pom.xml.sav	2007-06-14 02:41:58.000000000 -0400
! +++ ./maven-ant/pom.xml	2008-04-08 15:00:40.000000000 -0400
! @@ -28,6 +28,11 @@
         <version>1.0-alpha-13</version>
       </dependency>  
       <dependency>
- +      <groupId>org.codehaus.plexus</groupId>
- +      <artifactId>plexus-classworlds</artifactId>
- +      <version>1.2-alpha-9</version>
- +    </dependency>  
- +    <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-project</artifactId>
-        <version>2.0.1</version>
--- 1,11 ----
! --- maven-ant/pom.xml.sav1	2007-11-27 17:26:32.000000000 +0100
! +++ maven-ant/pom.xml	2007-11-27 17:27:00.000000000 +0100
! @@ -24,7 +24,7 @@
!    <dependencies>
!      <dependency>
!        <groupId>org.codehaus.plexus</groupId>
! -      <artifactId>plexus-container-default</artifactId>
! +      <artifactId>plexus-containers-container-default</artifactId>
         <version>1.0-alpha-13</version>
       </dependency>  
       <dependency>

--- NEW FILE: maven-shared-settings.xml ---
<settings>
	<profiles>
		<profile>
			<id>JPP</id>
			<repositories>
				<repository>
					<id>internal</id>
					<layout>jpp</layout>
					<url>__INTERNAL_REPO_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>external</id>
					<layout>jpp</layout>
					<url>__EXTERNAL_REPO_PLACEHOLDER__</url>
				</repository>
			</repositories>
			<pluginRepositories>
				<pluginRepository>
					<id>plugins-internal</id>
					<name>plugins-internal</name>
					<layout>jpp</layout>
					<url>__INTERNAL_REPO_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-external</id>
					<name>plugins-external</name>
					<layout>jpp</layout>
					<url>__EXTERNAL_REPO_PLACEHOLDER__</url>
				</pluginRepository>
			</pluginRepositories>
		</profile>
	</profiles>
	<activeProfiles>
		<activeProfile>JPP</activeProfile>
	</activeProfiles>
</settings>

Index: maven-shared.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven-shared/maven-shared.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** maven-shared.spec	27 Apr 2009 01:57:51 -0000	1.5
--- maven-shared.spec	5 Dec 2010 11:19:58 -0000	1.6
***************
*** 1,3 ****
! # Copyright (c) 2000-2005, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 29,39 ****
  #
[...2211 lines suppressed...]
+ - Relax (B)Rs
+ - remove javadoc scriptlets
+ - fix permissions
+ - fix maven directory ownership
+ - update License
+ - update BuildRoot
+ - build without maven by default
+ - maven build requires saxpath
+ - fix java call
+ - patch for new asm
+ - partially updated for recent versions of bouncycastle
+ - comment out sitemesh BuildRequires for now
+ - Use easymock-java5 instead of easymock
+ - Add missing BRs for jetty and openqa-selenium-core
+ - Move version to the parent-version
+ - Conserve proper version for each component
+ - maven-shared-components-8 package set
+ 
  * Mon Apr 27 2009 Yong Yang <yyang at redhat.com> - 8-0.p8.4
  - Rebuild with maven2-2.0.8 built in non-bootstrap mode

Index: maven-shared-8-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven-shared/maven-shared-8-jpp-depmap.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** maven-shared-8-jpp-depmap.xml	27 Apr 2009 01:57:51 -0000	1.4
--- maven-shared-8-jpp-depmap.xml	5 Dec 2010 11:19:58 -0000	1.5
***************
*** 2,5 ****
--- 2,17 ----
          <dependency>
            <maven>
+                 <groupId>easymock</groupId>
+                 <artifactId>easymock</artifactId>
+                 <version>1.2_Java1.3</version>
+           </maven>
+           <jpp>
+                 <groupId>JPP</groupId>
+                 <artifactId>easymock</artifactId>
+                 <version>1.2</version>
+           </jpp>
+         </dependency>
+         <dependency>
+           <maven>
                  <groupId>junit-addons</groupId>
                  <artifactId>junit-addons</artifactId>
***************
*** 7,12 ****
            </maven>
            <jpp>
!                 <groupId>JPP/maven2</groupId>
!                 <artifactId>empty-dep</artifactId>
                  <version>1.4</version>
            </jpp>
--- 19,24 ----
            </maven>
            <jpp>
!                 <groupId>JPP</groupId>
!                 <artifactId>junit-addons</artifactId>
                  <version>1.4</version>
            </jpp>
***************
*** 36,64 ****
            </jpp>
          </dependency>
-         <dependency>
-           <maven>
-                 <groupId>asm</groupId>
-                 <artifactId>asm-parent</artifactId>
-                 <version>3.0</version>
-           </maven>
-           <jpp>
-                 <groupId>JPP/objectweb-asm</groupId>
-                 <artifactId>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>
--- 48,51 ----
***************
*** 70,147 ****
            <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.plugins</groupId>
-                 <artifactId>maven-jar-plugin</artifactId>
-                 <version>2.1-SNAPSHOT</version>
-             </maven>
-             <jpp>
-                 <groupId>JPP/maven2/plugins</groupId>
-                 <artifactId>jar-plugin</artifactId>
-                 <version>2.1-SNAPSHOT</version>
-             </jpp>
-         </dependency>
-         <dependency>
-             <maven>
-               <groupId>org.apache.maven</groupId>
-               <artifactId>maven-archiver</artifactId>
-               <version>2.2</version>
-             </maven>
-             <jpp>
-               <groupId>JPP/maven-shared</groupId>
-               <artifactId>archiver</artifactId>
-               <version>2.3</version>
-             </jpp>
-           </dependency>
- 
-     <dependency>
-         <maven>
-             <groupId>com.thoughtworks.qdox</groupId>
-             <artifactId>qdox</artifactId>
-             <version>1.6.3</version>
-         </maven>
-         <jpp>
-             <groupId>JPP</groupId>
-             <artifactId>qdox</artifactId>
-             <version>1.6.3</version>
-         </jpp>
-     </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-all</artifactId>
-             <version>2.0.8</version>
-         </jpp>
-     </dependency>
- 
-     
  </dependencies>
--- 57,89 ----
            <jpp>
                  <groupId>JPP</groupId>
!                 <artifactId>servlet_2_4_api</artifactId>
                  <version>2.4</version>
            </jpp>
          </dependency>
  
          <dependency>
            <maven>
                  <groupId>org.codehaus.plexus</groupId>
!                 <artifactId>plexus-containers-container-default</artifactId>
!                 <version>1.0-alpha-13</version>
            </maven>
+           <jpp>
+                 <groupId>JPP/plexus</groupId>
+                 <artifactId>containers-container-default</artifactId>
+                 <version>1.0-alpha-34</version>
+           </jpp>
          </dependency>
          <dependency>
            <maven>
!                 <groupId>org.codehaus.plexus</groupId>
!                 <artifactId>plexus-component-api</artifactId>
!                 <version>1.0-alpha-20</version>
            </maven>
+           <jpp>
+                 <groupId>JPP/plexus</groupId>
+                 <artifactId>containers-component-api</artifactId>
+                 <version>1.0-alpha-34</version>
+           </jpp>
          </dependency>
  
  </dependencies>




More information about the JPackage-commits mailing list