maven-doxia-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vsive...@apache.org
Subject svn commit: r740732 - in /maven/doxia: doxia/trunk/doxia-maven-plugin/pom.xml site/pom.xml
Date Wed, 04 Feb 2009 13:28:25 GMT
Author: vsiveton
Date: Wed Feb  4 13:28:25 2009
New Revision: 740732

URL: http://svn.apache.org/viewvc?rev=740732&view=rev
Log:
MNG-3402: MavenArtifactFilterManager needs to not filtering doxia-sink-api

o proof of concept for a workaround using shade-plugin
o mvn site on the Doxia site generates correctly the site using Maven 2.0.9 and 2.1.0.M2

Modified:
    maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml
    maven/doxia/site/pom.xml

Modified: maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml?rev=740732&r1=740731&r2=740732&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml Wed Feb  4 13:28:25 2009
@@ -51,6 +51,49 @@
       <version>${projectVersion}</version>
     </dependency>
     <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>doxia-core</artifactId>
+      <version>${projectVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>doxia-logging-api</artifactId>
+      <version>${projectVersion}</version>
+    </dependency>
+
+    <!-- doxia modules ordered -->
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-module-apt</artifactId>
+      <version>${projectVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-module-docbook-simple</artifactId>
+      <version>${projectVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-module-itext</artifactId>
+      <version>${projectVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-module-latex</artifactId>
+      <version>${projectVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-module-xdoc</artifactId>
+      <version>${projectVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-module-xhtml</artifactId>
+      <version>${projectVersion}</version>
+    </dependency>
+
+    <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
@@ -61,6 +104,42 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <!-- Backward compatibility with Maven 2.0.x (MNG-3402) -->
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>1.2</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <finalName>${project.build.finalName}</finalName>
+              <createDependencyReducedPom>
+                false
+              </createDependencyReducedPom>
+              <keepDependenciesWithProvidedScope>
+                true
+              </keepDependenciesWithProvidedScope>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"
/>
+              </transformers>
+              <artifactSet>
+                <includes>
+                  <include>org.apache.maven.doxia:doxia-sink-api</include>
+                  <include>org.apache.maven.doxia:doxia-logging-api</include>
+                </includes>
+              </artifactSet>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
   <reporting>
     <plugins>
       <plugin>

Modified: maven/doxia/site/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/site/pom.xml?rev=740732&r1=740731&r2=740732&view=diff
==============================================================================
--- maven/doxia/site/pom.xml (original)
+++ maven/doxia/site/pom.xml Wed Feb  4 13:28:25 2009
@@ -147,7 +147,7 @@
       <plugin>
         <groupId>org.apache.maven.doxia</groupId>
         <artifactId>doxia-maven-plugin</artifactId>
-        <version>1.0-alpha-10</version>
+        <version>1.1-SNAPSHOT</version>
         <executions>
           <execution>
             <phase>pre-site</phase>



Mime
View raw message