This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch MSKINS-165 in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git
commit fae533500f48d5c40f546f6a756b8cee2d4626e4 Author: Sylwester Lachiewicz <slachiew...@apache.org> AuthorDate: Thu Mar 26 12:59:15 2020 +0100 [MSKINS-165] use common parent for ITs from Skins --- src/it/mskins-10/pom.xml | 8 ++++++-- src/it/mskins-107/pom.xml | 8 ++++++-- src/it/mskins-13/pom.xml | 18 +++++++++++------- src/it/mskins-14/pom.xml | 18 +++++++++++------- src/it/mskins-143_default/pom.xml | 8 ++++++-- src/it/mskins-143_false/pom.xml | 8 ++++++-- src/it/mskins-143_true/pom.xml | 8 ++++++-- src/it/mskins-14_sitesearch/pom.xml | 18 +++++++++++------- src/it/mskins-15/pom.xml | 18 +++++++++++------- src/it/mskins-16/pom.xml | 18 +++++++++++------- src/it/mskins-161/pom.xml | 4 ++-- src/it/mskins-17/pom.xml | 18 +++++++++++------- src/it/mskins-17/verify.groovy | 2 +- src/it/mskins-21/pom.xml | 4 ++-- src/it/mskins-22/pom.xml | 4 ++-- src/it/mskins-22_default/pom.xml | 4 ++-- src/it/mskins-22_topbar/pom.xml | 4 ++-- src/it/mskins-23/pom.xml | 4 ++-- src/it/mskins-24/pom.xml | 4 ++-- src/it/mskins-24_topbar/pom.xml | 4 ++-- src/it/mskins-25/pom.xml | 4 ++-- src/it/mskins-28/pom.xml | 7 ++++++- src/it/mskins-31/pom.xml | 5 +++++ src/it/mskins-33/pom.xml | 4 ++-- src/it/mskins-33_topbar/pom.xml | 4 ++-- src/it/mskins-41/pom.xml | 7 ++++++- src/it/mskins-47/pom.xml | 5 +++++ src/it/mskins-72/pom.xml | 4 ++-- src/it/mskins-75/pom.xml | 4 ++-- src/it/mskins-76/pom.xml | 4 ++-- src/it/mskins-76_topbar/pom.xml | 4 ++-- src/it/mskins-85/pom.xml | 4 ++-- src/it/mskins-85/src/site/site.xml | 2 +- src/it/sidebar/pom.xml | 5 ++--- src/it/sidebar/verify.groovy | 2 +- src/it/topbar-inverse/pom.xml | 5 ++--- src/it/topbar/pom.xml | 5 ++--- src/it/topbar/verify.groovy | 2 +- 38 files changed, 160 insertions(+), 99 deletions(-) diff --git a/src/it/mskins-10/pom.xml b/src/it/mskins-10/pom.xml index ca5d77f..c3b1d1f 100644 --- a/src/it/mskins-10/pom.xml +++ b/src/it/mskins-10/pom.xml @@ -18,6 +18,11 @@ <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> + <parent> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> + <version>@project.parent.version@</version> + </parent> <groupId>org.apache.maven.skins.its</groupId> <artifactId>mskins-10</artifactId> @@ -46,10 +51,9 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.4</version> + <version>3.0.0</version> <configuration> <dependencyDetailsEnabled>false</dependencyDetailsEnabled> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> </configuration> </plugin> </plugins> diff --git a/src/it/mskins-107/pom.xml b/src/it/mskins-107/pom.xml index 17ff374..77fb4ba 100644 --- a/src/it/mskins-107/pom.xml +++ b/src/it/mskins-107/pom.xml @@ -18,6 +18,11 @@ <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> + <parent> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> + <version>@project.parent.version@</version> + </parent> <groupId>org.apache.maven.skins.its</groupId> <artifactId>mskins-107</artifactId> @@ -46,10 +51,9 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.4</version> + <version>3.0.0</version> <configuration> <dependencyDetailsEnabled>false</dependencyDetailsEnabled> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> </configuration> </plugin> </plugins> diff --git a/src/it/mskins-13/pom.xml b/src/it/mskins-13/pom.xml index 213109c..4a6a637 100644 --- a/src/it/mskins-13/pom.xml +++ b/src/it/mskins-13/pom.xml @@ -18,6 +18,11 @@ <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> + <parent> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> + <version>@project.parent.version@</version> + </parent> <groupId>org.apache.maven.skins.its</groupId> <artifactId>@project.artifactId@-mskins-13</artifactId> @@ -49,23 +54,22 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.4</version> + <version>3.0.0</version> <configuration> <dependencyDetailsEnabled>false</dependencyDetailsEnabled> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> </configuration> <reportSets> <reportSet> <reports> <report>index</report> <report>summary</report> - <report>license</report> - <report>project-team</report> + <report>licenses</report> + <report>team</report> <report>scm</report> - <report>issue-tracking</report> - <report>mailing-list</report> + <report>issue-management</report> + <report>mailing-lists</report> <report>dependencies</report> - <report>cim</report> + <report>ci-management</report> <report>plugin-management</report> <report>plugins</report> </reports> diff --git a/src/it/mskins-14/pom.xml b/src/it/mskins-14/pom.xml index 9440373..975b25b 100644 --- a/src/it/mskins-14/pom.xml +++ b/src/it/mskins-14/pom.xml @@ -18,6 +18,11 @@ <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> + <parent> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> + <version>@project.parent.version@</version> + </parent> <groupId>org.apache.maven.skins.its</groupId> <artifactId>@project.artifactId@-mskins-14</artifactId> @@ -49,23 +54,22 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.4</version> + <version>3.0.0</version> <configuration> <dependencyDetailsEnabled>false</dependencyDetailsEnabled> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> </configuration> <reportSets> <reportSet> <reports> <report>index</report> <report>summary</report> - <report>license</report> - <report>project-team</report> + <report>licenses</report> + <report>team</report> <report>scm</report> - <report>issue-tracking</report> - <report>mailing-list</report> + <report>issue-management</report> + <report>mailing-lists</report> <report>dependencies</report> - <report>cim</report> + <report>ci-management</report> <report>plugin-management</report> <report>plugins</report> </reports> diff --git a/src/it/mskins-143_default/pom.xml b/src/it/mskins-143_default/pom.xml index 3e93f0e..9558810 100644 --- a/src/it/mskins-143_default/pom.xml +++ b/src/it/mskins-143_default/pom.xml @@ -18,6 +18,11 @@ <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> + <parent> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> + <version>@project.parent.version@</version> + </parent> <groupId>org.apache.maven.skins.its</groupId> <artifactId>mskins-143_default</artifactId> @@ -46,10 +51,9 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.4</version> + <version>3.0.0</version> <configuration> <dependencyDetailsEnabled>false</dependencyDetailsEnabled> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> </configuration> </plugin> </plugins> diff --git a/src/it/mskins-143_false/pom.xml b/src/it/mskins-143_false/pom.xml index b40d96d..ce4ec75 100644 --- a/src/it/mskins-143_false/pom.xml +++ b/src/it/mskins-143_false/pom.xml @@ -18,6 +18,11 @@ <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> + <parent> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> + <version>@project.parent.version@</version> + </parent> <groupId>org.apache.maven.skins.its</groupId> <artifactId>mskins-143_false</artifactId> @@ -46,10 +51,9 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.4</version> + <version>3.0.0</version> <configuration> <dependencyDetailsEnabled>false</dependencyDetailsEnabled> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> </configuration> </plugin> </plugins> diff --git a/src/it/mskins-143_true/pom.xml b/src/it/mskins-143_true/pom.xml index f6bdd48..1ab0d54 100644 --- a/src/it/mskins-143_true/pom.xml +++ b/src/it/mskins-143_true/pom.xml @@ -18,6 +18,11 @@ <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> + <parent> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> + <version>@project.parent.version@</version> + </parent> <groupId>org.apache.maven.skins.its</groupId> <artifactId>mskins-143_true</artifactId> @@ -46,10 +51,9 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.4</version> + <version>3.0.0</version> <configuration> <dependencyDetailsEnabled>true</dependencyDetailsEnabled> - <dependencyLocationsEnabled>true</dependencyLocationsEnabled> </configuration> </plugin> </plugins> diff --git a/src/it/mskins-14_sitesearch/pom.xml b/src/it/mskins-14_sitesearch/pom.xml index b3c2ca4..f463048 100644 --- a/src/it/mskins-14_sitesearch/pom.xml +++ b/src/it/mskins-14_sitesearch/pom.xml @@ -18,6 +18,11 @@ <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> + <parent> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> + <version>@project.parent.version@</version> + </parent> <groupId>org.apache.maven.skins.its</groupId> <artifactId>@project.artifactId@-mskins-14_sitesearch</artifactId> @@ -49,23 +54,22 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.4</version> + <version>3.0.0</version> <configuration> <dependencyDetailsEnabled>false</dependencyDetailsEnabled> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> </configuration> <reportSets> <reportSet> <reports> <report>index</report> <report>summary</report> - <report>license</report> - <report>project-team</report> + <report>licenses</report> + <report>team</report> <report>scm</report> - <report>issue-tracking</report> - <report>mailing-list</report> + <report>issue-management</report> + <report>mailing-lists</report> <report>dependencies</report> - <report>cim</report> + <report>ci-management</report> <report>plugin-management</report> <report>plugins</report> </reports> diff --git a/src/it/mskins-15/pom.xml b/src/it/mskins-15/pom.xml index 314b873..4775e2d 100644 --- a/src/it/mskins-15/pom.xml +++ b/src/it/mskins-15/pom.xml @@ -18,6 +18,11 @@ <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> + <parent> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> + <version>@project.parent.version@</version> + </parent> <groupId>org.apache.maven.skins.its</groupId> <artifactId>@project.artifactId@-mskins-15</artifactId> @@ -49,23 +54,22 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.4</version> + <version>3.0.0</version> <configuration> <dependencyDetailsEnabled>false</dependencyDetailsEnabled> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> </configuration> <reportSets> <reportSet> <reports> <report>index</report> <report>summary</report> - <report>license</report> - <report>project-team</report> + <report>licenses</report> + <report>team</report> <report>scm</report> - <report>issue-tracking</report> - <report>mailing-list</report> + <report>issue-management</report> + <report>mailing-lists</report> <report>dependencies</report> - <report>cim</report> + <report>ci-management</report> <report>plugin-management</report> <report>plugins</report> </reports> diff --git a/src/it/mskins-16/pom.xml b/src/it/mskins-16/pom.xml index 19a9763..a6dd40a 100644 --- a/src/it/mskins-16/pom.xml +++ b/src/it/mskins-16/pom.xml @@ -18,6 +18,11 @@ <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> + <parent> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> + <version>@project.parent.version@</version> + </parent> <groupId>org.apache.maven.skins.its</groupId> <artifactId>@project.artifactId@-mskins-16</artifactId> @@ -49,23 +54,22 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.4</version> + <version>3.0.0</version> <configuration> <dependencyDetailsEnabled>false</dependencyDetailsEnabled> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> </configuration> <reportSets> <reportSet> <reports> <report>index</report> <report>summary</report> - <report>license</report> - <report>project-team</report> + <report>licenses</report> + <report>team</report> <report>scm</report> - <report>issue-tracking</report> - <report>mailing-list</report> + <report>issue-management</report> + <report>mailing-lists</report> <report>dependencies</report> - <report>cim</report> + <report>ci-management</report> <report>plugin-management</report> <report>plugins</report> </reports> diff --git a/src/it/mskins-161/pom.xml b/src/it/mskins-161/pom.xml index ce181e2..2bede34 100644 --- a/src/it/mskins-161/pom.xml +++ b/src/it/mskins-161/pom.xml @@ -19,8 +19,8 @@ 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> <parent> - <groupId>org.apache.maven</groupId> - <artifactId>maven-parent</artifactId> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> <version>@project.parent.version@</version> </parent> diff --git a/src/it/mskins-17/pom.xml b/src/it/mskins-17/pom.xml index 4caa80b..3536e17 100644 --- a/src/it/mskins-17/pom.xml +++ b/src/it/mskins-17/pom.xml @@ -18,6 +18,11 @@ <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> + <parent> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> + <version>@project.parent.version@</version> + </parent> <groupId>org.apache.maven.skins.its</groupId> <artifactId>@project.artifactId@-mskins-17</artifactId> @@ -49,23 +54,22 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.4</version> + <version>3.0.0</version> <configuration> <dependencyDetailsEnabled>false</dependencyDetailsEnabled> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> </configuration> <reportSets> <reportSet> <reports> <report>index</report> <report>summary</report> - <report>license</report> - <report>project-team</report> + <report>licenses</report> + <report>team</report> <report>scm</report> - <report>issue-tracking</report> - <report>mailing-list</report> + <report>issue-management</report> + <report>mailing-lists</report> <report>dependencies</report> - <report>cim</report> + <report>ci-management</report> <report>plugin-management</report> <report>plugins</report> </reports> diff --git a/src/it/mskins-17/verify.groovy b/src/it/mskins-17/verify.groovy index 4cb46c4..0a99140 100644 --- a/src/it/mskins-17/verify.groovy +++ b/src/it/mskins-17/verify.groovy @@ -19,4 +19,4 @@ File index = new File( basedir, "target/site/index.html" ) assert index.exists() -assert 1 == index.getText().count( '<li id="publishDate" class="pull-right">Last Published: 1970-01-01</li>' ) \ No newline at end of file +assert 1 == index.getText().count( '<li id="publishDate" class="pull-right"><span class="divider">|</span> Last Published: 1970-01-01</li>' ) \ No newline at end of file diff --git a/src/it/mskins-21/pom.xml b/src/it/mskins-21/pom.xml index 607af60..0fec53d 100644 --- a/src/it/mskins-21/pom.xml +++ b/src/it/mskins-21/pom.xml @@ -19,8 +19,8 @@ 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> <parent> - <groupId>org.apache.maven</groupId> - <artifactId>maven-parent</artifactId> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> <version>@project.parent.version@</version> </parent> diff --git a/src/it/mskins-22/pom.xml b/src/it/mskins-22/pom.xml index 20ef934..785517b 100644 --- a/src/it/mskins-22/pom.xml +++ b/src/it/mskins-22/pom.xml @@ -19,8 +19,8 @@ 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> <parent> - <groupId>org.apache.maven</groupId> - <artifactId>maven-parent</artifactId> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> <version>@project.parent.version@</version> </parent> diff --git a/src/it/mskins-22_default/pom.xml b/src/it/mskins-22_default/pom.xml index e52e148..c6c992f 100644 --- a/src/it/mskins-22_default/pom.xml +++ b/src/it/mskins-22_default/pom.xml @@ -19,8 +19,8 @@ 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> <parent> - <groupId>org.apache.maven</groupId> - <artifactId>maven-parent</artifactId> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> <version>@project.parent.version@</version> </parent> diff --git a/src/it/mskins-22_topbar/pom.xml b/src/it/mskins-22_topbar/pom.xml index 20ef934..785517b 100644 --- a/src/it/mskins-22_topbar/pom.xml +++ b/src/it/mskins-22_topbar/pom.xml @@ -19,8 +19,8 @@ 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> <parent> - <groupId>org.apache.maven</groupId> - <artifactId>maven-parent</artifactId> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> <version>@project.parent.version@</version> </parent> diff --git a/src/it/mskins-23/pom.xml b/src/it/mskins-23/pom.xml index 374c1ae..1a4fbae 100644 --- a/src/it/mskins-23/pom.xml +++ b/src/it/mskins-23/pom.xml @@ -19,8 +19,8 @@ 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> <parent> - <groupId>org.apache.maven</groupId> - <artifactId>maven-parent</artifactId> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> <version>@project.parent.version@</version> </parent> diff --git a/src/it/mskins-24/pom.xml b/src/it/mskins-24/pom.xml index 307d11d..55b2ec9 100644 --- a/src/it/mskins-24/pom.xml +++ b/src/it/mskins-24/pom.xml @@ -19,8 +19,8 @@ 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> <parent> - <groupId>org.apache.maven</groupId> - <artifactId>maven-parent</artifactId> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> <version>@project.parent.version@</version> </parent> diff --git a/src/it/mskins-24_topbar/pom.xml b/src/it/mskins-24_topbar/pom.xml index df6351b..0c58e5d 100644 --- a/src/it/mskins-24_topbar/pom.xml +++ b/src/it/mskins-24_topbar/pom.xml @@ -19,8 +19,8 @@ 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> <parent> - <groupId>org.apache.maven</groupId> - <artifactId>maven-parent</artifactId> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> <version>@project.parent.version@</version> </parent> diff --git a/src/it/mskins-25/pom.xml b/src/it/mskins-25/pom.xml index c04a411..570d6c7 100644 --- a/src/it/mskins-25/pom.xml +++ b/src/it/mskins-25/pom.xml @@ -19,8 +19,8 @@ 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> <parent> - <groupId>org.apache.maven</groupId> - <artifactId>maven-parent</artifactId> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> <version>@project.parent.version@</version> </parent> diff --git a/src/it/mskins-28/pom.xml b/src/it/mskins-28/pom.xml index d359761..21f608f 100644 --- a/src/it/mskins-28/pom.xml +++ b/src/it/mskins-28/pom.xml @@ -18,6 +18,11 @@ <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> + <parent> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> + <version>@project.parent.version@</version> + </parent> <groupId>org.apache.maven.skins.its</groupId> <artifactId>mskins-28</artifactId> @@ -50,7 +55,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.4</version> + <version>3.0.0</version> <reportSets> <reportSet> <reports> diff --git a/src/it/mskins-31/pom.xml b/src/it/mskins-31/pom.xml index 39d2189..5b0fc81 100644 --- a/src/it/mskins-31/pom.xml +++ b/src/it/mskins-31/pom.xml @@ -18,6 +18,11 @@ <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> + <parent> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> + <version>@project.parent.version@</version> + </parent> <groupId>org.apache.maven.skins.its</groupId> <artifactId>@project.artifactId@-mskins-31</artifactId> diff --git a/src/it/mskins-33/pom.xml b/src/it/mskins-33/pom.xml index 82f8944..fcadd46 100644 --- a/src/it/mskins-33/pom.xml +++ b/src/it/mskins-33/pom.xml @@ -19,8 +19,8 @@ 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> <parent> - <groupId>org.apache.maven</groupId> - <artifactId>maven-parent</artifactId> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> <version>@project.parent.version@</version> </parent> diff --git a/src/it/mskins-33_topbar/pom.xml b/src/it/mskins-33_topbar/pom.xml index 82f8944..fcadd46 100644 --- a/src/it/mskins-33_topbar/pom.xml +++ b/src/it/mskins-33_topbar/pom.xml @@ -19,8 +19,8 @@ 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> <parent> - <groupId>org.apache.maven</groupId> - <artifactId>maven-parent</artifactId> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> <version>@project.parent.version@</version> </parent> diff --git a/src/it/mskins-41/pom.xml b/src/it/mskins-41/pom.xml index 599d15e..a889442 100644 --- a/src/it/mskins-41/pom.xml +++ b/src/it/mskins-41/pom.xml @@ -18,6 +18,11 @@ <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> + <parent> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> + <version>@project.parent.version@</version> + </parent> <groupId>org.apache.maven.skins.its</groupId> <artifactId>mskins-41</artifactId> @@ -46,7 +51,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.4</version> + <version>3.0.0</version> <reportSets> <reportSet> <reports> diff --git a/src/it/mskins-47/pom.xml b/src/it/mskins-47/pom.xml index bc6dd9d..2cbb8be 100644 --- a/src/it/mskins-47/pom.xml +++ b/src/it/mskins-47/pom.xml @@ -18,6 +18,11 @@ <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> + <parent> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> + <version>@project.parent.version@</version> + </parent> <groupId>org.apache.maven.skins.its</groupId> <artifactId>@project.artifactId@-mskins-47</artifactId> diff --git a/src/it/mskins-72/pom.xml b/src/it/mskins-72/pom.xml index 0369ee7..d56cebc 100644 --- a/src/it/mskins-72/pom.xml +++ b/src/it/mskins-72/pom.xml @@ -19,8 +19,8 @@ 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> <parent> - <groupId>org.apache.maven</groupId> - <artifactId>maven-parent</artifactId> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> <version>@project.parent.version@</version> </parent> diff --git a/src/it/mskins-75/pom.xml b/src/it/mskins-75/pom.xml index f124651..2ebcc62 100644 --- a/src/it/mskins-75/pom.xml +++ b/src/it/mskins-75/pom.xml @@ -19,8 +19,8 @@ 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> <parent> - <groupId>org.apache.maven</groupId> - <artifactId>maven-parent</artifactId> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> <version>@project.parent.version@</version> </parent> diff --git a/src/it/mskins-76/pom.xml b/src/it/mskins-76/pom.xml index e2efb84..8946504 100644 --- a/src/it/mskins-76/pom.xml +++ b/src/it/mskins-76/pom.xml @@ -19,8 +19,8 @@ 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> <parent> - <groupId>org.apache.maven</groupId> - <artifactId>maven-parent</artifactId> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> <version>@project.parent.version@</version> </parent> diff --git a/src/it/mskins-76_topbar/pom.xml b/src/it/mskins-76_topbar/pom.xml index e2efb84..8946504 100644 --- a/src/it/mskins-76_topbar/pom.xml +++ b/src/it/mskins-76_topbar/pom.xml @@ -19,8 +19,8 @@ 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> <parent> - <groupId>org.apache.maven</groupId> - <artifactId>maven-parent</artifactId> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> <version>@project.parent.version@</version> </parent> diff --git a/src/it/mskins-85/pom.xml b/src/it/mskins-85/pom.xml index f49c20a..5073563 100644 --- a/src/it/mskins-85/pom.xml +++ b/src/it/mskins-85/pom.xml @@ -19,8 +19,8 @@ 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> <parent> - <groupId>org.apache.maven</groupId> - <artifactId>maven-parent</artifactId> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> <version>@project.parent.version@</version> </parent> diff --git a/src/it/mskins-85/src/site/site.xml b/src/it/mskins-85/src/site/site.xml index 6200d4a..4c274fb 100644 --- a/src/it/mskins-85/src/site/site.xml +++ b/src/it/mskins-85/src/site/site.xml @@ -34,7 +34,7 @@ <!-- START SNIPPET: skin-custom-config --> <custom> <fluidoSkin> - <!-- Cannot use multibyte chars due to https://jira.codehaus.org/browse/DOXIA-386 --> + <!-- Cannot use multibyte chars due to https://issues.apache.org/jira/browse/DOXIA-386 --> <breadcrumbDivider>»</breadcrumbDivider> </fluidoSkin> </custom> diff --git a/src/it/sidebar/pom.xml b/src/it/sidebar/pom.xml index ff61227..19c54d0 100644 --- a/src/it/sidebar/pom.xml +++ b/src/it/sidebar/pom.xml @@ -19,8 +19,8 @@ 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> <parent> - <groupId>org.apache.maven</groupId> - <artifactId>maven-parent</artifactId> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> <version>@project.parent.version@</version> </parent> @@ -66,7 +66,6 @@ <artifactId>maven-project-info-reports-plugin</artifactId> <configuration> <dependencyDetailsEnabled>false</dependencyDetailsEnabled> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> </configuration> </plugin> </plugins> diff --git a/src/it/sidebar/verify.groovy b/src/it/sidebar/verify.groovy index 4071b34..eec3ebf 100644 --- a/src/it/sidebar/verify.groovy +++ b/src/it/sidebar/verify.groovy @@ -26,6 +26,6 @@ String html = index.getText() assert html.contains( '<li class="active"><a href="#"><span class="none"></span>About</a>' ) // inactive menu assert html.contains( '<li><a href="summary.html" title="Summary"><span class="none"></span>Summary</a>' ) -assert html.contains( '<li><a href="https://maven.apache.org/plugins/index.html" class="externalLink" title="Plugins"><span class="none"></span>Plugins</a>' ) +assert html.contains( '<li><a href="plugins.html" title="Plugins"><span class="none"></span>Plugins</a></li>' ) // breadcrumb assert html.contains( '<li class=""><a href="https://www.apache.org/" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>' ) diff --git a/src/it/topbar-inverse/pom.xml b/src/it/topbar-inverse/pom.xml index 6189cfb..d24fd40 100644 --- a/src/it/topbar-inverse/pom.xml +++ b/src/it/topbar-inverse/pom.xml @@ -19,8 +19,8 @@ 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> <parent> - <groupId>org.apache.maven</groupId> - <artifactId>maven-parent</artifactId> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> <version>@project.parent.version@</version> </parent> @@ -66,7 +66,6 @@ <artifactId>maven-project-info-reports-plugin</artifactId> <configuration> <dependencyDetailsEnabled>false</dependencyDetailsEnabled> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> </configuration> </plugin> </plugins> diff --git a/src/it/topbar/pom.xml b/src/it/topbar/pom.xml index a362056..bf86dd6 100644 --- a/src/it/topbar/pom.xml +++ b/src/it/topbar/pom.xml @@ -19,8 +19,8 @@ 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> <parent> - <groupId>org.apache.maven</groupId> - <artifactId>maven-parent</artifactId> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-skins</artifactId> <version>@project.parent.version@</version> </parent> @@ -66,7 +66,6 @@ <artifactId>maven-project-info-reports-plugin</artifactId> <configuration> <dependencyDetailsEnabled>false</dependencyDetailsEnabled> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> </configuration> </plugin> </plugins> diff --git a/src/it/topbar/verify.groovy b/src/it/topbar/verify.groovy index 85f2843..68e808a 100644 --- a/src/it/topbar/verify.groovy +++ b/src/it/topbar/verify.groovy @@ -26,6 +26,6 @@ String html = index.getText() assert html.contains( '<li><a href="index.html" title="About">About</a></li>' ) // inactive menu assert html.contains( '<li><a href="summary.html" title="Summary">Summary</a></li>' ) -assert html.contains( '<li><a href="https://maven.apache.org/plugins/index.html" title="Plugins">Plugins</a></li>' ) +assert html.contains( '<li><a href="plugins.html" title="Plugins">Plugins</a></li>' ) // breadcrumb assert html.contains( '<li class=""><a href="https://www.apache.org/" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>' )