Split modello config per model

apache · Jun 27, 2023 · 820d32e · 820d32e
1 parent bfbfb70
commit 820d32e
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 9 deletions.
diff --git a/doxia-site-model/pom.xml b/doxia-site-model/pom.xml
@@ -63,12 +63,6 @@ under the License.
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
         <configuration>
-          <models>
-            <model>src/main/mdo/site.mdo</model>
-            <model>src/main/mdo/decoration.mdo</model>
-          </models>
-          <!-- TODO Do not forget to update the version in the description. See DOXIASITETOOLS-98. -->
-          <version>2.0.0</version>
           <firstVersion>1.0.0</firstVersion>
         </configuration>
         <executions>
@@ -81,13 +75,55 @@ under the License.
               <goal>xsd</goal>
             </goals>
             <phase>generate-sources</phase>
+            <configuration>
+              <models>
+                <model>src/main/mdo/site.mdo</model>
+              </models>
+              <!-- TODO Do not forget to update the version in the description. See DOXIASITETOOLS-98. -->
+              <version>2.0.0</version>
+            </configuration>
+          </execution>
+          <execution>
+            <id>old-descriptor</id>
+            <goals>
+              <goal>java</goal>
+              <goal>xpp3-reader</goal>
+              <goal>xsd</goal>
+            </goals>
+            <phase>generate-sources</phase>
+            <configuration>
+              <models>
+                <model>src/main/mdo/decoration.mdo</model>
+              </models>
+              <version>1.8.1</version>
+            </configuration>
           </execution>
           <execution>
             <id>descriptor-xdoc</id>
             <goals>
               <goal>xdoc</goal>
             </goals>
             <phase>pre-site</phase>
+            <configuration>
+              <models>
+                <model>src/main/mdo/site.mdo</model>
+              </models>
+              <!-- TODO Do not forget to update the version in the description. See DOXIASITETOOLS-98. -->
+              <version>2.0.0</version>
+            </configuration>
+          </execution>
+          <execution>
+            <id>old-descriptor-xdoc</id>
+            <goals>
+              <goal>xdoc</goal>
+            </goals>
+            <phase>pre-site</phase>
+            <configuration>
+              <models>
+                <model>src/main/mdo/decoration.mdo</model>
+              </models>
+              <version>1.8.1</version>
+            </configuration>
           </execution>
           <execution>
             <id>descriptor-xsd</id>
@@ -96,6 +132,25 @@ under the License.
             </goals>
             <phase>pre-site</phase>
             <configuration>
+              <models>
+                <model>src/main/mdo/site.mdo</model>
+              </models>
+              <!-- TODO Do not forget to update the version in the description. See DOXIASITETOOLS-98. -->
+              <version>2.0.0</version>
+              <outputDirectory>${project.build.directory}/generated-site/resources/xsd</outputDirectory>
+            </configuration>
+          </execution>
+          <execution>
+            <id>old-descriptor-xsd</id>
+            <goals>
+              <goal>xsd</goal>
+            </goals>
+            <phase>pre-site</phase>
+            <configuration>
+              <models>
+                <model>src/main/mdo/decoration.mdo</model>
+              </models>
+              <version>1.8.1</version>
               <outputDirectory>${project.build.directory}/generated-site/resources/xsd</outputDirectory>
             </configuration>
           </execution>

diff --git a/doxia-site-model/src/main/mdo/decoration.mdo b/doxia-site-model/src/main/mdo/decoration.mdo
@@ -30,7 +30,7 @@ under the License.
     <p>An XSD is available at:</p>
     <ul>
       <!-- There is no property filtering in Modello, this has to be updated manually. See DOXIASITETOOLS-98. -->
-      <li><a href="https://maven.apache.org/xsd/decoration-2.0.0.xsd">https://maven.apache.org/xsd/decoration-2.0.0.xsd</a></li>
+      <li><a href="https://maven.apache.org/xsd/decoration-1.8.1.xsd">https://maven.apache.org/xsd/decoration-1.8.1.xsd</a></li>
     </ul>
     ]]></description>
 
@@ -358,7 +358,7 @@ under the License.
               of the Java Virtual Machine. Refer to <code>java.util.TimeZone</code> for details.
             ]]>
           </description>
-          <version>2.0.0+</version>
+          <version>1.8.1+</version>
           <type>String</type>
           <identifier>true</identifier>
           <defaultValue>Etc/UTC</defaultValue>

diff --git a/doxia-site-model/src/main/mdo/site.mdo b/doxia-site-model/src/main/mdo/site.mdo
@@ -344,7 +344,7 @@ under the License.
               of the Java Virtual Machine. Refer to <code>java.util.TimeZone</code> for details.
             ]]>
           </description>
-          <version>2.0.0+</version>
+          <version>1.8.1+</version>
           <type>String</type>
           <identifier>true</identifier>
           <defaultValue>Etc/UTC</defaultValue>