[Jpackage-commits] dist/maven2/JPP-6 .cvsignore, 1.1, 1.2 maven2-plugin-changes-ChangesXML.patch, NONE, 1.1 maven2-plugin-changes-mdo.patch, NONE, 1.1 maven2-plugin-changes-pom.patch, NONE, 1.1 maven2-plugin-invoker-pom.patch, NONE, 1.1 maven2-plugin-javadoc-AbstractJavadocMojo.patch, NONE, 1.1 maven2-plugin-javadoc-pom.patch, 1.1, 1.2 maven2-plugin-war-MappingUtils.patch, 1.1, 1.2 maven2-plugins-jpprepolayout.patch, 1.1, 1.2 maven2-site-plugin-SiteDescriptorAttachMojo-doxia-tools-101.patch, NONE, 1.1 maven2-site-plugin-pom.patch, NONE, 1.1 maven2.spec, 1.30, 1.31 sources, 1.4, 1.5

jpackage jpackage at ryu.zarb.org
Sun Dec 12 23:29:10 CET 2010


Update of /home/projects/jpackage/cvs/dist/maven2/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv25246

Modified Files:
	.cvsignore maven2-plugin-javadoc-pom.patch 
	maven2-plugin-war-MappingUtils.patch 
	maven2-plugins-jpprepolayout.patch maven2.spec sources 
Added Files:
	maven2-plugin-changes-ChangesXML.patch 
	maven2-plugin-changes-mdo.patch 
	maven2-plugin-changes-pom.patch 
	maven2-plugin-invoker-pom.patch 
	maven2-plugin-javadoc-AbstractJavadocMojo.patch 
	maven2-site-plugin-SiteDescriptorAttachMojo-doxia-tools-101.patch 
	maven2-site-plugin-pom.patch 
Log Message:
2.0.8-29

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven2/JPP-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	29 Mar 2010 18:59:09 -0000	1.1
--- .cvsignore	12 Dec 2010 22:29:08 -0000	1.2
***************
*** 1,8 ****
  maven2-src.tar.gz
  maven2-plugins-070705-src.tar.gz
- maven-javadoc-plugin-2.4-src.tar.gz
- maven2-model-v3.jar
- maven2-maven-site-plugin.tar.gz
  m2_pom_repo.tar.gz
  m2_jar_repo.tar.gz
! maven2-empty-dep.jar
--- 1,10 ----
  maven2-src.tar.gz
  maven2-plugins-070705-src.tar.gz
  m2_pom_repo.tar.gz
  m2_jar_repo.tar.gz
! maven-resources-plugin-2.4.3.tar.gz
! maven-site-plugin-2.0.1.tar.gz
! maven-assembly-plugin-2.2.tar.gz
! maven-changes-plugin-2.3.tar.gz
! maven-javadoc-plugin-2.5.tar.gz
! maven-invoker-plugin-1.4.tar.gz

--- NEW FILE: maven2-site-plugin-pom.patch ---
--- maven2-plugins/maven-site-plugin/pom.xml.sav7	2009-07-10 13:57:12.000000000 +0200
+++ maven2-plugins/maven-site-plugin/pom.xml	2010-12-09 18:33:29.000000000 +0100
@@ -316,6 +316,7 @@
     </pluginManagement>
   </build>
 
+  <!-- avoid circular dependency
   <reporting>
     <plugins>
       <plugin>
@@ -329,6 +330,7 @@
       </plugin>
     </plugins>
   </reporting>
+  -->
 
   <profiles>
     <profile>

--- NEW FILE: maven2-plugin-changes-ChangesXML.patch ---
--- maven2-plugins/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesXML.java.sav30	2009-10-31 23:21:29.000000000 +0100
+++ maven2-plugins/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesXML.java	2010-12-10 22:52:58.000000000 +0100
@@ -21,6 +21,7 @@
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.InputStreamReader;
 import java.util.Collections;
 import java.util.List;
 
@@ -62,7 +63,7 @@
 
             ChangesXpp3Reader reader = new ChangesXpp3Reader();
 
-            changesDocument = reader.read( new FileInputStream( xmlPath ), false );
+            changesDocument = reader.read( new InputStreamReader(new FileInputStream( xmlPath )), false );
 
             if ( changesDocument == null )
             {

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven2/JPP-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** sources	4 Dec 2010 10:39:50 -0000	1.4
--- sources	12 Dec 2010 22:29:08 -0000	1.5
***************
*** 1,8 ****
  ffd6fcb439b5b7e143a31a4fd5af9902  maven2-src.tar.gz
  a9b9ce42ffbba60eb1833f0a773f7aa7  maven2-plugins-070705-src.tar.gz
- c3c1014b8548f94f91f3b679a5500e4b  maven-javadoc-plugin-2.4-src.tar.gz
- 13c1088b7b9535b9e4fb31317f79491a  maven2-model-v3.jar
- de45a278b88554bb545f092e2f82c56d  maven2-maven-site-plugin.tar.gz
  2d748942f6e1de90252509e498c9ad47  m2_pom_repo.tar.gz
  cfd387a94777b0836e4ab64bbf846c39  m2_jar_repo.tar.gz
! dc36ce1fbefedbdd27fa93c8584ba91a  maven2-empty-dep.jar
--- 1,10 ----
  ffd6fcb439b5b7e143a31a4fd5af9902  maven2-src.tar.gz
  a9b9ce42ffbba60eb1833f0a773f7aa7  maven2-plugins-070705-src.tar.gz
  2d748942f6e1de90252509e498c9ad47  m2_pom_repo.tar.gz
  cfd387a94777b0836e4ab64bbf846c39  m2_jar_repo.tar.gz
! 6de0577720a9269626c5a268ae322fb1  maven-resources-plugin-2.4.3.tar.gz
! aaeb205002ddd3245410839d38948135  maven-site-plugin-2.0.1.tar.gz
! fc10ed5cdca3ee83a94fab6a5cd81b39  maven-assembly-plugin-2.2.tar.gz
! e031ad52ca6528b817b6c456a2ca7564  maven-changes-plugin-2.3.tar.gz
! 092bc2bde5e69d099567784a47fec69d  maven-javadoc-plugin-2.5.tar.gz
! bc4ce5faa960ccedeb2e53c05f205aad  maven-invoker-plugin-1.4.tar.gz

--- NEW FILE: maven2-site-plugin-SiteDescriptorAttachMojo-doxia-tools-101.patch ---
--- maven2-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java.sav	2010-12-09 18:02:39.000000000 +0100
+++ maven2-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java	2010-12-09 18:03:08.000000000 +0100
@@ -109,11 +109,11 @@
                 MavenProject parentProject = siteTool.getParentProject( project, reactorProjects, localRepository );
                 if ( parentProject != null && project.getUrl() != null && parentProject.getUrl() != null )
                 {
-                    siteTool.populateParentMenu( decoration, locale, project, parentProject, true );
+                    siteTool.populateProjectParentMenu( decoration, locale, project, parentProject, true );
                 }
                 try
                 {
-                    siteTool.populateModulesMenu( project, reactorProjects, localRepository, decoration, locale, true );
+                    siteTool.populateModules( project, reactorProjects, localRepository, decoration, locale, true );
                 }
                 catch ( SiteToolException e )
                 {

--- NEW FILE: maven2-plugin-javadoc-AbstractJavadocMojo.patch ---
--- maven2-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java.sav	2010-12-10 12:51:52.000000000 +0100
+++ maven2-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java	2010-12-10 12:53:02.000000000 +0100
@@ -3204,6 +3204,11 @@
                     throw new MavenReportException( "Extraction of resources failed. Artifact that failed was: "
                         + artifact.getArtifactId(), e );
                 }
+                catch ( IOException ioe )
+                {
+                    throw new MavenReportException( "Extraction of resources failed. Artifact that failed was: "
+                        + artifact.getArtifactId(), ioe );
+                }
             }
         }
     }

--- NEW FILE: maven2-plugin-invoker-pom.patch ---
--- maven2-plugins/maven-invoker-plugin/pom.xml.sav	2010-12-12 14:28:43.000000000 +0100
+++ maven2-plugins/maven-invoker-plugin/pom.xml	2010-12-12 14:29:26.000000000 +0100
@@ -206,14 +206,12 @@
               <!-- Generate the Java sources for the model itself -->
               <goal>java</goal>
             </goals>
+            <configuration>
+              <model>src/main/mdo/invocation.mdo</model>
+              <version>1.0.0</version>
+            </configuration>
           </execution>
         </executions>
-        <configuration>
-          <models>
-            <model>src/main/mdo/invocation.mdo</model>
-          </models>
-          <version>1.0.0</version>
-        </configuration>
       </plugin>
     </plugins>
   </build>

--- NEW FILE: maven2-plugin-changes-pom.patch ---
--- maven2-plugins/maven-changes-plugin/pom.xml.sav28	2009-12-06 22:02:43.000000000 +0100
+++ maven2-plugins/maven-changes-plugin/pom.xml	2010-12-10 19:19:20.000000000 +0100
@@ -331,6 +331,8 @@
             </goals>
             <configuration>
               <outputDirectory>src/site/xdoc/</outputDirectory>
+              <version>1.0.0</version>
+              <model>src/main/mdo/changes.mdo</model>
             </configuration>
           </execution>
           <execution>
@@ -340,6 +342,10 @@
               <goal>xpp3-reader</goal>
               <goal>xpp3-writer</goal>
             </goals>
+            <configuration>
+              <version>1.0.0</version>
+              <model>src/main/mdo/changes.mdo</model>
+            </configuration>
           </execution>
           <execution>
             <id>generate-xsd</id>
@@ -349,6 +355,8 @@
             </goals>
             <configuration>
               <outputDirectory>${project.build.outputDirectory}/META-INF/changes/xsd</outputDirectory>
+              <version>1.0.0</version>
+              <model>src/main/mdo/changes.mdo</model>
             </configuration>
           </execution>
           <execution>
@@ -359,15 +367,11 @@
             </goals>
             <configuration>
               <outputDirectory>${project.reporting.outputDirectory}/xsd</outputDirectory>
+              <version>1.0.0</version>
+              <model>src/main/mdo/changes.mdo</model>
             </configuration>
           </execution>
         </executions>
-        <configuration>
-          <version>1.0.0</version>
-          <models>
-            <model>src/main/mdo/changes.mdo</model>
-          </models>
-        </configuration>
       </plugin>
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
@@ -386,7 +390,9 @@
             <configuration>
               <output>${project.build.outputDirectory}/META-INF/plexus/components.xml</output>
               <descriptors>
+              <!--
                 <descriptor>${project.build.outputDirectory}/META-INF/plexus/components.xml</descriptor>
+                -->
                 <descriptor>src/main/resources/META-INF/plexus/components.xml</descriptor>
               </descriptors>
             </configuration>

--- NEW FILE: maven2-plugin-changes-mdo.patch ---
--- maven2-plugins/maven-changes-plugin/src/main/mdo/changes.mdo.sav	2010-12-10 18:54:45.000000000 +0100
+++ maven2-plugins/maven-changes-plugin/src/main/mdo/changes.mdo	2010-12-10 18:54:58.000000000 +0100
@@ -180,7 +180,7 @@
         <field>
           <name>name</name>
           <version>1.0.0</version>
-          <type>Content</type>
+          <type>String</type>
           <description>
             The page author name.
           </description>
@@ -205,7 +205,7 @@
         <field>
           <name>action</name>
           <version>1.0.0</version>
-          <type>Content</type>
+          <type>String</type>
           <description>
             A short description of the action taken.
           </description>

Index: maven2-plugin-war-MappingUtils.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven2/JPP-6/maven2-plugin-war-MappingUtils.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven2-plugin-war-MappingUtils.patch	4 Dec 2010 10:39:50 -0000	1.1
--- maven2-plugin-war-MappingUtils.patch	12 Dec 2010 22:29:08 -0000	1.2
***************
*** 1,4 ****
  --- maven2-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/MappingUtils.java.sav24	2007-03-11 17:55:10.000000000 +0100
! +++ maven2-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/MappingUtils.java	2010-11-28 17:37:14.000000000 +0100
  @@ -21,8 +21,8 @@
   
--- 1,4 ----
  --- maven2-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/MappingUtils.java.sav24	2007-03-11 17:55:10.000000000 +0100
! +++ maven2-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/MappingUtils.java	2010-12-10 01:37:08.000000000 +0100
  @@ -21,8 +21,8 @@
   
***************
*** 12,13 ****
--- 12,24 ----
   import java.util.ArrayList;
   import java.util.Iterator;
+ @@ -95,6 +95,10 @@
+              return properties.getProperty( key );
+          }
+  
+ +        public List getFeedback() { return (List)null; }
+ +
+ +        public void clearFeedback() {}
+ +
+      }
+  
+  

Index: maven2-plugins-jpprepolayout.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven2/JPP-6/maven2-plugins-jpprepolayout.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven2-plugins-jpprepolayout.patch	29 Mar 2010 15:28:10 -0000	1.1
--- maven2-plugins-jpprepolayout.patch	12 Dec 2010 22:29:08 -0000	1.2
***************
*** 15,32 ****
               VersionRange versionSpec = VersionRange.createFromVersionSpec( version );
               artifact = factory.createDependencyArtifact( skin.getGroupId(), skin.getArtifactId(), versionSpec, "jar",
- diff -up maven2-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java.sav maven2-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
- --- maven2-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java.sav	2009-05-05 16:36:38.000000000 -0400
- +++ maven2-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java	2009-05-05 16:36:47.000000000 -0400
- @@ -376,7 +376,11 @@ public abstract class AbstractSiteRender
-          {
-              if ( version == null )
-              {
- -                version = Artifact.RELEASE_VERSION;
- +                if (System.getProperty("maven2.ignore.versions") != null) {
- +                    version = "2.0.8";
- +                } else {
- +                    version = Artifact.RELEASE_VERSION;
- +                }
-              }
-              VersionRange versionSpec = VersionRange.createFromVersionSpec( version );
-              artifact = artifactFactory.createDependencyArtifact( skin.getGroupId(), skin.getArtifactId(), versionSpec,
--- 15,16 ----

Index: maven2-plugin-javadoc-pom.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven2/JPP-6/maven2-plugin-javadoc-pom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven2-plugin-javadoc-pom.patch	4 Dec 2010 10:39:50 -0000	1.1
--- maven2-plugin-javadoc-pom.patch	12 Dec 2010 22:29:08 -0000	1.2
***************
*** 1,21 ****
! --- maven2-plugins/maven-javadoc-plugin/pom.xml.sav	2010-11-29 00:20:39.000000000 +0100
! +++ maven2-plugins/maven-javadoc-plugin/pom.xml	2010-11-29 00:22:13.000000000 +0100
! @@ -112,6 +112,11 @@
!        <artifactId>doxia-sink-api</artifactId>
!        <version>${doxiaVersion}</version>
!      </dependency>
! +    <dependency>
! +      <groupId>org.apache.maven.doxia</groupId>
! +      <artifactId>doxia-core</artifactId>
! +      <version>${doxiaVersion}</version>
! +    </dependency>
   
!      <!-- Doxia-sitetools -->
!      <dependency>
! @@ -279,4 +284,4 @@
!        </build>
!      </profile>
!    </profiles>
! -</project>
! \ No newline at end of file
! +</project>
--- 1,30 ----
! --- maven2-plugins/maven-javadoc-plugin/pom.xml.sav26	2008-08-22 13:25:23.000000000 +0200
! +++ maven2-plugins/maven-javadoc-plugin/pom.xml	2010-12-10 08:27:44.000000000 +0100
! @@ -38,7 +38,7 @@
!    <inceptionYear>2004</inceptionYear>
   
!    <prerequisites>
! -    <maven>2.0.9</maven>
! +    <maven>2.0.8</maven>
!    </prerequisites>
!  
!    <scm>
! @@ -211,14 +211,12 @@
!              <goals>
!                <goal>java</goal>
!              </goals>
! +            <configuration>
! +              <version>1.0.0</version>
! +              <model>src/main/mdo/javadocOptions.mdo</model>
! +            </configuration>
!            </execution>
!          </executions>
! -        <configuration>
! -          <version>1.0.0</version>
! -          <models>
! -            <model>src/main/mdo/javadocOptions.mdo</model>
! -          </models>
! -        </configuration>
!        </plugin>
!      </plugins>
!    </build>

Index: maven2.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven2/JPP-6/maven2.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -C 2 -d -r1.30 -r1.31
*** maven2.spec	4 Dec 2010 16:18:39 -0000	1.30
--- maven2.spec	12 Dec 2010 22:29:08 -0000	1.31
***************
*** 1,3 ****
! # Copyright (c) 2000-2005, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 60,64 ****
  Name:           %{name}
[...1306 lines suppressed...]
  done
***************
*** 1691,1695 ****
  install -p -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{repodirsrc}
  install -p -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{repodirsrc}
- install -p -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{repodirsrc}
  install -p -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{repodirsrc}
  install -p -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{repodirsrc}
--- 1725,1728 ----
***************
*** 2890,2893 ****
--- 2923,2930 ----
  
  %changelog
+ * Thu Dec 09 2010 Ralph Apel <r.apel at r-apel.de> 0:2.0.8-29
+ - Upgrade plugins: resources, site, assembly, javadoc, changes, 
+   invoker
+ 
  * Sun Nov 28 2010 Ralph Apel <r.apel at r-apel.de> 0:2.0.8-28
  - Adapt to doxia 1.0, modello 1.3, fix war plugin




More information about the JPackage-commits mailing list