You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/04/23 21:00:33 UTC
[maven-site-plugin] branch doxia-2.0.0 updated (c60035b2 -> 0a6fa206)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch doxia-2.0.0
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
discard c60035b2 Doxia 2.0.0
add c11aeae1 update releases list, add minimum Java and Maven
add 789a7a10 lighten content: keep only meaningful values
add 6604ab3b also keep only Doxia versions changes
add 3c8d426a keep only release month, drop day
new 0a6fa206 Doxia 2.0.0
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (c60035b2)
\
N -- N -- N refs/heads/doxia-2.0.0 (0a6fa206)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/site/apt/history.apt | 90 +++++++++++++++++++++++++-----------------------
1 file changed, 47 insertions(+), 43 deletions(-)
[maven-site-plugin] 01/01: Doxia 2.0.0
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch doxia-2.0.0
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 0a6fa206517e263d7a2db75f6409492d17739026
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Feb 20 21:36:15 2022 +0100
Doxia 2.0.0
---
pom.xml | 36 +-----
src/it/projects/MSITE-159/pom.xml | 2 +-
src/it/projects/MSITE-265/pom.xml | 4 +-
src/it/projects/MSITE-354/pom.xml | 4 +-
src/it/projects/MSITE-456/pom.xml | 2 +-
src/it/projects/MSITE-458/pom.xml | 2 +-
src/it/projects/MSITE-484/invoker.properties | 2 -
src/it/projects/MSITE-484/pom.xml | 12 +-
src/it/projects/MSITE-484/verify.groovy | 6 +-
src/it/projects/MSITE-497/pom.xml | 26 +---
src/it/projects/MSITE-504/pom.xml | 4 +-
src/it/projects/MSITE-507/pom.xml | 138 ++++++++++-----------
src/it/projects/MSITE-548/pom.xml | 2 +-
src/it/projects/MSITE-582/pom.xml | 2 +-
src/it/projects/MSITE-604/invoker.properties | 3 -
src/it/projects/MSITE-604/pom.xml | 2 +-
src/it/projects/MSITE-609/pom.xml | 4 +-
src/it/projects/MSITE-609/verify.bsh | 4 +-
src/it/projects/MSITE-627/invoker.properties | 1 -
src/it/projects/MSITE-627/pom.xml | 7 +-
.../java/org/apache/maven/plugins/it/MyReport.java | 4 +-
src/it/projects/MSITE-658/pom.xml | 12 +-
src/it/projects/MSITE-658/verify.bsh | 20 +--
src/it/projects/MSITE-665/pom.xml | 2 +-
src/it/projects/MSITE-723/pom.xml | 2 +-
src/it/projects/MSITE-842/invoker.properties | 3 +-
src/it/projects/MSITE-842/pom.xml | 65 +---------
src/it/projects/MSITE-842/{ => project}/pom.xml | 14 +--
.../MSITE-842/{ => project}/src/it/MSITE-842.html | 0
.../{ => project}/src/it/another-page.html | 0
.../MSITE-842/{ => project}/src/it/sub/sub.html | 0
.../java/org/apache/maven/plugins/it/MyReport.java | 0
.../src/site/site.xml} | 23 +++-
.../projects/{MSITE-609 => MSITE-842/skin}/pom.xml | 41 +-----
.../src/main/resources/META-INF/maven/site.vm} | 0
src/it/projects/MSITE-842/verify.groovy | 12 +-
src/it/projects/MSITE-856/pom.xml | 2 +-
.../src/site/apt/velocity-context.apt.vm | 11 --
.../src/site/confluence/confluence.confluence | 35 ------
.../doxia-formats/src/site/docbook/docbook.xml | 56 ---------
.../doxia-formats/src/site/twiki/twiki.twiki | 25 ----
src/it/projects/doxia-formats/verify.groovy | 3 -
src/it/projects/empty-report-set/pom.xml | 2 +-
src/it/projects/failure/invoker.properties | 2 -
src/it/projects/full-reporting/invoker.properties | 2 -
.../projects/inheritedReports/invoker.properties | 6 -
src/it/projects/inheritedReports/pom.xml | 2 +-
src/it/projects/it-plugin-test/pom.xml | 4 +-
.../projects/new-configuration/invoker.properties | 2 -
src/it/projects/new-configuration/pom.xml | 8 +-
src/it/projects/reportConfig/invoker.properties | 2 -
src/it/projects/site-attach-descriptor/pom.xml | 4 +-
src/it/projects/site-deploy/pom.xml | 4 +-
src/it/projects/site-deploy/verify.bsh | 4 +-
src/it/projects/site-inheritance/pom.xml | 2 +-
src/it/projects/site-jar/pom.xml | 4 +-
src/it/projects/site-sd-2/pom.xml | 2 +-
src/it/projects/site-sd-lang/pom.xml | 2 +-
src/it/projects/site-sd/pom.xml | 2 +-
src/it/projects/template-skin/invoker.properties | 4 +-
src/it/projects/template-skin/pom.xml | 20 +--
.../site/render/AbstractSiteRenderingMojo.java | 56 +++------
.../render/CategorySummaryDocumentRenderer.java | 8 +-
.../site/render/ReportDocumentRenderer.java | 3 -
.../apache/maven/plugins/site/run/DoxiaFilter.java | 2 +-
src/site/apt/examples/templatefile.apt.vm | 98 ---------------
src/site/site.xml | 1 -
67 files changed, 216 insertions(+), 623 deletions(-)
diff --git a/pom.xml b/pom.xml
index d8afa459..a7fec28d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
</parent>
<artifactId>maven-site-plugin</artifactId>
- <version>3.12.1-SNAPSHOT</version>
+ <version>4.0.0-M1-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Maven Site Plugin</name>
@@ -197,10 +197,9 @@ under the License.
<properties>
<mavenVersion>3.2.5</mavenVersion>
<javaVersion>8</javaVersion>
-
<!-- for dependencies -->
- <doxiaVersion>1.11.1</doxiaVersion>
- <doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
+ <doxiaVersion>2.0.0-M2</doxiaVersion>
+ <doxiaSitetoolsVersion>2.0.0-M2</doxiaSitetoolsVersion>
<jettyVersion>9.4.46.v20220331</jettyVersion>
<wagonVersion>3.5.1</wagonVersion>
<slf4jVersion>1.7.36</slf4jVersion>
@@ -220,12 +219,12 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.1.0</version>
+ <version>4.0.0-M1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-exec</artifactId>
- <version>1.6.0</version>
+ <version>2.0.0-M1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
@@ -372,24 +371,7 @@ under the License.
<version>${doxiaVersion}</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-confluence</artifactId>
- <version>${doxiaVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-docbook-simple</artifactId>
- <version>${doxiaVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-twiki</artifactId>
- <version>${doxiaVersion}</version>
- <scope>runtime</scope>
- </dependency>
+
<!-- Doxia Sitetools -->
<dependency>
<groupId>org.apache.maven.doxia</groupId>
@@ -407,12 +389,6 @@ under the License.
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-integration-tools</artifactId>
<version>${doxiaSitetoolsVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- Wagon -->
diff --git a/src/it/projects/MSITE-159/pom.xml b/src/it/projects/MSITE-159/pom.xml
index e2f3c88d..731cf57f 100644
--- a/src/it/projects/MSITE-159/pom.xml
+++ b/src/it/projects/MSITE-159/pom.xml
@@ -56,7 +56,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/MSITE-265/pom.xml b/src/it/projects/MSITE-265/pom.xml
index 7142d903..9b9a40e6 100644
--- a/src/it/projects/MSITE-265/pom.xml
+++ b/src/it/projects/MSITE-265/pom.xml
@@ -52,7 +52,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1.2</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
@@ -64,7 +64,7 @@ under the License.
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
- <version>2.0</version>
+ <version>3.0.0</version>
</plugin>
</plugins>
</reporting>
diff --git a/src/it/projects/MSITE-354/pom.xml b/src/it/projects/MSITE-354/pom.xml
index 543ff47d..912ac9c6 100644
--- a/src/it/projects/MSITE-354/pom.xml
+++ b/src/it/projects/MSITE-354/pom.xml
@@ -54,12 +54,12 @@ under the License.
</plugin>
</plugins>
</build>
-
+
<reporting>
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/MSITE-456/pom.xml b/src/it/projects/MSITE-456/pom.xml
index a74e5bcb..0e420c59 100644
--- a/src/it/projects/MSITE-456/pom.xml
+++ b/src/it/projects/MSITE-456/pom.xml
@@ -45,7 +45,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/MSITE-458/pom.xml b/src/it/projects/MSITE-458/pom.xml
index e6f60b0c..e703aa48 100644
--- a/src/it/projects/MSITE-458/pom.xml
+++ b/src/it/projects/MSITE-458/pom.xml
@@ -53,7 +53,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.4</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/MSITE-484/invoker.properties b/src/it/projects/MSITE-484/invoker.properties
index 5fcde54e..978b68af 100644
--- a/src/it/projects/MSITE-484/invoker.properties
+++ b/src/it/projects/MSITE-484/invoker.properties
@@ -14,5 +14,3 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
-invoker.maven.version = 3.0+
diff --git a/src/it/projects/MSITE-484/pom.xml b/src/it/projects/MSITE-484/pom.xml
index e8e50dc5..8cd975c4 100644
--- a/src/it/projects/MSITE-484/pom.xml
+++ b/src/it/projects/MSITE-484/pom.xml
@@ -28,6 +28,12 @@ under the License.
<version>1.0-SNAPSHOT</version>
<name>parent</name>
<url>http://url</url>
+
+ <issueManagement>
+ <system>jira</system>
+ <url>http://example.com</url>
+ </issueManagement>
+
<build>
<plugins>
<plugin>
@@ -47,7 +53,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.2</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<configuration>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
</configuration>
@@ -56,8 +62,8 @@ under the License.
<reports>
<report>summary</report>
<report>index</report>
- <report>cim</report>
- <report>issue-tracking</report>
+ <report>ci-management</report>
+ <report>issue-management</report>
<report>scm</report>
</reports>
</reportSet>
diff --git a/src/it/projects/MSITE-484/verify.groovy b/src/it/projects/MSITE-484/verify.groovy
index 65845249..134f02c2 100644
--- a/src/it/projects/MSITE-484/verify.groovy
+++ b/src/it/projects/MSITE-484/verify.groovy
@@ -18,11 +18,11 @@
* under the License.
*/
-assert new File( basedir, 'target/site/issue-tracking.html' ).exists();
+assert new File( basedir, 'target/site/issue-management.html' ).exists();
assert new File( basedir, 'parent-usage-test/target/site/xref/index.html' ).exists();
assert new File( basedir, 'parent-usage-test/target/site/xref-test/index.html' ).exists();
-assert new File( basedir, 'parent-usage-test/target/site/issue-tracking.html' ).exists();
+assert new File( basedir, 'parent-usage-test/target/site/issue-management.html' ).exists();
assert new File( basedir, 'parent-usage-test/target/site/apidocs' ).exists();
-return true;
\ No newline at end of file
+return true;
diff --git a/src/it/projects/MSITE-497/pom.xml b/src/it/projects/MSITE-497/pom.xml
index 2e212919..ff6dd1a5 100644
--- a/src/it/projects/MSITE-497/pom.xml
+++ b/src/it/projects/MSITE-497/pom.xml
@@ -48,8 +48,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <!-- version used by maven 2.x, maven 3 handled by profile -->
- <version>2.1.1</version>
+ <version>@project.version@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -70,27 +69,4 @@ under the License.
</plugins>
</reporting>
- <profiles>
- <profile>
- <id>maven-3</id>
- <activation>
- <file>
- <!-- This employs that the basedir expression is only recognized
- by Maven 3.x (see MNG-2363) -->
- <exists>${basedir}</exists>
- </file>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>@project.version@</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/src/it/projects/MSITE-504/pom.xml b/src/it/projects/MSITE-504/pom.xml
index d0101fcb..2936ff09 100644
--- a/src/it/projects/MSITE-504/pom.xml
+++ b/src/it/projects/MSITE-504/pom.xml
@@ -32,7 +32,7 @@ under the License.
</modules>
<prerequisites>
- <maven>2.2</maven>
+ <maven>3.2.5</maven>
</prerequisites>
<build>
@@ -52,4 +52,4 @@ under the License.
</pluginManagement>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/it/projects/MSITE-507/pom.xml b/src/it/projects/MSITE-507/pom.xml
index 149e449a..4f02e2d4 100644
--- a/src/it/projects/MSITE-507/pom.xml
+++ b/src/it/projects/MSITE-507/pom.xml
@@ -22,81 +22,81 @@ under the License.
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<groupId>my.group.id</groupId>
<artifactId>my-artifact-id</artifactId>
<version>1.0-SNAPSHOT</version>
-
- <properties>
- <maven.skin.version>1.1.8</maven.skin.version>
- </properties>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
+
+ <properties>
+ <maven.skin.version>1.1.8</maven.skin.version>
+ </properties>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
<version>@pom.version@</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <aggregate>true</aggregate>
- <inputEncoding>utf-8</inputEncoding>
- <outputEncoding>utf-8</outputEncoding>
- <stylesheet>xref/cedarsoft.css</stylesheet>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>com.cedarsoft.maven</groupId>
- <artifactId>cedarsoft-skin</artifactId>
- <version>${maven.skin.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <!--This is a duplicate definition to avoid problems with the jxr plugin that else can't resolve the style sheet-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>com.cedarsoft.maven</groupId>
- <artifactId>cedarsoft-skin</artifactId>
- <version>${maven.skin.version}</version>
- </dependency>
- </dependencies>
- </plugin>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>@projectInfoReportsPluginVersion@</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>3.2.0</version>
+ <configuration>
+ <aggregate>true</aggregate>
+ <inputEncoding>utf-8</inputEncoding>
+ <outputEncoding>utf-8</outputEncoding>
+ <stylesheet>xref/cedarsoft.css</stylesheet>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>com.cedarsoft.maven</groupId>
+ <artifactId>cedarsoft-skin</artifactId>
+ <version>${maven.skin.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <!--This is a duplicate definition to avoid problems with the jxr plugin that else can't resolve the style sheet-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>com.cedarsoft.maven</groupId>
+ <artifactId>cedarsoft-skin</artifactId>
+ <version>${maven.skin.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
+ </plugin>
+ </plugins>
+ </build>
+
<reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- <inputEncoding>utf-8</inputEncoding>
- <outputEncoding>utf-8</outputEncoding>
- <stylesheet>xref/cedarsoft.css</stylesheet>
- </configuration>
- </plugin>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ <inputEncoding>utf-8</inputEncoding>
+ <outputEncoding>utf-8</outputEncoding>
+ <stylesheet>xref/cedarsoft.css</stylesheet>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -108,7 +108,7 @@ under the License.
</reports>
</reportSet>
</reportSets>
- </plugin>
- </plugins>
+ </plugin>
+ </plugins>
</reporting>
</project>
diff --git a/src/it/projects/MSITE-548/pom.xml b/src/it/projects/MSITE-548/pom.xml
index a7e5da50..bd2ff516 100644
--- a/src/it/projects/MSITE-548/pom.xml
+++ b/src/it/projects/MSITE-548/pom.xml
@@ -51,7 +51,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/MSITE-582/pom.xml b/src/it/projects/MSITE-582/pom.xml
index 1617b4c5..f8f10b3c 100644
--- a/src/it/projects/MSITE-582/pom.xml
+++ b/src/it/projects/MSITE-582/pom.xml
@@ -51,7 +51,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1.2</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/MSITE-604/invoker.properties b/src/it/projects/MSITE-604/invoker.properties
index de515df4..0acfea1d 100644
--- a/src/it/projects/MSITE-604/invoker.properties
+++ b/src/it/projects/MSITE-604/invoker.properties
@@ -15,8 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-# only fixed with Maven 3
-invoker.maven.version = 3.0+
invoker.goals=clean site:site site:deploy
invoker.profiles = msite604
-
diff --git a/src/it/projects/MSITE-604/pom.xml b/src/it/projects/MSITE-604/pom.xml
index 77a560f8..2ecd5611 100644
--- a/src/it/projects/MSITE-604/pom.xml
+++ b/src/it/projects/MSITE-604/pom.xml
@@ -66,7 +66,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1.2</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/MSITE-609/pom.xml b/src/it/projects/MSITE-609/pom.xml
index 85d4a09e..6d01c0fd 100644
--- a/src/it/projects/MSITE-609/pom.xml
+++ b/src/it/projects/MSITE-609/pom.xml
@@ -32,7 +32,7 @@ under the License.
<name>MSITE-609 IT</name>
<properties>
- <currentVersion>3.0.5</currentVersion>
+ <currentVersion>3.2.5</currentVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -58,7 +58,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1.2</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/MSITE-609/verify.bsh b/src/it/projects/MSITE-609/verify.bsh
index 0b822a86..5fdf251a 100644
--- a/src/it/projects/MSITE-609/verify.bsh
+++ b/src/it/projects/MSITE-609/verify.bsh
@@ -65,10 +65,10 @@ try
return false;
}
String downloadContent = FileUtils.fileRead( download, "UTF-8" );
- int indexOf = downloadContent.indexOf( "Download Maven 3.0.5" );
+ int indexOf = downloadContent.indexOf( "Download Maven 3.2.5" );
if ( indexOf < 0 )
{
- System.err.println( "download.html doesn't contain Download Maven 3.0.5" );
+ System.err.println( "download.html doesn't contain Download Maven 3.2.5" );
return false;
}
}
diff --git a/src/it/projects/MSITE-627/invoker.properties b/src/it/projects/MSITE-627/invoker.properties
index 23810591..dc513b4f 100644
--- a/src/it/projects/MSITE-627/invoker.properties
+++ b/src/it/projects/MSITE-627/invoker.properties
@@ -18,4 +18,3 @@
invoker.goals.1 = clean install
invoker.debug.1 = false
invoker.goals.2 = site
-invoker.maven.version = 3.0+
\ No newline at end of file
diff --git a/src/it/projects/MSITE-627/pom.xml b/src/it/projects/MSITE-627/pom.xml
index bb7c6fd7..bdf9f9b7 100644
--- a/src/it/projects/MSITE-627/pom.xml
+++ b/src/it/projects/MSITE-627/pom.xml
@@ -39,7 +39,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>2.1</version>
+ <version>4.0.0-M1</version>
</dependency>
</dependencies>
@@ -51,6 +51,11 @@ under the License.
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>3.6.4</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
diff --git a/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java b/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java
index 1d4ffe2b..8fba898f 100644
--- a/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java
+++ b/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java
@@ -20,7 +20,7 @@ package org.apache.maven.plugins.it;
*/
import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.sink.SinkAdapter;
+import org.apache.maven.doxia.sink.impl.SinkAdapter;
import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.AbstractMavenReport;
@@ -30,7 +30,7 @@ import java.util.Locale;
/**
* Goal which creates a sink in a report.
- *
+ *
* @goal test
* @phase site
*/
diff --git a/src/it/projects/MSITE-658/pom.xml b/src/it/projects/MSITE-658/pom.xml
index c6299e33..cab60004 100644
--- a/src/it/projects/MSITE-658/pom.xml
+++ b/src/it/projects/MSITE-658/pom.xml
@@ -31,6 +31,14 @@ under the License.
<name>MSITE-658</name>
<url>http://maven.apache.org/sub-directory</url>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -55,12 +63,12 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.5.1</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
<report>index</report>
- <report>license</report>
+ <report>licenses</report>
</reports>
</reportSet>
</reportSets>
diff --git a/src/it/projects/MSITE-658/verify.bsh b/src/it/projects/MSITE-658/verify.bsh
index 1aafec0d..2d423a31 100644
--- a/src/it/projects/MSITE-658/verify.bsh
+++ b/src/it/projects/MSITE-658/verify.bsh
@@ -33,18 +33,18 @@ try
result = false;
}
- File license = new File( siteDirectory, "license.html" );
- if ( !license.exists() || license.isDirectory() )
+ File licenses = new File( siteDirectory, "licenses.html" );
+ if ( !licenses.exists() || licenses.isDirectory() )
{
- System.err.println( "no license file or is a directory." );
+ System.err.println( "no licenses file or is a directory." );
result = false;
}
- String content = FileUtils.fileRead( license, "UTF-8" );
+ String content = FileUtils.fileRead( licenses, "UTF-8" );
int index = content.indexOf( "<a href=\"index.html\" title=\"Home\">Home</a>" );
if ( index < 0 )
{
- System.err.println( "license.html has incorrect links!" );
+ System.err.println( "licenses.html has incorrect links!" );
result = false;
}
@@ -57,18 +57,18 @@ try
result = false;
}
- license = new File( deDirectory, "license.html" );
- if ( !license.exists() || license.isDirectory() )
+ licenses = new File( deDirectory, "licenses.html" );
+ if ( !licenses.exists() || licenses.isDirectory() )
{
- System.err.println( "no license file or is a directory." );
+ System.err.println( "no licenses file or is a directory." );
result = false;
}
- content = FileUtils.fileRead( license, "UTF-8" );
+ content = FileUtils.fileRead( licenses, "UTF-8" );
int index = content.indexOf( "<a href=\"index.html\" title=\"Heim\">Heim</a>" );
if ( index < 0 )
{
- System.err.println( "license.html has incorrect links!" );
+ System.err.println( "licenses.html has incorrect links!" );
result = false;
}
}
diff --git a/src/it/projects/MSITE-665/pom.xml b/src/it/projects/MSITE-665/pom.xml
index c8c57c88..ef0b457e 100644
--- a/src/it/projects/MSITE-665/pom.xml
+++ b/src/it/projects/MSITE-665/pom.xml
@@ -70,7 +70,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.5.1</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/MSITE-723/pom.xml b/src/it/projects/MSITE-723/pom.xml
index f7818e3b..d53ddbb2 100644
--- a/src/it/projects/MSITE-723/pom.xml
+++ b/src/it/projects/MSITE-723/pom.xml
@@ -73,7 +73,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.5.1</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/MSITE-842/invoker.properties b/src/it/projects/MSITE-842/invoker.properties
index ed62a613..fc01a821 100644
--- a/src/it/projects/MSITE-842/invoker.properties
+++ b/src/it/projects/MSITE-842/invoker.properties
@@ -17,5 +17,4 @@
invoker.goals.1 = clean install
invoker.debug.1 = false
-invoker.goals.2 = site
-invoker.maven.version = 3.0+
+invoker.goals.2 = -pl project site
diff --git a/src/it/projects/MSITE-842/pom.xml b/src/it/projects/MSITE-842/pom.xml
index 470ef867..15ac0597 100644
--- a/src/it/projects/MSITE-842/pom.xml
+++ b/src/it/projects/MSITE-842/pom.xml
@@ -25,69 +25,16 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.site.its</groupId>
- <artifactId>MSITE-842</artifactId>
+ <artifactId>MSITE-842-aggregator</artifactId>
<version>1.0-SNAPSHOT</version>
- <packaging>maven-plugin</packaging>
+ <packaging>pom</packaging>
<name>it-plugin-test Maven Mojo</name>
<url>http://maven.apache.org</url>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-impl</artifactId>
- <version>3.0.0</version>
- </dependency>
- </dependencies>
-
- <build>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>@project.version@</version>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <templateFile>${basedir}/src/site/show-properties.vm</templateFile>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins.site.its</groupId>
- <artifactId>MSITE-842</artifactId>
- <version>${project.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.9</version>
- <reportSets>
- <reportSet>
- <configuration>
- <skip>true</skip>
- </configuration>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
+ <modules>
+ <module>skin</module>
+ <module>project</module>
+ </modules>
</project>
diff --git a/src/it/projects/MSITE-842/pom.xml b/src/it/projects/MSITE-842/project/pom.xml
similarity index 88%
copy from src/it/projects/MSITE-842/pom.xml
copy to src/it/projects/MSITE-842/project/pom.xml
index 470ef867..d44dd883 100644
--- a/src/it/projects/MSITE-842/pom.xml
+++ b/src/it/projects/MSITE-842/project/pom.xml
@@ -25,7 +25,7 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.site.its</groupId>
- <artifactId>MSITE-842</artifactId>
+ <artifactId>MSITE-842-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
@@ -40,7 +40,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>3.0.0</version>
+ <version>4.0.0-M1</version>
</dependency>
</dependencies>
@@ -59,10 +59,8 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <templateFile>${basedir}/src/site/show-properties.vm</templateFile>
- </configuration>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>3.6.4</version>
</plugin>
</plugins>
@@ -72,13 +70,13 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins.site.its</groupId>
- <artifactId>MSITE-842</artifactId>
+ <artifactId>MSITE-842-plugin</artifactId>
<version>${project.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.9</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<configuration>
diff --git a/src/it/projects/MSITE-842/src/it/MSITE-842.html b/src/it/projects/MSITE-842/project/src/it/MSITE-842.html
similarity index 100%
rename from src/it/projects/MSITE-842/src/it/MSITE-842.html
rename to src/it/projects/MSITE-842/project/src/it/MSITE-842.html
diff --git a/src/it/projects/MSITE-842/src/it/another-page.html b/src/it/projects/MSITE-842/project/src/it/another-page.html
similarity index 100%
rename from src/it/projects/MSITE-842/src/it/another-page.html
rename to src/it/projects/MSITE-842/project/src/it/another-page.html
diff --git a/src/it/projects/MSITE-842/src/it/sub/sub.html b/src/it/projects/MSITE-842/project/src/it/sub/sub.html
similarity index 100%
rename from src/it/projects/MSITE-842/src/it/sub/sub.html
rename to src/it/projects/MSITE-842/project/src/it/sub/sub.html
diff --git a/src/it/projects/MSITE-842/src/main/java/org/apache/maven/plugins/it/MyReport.java b/src/it/projects/MSITE-842/project/src/main/java/org/apache/maven/plugins/it/MyReport.java
similarity index 100%
rename from src/it/projects/MSITE-842/src/main/java/org/apache/maven/plugins/it/MyReport.java
rename to src/it/projects/MSITE-842/project/src/main/java/org/apache/maven/plugins/it/MyReport.java
diff --git a/src/it/projects/MSITE-842/src/site/show-properties.vm b/src/it/projects/MSITE-842/project/src/site/site.xml
similarity index 53%
copy from src/it/projects/MSITE-842/src/site/show-properties.vm
copy to src/it/projects/MSITE-842/project/src/site/site.xml
index f51d49eb..46939e5e 100644
--- a/src/it/projects/MSITE-842/src/site/show-properties.vm
+++ b/src/it/projects/MSITE-842/project/src/site/site.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,10 +19,21 @@ specific language governing permissions and limitations
under the License.
-->
-alignedFileName = $alignedFileName
-
-currentFileName = $currentFileName
+<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+ <skin>
+ <groupId>org.apache.maven.plugins.site.its</groupId>
+ <artifactId>MSITE-842-skin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </skin>
-getRelativePath() = $docRenderingContext.getRelativePath()
+ <body>
+ <links>
+ <item name="Maven" href="http://maven.apache.org/"/>
+ </links>
-content = $bodyContent
+ <menu name="Documentation">
+ <!--<item name="Xdoc Example" href="xdoc.html"/>-->
+ </menu>
+ </body>
+</project>
diff --git a/src/it/projects/MSITE-609/pom.xml b/src/it/projects/MSITE-842/skin/pom.xml
similarity index 56%
copy from src/it/projects/MSITE-609/pom.xml
copy to src/it/projects/MSITE-842/skin/pom.xml
index 85d4a09e..009ce86b 100644
--- a/src/it/projects/MSITE-609/pom.xml
+++ b/src/it/projects/MSITE-842/skin/pom.xml
@@ -25,48 +25,15 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.site.its</groupId>
- <artifactId>MSITE-609</artifactId>
+ <artifactId>MSITE-842-skin</artifactId>
<version>1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
+ <packaging>jar</packaging>
- <name>MSITE-609 IT</name>
+ <name>it-plugin-test Maven Mojo</name>
+ <url>http://maven.apache.org</url>
<properties>
- <currentVersion>3.0.5</currentVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
- <distributionManagement>
- <site>
- <id>MSITE-609</id>
- <name>Example company web server</name>
- <url>file://@project.build.directory@/it/MSITE-609/target/site-deployed/</url>
- </site>
- </distributionManagement>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <version>@project.version@</version>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1.2</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>index</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
</project>
diff --git a/src/it/projects/MSITE-842/src/site/show-properties.vm b/src/it/projects/MSITE-842/skin/src/main/resources/META-INF/maven/site.vm
similarity index 100%
rename from src/it/projects/MSITE-842/src/site/show-properties.vm
rename to src/it/projects/MSITE-842/skin/src/main/resources/META-INF/maven/site.vm
diff --git a/src/it/projects/MSITE-842/verify.groovy b/src/it/projects/MSITE-842/verify.groovy
index 508edb64..2bc801d6 100644
--- a/src/it/projects/MSITE-842/verify.groovy
+++ b/src/it/projects/MSITE-842/verify.groovy
@@ -22,22 +22,22 @@ File resultFile;
File expectedFile;
// Check MSITE-842.html (must exist and be exactly like the model
-resultFile = new File(basedir, "target/site/MSITE-842.html");
-expectedFile = new File(basedir, "src/it/MSITE-842.html");
+resultFile = new File(basedir, "project/target/site/MSITE-842.html");
+expectedFile = new File(basedir, "project/src/it/MSITE-842.html");
assert resultFile.exists() && resultFile.isFile()
assert resultFile.text.normalize().equals(expectedFile.text.normalize())
// Check another-page.html (must exist and be exactly like the model
-resultFile = new File(basedir, "target/site/another-page.html");
-expectedFile = new File(basedir, "src/it/another-page.html");
+resultFile = new File(basedir, "project/target/site/another-page.html");
+expectedFile = new File(basedir, "project/src/it/another-page.html");
assert resultFile.exists() && resultFile.isFile()
assert resultFile.text.normalize().equals(expectedFile.text.normalize())
// Check sub/sub.html (must exist and be exactly like the model
-resultFile = new File(basedir, "target/site/sub/sub.html");
-expectedFile = new File(basedir, "src/it/sub/sub.html");
+resultFile = new File(basedir, "project/target/site/sub/sub.html");
+expectedFile = new File(basedir, "project/src/it/sub/sub.html");
assert resultFile.exists() && resultFile.isFile()
assert resultFile.text.normalize().equals(expectedFile.text.normalize())
diff --git a/src/it/projects/MSITE-856/pom.xml b/src/it/projects/MSITE-856/pom.xml
index dfdeccb7..ddd787e6 100644
--- a/src/it/projects/MSITE-856/pom.xml
+++ b/src/it/projects/MSITE-856/pom.xml
@@ -47,7 +47,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/doxia-formats/src/site/apt/velocity-context.apt.vm b/src/it/projects/doxia-formats/src/site/apt/velocity-context.apt.vm
index 122a9313..b1e30996 100644
--- a/src/it/projects/doxia-formats/src/site/apt/velocity-context.apt.vm
+++ b/src/it/projects/doxia-formats/src/site/apt/velocity-context.apt.vm
@@ -52,15 +52,8 @@ Doxia Site Renderer Velocity Context
*-----------------------+-------------------------------------------------------+
| <<<decoration>>> | <<<decoration.name>>> = <<< $decoration.name>>>
*-----------------------+-------------------------------------------------------+
-| <<<currentDate>>> | = <<<$currentDate>>> \
-| | <<<dateFormat.format(currentDate)>>> = <<<$dateFormat.format($currentDate)>>>
-*-----------------------+-------------------------------------------------------+
| <<<currentFileName>>> | = <<<$currentFileName>>>
*-----------------------+-------------------------------------------------------+
-| <<<dateFormat>>> | = <<<$dateFormat>>>
-*-----------------------+-------------------------------------------------------+
-| <<<dateRevision>>> | = <<<$dateRevision>>>
-*-----------------------+-------------------------------------------------------+
| <<<doxiaSiteRendererVersion>>> | = <<<$doxiaSiteRendererVersion>>>
*-----------------------+-------------------------------------------------------+
| <<<locale>>> | = <<<$locale>>>
@@ -77,10 +70,6 @@ Doxia Site Renderer Velocity Context
*-----------------------*-------------------------------------------------------*
|| variable || examples ||
*-----------------------+-------------------------------------------------------+
-| <<<FileUtils>>> | = <<<$FileUtils>>>
-*-----------------------+-------------------------------------------------------+
-| <<<i18n>>> | = <<<$i18n>>>
-*-----------------------+-------------------------------------------------------+
| <<<PathTool>>> | = <<<$PathTool>>>
*-----------------------+-------------------------------------------------------+
| <<<StringUtils>>> | = <<<$StringUtils>>>
diff --git a/src/it/projects/doxia-formats/src/site/confluence/confluence.confluence b/src/it/projects/doxia-formats/src/site/confluence/confluence.confluence
deleted file mode 100644
index 89c3f06c..00000000
--- a/src/it/projects/doxia-formats/src/site/confluence/confluence.confluence
+++ /dev/null
@@ -1,35 +0,0 @@
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
-h4. Confluence Markup
-
-Ideally, the markup should be _readable_ and even *clearly understandable* when you are
-editing it. Inserting formatting should require few keystrokes, and little thought.
-
-After all, we want people to be concentrating on the words, not on where the angle-brackets
-should go.
-
-* Kinds of Markup
-** Text Effects
-** Headings
-** Text Breaks
-** Links
-** Other
-
-Example from [https://confluence.atlassian.com/display/CONF25/Confluence+Notation+Guide+Overview]
-
-Content for verify.groovy
diff --git a/src/it/projects/doxia-formats/src/site/docbook/docbook.xml b/src/it/projects/doxia-formats/src/site/docbook/docbook.xml
deleted file mode 100644
index a5d77f24..00000000
--- a/src/it/projects/doxia-formats/src/site/docbook/docbook.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding='UTF-8'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<!-- example from https://supportweb.cs.bham.ac.uk/docs/tutorials/docsystem/build/tutorials/docbooksys/segmentedhtml/ch08s03.html -->
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<article>
- <articleinfo>
- <title>Your title here</title>
-
- <author>
- <firstname>Your first name</firstname>
- <surname>Your surname</surname>
- <affiliation>
- <address><email>Your e-mail address</email></address>
- </affiliation>
- </author>
-
- <copyright>
- <year>2002</year>
- <holder role="mailto:your e-mail address">Your name</holder>
- </copyright>
-
- <abstract>
- <para>Include an abstract of the article's contents here.</para>
- </abstract>
- </articleinfo>
-
- <sect1><title>Section 1</title>
- <para>
- blah blah blah
- </para>
- </sect1>
-
- <sect1><title>Section 2</title>
- <para>
- Content for verify.groovy
- </para>
- </sect1>
-</article>
diff --git a/src/it/projects/doxia-formats/src/site/twiki/twiki.twiki b/src/it/projects/doxia-formats/src/site/twiki/twiki.twiki
deleted file mode 100644
index 1c9876d3..00000000
--- a/src/it/projects/doxia-formats/src/site/twiki/twiki.twiki
+++ /dev/null
@@ -1,25 +0,0 @@
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
----++ Example
-
- * level 1
- * level 2
- * back on 1
- * last bullet
-
-Content for verify.groovy
diff --git a/src/it/projects/doxia-formats/verify.groovy b/src/it/projects/doxia-formats/verify.groovy
index 6b2f273b..6d3a5643 100644
--- a/src/it/projects/doxia-formats/verify.groovy
+++ b/src/it/projects/doxia-formats/verify.groovy
@@ -24,14 +24,11 @@
'index.html',
'velocity-context.html',
'velocity-include-parse.html',
- 'confluence.html',
- 'docbook.html',
'faq-macro.html',
'faq.html',
'markdown-macro.html',
'markdown.html',
'markdown2.html',
- 'twiki.html',
'xdoc.html',
'xdoc-macro.html',
'xhtml.html',
diff --git a/src/it/projects/empty-report-set/pom.xml b/src/it/projects/empty-report-set/pom.xml
index 1f0d5321..cc704686 100644
--- a/src/it/projects/empty-report-set/pom.xml
+++ b/src/it/projects/empty-report-set/pom.xml
@@ -46,7 +46,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1.1</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<!-- this should suppress the default reports -->
<reportSet/>
diff --git a/src/it/projects/failure/invoker.properties b/src/it/projects/failure/invoker.properties
index 60377a75..064023ea 100644
--- a/src/it/projects/failure/invoker.properties
+++ b/src/it/projects/failure/invoker.properties
@@ -18,8 +18,6 @@
invoker.buildResult = failure
invoker.debug = false
-# --log-file option is only supported by Maven 3
-invoker.maven.version = 3.0+
invoker.goals.1 = --log-file report-plugin.log -DsiteOutputDirectory=target/site-report-plugin -Preport-plugin clean site
invoker.goals.2 = --log-file report-plugin-debug.log -DsiteOutputDirectory=target/site-report-plugin-debug -Preport-plugin clean site
invoker.debug.2 = true
diff --git a/src/it/projects/full-reporting/invoker.properties b/src/it/projects/full-reporting/invoker.properties
index 84ce0624..7327407c 100644
--- a/src/it/projects/full-reporting/invoker.properties
+++ b/src/it/projects/full-reporting/invoker.properties
@@ -16,5 +16,3 @@
# under the License.
invoker.profiles=reporting
-# see MNG-5140
-invoker.maven.version = 2.2.2+
\ No newline at end of file
diff --git a/src/it/projects/inheritedReports/invoker.properties b/src/it/projects/inheritedReports/invoker.properties
index c51c2994..978b68af 100644
--- a/src/it/projects/inheritedReports/invoker.properties
+++ b/src/it/projects/inheritedReports/invoker.properties
@@ -14,9 +14,3 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
-# Maven 2 & 3 don't handle the test the same way:
-# - Maven 2 adds report: this is the tested behaviour
-# - until 3.0.3, Maven 3 replaces report: the test fails
-# - since 3.0.4, Maven 3 has the same behaviour than Maven 2, as a side effect of MNG-5155
-invoker.maven.version = 3.0-,3.0.4+
diff --git a/src/it/projects/inheritedReports/pom.xml b/src/it/projects/inheritedReports/pom.xml
index 5ea67f35..d87a307b 100644
--- a/src/it/projects/inheritedReports/pom.xml
+++ b/src/it/projects/inheritedReports/pom.xml
@@ -47,7 +47,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/it-plugin-test/pom.xml b/src/it/projects/it-plugin-test/pom.xml
index 550019eb..60488a8b 100644
--- a/src/it/projects/it-plugin-test/pom.xml
+++ b/src/it/projects/it-plugin-test/pom.xml
@@ -35,7 +35,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>3.0</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -63,7 +63,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>2.5.1</version>
+ <version>3.6.4</version>
</plugin>
</plugins>
</reporting>
diff --git a/src/it/projects/new-configuration/invoker.properties b/src/it/projects/new-configuration/invoker.properties
index 5fcde54e..978b68af 100644
--- a/src/it/projects/new-configuration/invoker.properties
+++ b/src/it/projects/new-configuration/invoker.properties
@@ -14,5 +14,3 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
-invoker.maven.version = 3.0+
diff --git a/src/it/projects/new-configuration/pom.xml b/src/it/projects/new-configuration/pom.xml
index f5ab9031..d96b01c0 100644
--- a/src/it/projects/new-configuration/pom.xml
+++ b/src/it/projects/new-configuration/pom.xml
@@ -35,7 +35,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>3.0</version>
+ <version>3.2.5</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -56,7 +56,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.2</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<configuration>
<dependencyDetailsEnabled>false</dependencyDetailsEnabled>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
@@ -71,7 +71,7 @@ under the License.
<report>index</report>
</reports>
</reportSet>
- </reportSets>
+ </reportSets>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -99,7 +99,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>2.5.1</version>
+ <version>3.6.4</version>
</plugin>
</plugins>
</reporting>
diff --git a/src/it/projects/reportConfig/invoker.properties b/src/it/projects/reportConfig/invoker.properties
index 228aa641..978b68af 100644
--- a/src/it/projects/reportConfig/invoker.properties
+++ b/src/it/projects/reportConfig/invoker.properties
@@ -14,5 +14,3 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
-invoker.maven.version = 3.0+
\ No newline at end of file
diff --git a/src/it/projects/site-attach-descriptor/pom.xml b/src/it/projects/site-attach-descriptor/pom.xml
index db1475cf..27f95777 100644
--- a/src/it/projects/site-attach-descriptor/pom.xml
+++ b/src/it/projects/site-attach-descriptor/pom.xml
@@ -37,7 +37,7 @@ under the License.
</modules>
<properties>
- <currentVersion>3.0.5</currentVersion>
+ <currentVersion>3.2.5</currentVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -87,7 +87,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1.2</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/site-deploy/pom.xml b/src/it/projects/site-deploy/pom.xml
index 163090d5..b9ec5ecd 100644
--- a/src/it/projects/site-deploy/pom.xml
+++ b/src/it/projects/site-deploy/pom.xml
@@ -32,7 +32,7 @@ under the License.
<name>site-deploy IT</name>
<properties>
- <currentVersion>3.0.5</currentVersion>
+ <currentVersion>3.2.5</currentVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -58,7 +58,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1.2</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/site-deploy/verify.bsh b/src/it/projects/site-deploy/verify.bsh
index 0b822a86..5fdf251a 100644
--- a/src/it/projects/site-deploy/verify.bsh
+++ b/src/it/projects/site-deploy/verify.bsh
@@ -65,10 +65,10 @@ try
return false;
}
String downloadContent = FileUtils.fileRead( download, "UTF-8" );
- int indexOf = downloadContent.indexOf( "Download Maven 3.0.5" );
+ int indexOf = downloadContent.indexOf( "Download Maven 3.2.5" );
if ( indexOf < 0 )
{
- System.err.println( "download.html doesn't contain Download Maven 3.0.5" );
+ System.err.println( "download.html doesn't contain Download Maven 3.2.5" );
return false;
}
}
diff --git a/src/it/projects/site-inheritance/pom.xml b/src/it/projects/site-inheritance/pom.xml
index c06ed59a..ccfa82b3 100644
--- a/src/it/projects/site-inheritance/pom.xml
+++ b/src/it/projects/site-inheritance/pom.xml
@@ -56,7 +56,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/site-jar/pom.xml b/src/it/projects/site-jar/pom.xml
index 0bf8b832..6d3fdeef 100644
--- a/src/it/projects/site-jar/pom.xml
+++ b/src/it/projects/site-jar/pom.xml
@@ -32,7 +32,7 @@ under the License.
<name>site-jar IT</name>
<properties>
- <currentVersion>3.0.5</currentVersion>
+ <currentVersion>3.2.5</currentVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.outputTimestamp>2019-11-02T17:48:12Z</project.build.outputTimestamp>
</properties>
@@ -66,7 +66,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1.2</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/site-sd-2/pom.xml b/src/it/projects/site-sd-2/pom.xml
index c436e997..9e3d6f3e 100644
--- a/src/it/projects/site-sd-2/pom.xml
+++ b/src/it/projects/site-sd-2/pom.xml
@@ -53,7 +53,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/site-sd-lang/pom.xml b/src/it/projects/site-sd-lang/pom.xml
index 63fde74c..7eb182a2 100755
--- a/src/it/projects/site-sd-lang/pom.xml
+++ b/src/it/projects/site-sd-lang/pom.xml
@@ -57,7 +57,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/site-sd/pom.xml b/src/it/projects/site-sd/pom.xml
index aae7c5c5..a4cee47c 100644
--- a/src/it/projects/site-sd/pom.xml
+++ b/src/it/projects/site-sd/pom.xml
@@ -59,7 +59,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1.2</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/template-skin/invoker.properties b/src/it/projects/template-skin/invoker.properties
index 245bb47c..d76b4eaa 100644
--- a/src/it/projects/template-skin/invoker.properties
+++ b/src/it/projects/template-skin/invoker.properties
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=site:site install
-invoker.goals.2=-Puse-skin site:site
+invoker.goals=install
+invoker.goals.2=site:site
diff --git a/src/it/projects/template-skin/pom.xml b/src/it/projects/template-skin/pom.xml
index bde0432c..25ed717c 100644
--- a/src/it/projects/template-skin/pom.xml
+++ b/src/it/projects/template-skin/pom.xml
@@ -54,28 +54,10 @@ under the License.
<profiles>
<profile>
- <id>use-template</id>
+ <id>use-skin</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <templateFile>${basedir}/src/main/resources/META-INF/maven/site.vm</templateFile>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- <profile>
- <id>use-skin</id>
- <reporting>
- <outputDirectory>${project.build.directory}/site-skin</outputDirectory>
- </reporting>
</profile>
</profiles>
</project>
diff --git a/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java b/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
index 3fceab25..589470f0 100644
--- a/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
+++ b/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
@@ -85,17 +85,6 @@ public abstract class AbstractSiteRenderingMojo extends AbstractSiteDescriptorMo
@Parameter
private Map<String, String> moduleExcludes;
- /**
- * The location of a Velocity template file to use. When used, skins and the default templates, CSS and images
- * are disabled. It is highly recommended that you package this as a skin instead.
- *
- * @since 2.0-beta-5
- * @deprecated Upcoming major Doxia version removes support for template files in favor of skins.
- */
- @Parameter( property = "templateFile" )
- @Deprecated
- private File templateFile;
-
/**
* Additional template properties for rendering the site. See
* <a href="/doxia/doxia-sitetools/doxia-site-renderer/">Doxia Site Renderer</a>.
@@ -302,40 +291,25 @@ public abstract class AbstractSiteRenderingMojo extends AbstractSiteDescriptorMo
}
SiteRenderingContext context;
- if ( templateFile != null )
+ try
{
- getLog().info( buffer().a( "Rendering content with " ).strong( templateFile
- + " template file" ).a( '.' ).toString() );
+ Artifact skinArtifact =
+ siteTool.getSkinArtifactFromRepository( localRepository, repositories, decorationModel );
- if ( !templateFile.exists() )
- {
- throw new MojoFailureException( "Template file '" + templateFile + "' does not exist" );
- }
- context = siteRenderer.createContextForTemplate( templateFile, attributes, decorationModel,
- project.getName(), locale );
+ getLog().info( buffer().a( "Rendering content with " ).strong( skinArtifact.getId()
+ + " skin" ).a( '.' ).toString() );
+
+ context = siteRenderer.createContextForSkin( skinArtifact, attributes, decorationModel,
+ project.getName(), locale );
}
- else
+ catch ( SiteToolException e )
{
- try
- {
- Artifact skinArtifact =
- siteTool.getSkinArtifactFromRepository( localRepository, repositories, decorationModel );
-
- getLog().info( buffer().a( "Rendering content with " ).strong( skinArtifact.getId()
- + " skin" ).a( '.' ).toString() );
-
- context = siteRenderer.createContextForSkin( skinArtifact, attributes, decorationModel,
- project.getName(), locale );
- }
- catch ( SiteToolException e )
- {
- throw new MojoExecutionException( "SiteToolException while preparing skin: " + e.getMessage(), e );
- }
- catch ( RendererException e )
- {
- throw new MojoExecutionException( "RendererException while preparing context for skin: "
- + e.getMessage(), e );
- }
+ throw new MojoExecutionException( "SiteToolException while preparing skin: " + e.getMessage(), e );
+ }
+ catch ( RendererException e )
+ {
+ throw new MojoExecutionException( "RendererException while preparing context for skin: "
+ + e.getMessage(), e );
}
// Generate static site
diff --git a/src/main/java/org/apache/maven/plugins/site/render/CategorySummaryDocumentRenderer.java b/src/main/java/org/apache/maven/plugins/site/render/CategorySummaryDocumentRenderer.java
index e2979f03..9c295a10 100644
--- a/src/main/java/org/apache/maven/plugins/site/render/CategorySummaryDocumentRenderer.java
+++ b/src/main/java/org/apache/maven/plugins/site/render/CategorySummaryDocumentRenderer.java
@@ -32,7 +32,6 @@ import org.apache.maven.doxia.siterenderer.RendererException;
import org.apache.maven.doxia.siterenderer.RenderingContext;
import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
-import org.apache.maven.doxia.tools.MojoLogWrapper;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.reporting.MavenReport;
import org.codehaus.plexus.i18n.I18N;
@@ -82,11 +81,6 @@ public class CategorySummaryDocumentRenderer
{
SiteRendererSink sink = new SiteRendererSink( renderingContext );
- if ( log != null )
- {
- sink.enableLogging( new MojoLogWrapper( log ) );
- }
-
sink.head();
sink.title();
@@ -172,7 +166,7 @@ public class CategorySummaryDocumentRenderer
sink.close();
- renderer.generateDocument( writer, sink, siteRenderingContext );
+ renderer.mergeDocumentIntoSite( writer, sink, siteRenderingContext );
}
public String getOutputName()
diff --git a/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java b/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java
index 45cf613f..40cf3ad0 100644
--- a/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java
+++ b/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java
@@ -40,7 +40,6 @@ import org.apache.maven.doxia.siterenderer.RendererException;
import org.apache.maven.doxia.siterenderer.RenderingContext;
import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
-import org.apache.maven.doxia.tools.MojoLogWrapper;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.reporting.MavenMultiPageReport;
import org.apache.maven.reporting.MavenReport;
@@ -280,8 +279,6 @@ public class ReportDocumentRenderer
for ( MultiPageSubSink mySink : sinks )
{
- mySink.enableLogging( new MojoLogWrapper( log ) );
-
outputName = mySink.getOutputName();
log.debug( " Rendering " + outputName );
diff --git a/src/main/java/org/apache/maven/plugins/site/run/DoxiaFilter.java b/src/main/java/org/apache/maven/plugins/site/run/DoxiaFilter.java
index 7c698969..012ae187 100644
--- a/src/main/java/org/apache/maven/plugins/site/run/DoxiaFilter.java
+++ b/src/main/java/org/apache/maven/plugins/site/run/DoxiaFilter.java
@@ -177,7 +177,7 @@ public class DoxiaFilter
try
{
Map<String, DocumentRenderer> locateDocuments =
- siteRenderer.locateDocumentFiles( generatedSiteContext );
+ siteRenderer.locateDocumentFiles( generatedSiteContext, false );
if ( locateDocuments.containsKey( path ) )
{
diff --git a/src/site/apt/examples/templatefile.apt.vm b/src/site/apt/examples/templatefile.apt.vm
deleted file mode 100644
index 80d0c890..00000000
--- a/src/site/apt/examples/templatefile.apt.vm
+++ /dev/null
@@ -1,98 +0,0 @@
- ------
- Changing the Template File
- ------
- Vincent Siveton
- <vi...@gmail.com>
- Maria Odea Ching
- ------
- 2009-03-08
- ------
-
- ~~ Licensed to the Apache Software Foundation (ASF) under one
- ~~ or more contributor license agreements. See the NOTICE file
- ~~ distributed with this work for additional information
- ~~ regarding copyright ownership. The ASF licenses this file
- ~~ to you under the Apache License, Version 2.0 (the
- ~~ "License"); you may not use this file except in compliance
- ~~ with the License. You may obtain a copy of the License at
- ~~
- ~~ http://www.apache.org/licenses/LICENSE-2.0
- ~~
- ~~ Unless required by applicable law or agreed to in writing,
- ~~ software distributed under the License is distributed on an
- ~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~~ KIND, either express or implied. See the License for the
- ~~ specific language governing permissions and limitations
- ~~ under the License.
-
- ~~ NOTE: For help with the syntax of this file, see:
- ~~ http://maven.apache.org/doxia/references/apt-format.html
-
-
-Changing the Template File
-
- It is possible to change the Velocity template used for creating the site.
- Save your custom template in a directory of your choice and configure the
- Site Plugin accordingly.
-
- <<Note:>> If you use this method then skins and the default templates, CSS
- and images are disabled. It is therefor highly recommended that you package
- this as a {{{./creatingskins.html}skin}} instead.
-
- For version 2.0-beta-5 and later you would add something like this to your
- <<<pom.xml>>>:
-
-+-----+
-<project>
- ...
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <templateFile>${basedir}/maven-site.vm</templateFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
- ...
-</project>
-+-----+
-
- For version 2.0-beta-4 and earlier it was done by adding this to your
- <<<pom.xml>>>:
-
-+-----+
-<project>
- ...
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-4</version>
- <configuration>
- <templateDirectory>${basedir}</templateDirectory>
- <template>maven-site.vm</template>
- </configuration>
- </plugin>
- </plugins>
- </build>
- ...
-</project>
-+-----+
-
- Then you execute the site goal from your project:
-
-------
-mvn site
-------
-
- If you do not want to start from scratch you can start with the
- {{{https://github.com/apache/maven-doxia-sitetools/blob/master/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm}default template}}
- that is used by the Site Plugin.
-
- For more information about Velocity, see
- {{{http://velocity.apache.org/}http://velocity.apache.org/}}.
\ No newline at end of file
diff --git a/src/site/site.xml b/src/site/site.xml
index 27e90d52..b6f6533c 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -49,7 +49,6 @@ under the License.
</menu>
<menu name="Site Template">
- <item name="Changing the Template File" href="/examples/templatefile.html"/>
<item name="Creating Skins" href="/examples/creatingskins.html"/>
</menu>