Package: doxia / 1.1.4-6

0003-switch-to-plexus-component-metadata.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
From: Torsten Werner <twerner@debian.org>
Date: Sat, 10 Sep 2011 00:06:13 +0200
Subject: switch to plexus-component-metadata

The old plexus-maven-plugin fails in merge-descriptors and has been replaced by
plexus-component-metadata.
---
 doxia-modules/doxia-module-apt/pom.xml            |   11 ++++-------
 doxia-modules/doxia-module-docbook-simple/pom.xml |    9 +++------
 doxia-modules/doxia-module-fml/pom.xml            |    9 +++------
 doxia-modules/doxia-module-xdoc/pom.xml           |    9 +++------
 pom.xml                                           |    9 ++++-----
 5 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/doxia-modules/doxia-module-apt/pom.xml b/doxia-modules/doxia-module-apt/pom.xml
index 010c559..a652578 100644
--- a/doxia-modules/doxia-module-apt/pom.xml
+++ b/doxia-modules/doxia-module-apt/pom.xml
@@ -49,21 +49,18 @@ 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>
-          </descriptors>
+          <staticMetadataDirectory>${basedir}/src/main/components/</staticMetadataDirectory>
         </configuration>
         <executions>
           <execution>
             <goals>
-              <goal>merge-descriptors</goal>
+              <goal>generate-metadata</goal>
             </goals>
           </execution>
         </executions>
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/doxia-modules/doxia-module-docbook-simple/pom.xml b/doxia-modules/doxia-module-docbook-simple/pom.xml
index 64f671a..a3bf3b2 100644
--- a/doxia-modules/doxia-module-docbook-simple/pom.xml
+++ b/doxia-modules/doxia-module-docbook-simple/pom.xml
@@ -45,17 +45,14 @@ 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>
-          </descriptors>
+            <staticMetadataDirectory>${basedir}/src/main/components/</staticMetadataDirectory>
         </configuration>
         <executions>
           <execution>
             <goals>
-              <goal>merge-descriptors</goal>
+              <goal>generate-metadata</goal>
             </goals>
           </execution>
         </executions>
diff --git a/doxia-modules/doxia-module-fml/pom.xml b/doxia-modules/doxia-module-fml/pom.xml
index 2afafe8..2a4b94f 100644
--- a/doxia-modules/doxia-module-fml/pom.xml
+++ b/doxia-modules/doxia-module-fml/pom.xml
@@ -77,17 +77,14 @@ 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>
-          </descriptors>
+          <staticMetadataDirectory>${basedir}/src/main/components</staticMetadataDirectory>
         </configuration>
         <executions>
           <execution>
             <goals>
-              <goal>merge-descriptors</goal>
+              <goal>generate-metadata</goal>
             </goals>
           </execution>
         </executions>
diff --git a/doxia-modules/doxia-module-xdoc/pom.xml b/doxia-modules/doxia-module-xdoc/pom.xml
index f393ef8..947d1e2 100644
--- a/doxia-modules/doxia-module-xdoc/pom.xml
+++ b/doxia-modules/doxia-module-xdoc/pom.xml
@@ -68,17 +68,14 @@ 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>
-          </descriptors>
+          <staticMetadataDirectory>${basedir}/src/main/components/components.xml</staticMetadataDirectory>
         </configuration>
         <executions>
           <execution>
             <goals>
-              <goal>merge-descriptors</goal>
+              <goal>generate-metadata</goal>
             </goals>
           </execution>
         </executions>
diff --git a/pom.xml b/pom.xml
index 5f9dee3..160e2d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -271,9 +271,8 @@ under the License.
         <!-- 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.8 makes the descriptor merges fail, probably due to PLX-409 -->
-          <version>1.3.5</version>
+          <artifactId>plexus-component-metadata</artifactId>
+          <version>1.5.5</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.modello</groupId>
@@ -328,11 +327,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>
--