Author: hboutemy
Date: Sat Mar 25 21:07:37 2017
New Revision: 1788691
URL: http://svn.apache.org/viewvc?rev=1788691&view=rev
Log:
[MSITE-791] integrated DOxia 1.8 to benefit from new Markdown parser based on
flexmark-java (requires Java 7)
Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-159/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-497/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-566/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-582/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-609/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-723/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/repo-parent/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/it-plugin-test/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/resources/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/aggregator/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/module/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/parent/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/site-jar/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/site-sd-lang/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/site-sd/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/template-skin/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/validate/pom.xml
Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1788691&r1=1788690&r2=1788691&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Sat Mar 25 21:07:37 2017
@@ -190,7 +190,7 @@ under the License.
</distributionManagement>
<properties>
- <doxiaVersion>1.7</doxiaVersion>
+ <doxiaVersion>1.8-SNAPSHOT</doxiaVersion>
<doxiaSitetoolsVersion>1.7.4</doxiaSitetoolsVersion>
<mavenVersion>3.0</mavenVersion>
<prerequisiteMavenVersion>2.2.1</prerequisiteMavenVersion>
@@ -517,6 +517,27 @@ under the License.
</configuration>
</execution>
</executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-bytecode-version</id>
+ <configuration>
+ <rules>
+ <enforceBytecodeVersion>
+ <maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
+ <excludes><!-- DOXIA-554 Markdown parser requires Java 7
(use version 1.7 if you absolutely require Java 6) -->
+
<exclude>org.apache.maven.doxia:doxia-module-markdown</exclude>
+ <exclude>org.nibor.autolink:autolink</exclude>
+ </excludes>
+ </enforceBytecodeVersion>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-159/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-159/pom.xml?rev=1788691&r1=1788690&r2=1788691&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-159/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-159/pom.xml Sat Mar 25
21:07:37 2017
@@ -47,6 +47,13 @@ under the License.
<configuration>
<relativizeDecorationLinks>false</relativizeDecorationLinks>
</configuration>
+ <dependencies><!-- TODO remove when prerequisite is Java 7 -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</pluginManagement>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml?rev=1788691&r1=1788690&r2=1788691&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml Sat Mar 25
21:07:37 2017
@@ -44,6 +44,13 @@ under the License.
<configuration>
<locales>en,ca,cs,da,de,es,fr,hu,it,ja,ko,nl,no,pl,pt,pt_BR,sk,sv,tr,zh_CN</locales>
</configuration>
+ <dependencies><!-- TODO remove when prerequisite is Java 7 -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/pom.xml?rev=1788691&r1=1788690&r2=1788691&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/pom.xml Sat Mar 25
21:07:37 2017
@@ -44,6 +44,13 @@ under the License.
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
+ <dependencies><!-- TODO remove when prerequisite is Java 7 -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</pluginManagement>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-497/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-497/pom.xml?rev=1788691&r1=1788690&r2=1788691&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-497/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-497/pom.xml Sat Mar 25
21:07:37 2017
@@ -87,6 +87,13 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
+ <dependencies><!-- TODO remove when prerequisite is Java 7 -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</pluginManagement>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-566/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-566/pom.xml?rev=1788691&r1=1788690&r2=1788691&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-566/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-566/pom.xml Sat Mar 25
21:07:37 2017
@@ -43,6 +43,13 @@ under the License.
<configuration>
<generateReports>false</generateReports>
</configuration>
+ <dependencies><!-- TODO remove when prerequisite is Java 7 -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</pluginManagement>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-582/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-582/pom.xml?rev=1788691&r1=1788690&r2=1788691&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-582/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-582/pom.xml Sat Mar 25
21:07:37 2017
@@ -41,6 +41,13 @@ under the License.
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
+ <dependencies><!-- TODO remove when prerequisite is Java 7 -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</pluginManagement>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-609/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-609/pom.xml?rev=1788691&r1=1788690&r2=1788691&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-609/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-609/pom.xml Sat Mar 25
21:07:37 2017
@@ -49,6 +49,13 @@ under the License.
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
+ <dependencies><!-- TODO remove when prerequisite is Java 7 -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/pom.xml?rev=1788691&r1=1788690&r2=1788691&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/pom.xml Sat Mar 25
21:07:37 2017
@@ -46,6 +46,13 @@ under the License.
<configuration>
<locales>en,de</locales>
</configuration>
+ <dependencies><!-- TODO remove when prerequisite is Java 7 -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</pluginManagement>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-723/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-723/pom.xml?rev=1788691&r1=1788690&r2=1788691&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-723/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-723/pom.xml Sat Mar 25
21:07:37 2017
@@ -64,6 +64,13 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
+ <dependencies><!-- TODO remove when prerequisite is Java 7 -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/pom.xml?rev=1788691&r1=1788690&r2=1788691&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/pom.xml
(original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/pom.xml Sat Mar
25 21:07:37 2017
@@ -66,6 +66,11 @@ under the License.
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency><!-- TODO remove when prerequisite is Java 7 -->
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.7</version>
+ </dependency>
</dependencies>
</plugin>
</plugins>
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/pom.xml?rev=1788691&r1=1788690&r2=1788691&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/pom.xml
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/pom.xml
Sat Mar 25 21:07:37 2017
@@ -49,6 +49,13 @@ under the License.
<configuration>
<generateReports>false</generateReports>
</configuration>
+ <dependencies><!-- TODO remove when prerequisite is Java 7 -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/repo-parent/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/repo-parent/pom.xml?rev=1788691&r1=1788690&r2=1788691&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/repo-parent/pom.xml
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/repo-parent/pom.xml
Sat Mar 25 21:07:37 2017
@@ -67,6 +67,13 @@ under the License.
</goals>
</execution>
</executions>
+ <dependencies><!-- TODO remove when prerequisite is Java 7 -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/pom.xml?rev=1788691&r1=1788690&r2=1788691&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/pom.xml
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/pom.xml
Sat Mar 25 21:07:37 2017
@@ -46,6 +46,13 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
+ <dependencies><!-- TODO remove when prerequisite is Java 7 -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</pluginManagement>
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/pom.xml?rev=1788691&r1=1788690&r2=1788691&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/pom.xml
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/pom.xml
Sat Mar 25 21:07:37 2017
@@ -46,6 +46,13 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
+ <dependencies><!-- TODO remove when prerequisite is Java 7 -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</pluginManagement>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/pom.xml?rev=1788691&r1=1788690&r2=1788691&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/pom.xml
(original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/pom.xml Sat Mar
25 21:07:37 2017
@@ -40,6 +40,13 @@ under the License.
<configuration>
<generateReports>false</generateReports>
</configuration>
+ <dependencies><!-- TODO remove when prerequisite is Java 7 -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</pluginManagement>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/it-plugin-test/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/it-plugin-test/pom.xml?rev=1788691&r1=1788690&r2=1788691&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/it-plugin-test/pom.xml
(original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/it-plugin-test/pom.xml Sat Mar
25 21:07:37 2017
@@ -45,6 +45,25 @@ under the License.
</dependency>
</dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>@project.version@</version>
+ <dependencies><!-- TODO remove when prerequisite is Java 7 -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
<reporting>
<excludeDefaults>true</excludeDefaults>
<plugins>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/resources/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/resources/pom.xml?rev=1788691&r1=1788690&r2=1788691&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/resources/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/resources/pom.xml Sat Mar 25
21:07:37 2017
@@ -47,6 +47,13 @@ under the License.
<configuration>
<generateReports>false</generateReports>
</configuration>
+ <dependencies><!-- TODO remove when prerequisite is Java 7 -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</pluginManagement>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/pom.xml?rev=1788691&r1=1788690&r2=1788691&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/pom.xml Sat Mar 25
21:07:37 2017
@@ -49,6 +49,13 @@ under the License.
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
+ <dependencies><!-- TODO remove when prerequisite is Java 7 -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/aggregator/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/aggregator/pom.xml?rev=1788691&r1=1788690&r2=1788691&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/aggregator/pom.xml
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/aggregator/pom.xml
Sat Mar 25 21:07:37 2017
@@ -47,6 +47,13 @@ under the License.
<stagingDirectory>@project.build.directory@/it/site-inheritance/webhost.company.com/stage/</stagingDirectory>
<stagingSiteURL>file:///@project.build.directory@/it/site-inheritance/webhost.company.com/stage-deploy/</stagingSiteURL>
</configuration>
+ <dependencies><!-- TODO remove when prerequisite is Java 7 -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</pluginManagement>
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/module/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/module/pom.xml?rev=1788691&r1=1788690&r2=1788691&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/module/pom.xml
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/module/pom.xml
Sat Mar 25 21:07:37 2017
@@ -46,6 +46,13 @@ under the License.
<stagingDirectory>@project.build.directory@/it/site-inheritance/webhost.company.com/stage/www/website/module</stagingDirectory>
<stagingSiteURL>file:///@project.build.directory@/it/site-inheritance/webhost.company.com/stage-deploy/www/website/module</stagingSiteURL>
</configuration>
+ <dependencies><!-- TODO remove when prerequisite is Java 7 -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/parent/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/parent/pom.xml?rev=1788691&r1=1788690&r2=1788691&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/parent/pom.xml
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/parent/pom.xml
Sat Mar 25 21:07:37 2017
@@ -47,6 +47,13 @@ under the License.
<stagingDirectory>@project.build.directory@/it/site-inheritance/webhost.company.com/stage/</stagingDirectory>
<stagingSiteURL>file:///@project.build.directory@/it/site-inheritance/webhost.company.com/stage-deploy/</stagingSiteURL>
</configuration>
+ <dependencies><!-- TODO remove when prerequisite is Java 7 -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</pluginManagement>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/pom.xml?rev=1788691&r1=1788690&r2=1788691&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/pom.xml
(original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/pom.xml Sat
Mar 25 21:07:37 2017
@@ -47,6 +47,13 @@ under the License.
<stagingDirectory>@project.build.directory@/it/site-inheritance/webhost.company.com/stage/junk/</stagingDirectory>
<stagingSiteURL>file:///@project.build.directory@/it/site-inheritance/webhost.company.com/stage-deploy/junk/</stagingSiteURL>
</configuration>
+ <dependencies><!-- TODO remove when prerequisite is Java 7 -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</pluginManagement>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-jar/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-jar/pom.xml?rev=1788691&r1=1788690&r2=1788691&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-jar/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-jar/pom.xml Sat Mar 25
21:07:37 2017
@@ -56,6 +56,13 @@ under the License.
</manifestEntries>
</archive>
</configuration>
+ <dependencies><!-- TODO remove when prerequisite is Java 7 -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-lang/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-sd-lang/pom.xml?rev=1788691&r1=1788690&r2=1788691&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-sd-lang/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-sd-lang/pom.xml Sat Mar
25 21:07:37 2017
@@ -45,8 +45,15 @@ under the License.
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
- <configuration>
- <locales>en,fr</locales>
+ <dependencies><!-- TODO remove when prerequisite is Java 7 -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <locales>en,fr</locales>
</configuration>
</plugin>
</plugins>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-sd/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-sd/pom.xml?rev=1788691&r1=1788690&r2=1788691&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-sd/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-sd/pom.xml Sat Mar 25
21:07:37 2017
@@ -49,6 +49,13 @@ under the License.
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
+ <dependencies><!-- TODO remove when prerequisite is Java 7 -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</pluginManagement>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/template-skin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/template-skin/pom.xml?rev=1788691&r1=1788690&r2=1788691&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/template-skin/pom.xml
(original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/template-skin/pom.xml Sat Mar
25 21:07:37 2017
@@ -47,6 +47,13 @@ under the License.
<att1>val1</att1>
</attributes>
</configuration>
+ <dependencies><!-- TODO remove when prerequisite is Java 7 -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</pluginManagement>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/validate/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/validate/pom.xml?rev=1788691&r1=1788690&r2=1788691&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/validate/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/validate/pom.xml Sat Mar 25
21:07:37 2017
@@ -43,6 +43,13 @@ under the License.
<validate>true</validate>
<generateReports>false</generateReports>
</configuration>
+ <dependencies><!-- TODO remove when prerequisite is Java 7 -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.7</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
