[Jpackage-commits] dist/maven-doxia/JPP-6 maven-doxia-1.0-pom.patch, 1.2, 1.3 maven-doxia-plexus-component-metadata.patch, NONE, 1.1 maven-doxia.spec, 1.44, 1.45

David Walluck david at ryu.zarb.org
Wed Oct 12 08:46:51 CEST 2011


Update of /home/projects/jpackage/cvs/dist/maven-doxia/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv3600

Modified Files:
	maven-doxia-1.0-pom.patch maven-doxia.spec 
Added Files:
	maven-doxia-plexus-component-metadata.patch 
Log Message:
- debug

Index: maven-doxia.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-doxia/JPP-6/maven-doxia.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -C 2 -d -r1.44 -r1.45
*** maven-doxia.spec	12 Oct 2011 06:28:24 -0000	1.44
--- maven-doxia.spec	12 Oct 2011 06:46:49 -0000	1.45
***************
*** 59,62 ****
--- 59,63 ----
  Patch6:         maven-doxia-doxia-maven-plugin.patch
  Patch7:         maven-doxia-module-fo-pom.patch
+ Patch8:         maven-doxia-plexus-component-metadata.patch
  Requires(post): jpackage-utils
  Requires(postun): jpackage-utils
***************
*** 99,103 ****
--- 100,108 ----
  # XXX: 1.0-beta-6
  BuildRequires:  plexus-i18n >= 0:1.0
+ %if 0
  BuildRequires:  plexus-maven-plugin
+ %else
+ BuildRequires:  plexus-containers-component-metadata
+ %endif
  BuildRequires:  plexus-utils
  BuildRequires:  xerces-j2
***************
*** 156,159 ****
--- 161,165 ----
  %patch6 -p1 -b .sav6
  %patch7 -p1 -b .sav7
+ %patch8 -p1 -b .sav8
  
  %if %with maven

--- NEW FILE: maven-doxia-plexus-component-metadata.patch ---
diff -ur maven-doxia-1.1.orig/doxia-modules/doxia-module-apt/pom.xml maven-doxia-1.1/doxia-modules/doxia-module-apt/pom.xml
--- maven-doxia-1.1.orig/doxia-modules/doxia-module-apt/pom.xml	2009-03-03 13:32:44.000000000 -0500
+++ maven-doxia-1.1/doxia-modules/doxia-module-apt/pom.xml	2011-10-12 02:42:51.882063400 -0400
@@ -49,17 +49,17 @@
     <plugins>
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-maven-plugin</artifactId>
+        <artifactId>plexus-component-metadata</artifactId>
         <configuration>
           <descriptors>
             <descriptor>src/main/components/components.xml</descriptor>
-            <descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
+            <descriptor>target/classes/META-INF/plexus/components.xml</descriptor>
           </descriptors>
         </configuration>
         <executions>
           <execution>
             <goals>
-              <goal>merge-descriptors</goal>
+              <goal>merge-metadata</goal>
             </goals>
           </execution>
         </executions>
diff -ur maven-doxia-1.1.orig/doxia-modules/doxia-module-docbook-simple/pom.xml maven-doxia-1.1/doxia-modules/doxia-module-docbook-simple/pom.xml
--- maven-doxia-1.1.orig/doxia-modules/doxia-module-docbook-simple/pom.xml	2009-03-03 13:32:44.000000000 -0500
+++ maven-doxia-1.1/doxia-modules/doxia-module-docbook-simple/pom.xml	2011-10-12 02:42:51.882063400 -0400
@@ -45,17 +45,17 @@
     <plugins>
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-maven-plugin</artifactId>
+        <artifactId>plexus-component-metadata</artifactId>
         <configuration>
           <descriptors>
             <descriptor>src/main/components/components.xml</descriptor>
-            <descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
+            <descriptor>target/classes/META-INF/plexus/components.xml</descriptor>
           </descriptors>
         </configuration>
         <executions>
           <execution>
             <goals>
-              <goal>merge-descriptors</goal>
+              <goal>merge-metadata</goal>
             </goals>
           </execution>
         </executions>
diff -ur maven-doxia-1.1.orig/doxia-modules/doxia-module-xdoc/pom.xml maven-doxia-1.1/doxia-modules/doxia-module-xdoc/pom.xml
--- maven-doxia-1.1.orig/doxia-modules/doxia-module-xdoc/pom.xml	2009-03-03 13:32:44.000000000 -0500
+++ maven-doxia-1.1/doxia-modules/doxia-module-xdoc/pom.xml	2011-10-12 02:42:51.886063100 -0400
@@ -58,17 +58,17 @@
     <plugins>
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-maven-plugin</artifactId>
+        <artifactId>plexus-component-metadata</artifactId>
         <configuration>
           <descriptors>
             <descriptor>src/main/components/components.xml</descriptor>
-            <descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
+            <descriptor>target/classes/META-INF/plexus/components.xml</descriptor>
           </descriptors>
         </configuration>
         <executions>
           <execution>
             <goals>
-              <goal>merge-descriptors</goal>
+              <goal>merge-metadata</goal>
             </goals>
           </execution>
         </executions>
diff -ur maven-doxia-1.1.orig/pom.xml maven-doxia-1.1/pom.xml
--- maven-doxia-1.1.orig/pom.xml	2009-03-03 13:32:44.000000000 -0500
+++ maven-doxia-1.1/pom.xml	2011-10-12 02:42:59.383501632 -0400
@@ -272,8 +272,8 @@
         <!-- TODO need to upgrade to last version or Maven parent version -->
         <plugin>
           <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-maven-plugin</artifactId>
-          <version>1.3.5</version>
+          <artifactId>plexus-component-metadata</artifactId>
+          <version>1.5.5</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.modello</groupId>
@@ -289,7 +289,7 @@
     <plugins>
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-maven-plugin</artifactId>
+        <artifactId>plexus-component-metadata</artifactId>
         <executions>
           <execution>
             <goals>
Only in maven-doxia-1.1: pom.xml~

Index: maven-doxia-1.0-pom.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-doxia/JPP-6/maven-doxia-1.0-pom.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** maven-doxia-1.0-pom.patch	12 Oct 2011 00:59:02 -0000	1.2
--- maven-doxia-1.0-pom.patch	12 Oct 2011 06:46:49 -0000	1.3
***************
*** 1,8 ****
  --- pom.xml.sav0	2009-03-03 13:32:44.000000000 -0500
  +++ pom.xml	2011-10-11 20:58:30.189826808 -0400
! @@ -288,6 +288,14 @@
!      </pluginManagement>
!      <plugins>
!        <plugin>
  +        <groupId>org.apache.maven.plugins</groupId>
  +        <artifactId>maven-compiler-plugin</artifactId>
--- 1,9 ----
  --- pom.xml.sav0	2009-03-03 13:32:44.000000000 -0500
  +++ pom.xml	2011-10-11 20:58:30.189826808 -0400
! @@ -298,6 +298,14 @@
!            </execution>
!          </executions>
!        </plugin>
! +      <plugin>
  +        <groupId>org.apache.maven.plugins</groupId>
  +        <artifactId>maven-compiler-plugin</artifactId>
***************
*** 12,17 ****
  +        </configuration>
  +      </plugin>
! +      <plugin>
!          <groupId>org.codehaus.plexus</groupId>
!          <artifactId>plexus-maven-plugin</artifactId>
!          <executions>
--- 13,17 ----
  +        </configuration>
  +      </plugin>
!      </plugins>
!    </build>
!  




More information about the JPackage-commits mailing list