File pom.patch of Package maven-doxia
Index: pom.xml
===================================================================
--- pom.xml.orig
+++ pom.xml
@@ -223,7 +223,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-30</version>
+ <version>1.0-alpha-8</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -313,11 +313,11 @@ under the License.
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
+ <artifactId>plexus-component-metadata</artifactId>
<executions>
<execution>
<goals>
- <goal>descriptor</goal>
+ <goal>generate-metadata</goal>
</goals>
</execution>
</executions>
Index: doxia-core/pom.xml
===================================================================
--- doxia-core/pom.xml.orig
+++ doxia-core/pom.xml
@@ -107,7 +107,9 @@ under the License.
</executions>
<configuration>
<version>1.0.1</version>
+ <models>
<model>src/main/mdo/document.mdo</model>
+ </models>
</configuration>
</plugin>
</plugins>
Index: doxia-modules/doxia-module-apt/pom.xml
===================================================================
--- doxia-modules/doxia-module-apt/pom.xml.orig
+++ doxia-modules/doxia-module-apt/pom.xml
@@ -49,17 +49,23 @@ under the License.
<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/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>-->
</descriptors>
</configuration>
<executions>
+<!-- <execution>
+ <id>patched-phase</id>
+ <goals>
+ <goal>generate-metadata</goal>
+ </goals>
+ </execution>-->
<execution>
<goals>
- <goal>merge-descriptors</goal>
+ <goal>merge-metadata</goal>
</goals>
</execution>
</executions>
Index: doxia-modules/doxia-module-docbook-simple/pom.xml
===================================================================
--- doxia-modules/doxia-module-docbook-simple/pom.xml.orig
+++ doxia-modules/doxia-module-docbook-simple/pom.xml
@@ -45,17 +45,17 @@ under the License.
<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/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>-->
</descriptors>
</configuration>
<executions>
<execution>
<goals>
- <goal>merge-descriptors</goal>
+ <goal>merge-metadata</goal>
</goals>
</execution>
</executions>
Index: doxia-modules/doxia-module-fml/pom.xml
===================================================================
--- doxia-modules/doxia-module-fml/pom.xml.orig
+++ doxia-modules/doxia-module-fml/pom.xml
@@ -67,7 +67,9 @@ under the License.
<goal>java</goal>
</goals>
<configuration>
+ <models>
<model>src/main/mdo/fml.mdo</model>
+ </models>
<version>1.0.0</version>
</configuration>
</execution>
@@ -75,17 +77,17 @@ under the License.
</plugin>
<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/generated-resources/plexus/META-INF/plexus/components.xml</descriptor> -->
</descriptors>
</configuration>
<executions>
<execution>
<goals>
- <goal>merge-descriptors</goal>
+ <goal>merge-metadata</goal>
</goals>
</execution>
</executions>
Index: doxia-modules/doxia-module-xdoc/pom.xml
===================================================================
--- doxia-modules/doxia-module-xdoc/pom.xml.orig
+++ doxia-modules/doxia-module-xdoc/pom.xml
@@ -58,17 +58,17 @@ under the License.
<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/generated-resources/plexus/META-INF/plexus/components.xml</descriptor> -->
</descriptors>
</configuration>
<executions>
<execution>
<goals>
- <goal>merge-descriptors</goal>
+ <goal>merge-metadata</goal>
</goals>
</execution>
</executions>
Index: doxia-book/pom.xml
===================================================================
--- doxia-book/pom.xml.orig
+++ doxia-book/pom.xml
@@ -99,8 +99,10 @@ under the License.
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
- <configuration>
- <model>src/main/modello/book.mdo</model>
+ <configuration>
+ <models>
+ <model>src/main/modello/book.mdo</model>
+ </models>
<version>1.0.0</version>
</configuration>
<executions>
