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/24 11:30:17 UTC
[maven-site-plugin] 05/05: [MSITE-895] Upgrade plugins and components in ITs
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 58416d7b3594e1a0f316e6de20e5fba518f273bd
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Apr 24 13:16:56 2022 +0200
[MSITE-895] Upgrade plugins and components in ITs
---
pom.xml | 4 +-
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 +-
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/project/pom.xml | 4 +-
src/it/projects/MSITE-856/pom.xml | 2 +-
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 +-
43 files changed, 152 insertions(+), 175 deletions(-)
diff --git a/pom.xml b/pom.xml
index a7fec28d..e1f22d4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -208,8 +208,10 @@ under the License.
<javadocPluginVersion>3.3.2</javadocPluginVersion>
<pmdPluginVersion>3.16.0</pmdPluginVersion>
<jxrPluginVersion>3.2.0</jxrPluginVersion>
- <projectInfoReportsPluginVersion>3.2.2</projectInfoReportsPluginVersion>
+ <projectInfoReportsPluginVersion>3.3.0</projectInfoReportsPluginVersion>
<surefirePluginVersion>2.22.2</surefirePluginVersion>
+ <mavenPluginPluginVersion>3.6.4</mavenPluginPluginVersion>
+ <mavenReportingImplVersion>4.0.0-M1</mavenReportingImplVersion>
<surefire.version>2.22.2</surefire.version>
<project.build.outputTimestamp>2022-04-16T21:02:16Z</project.build.outputTimestamp>
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..94486ca5 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>@mavenVersion@</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..5b5925aa 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>@mavenVersion@</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..5def1bae 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>@mavenReportingImplVersion@</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>@mavenPluginPluginVersion@</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
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/project/pom.xml b/src/it/projects/MSITE-842/project/pom.xml
index d44dd883..e9c34723 100644
--- a/src/it/projects/MSITE-842/project/pom.xml
+++ b/src/it/projects/MSITE-842/project/pom.xml
@@ -40,7 +40,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>4.0.0-M1</version>
+ <version>@mavenReportingImplVersion@</version>
</dependency>
</dependencies>
@@ -60,7 +60,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.6.4</version>
+ <version>@mavenPluginPluginVersion@</version>
</plugin>
</plugins>
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/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..21792270 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>@mavenVersion@</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>@mavenPluginPluginVersion@</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..cd134fc5 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>@mavenVersion@</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>@mavenPluginPluginVersion@</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..ddb935cf 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>@mavenVersion@</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..296816b7 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>@mavenVersion@</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..4e149b1c 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>@mavenVersion@</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>