This is an automated email from the ASF dual-hosted git repository. sjaranowski pushed a commit to branch JXR-172 in repository https://gitbox.apache.org/repos/asf/maven-jxr.git
commit dca931ca4b0810c04f1472c1e480bccae2fe50ac Author: Slawomir Jaranowski <[email protected]> AuthorDate: Mon Jul 25 22:29:44 2022 +0200 [JXR-172] Upgrade Parent to 37, project cleanup - upgrade parent to 37 - remove configuration which override parent pom items - use the same version of plugins in project and IT tests - improvement assertions in IT tests --- .../src/it/JXR-100_parameterlink/verify.groovy | 3 +- maven-jxr-plugin/src/it/JXR-143_nofork/pom.xml | 18 ---------- .../src/it/JXR-143_nofork/verify.groovy | 29 +++++++-------- maven-jxr-plugin/src/it/aggregate/pom.xml | 4 +-- maven-jxr-plugin/src/it/aggregate/verify.groovy | 40 ++++++++++----------- .../src/it/mixed-plugin-report/pom.xml | 6 ++-- .../src/it/mixed-plugin-report/verify.groovy | 41 +++++++++++----------- maven-jxr-plugin/src/it/new-site-config/pom.xml | 2 +- .../src/it/new-site-config/verify.groovy | 29 +++++++-------- maven-jxr-plugin/src/it/settings.xml | 28 ++------------- .../src/it/simple-project/verify.groovy | 27 +++++++------- pom.xml | 19 +++++----- 12 files changed, 98 insertions(+), 148 deletions(-) diff --git a/maven-jxr-plugin/src/it/JXR-100_parameterlink/verify.groovy b/maven-jxr-plugin/src/it/JXR-100_parameterlink/verify.groovy index 064decc..e959133 100644 --- a/maven-jxr-plugin/src/it/JXR-100_parameterlink/verify.groovy +++ b/maven-jxr-plugin/src/it/JXR-100_parameterlink/verify.groovy @@ -1,4 +1,3 @@ - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -19,4 +18,4 @@ */ assert new File( basedir, 'target/site/xref/com/mycompany/app/Foo.html' ).exists() -assert 4 == new File( basedir, '/target/site/xref/com/mycompany/app/Foo.html' ).text.count('<a name="App" href="../../../com/mycompany/app/App.html#App">App</a>') +assert 4 == new File( basedir, '/target/site/xref/com/mycompany/app/Foo.html' ).text.count( '<a name="App" href="../../../com/mycompany/app/App.html#App">App</a>' ) diff --git a/maven-jxr-plugin/src/it/JXR-143_nofork/pom.xml b/maven-jxr-plugin/src/it/JXR-143_nofork/pom.xml index d84d314..ab70068 100644 --- a/maven-jxr-plugin/src/it/JXR-143_nofork/pom.xml +++ b/maven-jxr-plugin/src/it/JXR-143_nofork/pom.xml @@ -41,24 +41,6 @@ under the License. <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>3.1.0</version> - <executions> - <execution> - <goals> - <goal>enforce</goal> - </goals> - <phase>validate</phase> - <configuration> - <rules> - <AlwaysPass /> - </rules> - </configuration> - </execution> - </executions> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jxr-plugin</artifactId> diff --git a/maven-jxr-plugin/src/it/JXR-143_nofork/verify.groovy b/maven-jxr-plugin/src/it/JXR-143_nofork/verify.groovy index bb0cc6e..4098153 100644 --- a/maven-jxr-plugin/src/it/JXR-143_nofork/verify.groovy +++ b/maven-jxr-plugin/src/it/JXR-143_nofork/verify.groovy @@ -1,4 +1,3 @@ - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -17,24 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -assert new File( basedir, 'target/site' ).exists(); - -content = new File( basedir, 'target/site/project-reports.html' ).text; - -assert content.contains( 'xref/index.html' ); -assert content.contains( 'xref-test/index.html' ); +assert new File( basedir, 'target/site' ).exists() -assert new File( basedir, 'target/site/xref' ).exists(); -assert new File( basedir, 'target/site/xref/index.html' ).exists(); -assert new File( basedir, 'target/site/xref/org/apache/maven/jxr/it/App.html' ).exists(); +content = new File( basedir, 'target/site/project-reports.html' ).text -assert new File( basedir, 'target/site/xref-test' ).exists(); -assert new File( basedir, 'target/site/xref-test/index.html' ).exists(); -assert new File( basedir, 'target/site/xref-test/org/apache/maven/jxr/it/AppTest.html' ).exists(); +assert content.contains( 'xref/index.html' ) +assert content.contains( 'xref-test/index.html' ) -content = new File( basedir, 'target/site/xref/org/apache/maven/jxr/it/App.html' ).text; -assert content.contains( 'App2.html' ); +assert new File( basedir, 'target/site/xref' ).exists() +assert new File( basedir, 'target/site/xref/index.html' ).exists() +assert new File( basedir, 'target/site/xref/org/apache/maven/jxr/it/App.html' ).exists() -assert 1 == new File( basedir, 'build.log' ).text.count('Always pass!'); +assert new File( basedir, 'target/site/xref-test' ).exists() +assert new File( basedir, 'target/site/xref-test/index.html' ).exists() +assert new File( basedir, 'target/site/xref-test/org/apache/maven/jxr/it/AppTest.html' ).exists() -return true; \ No newline at end of file +content = new File( basedir, 'target/site/xref/org/apache/maven/jxr/it/App.html' ).text +assert content.contains( 'App2.html' ) diff --git a/maven-jxr-plugin/src/it/aggregate/pom.xml b/maven-jxr-plugin/src/it/aggregate/pom.xml index 48c2ec2..b0f5294 100644 --- a/maven-jxr-plugin/src/it/aggregate/pom.xml +++ b/maven-jxr-plugin/src/it/aggregate/pom.xml @@ -41,7 +41,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>${site-plugin-version}</version> + <version>@sitePluginVersion@</version> </plugin> </plugins> </build> @@ -72,7 +72,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>3.3.1</version> + <version>@javadocPluginVersion@</version> <reportSets> <reportSet> <id>aggregate</id> diff --git a/maven-jxr-plugin/src/it/aggregate/verify.groovy b/maven-jxr-plugin/src/it/aggregate/verify.groovy index 4136830..a44d397 100644 --- a/maven-jxr-plugin/src/it/aggregate/verify.groovy +++ b/maven-jxr-plugin/src/it/aggregate/verify.groovy @@ -1,4 +1,3 @@ - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -17,28 +16,29 @@ * specific language governing permissions and limitations * under the License. */ -assert new File( basedir, 'target/site' ).exists(); +assert new File( basedir, 'target/site' ).exists() + +content = new File( basedir, 'target/site/project-reports.html' ).text -content = new File( basedir, 'target/site/project-reports.html' ).text; +assert content.contains( 'xref/index.html' ) +assert content.contains( 'xref-test/index.html' ) -assert content.contains( 'xref/index.html' ); -assert content.contains( 'xref-test/index.html' ); +assert new File( basedir, 'target/site/xref' ).exists() +assert new File( basedir, 'target/site/xref/index.html' ).exists() +assert new File( basedir, 'target/site/xref/org/apache/maven/jxr/it/App.html' ).exists() +assert new File( basedir, 'target/site/xref/org/apache/maven/jxr/it2/App.html' ).exists() -assert new File( basedir, 'target/site/xref' ).exists(); -assert new File( basedir, 'target/site/xref/index.html' ).exists(); -assert new File( basedir, 'target/site/xref/org/apache/maven/jxr/it/App.html' ).exists(); -assert new File( basedir, 'target/site/xref/org/apache/maven/jxr/it2/App.html' ).exists(); +assert new File( basedir, 'target/site/xref-test' ).exists() +assert new File( basedir, 'target/site/xref-test/index.html' ).exists() +assert new File( basedir, 'target/site/xref-test/org/apache/maven/jxr/it/AppTest.html' ).exists() +assert new File( basedir, 'target/site/xref-test/org/apache/maven/jxr/it2/AppTest.html' ).exists() -assert new File( basedir, 'target/site/xref-test' ).exists(); -assert new File( basedir, 'target/site/xref-test/index.html' ).exists(); -assert new File( basedir, 'target/site/xref-test/org/apache/maven/jxr/it/AppTest.html' ).exists(); -assert new File( basedir, 'target/site/xref-test/org/apache/maven/jxr/it2/AppTest.html' ).exists(); +content = new File( basedir, 'target/site/xref/org/apache/maven/jxr/it/App.html' ).text +assert content.contains( 'App2.html' ) -content = new File( basedir, 'target/site/xref/org/apache/maven/jxr/it/App.html' ).text; -assert content.contains( 'App2.html' ); +content = new File( basedir, 'target/site/xref/org/apache/maven/jxr/it2/App.html' ).text +assert content.contains( 'App2.html' ) +content = new File( basedir, 'target/site/xref/index.html' ).text +assert content.contains( 'this is a JXR report set' ) -content = new File( basedir, 'target/site/xref/org/apache/maven/jxr/it2/App.html' ).text; -assert content.contains( 'App2.html' ); -content = new File( basedir, 'target/site/xref/index.html' ).text; -assert content.contains( 'this is a JXR report set' ); -return true; \ No newline at end of file +assert new File( basedir, 'target/site/apidocs/index.html' ).exists() diff --git a/maven-jxr-plugin/src/it/mixed-plugin-report/pom.xml b/maven-jxr-plugin/src/it/mixed-plugin-report/pom.xml index f5ac954..7b43f98 100644 --- a/maven-jxr-plugin/src/it/mixed-plugin-report/pom.xml +++ b/maven-jxr-plugin/src/it/mixed-plugin-report/pom.xml @@ -64,7 +64,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>3.3.1</version> + <version>@javadocPluginVersion@</version> <executions> <execution> <id>aggregate</id> @@ -79,7 +79,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>${site-plugin-version}</version> + <version>@sitePluginVersion@</version> </plugin> </plugins> </build> @@ -103,7 +103,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>3.3.1</version> + <version>@javadocPluginVersion@</version> </plugin> </plugins> </reporting> diff --git a/maven-jxr-plugin/src/it/mixed-plugin-report/verify.groovy b/maven-jxr-plugin/src/it/mixed-plugin-report/verify.groovy index f56bdcd..ba9eeea 100644 --- a/maven-jxr-plugin/src/it/mixed-plugin-report/verify.groovy +++ b/maven-jxr-plugin/src/it/mixed-plugin-report/verify.groovy @@ -1,4 +1,3 @@ - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -17,28 +16,30 @@ * specific language governing permissions and limitations * under the License. */ -assert new File( basedir, 'target/site' ).exists(); +assert new File( basedir, 'target/site' ).exists() + +content = new File( basedir, 'target/site/project-reports.html' ).text -content = new File( basedir, 'target/site/project-reports.html' ).text; +assert content.contains( 'xref/index.html' ) +assert content.contains( 'xref-test/index.html' ) -assert content.contains( 'xref/index.html' ); -assert content.contains( 'xref-test/index.html' ); +assert new File( basedir, 'target/site/xref' ).exists() +assert new File( basedir, 'target/site/xref/index.html' ).exists() +assert new File( basedir, 'target/site/xref/org/apache/maven/jxr/it/App.html' ).exists() +assert new File( basedir, 'target/site/xref/org/apache/maven/jxr/it2/App.html' ).exists() -assert new File( basedir, 'target/site/xref' ).exists(); -assert new File( basedir, 'target/site/xref/index.html' ).exists(); -assert new File( basedir, 'target/site/xref/org/apache/maven/jxr/it/App.html' ).exists(); -assert new File( basedir, 'target/site/xref/org/apache/maven/jxr/it2/App.html' ).exists(); +assert new File( basedir, 'target/site/xref-test' ).exists() +assert new File( basedir, 'target/site/xref-test/index.html' ).exists() +assert new File( basedir, 'target/site/xref-test/org/apache/maven/jxr/it/AppTest.html' ).exists() +assert new File( basedir, 'target/site/xref-test/org/apache/maven/jxr/it2/AppTest.html' ).exists() -assert new File( basedir, 'target/site/xref-test' ).exists(); -assert new File( basedir, 'target/site/xref-test/index.html' ).exists(); -assert new File( basedir, 'target/site/xref-test/org/apache/maven/jxr/it/AppTest.html' ).exists(); -assert new File( basedir, 'target/site/xref-test/org/apache/maven/jxr/it2/AppTest.html' ).exists(); +content = new File( basedir, 'target/site/xref/org/apache/maven/jxr/it/App.html' ).text +assert content.contains( 'App2.html' ) -content = new File( basedir, 'target/site/xref/org/apache/maven/jxr/it/App.html' ).text; -assert content.contains( 'App2.html' ); +content = new File( basedir, 'target/site/xref/org/apache/maven/jxr/it2/App.html' ).text +assert content.contains( 'App2.html' ) +content = new File( basedir, 'target/site/xref/index.html' ).text +assert content.contains( '<!-- this is a JXR report set (jdk4) -->' ) -content = new File( basedir, 'target/site/xref/org/apache/maven/jxr/it2/App.html' ).text; -assert content.contains( 'App2.html' ); -content = new File( basedir, 'target/site/xref/index.html' ).text; -assert content.contains( '<!-- this is a JXR report set (jdk4) -->' ); -return true; \ No newline at end of file +assert new File( basedir, 'target/site/apidocs/index.html' ).exists() +assert new File( basedir, 'target/site/testapidocs/index.html' ).exists() diff --git a/maven-jxr-plugin/src/it/new-site-config/pom.xml b/maven-jxr-plugin/src/it/new-site-config/pom.xml index be73b1e..20120c2 100644 --- a/maven-jxr-plugin/src/it/new-site-config/pom.xml +++ b/maven-jxr-plugin/src/it/new-site-config/pom.xml @@ -62,7 +62,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>3.3.1</version> + <version>@javadocPluginVersion@</version> </plugin> </plugins> </reporting> diff --git a/maven-jxr-plugin/src/it/new-site-config/verify.groovy b/maven-jxr-plugin/src/it/new-site-config/verify.groovy index 9eaba4e..c329d2b 100644 --- a/maven-jxr-plugin/src/it/new-site-config/verify.groovy +++ b/maven-jxr-plugin/src/it/new-site-config/verify.groovy @@ -16,23 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -assert new File( basedir, 'target/site' ).exists(); +assert new File( basedir, 'target/site' ).exists() -content = new File( basedir, 'target/site/project-reports.html' ).text; +content = new File( basedir, 'target/site/project-reports.html' ).text -assert content.contains( 'xref/index.html' ); -assert content.contains( 'xref-test/index.html' ); +assert content.contains( 'xref/index.html' ) +assert content.contains( 'xref-test/index.html' ) -assert new File( basedir, 'target/site/xref' ).exists(); -assert new File( basedir, 'target/site/xref/index.html' ).exists(); -assert new File( basedir, 'target/site/xref/org/apache/maven/jxr/it/App.html' ).exists(); +assert new File( basedir, 'target/site/xref' ).exists() +assert new File( basedir, 'target/site/xref/index.html' ).exists() +assert new File( basedir, 'target/site/xref/org/apache/maven/jxr/it/App.html' ).exists() -assert new File( basedir, 'target/site/xref-test' ).exists(); -assert new File( basedir, 'target/site/xref-test/index.html' ).exists(); -assert new File( basedir, 'target/site/xref-test/org/apache/maven/jxr/it/AppTest.html' ).exists(); +assert new File( basedir, 'target/site/xref-test' ).exists() +assert new File( basedir, 'target/site/xref-test/index.html' ).exists() +assert new File( basedir, 'target/site/xref-test/org/apache/maven/jxr/it/AppTest.html' ).exists() -content = new File( basedir, 'target/site/xref/org/apache/maven/jxr/it/App.html' ).text; -assert content.contains( 'App2.html' ); -assert content.contains( '<div id="overview"><a href="../../../../../../apidocs/org/apache/maven/jxr/it/App.html">View Javadoc</a></div>' ); +content = new File( basedir, 'target/site/xref/org/apache/maven/jxr/it/App.html' ).text +assert content.contains( 'App2.html' ) +assert content.contains( '<div id="overview"><a href="../../../../../../apidocs/org/apache/maven/jxr/it/App.html">View Javadoc</a></div>' ) -return true; \ No newline at end of file +assert new File( basedir, 'target/site/apidocs/index.html' ).exists() +assert new File( basedir, 'target/site/testapidocs/index.html' ).exists(); diff --git a/maven-jxr-plugin/src/it/settings.xml b/maven-jxr-plugin/src/it/settings.xml index 0e28627..543ff45 100644 --- a/maven-jxr-plugin/src/it/settings.xml +++ b/maven-jxr-plugin/src/it/settings.xml @@ -23,9 +23,6 @@ under the License. <profiles> <profile> <id>it-repo</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> <repositories> <repository> <id>local.central</id> @@ -37,17 +34,6 @@ under the License. <enabled>true</enabled> </snapshots> </repository> - <repository> - <id>apache.snapshots</id> - <name>Apache Snapshot Repository</name> - <url>http://repository.apache.org/content/groups/snapshots-group/</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> </repositories> <pluginRepositories> <pluginRepository> @@ -60,18 +46,10 @@ under the License. <enabled>true</enabled> </snapshots> </pluginRepository> - <pluginRepository> - <id>apache.snapshots</id> - <name>Apache Snapshot Repository</name> - <url>http://repository.apache.org/content/groups/snapshots/</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </pluginRepository> </pluginRepositories> </profile> </profiles> + <activeProfiles> + <activeProfile>it-repo</activeProfile> + </activeProfiles> </settings> diff --git a/maven-jxr-plugin/src/it/simple-project/verify.groovy b/maven-jxr-plugin/src/it/simple-project/verify.groovy index 0ef06fb..4ee41c8 100644 --- a/maven-jxr-plugin/src/it/simple-project/verify.groovy +++ b/maven-jxr-plugin/src/it/simple-project/verify.groovy @@ -1,4 +1,3 @@ - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -17,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -assert new File( basedir, 'target/site' ).exists(); +assert new File( basedir, 'target/site' ).exists() -content = new File( basedir, 'target/site/project-reports.html' ).text; +content = new File( basedir, 'target/site/project-reports.html' ).text -assert content.contains( 'xref/index.html' ); -assert content.contains( 'xref-test/index.html' ); +assert content.contains( 'xref/index.html' ) +assert content.contains( 'xref-test/index.html' ) -assert new File( basedir, 'target/site/xref' ).exists(); -assert new File( basedir, 'target/site/xref/index.html' ).exists(); -assert new File( basedir, 'target/site/xref/org/apache/maven/jxr/it/App.html' ).exists(); +assert new File( basedir, 'target/site/xref' ).exists() +assert new File( basedir, 'target/site/xref/index.html' ).exists() +assert new File( basedir, 'target/site/xref/org/apache/maven/jxr/it/App.html' ).exists() -assert new File( basedir, 'target/site/xref-test' ).exists(); -assert new File( basedir, 'target/site/xref-test/index.html' ).exists(); -assert new File( basedir, 'target/site/xref-test/org/apache/maven/jxr/it/AppTest.html' ).exists(); +assert new File( basedir, 'target/site/xref-test' ).exists() +assert new File( basedir, 'target/site/xref-test/index.html' ).exists() +assert new File( basedir, 'target/site/xref-test/org/apache/maven/jxr/it/AppTest.html' ).exists() -content = new File( basedir, 'target/site/xref/org/apache/maven/jxr/it/App.html' ).text; -assert content.contains( 'App2.html' ); +content = new File( basedir, 'target/site/xref/org/apache/maven/jxr/it/App.html' ).text +assert content.contains( 'App2.html' ) xrefPackageSummary = new File( basedir, 'target/site/xref/org/apache/maven/jxr/it/package-summary.html' ).text assert xrefPackageSummary.contains( 'App.html' ) @@ -44,5 +43,3 @@ testXrefPackageSummary = new File( basedir, 'target/site/xref-test/org/apache/ma assert !testXrefPackageSummary.contains( 'App.html' ) assert !testXrefPackageSummary.contains( 'App2.html' ) assert testXrefPackageSummary.contains( 'AppTest.html' ) - -return true; diff --git a/pom.xml b/pom.xml index e095ea8..5efc265 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ under the License. <parent> <groupId>org.apache.maven</groupId> <artifactId>maven-parent</artifactId> - <version>35</version> + <version>37</version> <relativePath /> </parent> @@ -65,6 +65,7 @@ under the License. <properties> <javaVersion>8</javaVersion> <sitePluginVersion>3.11.0</sitePluginVersion> + <javadocPluginVersion>3.4.0</javadocPluginVersion> <maven.site.path>jxr-archives/jxr-LATEST</maven.site.path> <checkstyle.violation.ignore>None</checkstyle.violation.ignore> <project.build.outputTimestamp>2022-03-15T19:02:53Z</project.build.outputTimestamp> @@ -138,22 +139,18 @@ under the License. <build> <pluginManagement> + <!-- use the same plugin version in project and in IT tests --> + <!-- additionally versions upgrade will be tracked --> <plugins> - <!-- TODO check with next parent --> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.10.1</version> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadocPluginVersion}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <version>3.16.0</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>taglist-maven-plugin</artifactId> - <version>3.0.0</version> + <artifactId>maven-site-plugin</artifactId> + <version>${sitePluginVersion}</version> </plugin> </plugins> </pluginManagement>
