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-javadoc-plugin.git
The following commit(s) were added to refs/heads/doxia-2.0.0 by this push: new 2651a609 dfadf 2651a609 is described below commit 2651a609a4528e91cb43c3bea92c1319e83e9f08 Author: Michael Osipov <micha...@apache.org> AuthorDate: Wed Nov 22 23:05:07 2023 +0100 dfadf --- pom.xml | 28 ++++- src/it/projects/MJAVADOC-110/pom.xml | 2 +- src/it/projects/MJAVADOC-126/pom.xml | 2 +- src/it/projects/MJAVADOC-137_jar/pom.xml | 2 +- src/it/projects/MJAVADOC-172/pom.xml | 2 +- src/it/projects/MJAVADOC-180/pom.xml | 4 +- src/it/projects/MJAVADOC-181/application/pom.xml | 4 +- src/it/projects/MJAVADOC-181/library/pom.xml | 4 +- src/it/projects/MJAVADOC-181/pom.xml | 4 +- src/it/projects/MJAVADOC-194/pom.xml | 4 +- src/it/projects/MJAVADOC-250/pom.xml | 2 +- src/it/projects/MJAVADOC-257/pom.xml | 6 +- src/it/projects/MJAVADOC-259/pom.xml | 4 +- src/it/projects/MJAVADOC-262/pom.xml | 2 +- src/it/projects/MJAVADOC-275/pom.xml | 3 +- src/it/projects/MJAVADOC-278/pom.xml | 4 +- src/it/projects/MJAVADOC-320/pom.xml | 2 +- src/it/projects/MJAVADOC-369/pom.xml | 6 +- src/it/projects/MJAVADOC-384/pom.xml | 2 +- src/it/projects/MJAVADOC-407/pom.xml | 4 +- src/it/projects/MJAVADOC-414/pom.xml | 2 +- src/it/projects/MJAVADOC-427/pom.xml | 2 +- src/it/projects/MJAVADOC-437/pom.xml | 2 +- src/it/projects/MJAVADOC-444/pom.xml | 6 +- .../MJAVADOC-449_aggr_modulepath/modulea/pom.xml | 22 ++-- .../MJAVADOC-449_aggr_modulepath/moduleb/pom.xml | 24 ++-- src/it/projects/MJAVADOC-497/pom.xml | 4 +- .../projects/MJAVADOC-498_aggr_modulepath/pom.xml | 2 +- src/it/projects/MJAVADOC-498_mm_modulepath/pom.xml | 2 +- src/it/projects/MJAVADOC-498_modulepath/pom.xml | 2 +- .../projects/MJAVADOC-506_excl-module-info/pom.xml | 6 +- src/it/projects/MJAVADOC-508/pom.xml | 2 +- .../javadoc-child/pom.xml | 36 +++--- .../projects/MJAVADOC-526_aggr-managedDeps/pom.xml | 22 ++-- src/it/projects/MJAVADOC-528/pom.xml | 2 +- .../MJAVADOC-555_aggr_mixed/module1/pom.xml | 14 +-- .../MJAVADOC-555_aggr_mixed/module2/pom.xml | 6 +- src/it/projects/MJAVADOC-555_aggr_mixed/pom.xml | 6 +- .../MJAVADOC-555_link-automatic-modules/pom.xml | 4 +- .../module/pom.xml | 4 +- src/it/projects/MJAVADOC-562_release/pom.xml | 2 +- .../MJAVADOC-567_aggr-mixed/module1/pom.xml | 14 +-- src/it/projects/MJAVADOC-567_aggr-mixed/pom.xml | 6 +- .../module1/pom.xml | 16 +-- .../module2/pom.xml | 130 ++++++++++----------- .../MJAVADOC-568_export-to-testcase/pom.xml | 4 +- .../MJAVADOC-568_jar-mixed/module2/pom.xml | 4 +- .../MJAVADOC-568_manifest-splitpackage/pom.xml | 12 +- .../MJAVADOC-569_aggr-mixed/module2/pom.xml | 8 +- src/it/projects/MJAVADOC-569_aggr-mixed/pom.xml | 4 +- .../module1/pom.xml | 16 +-- .../module2/pom.xml | 30 ++--- .../MJAVADOC-571_aggr-empty-sourcepaths/pom.xml | 60 +++++----- .../MJAVADOC-575_source8-module-info/pom.xml | 4 +- src/it/projects/MJAVADOC-580_detectLinks/pom.xml | 4 +- src/it/projects/MJAVADOC-591_release8/pom.xml | 6 +- src/it/projects/MJAVADOC-592_detectApiLink/pom.xml | 2 +- src/it/projects/MJAVADOC-610_mrjar/pom.xml | 4 +- src/it/projects/MJAVADOC-618_modular-war/pom.xml | 2 +- .../MJAVADOC-620_top-level-package/pom.xml | 4 +- src/it/projects/MJAVADOC-625_addstylesheet/pom.xml | 20 ++-- .../MJAVADOC-634-module-testreports/pom.xml | 2 +- .../modulea/pom.xml | 22 ++-- .../moduleb/pom.xml | 24 ++-- .../modulec/pom.xml | 24 ++-- .../projects/MJAVADOC-639_requires_ignored/pom.xml | 24 ++-- src/it/projects/MJAVADOC-661_mrjar/pom.xml | 4 +- .../MJAVADOC-677_require-static-transitive/pom.xml | 4 +- src/it/projects/MJAVADOC-679_encoding/pom.xml | 2 +- src/it/projects/MJAVADOC-704_toolchains/pom.xml | 2 +- src/it/projects/MJAVADOC-769/pom.xml | 2 +- src/it/projects/MJAVADOC-770/pom.xml | 2 +- .../additional-dependencies-non-aggregate/pom.xml | 4 +- src/it/projects/additional-dependencies/pom.xml | 4 +- .../MJAVADOC-280-1-distro/pom.xml | 2 +- src/it/projects/dependencySource-1/pom.xml | 8 +- .../MJAVADOC-280-2-distro/pom.xml | 2 +- .../MJAVADOC-280-2-projects/pom.xml | 10 +- src/it/projects/dependencySource-3/pom.xml | 2 +- .../MJAVADOC-280-4-distro/pom.xml | 2 +- .../MJAVADOC-280-4-projects/pom.xml | 12 +- src/it/projects/dependencySource-4/pom.xml | 2 +- src/it/projects/detectLinks/pom.xml | 2 +- src/it/projects/javadoc-fix/pom.xml | 4 +- src/it/projects/output-encoding/pom.xml | 2 +- src/it/projects/site-failOnError/pom.xml | 4 +- 86 files changed, 400 insertions(+), 385 deletions(-) diff --git a/pom.xml b/pom.xml index 0c404613..41d5858f 100644 --- a/pom.xml +++ b/pom.xml @@ -112,14 +112,20 @@ under the License. <properties> <javaVersion>8</javaVersion> <mavenVersion>3.2.5</mavenVersion> - <doxiaSitetoolsVersion>2.0.0-M13</doxiaSitetoolsVersion> + <doxiaSitetoolsVersion>2.0.0-M16</doxiaSitetoolsVersion> <wagonVersion>2.4</wagonVersion> <aetherVersion>1.0.0.v20140518</aetherVersion> <!-- https://cwiki.apache.org/confluence/x/VIHOCg#MavenEcosystemCleanup-ResolverandMaven --> <plexus-java.version>1.2.0</plexus-java.version> <jetty.version>9.4.51.v20230217</jetty.version> <!-- for ITs --> - <sitePluginVersion>4.0.0-M11</sitePluginVersion> + <sitePluginVersion>4.0.0-M12</sitePluginVersion> + <compilerPluginVersion>3.11.0</compilerPluginVersion> + <sourcePluginVersion>3.3.0</sourcePluginVersion> + <surefirePluginVersion>3.2.2</surefirePluginVersion> + <enforcerPluginVersion>3.4.1</enforcerPluginVersion> + <pluginPluginVersion>3.10.1</pluginPluginVersion> + <jarPluginVersion>3.3.0</jarPluginVersion> <projectInfoReportsPluginVersion>4.0.0-M1-SNAPSHOT</projectInfoReportsPluginVersion> <project.build.outputTimestamp>2023-11-03T20:32:23Z</project.build.outputTimestamp> <slf4jVersion>1.7.36</slf4jVersion> @@ -214,7 +220,7 @@ under the License. <dependency> <groupId>org.apache.maven.reporting</groupId> <artifactId>maven-reporting-impl</artifactId> - <version>4.0.0-M11</version> + <version>4.0.0-M12</version> <scope>provided</scope> </dependency> <dependency> @@ -301,7 +307,10 @@ under the License. <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>3.5.1</version> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-xml</artifactId> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> @@ -311,12 +320,13 @@ under the License. <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-archiver</artifactId> - <version>4.8.0</version> + <version>4.9.0</version> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.13.0</version> + <version>2.14.0</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> @@ -412,6 +422,12 @@ under the License. <version>3.24.2</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4jVersion}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> diff --git a/src/it/projects/MJAVADOC-110/pom.xml b/src/it/projects/MJAVADOC-110/pom.xml index c9653e42..4ed8adf3 100644 --- a/src/it/projects/MJAVADOC-110/pom.xml +++ b/src/it/projects/MJAVADOC-110/pom.xml @@ -41,7 +41,7 @@ <plugins> <plugin> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> </plugin> <plugin> <artifactId>maven-site-plugin</artifactId> diff --git a/src/it/projects/MJAVADOC-126/pom.xml b/src/it/projects/MJAVADOC-126/pom.xml index 8493c182..fccd5068 100644 --- a/src/it/projects/MJAVADOC-126/pom.xml +++ b/src/it/projects/MJAVADOC-126/pom.xml @@ -44,7 +44,7 @@ <plugins> <plugin> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> </plugin> </plugins> </pluginManagement> diff --git a/src/it/projects/MJAVADOC-137_jar/pom.xml b/src/it/projects/MJAVADOC-137_jar/pom.xml index 73c5ca9a..76286ddc 100644 --- a/src/it/projects/MJAVADOC-137_jar/pom.xml +++ b/src/it/projects/MJAVADOC-137_jar/pom.xml @@ -44,7 +44,7 @@ <plugins> <plugin> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> </plugin> <plugin> <artifactId>maven-site-plugin</artifactId> diff --git a/src/it/projects/MJAVADOC-172/pom.xml b/src/it/projects/MJAVADOC-172/pom.xml index 9fdf871b..10a8d778 100644 --- a/src/it/projects/MJAVADOC-172/pom.xml +++ b/src/it/projects/MJAVADOC-172/pom.xml @@ -43,7 +43,7 @@ <plugins> <plugin> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> </plugin> <plugin> <artifactId>maven-site-plugin</artifactId> diff --git a/src/it/projects/MJAVADOC-180/pom.xml b/src/it/projects/MJAVADOC-180/pom.xml index 73563ba7..a414ec97 100644 --- a/src/it/projects/MJAVADOC-180/pom.xml +++ b/src/it/projects/MJAVADOC-180/pom.xml @@ -51,7 +51,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> + <version>@compilerPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -62,7 +62,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> <version>@projectInfoReportsPluginVersion@</version> - </plugin> + </plugin> </plugins> </build> diff --git a/src/it/projects/MJAVADOC-181/application/pom.xml b/src/it/projects/MJAVADOC-181/application/pom.xml index 571a4515..55843e25 100644 --- a/src/it/projects/MJAVADOC-181/application/pom.xml +++ b/src/it/projects/MJAVADOC-181/application/pom.xml @@ -37,7 +37,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> <configuration> <groups> <group> @@ -45,7 +45,7 @@ <packages>app</packages> </group> </groups> - </configuration> + </configuration> </plugin> </plugins> </reporting> diff --git a/src/it/projects/MJAVADOC-181/library/pom.xml b/src/it/projects/MJAVADOC-181/library/pom.xml index f318b4e5..4361baa5 100644 --- a/src/it/projects/MJAVADOC-181/library/pom.xml +++ b/src/it/projects/MJAVADOC-181/library/pom.xml @@ -42,7 +42,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> <configuration> <aggregate>true</aggregate> <groups> @@ -55,7 +55,7 @@ <packages>bbb</packages> </group> </groups> - </configuration> + </configuration> </plugin> </plugins> </reporting> diff --git a/src/it/projects/MJAVADOC-181/pom.xml b/src/it/projects/MJAVADOC-181/pom.xml index 5ec477f8..ca2bc650 100644 --- a/src/it/projects/MJAVADOC-181/pom.xml +++ b/src/it/projects/MJAVADOC-181/pom.xml @@ -48,7 +48,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> </plugin> </plugins> </pluginManagement> @@ -60,7 +60,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> <reportSets> <reportSet> <configuration> diff --git a/src/it/projects/MJAVADOC-194/pom.xml b/src/it/projects/MJAVADOC-194/pom.xml index 83d0b324..86dd0de6 100644 --- a/src/it/projects/MJAVADOC-194/pom.xml +++ b/src/it/projects/MJAVADOC-194/pom.xml @@ -48,7 +48,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.0</version> + <version>3.4.0</version> <executions> <execution> <id>add-source</id> @@ -70,7 +70,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> <executions> <execution> <id>buildJavadoc</id> diff --git a/src/it/projects/MJAVADOC-250/pom.xml b/src/it/projects/MJAVADOC-250/pom.xml index 1992ed7f..998f5f1b 100644 --- a/src/it/projects/MJAVADOC-250/pom.xml +++ b/src/it/projects/MJAVADOC-250/pom.xml @@ -38,7 +38,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> <configuration> <force>true</force> </configuration> diff --git a/src/it/projects/MJAVADOC-257/pom.xml b/src/it/projects/MJAVADOC-257/pom.xml index e188ed8f..73cedeeb 100644 --- a/src/it/projects/MJAVADOC-257/pom.xml +++ b/src/it/projects/MJAVADOC-257/pom.xml @@ -52,12 +52,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> - <version>2.5</version> + <version>@pluginPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -79,7 +79,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> <configuration> <tagletArtifacts> <tagletArtifact> diff --git a/src/it/projects/MJAVADOC-259/pom.xml b/src/it/projects/MJAVADOC-259/pom.xml index f1248b39..efbc2842 100644 --- a/src/it/projects/MJAVADOC-259/pom.xml +++ b/src/it/projects/MJAVADOC-259/pom.xml @@ -51,7 +51,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -68,7 +68,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> <configuration> <stylesheetfile>${basedir}/src/main/javadoc/stylesheet.css</stylesheetfile> <docfilessubdirs>true</docfilessubdirs> diff --git a/src/it/projects/MJAVADOC-262/pom.xml b/src/it/projects/MJAVADOC-262/pom.xml index 2e1d6ca3..b467c903 100644 --- a/src/it/projects/MJAVADOC-262/pom.xml +++ b/src/it/projects/MJAVADOC-262/pom.xml @@ -48,7 +48,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> <configuration> <sourcepath>${basedir}/src/main/java${wrongPathSeparator}${basedir}/src/test/java${wrongPathSeparator}${basedir}/src/main/javadoc</sourcepath> </configuration> diff --git a/src/it/projects/MJAVADOC-275/pom.xml b/src/it/projects/MJAVADOC-275/pom.xml index 54cae562..252ffd7b 100644 --- a/src/it/projects/MJAVADOC-275/pom.xml +++ b/src/it/projects/MJAVADOC-275/pom.xml @@ -52,8 +52,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> - <!-- <version>2.6.1</version> --> + <version>@project.version@</version> <executions> <execution> <id>attach</id> diff --git a/src/it/projects/MJAVADOC-278/pom.xml b/src/it/projects/MJAVADOC-278/pom.xml index cc8a2205..96095a1f 100644 --- a/src/it/projects/MJAVADOC-278/pom.xml +++ b/src/it/projects/MJAVADOC-278/pom.xml @@ -51,7 +51,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> <configuration> <javadocDirectory>${basedir}/src/main/javadoc2</javadocDirectory> <stylesheetfile>${basedir}/src/main/javadoc/stylesheet.css</stylesheetfile> @@ -73,7 +73,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> <configuration> <javadocDirectory>${basedir}/src/main/javadoc2</javadocDirectory> <stylesheetfile>${basedir}/src/main/javadoc/stylesheet.css</stylesheetfile> diff --git a/src/it/projects/MJAVADOC-320/pom.xml b/src/it/projects/MJAVADOC-320/pom.xml index 80af454d..eaee04dd 100644 --- a/src/it/projects/MJAVADOC-320/pom.xml +++ b/src/it/projects/MJAVADOC-320/pom.xml @@ -47,7 +47,7 @@ <plugins> <plugin> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> </plugin> </plugins> </pluginManagement> diff --git a/src/it/projects/MJAVADOC-369/pom.xml b/src/it/projects/MJAVADOC-369/pom.xml index 0504d2f9..33776f90 100644 --- a/src/it/projects/MJAVADOC-369/pom.xml +++ b/src/it/projects/MJAVADOC-369/pom.xml @@ -50,7 +50,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>1.3.1</version> + <version>@enforcerPluginVersion@</version> <executions> <execution> <id>default-enforce</id> @@ -72,7 +72,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -89,7 +89,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> <reportSets> <reportSet> <reports> diff --git a/src/it/projects/MJAVADOC-384/pom.xml b/src/it/projects/MJAVADOC-384/pom.xml index 1ee0f3fa..e45168b2 100644 --- a/src/it/projects/MJAVADOC-384/pom.xml +++ b/src/it/projects/MJAVADOC-384/pom.xml @@ -36,7 +36,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>@compilerPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/src/it/projects/MJAVADOC-407/pom.xml b/src/it/projects/MJAVADOC-407/pom.xml index 289fad04..04acf620 100644 --- a/src/it/projects/MJAVADOC-407/pom.xml +++ b/src/it/projects/MJAVADOC-407/pom.xml @@ -36,12 +36,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>@compilerPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> <configuration> <quiet>true</quiet> <links> diff --git a/src/it/projects/MJAVADOC-414/pom.xml b/src/it/projects/MJAVADOC-414/pom.xml index b49de226..5d529717 100644 --- a/src/it/projects/MJAVADOC-414/pom.xml +++ b/src/it/projects/MJAVADOC-414/pom.xml @@ -48,7 +48,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> </plugin> </plugins> </pluginManagement> diff --git a/src/it/projects/MJAVADOC-427/pom.xml b/src/it/projects/MJAVADOC-427/pom.xml index bf7a406d..b24bef79 100644 --- a/src/it/projects/MJAVADOC-427/pom.xml +++ b/src/it/projects/MJAVADOC-427/pom.xml @@ -49,7 +49,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> <configuration> <detectLinks>true</detectLinks> </configuration> diff --git a/src/it/projects/MJAVADOC-437/pom.xml b/src/it/projects/MJAVADOC-437/pom.xml index cff09672..8e35d3b8 100644 --- a/src/it/projects/MJAVADOC-437/pom.xml +++ b/src/it/projects/MJAVADOC-437/pom.xml @@ -45,7 +45,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> </plugin> </plugins> </pluginManagement> diff --git a/src/it/projects/MJAVADOC-444/pom.xml b/src/it/projects/MJAVADOC-444/pom.xml index 9f073a8f..d4560ed4 100644 --- a/src/it/projects/MJAVADOC-444/pom.xml +++ b/src/it/projects/MJAVADOC-444/pom.xml @@ -46,7 +46,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>1.3.1</version> + <version>@enforcerPluginVersion@</version> <executions> <execution> <id>default-enforce</id> @@ -68,7 +68,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -85,7 +85,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> <reportSets> <reportSet> <reports> diff --git a/src/it/projects/MJAVADOC-449_aggr_modulepath/modulea/pom.xml b/src/it/projects/MJAVADOC-449_aggr_modulepath/modulea/pom.xml index aa6921bc..d08cdf7e 100644 --- a/src/it/projects/MJAVADOC-449_aggr_modulepath/modulea/pom.xml +++ b/src/it/projects/MJAVADOC-449_aggr_modulepath/modulea/pom.xml @@ -1,13 +1,13 @@ -<!-- ~ 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 +<!-- ~ 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. --> <project xmlns="http://maven.apache.org/POM/4.0.0" @@ -22,7 +22,7 @@ <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>@compilerPluginVersion@</version> <configuration> <release>9</release> </configuration> diff --git a/src/it/projects/MJAVADOC-449_aggr_modulepath/moduleb/pom.xml b/src/it/projects/MJAVADOC-449_aggr_modulepath/moduleb/pom.xml index c4a75571..3eb6ae91 100644 --- a/src/it/projects/MJAVADOC-449_aggr_modulepath/moduleb/pom.xml +++ b/src/it/projects/MJAVADOC-449_aggr_modulepath/moduleb/pom.xml @@ -1,15 +1,15 @@ -<!-- ~ 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 +<!-- ~ 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. --> - + <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"> @@ -22,7 +22,7 @@ <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>@compilerPluginVersion@</version> <configuration> <release>9</release> </configuration> diff --git a/src/it/projects/MJAVADOC-497/pom.xml b/src/it/projects/MJAVADOC-497/pom.xml index 1b186344..c25fd368 100644 --- a/src/it/projects/MJAVADOC-497/pom.xml +++ b/src/it/projects/MJAVADOC-497/pom.xml @@ -43,7 +43,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.1</version> + <version>@compilerPluginVersion@</version> <configuration> <source>@maven.compiler.source@</source> <target>@maven.compiler.target@</target> @@ -52,7 +52,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> <configuration> <subpackages>com.example.foo</subpackages> <excludePackageNames>**.impl</excludePackageNames> diff --git a/src/it/projects/MJAVADOC-498_aggr_modulepath/pom.xml b/src/it/projects/MJAVADOC-498_aggr_modulepath/pom.xml index aa3813cd..f7176e66 100644 --- a/src/it/projects/MJAVADOC-498_aggr_modulepath/pom.xml +++ b/src/it/projects/MJAVADOC-498_aggr_modulepath/pom.xml @@ -44,7 +44,7 @@ <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>3.7.0</version> + <version>@compilerPluginVersion@</version> <configuration> <release>9</release> </configuration> diff --git a/src/it/projects/MJAVADOC-498_mm_modulepath/pom.xml b/src/it/projects/MJAVADOC-498_mm_modulepath/pom.xml index 9b044f70..94ab3320 100644 --- a/src/it/projects/MJAVADOC-498_mm_modulepath/pom.xml +++ b/src/it/projects/MJAVADOC-498_mm_modulepath/pom.xml @@ -43,7 +43,7 @@ <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>3.7.0</version> + <version>@compilerPluginVersion@</version> <configuration> <release>9</release> </configuration> diff --git a/src/it/projects/MJAVADOC-498_modulepath/pom.xml b/src/it/projects/MJAVADOC-498_modulepath/pom.xml index ed338a0f..9191a06d 100644 --- a/src/it/projects/MJAVADOC-498_modulepath/pom.xml +++ b/src/it/projects/MJAVADOC-498_modulepath/pom.xml @@ -52,7 +52,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.7.0</version> + <version>@compilerPluginVersion@</version> <configuration> <release>9</release> </configuration> diff --git a/src/it/projects/MJAVADOC-506_excl-module-info/pom.xml b/src/it/projects/MJAVADOC-506_excl-module-info/pom.xml index df1f5502..1b00a7bb 100644 --- a/src/it/projects/MJAVADOC-506_excl-module-info/pom.xml +++ b/src/it/projects/MJAVADOC-506_excl-module-info/pom.xml @@ -46,7 +46,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>@compilerPluginVersion@</version> <configuration> <excludes> <exclude>module-info.java</exclude> @@ -62,13 +62,13 @@ <executions> <execution> <goals> - <goal>jar</goal> + <goal>jar</goal> </goals> </execution> </executions> <configuration> <sourceFileExcludes> - <exclude>module-info.java</exclude> + <exclude>module-info.java</exclude> </sourceFileExcludes> </configuration> </plugin> diff --git a/src/it/projects/MJAVADOC-508/pom.xml b/src/it/projects/MJAVADOC-508/pom.xml index 1232a961..45673cae 100644 --- a/src/it/projects/MJAVADOC-508/pom.xml +++ b/src/it/projects/MJAVADOC-508/pom.xml @@ -36,7 +36,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> <configuration> <failOnWarnings>true</failOnWarnings> <serialwarn>true</serialwarn> diff --git a/src/it/projects/MJAVADOC-526_aggr-managedDeps/javadoc-child/pom.xml b/src/it/projects/MJAVADOC-526_aggr-managedDeps/javadoc-child/pom.xml index 8f9a3112..942db704 100644 --- a/src/it/projects/MJAVADOC-526_aggr-managedDeps/javadoc-child/pom.xml +++ b/src/it/projects/MJAVADOC-526_aggr-managedDeps/javadoc-child/pom.xml @@ -28,27 +28,27 @@ <artifactId>javadoc-parent</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - + <artifactId>javadoc-child</artifactId> <dependencies> - <dependency> - <groupId>org.springframework.security</groupId> - <artifactId>spring-security-acl</artifactId> - <version>5.5.8</version> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.springframework.security</groupId> + <artifactId>spring-security-acl</artifactId> + <version>5.5.8</version> + <scope>runtime</scope> + </dependency> </dependencies> - + <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.springframework.security</groupId> - <artifactId>spring-security-core</artifactId> - <version>5.5.8</version> - <!-- Overriding the runtime scope --> - <scope>compile</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.springframework.security</groupId> + <artifactId>spring-security-core</artifactId> + <version>5.5.8</version> + <!-- Overriding the runtime scope --> + <scope>compile</scope> + </dependency> + </dependencies> </dependencyManagement> -</project> \ No newline at end of file +</project> diff --git a/src/it/projects/MJAVADOC-526_aggr-managedDeps/pom.xml b/src/it/projects/MJAVADOC-526_aggr-managedDeps/pom.xml index a29bfda2..74616c42 100644 --- a/src/it/projects/MJAVADOC-526_aggr-managedDeps/pom.xml +++ b/src/it/projects/MJAVADOC-526_aggr-managedDeps/pom.xml @@ -27,7 +27,7 @@ <artifactId>javadoc-parent</artifactId> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> - + <url>https://issues.apache.org/jira/browse/MJAVADOC-526</url> <properties> @@ -37,18 +37,18 @@ </properties> <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>@project.version@</version> - </plugin> - </plugins> - </pluginManagement> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>@project.version@</version> + </plugin> + </plugins> + </pluginManagement> </build> <modules> <module>javadoc-child</module> </modules> -</project> \ No newline at end of file +</project> diff --git a/src/it/projects/MJAVADOC-528/pom.xml b/src/it/projects/MJAVADOC-528/pom.xml index 6ee37129..15238307 100644 --- a/src/it/projects/MJAVADOC-528/pom.xml +++ b/src/it/projects/MJAVADOC-528/pom.xml @@ -36,7 +36,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> <configuration> <detectLinks>true</detectLinks> </configuration> diff --git a/src/it/projects/MJAVADOC-555_aggr_mixed/module1/pom.xml b/src/it/projects/MJAVADOC-555_aggr_mixed/module1/pom.xml index 288012bf..1185a358 100644 --- a/src/it/projects/MJAVADOC-555_aggr_mixed/module1/pom.xml +++ b/src/it/projects/MJAVADOC-555_aggr_mixed/module1/pom.xml @@ -23,10 +23,10 @@ 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> - <artifactId>javadoc-maven-report-exception</artifactId> - <groupId>testcase</groupId> - <version>1.0-SNAPSHOT</version> - </parent> - <artifactId>module1</artifactId> -</project> \ No newline at end of file + <parent> + <artifactId>javadoc-maven-report-exception</artifactId> + <groupId>testcase</groupId> + <version>1.0-SNAPSHOT</version> + </parent> + <artifactId>module1</artifactId> +</project> diff --git a/src/it/projects/MJAVADOC-555_aggr_mixed/module2/pom.xml b/src/it/projects/MJAVADOC-555_aggr_mixed/module2/pom.xml index bc44c239..b8b59857 100644 --- a/src/it/projects/MJAVADOC-555_aggr_mixed/module2/pom.xml +++ b/src/it/projects/MJAVADOC-555_aggr_mixed/module2/pom.xml @@ -29,14 +29,14 @@ <version>1.0-SNAPSHOT</version> </parent> <artifactId>module2</artifactId> - + <build> <pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.3.2</version> + <version>@jarPluginVersion@</version> <configuration> <archive> <manifestEntries> @@ -49,4 +49,4 @@ </pluginManagement> </build> -</project> \ No newline at end of file +</project> diff --git a/src/it/projects/MJAVADOC-555_aggr_mixed/pom.xml b/src/it/projects/MJAVADOC-555_aggr_mixed/pom.xml index c8819148..6d792f65 100644 --- a/src/it/projects/MJAVADOC-555_aggr_mixed/pom.xml +++ b/src/it/projects/MJAVADOC-555_aggr_mixed/pom.xml @@ -28,7 +28,7 @@ <groupId>testcase</groupId> <version>1.0-SNAPSHOT</version> <packaging>pom</packaging> - + <url>https://issues.apache.org/jira/browse/MJAVADOC-555</url> <properties> @@ -40,7 +40,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>@compilerPluginVersion@</version> <configuration> <release>9</release> </configuration> @@ -66,4 +66,4 @@ <module>module2</module> </modules> -</project> \ No newline at end of file +</project> diff --git a/src/it/projects/MJAVADOC-555_link-automatic-modules/pom.xml b/src/it/projects/MJAVADOC-555_link-automatic-modules/pom.xml index efadc3c7..0d6f5857 100644 --- a/src/it/projects/MJAVADOC-555_link-automatic-modules/pom.xml +++ b/src/it/projects/MJAVADOC-555_link-automatic-modules/pom.xml @@ -29,7 +29,7 @@ <version>1.0-SNAPSHOT</version> <url>https://issues.apache.org/jira/browse/MJAVADOC-555</url> - + <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <guava.version>32.0.0-jre</guava.version> @@ -40,7 +40,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>@compilerPluginVersion@</version> <configuration> <release>9</release> </configuration> diff --git a/src/it/projects/MJAVADOC-556_hide-non-exported-packages/module/pom.xml b/src/it/projects/MJAVADOC-556_hide-non-exported-packages/module/pom.xml index 5435eea6..4e135fcd 100644 --- a/src/it/projects/MJAVADOC-556_hide-non-exported-packages/module/pom.xml +++ b/src/it/projects/MJAVADOC-556_hide-non-exported-packages/module/pom.xml @@ -33,11 +33,11 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>@compilerPluginVersion@</version> <configuration> <release>9</release> </configuration> </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/src/it/projects/MJAVADOC-562_release/pom.xml b/src/it/projects/MJAVADOC-562_release/pom.xml index 1e43fa82..da5d91aa 100644 --- a/src/it/projects/MJAVADOC-562_release/pom.xml +++ b/src/it/projects/MJAVADOC-562_release/pom.xml @@ -39,7 +39,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>@compilerPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/src/it/projects/MJAVADOC-567_aggr-mixed/module1/pom.xml b/src/it/projects/MJAVADOC-567_aggr-mixed/module1/pom.xml index 288012bf..1185a358 100644 --- a/src/it/projects/MJAVADOC-567_aggr-mixed/module1/pom.xml +++ b/src/it/projects/MJAVADOC-567_aggr-mixed/module1/pom.xml @@ -23,10 +23,10 @@ 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> - <artifactId>javadoc-maven-report-exception</artifactId> - <groupId>testcase</groupId> - <version>1.0-SNAPSHOT</version> - </parent> - <artifactId>module1</artifactId> -</project> \ No newline at end of file + <parent> + <artifactId>javadoc-maven-report-exception</artifactId> + <groupId>testcase</groupId> + <version>1.0-SNAPSHOT</version> + </parent> + <artifactId>module1</artifactId> +</project> diff --git a/src/it/projects/MJAVADOC-567_aggr-mixed/pom.xml b/src/it/projects/MJAVADOC-567_aggr-mixed/pom.xml index 9b4797b3..e35790dd 100644 --- a/src/it/projects/MJAVADOC-567_aggr-mixed/pom.xml +++ b/src/it/projects/MJAVADOC-567_aggr-mixed/pom.xml @@ -28,7 +28,7 @@ <groupId>testcase</groupId> <version>1.0-SNAPSHOT</version> <packaging>pom</packaging> - + <url>https://issues.apache.org/jira/browse/MJAVADOC-567</url> <properties> @@ -40,7 +40,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>@compilerPluginVersion@</version> <configuration> <release>9</release> </configuration> @@ -66,4 +66,4 @@ <module>module2</module> </modules> -</project> \ No newline at end of file +</project> diff --git a/src/it/projects/MJAVADOC-568_export-to-testcase/module1/pom.xml b/src/it/projects/MJAVADOC-568_export-to-testcase/module1/pom.xml index 44b98b05..47acd83f 100644 --- a/src/it/projects/MJAVADOC-568_export-to-testcase/module1/pom.xml +++ b/src/it/projects/MJAVADOC-568_export-to-testcase/module1/pom.xml @@ -22,12 +22,12 @@ <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>testcase</groupId> - <artifactId>root</artifactId> - <version>1.0-SNAPSHOT</version> - </parent> - <artifactId>mjavadoc569.module1</artifactId> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>testcase</groupId> + <artifactId>root</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + <artifactId>mjavadoc569.module1</artifactId> -</project> \ No newline at end of file +</project> diff --git a/src/it/projects/MJAVADOC-568_export-to-testcase/module2/pom.xml b/src/it/projects/MJAVADOC-568_export-to-testcase/module2/pom.xml index 124211b1..3c72f577 100644 --- a/src/it/projects/MJAVADOC-568_export-to-testcase/module2/pom.xml +++ b/src/it/projects/MJAVADOC-568_export-to-testcase/module2/pom.xml @@ -22,70 +22,70 @@ <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>testcase</groupId> - <artifactId>root</artifactId> - <version>1.0-SNAPSHOT</version> - </parent> - <artifactId>mjavadoc569.module2</artifactId> -<!-- <packaging>maven-plugin</packaging> --> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>testcase</groupId> + <artifactId>root</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + <artifactId>mjavadoc569.module2</artifactId> +<!-- <packaging>maven-plugin</packaging> --> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestEntries> - <Automatic-Module-Name>mjavadoc569.module2</Automatic-Module-Name> - </manifestEntries> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-plugin-plugin</artifactId> - <version>3.6.0</version> - <executions> - <execution> - <id>default-descriptor</id> - <phase>process-classes</phase> - </execution> -<!-- <execution> --> -<!-- <id>help-descriptor</id> --> -<!-- <goals> --> -<!-- <goal>helpmojo</goal> --> -<!-- </goals> --> -<!-- </execution> --> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <id>default-jar</id> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <show>public</show> - <doctitle>My custom title</doctitle> - <windowtitle>My custom title</windowtitle> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifestEntries> + <Automatic-Module-Name>mjavadoc569.module2</Automatic-Module-Name> + </manifestEntries> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> + <version>@pluginPluginVersion@</version> + <executions> + <execution> + <id>default-descriptor</id> + <phase>process-classes</phase> + </execution> +<!-- <execution> --> +<!-- <id>help-descriptor</id> --> +<!-- <goals> --> +<!-- <goal>helpmojo</goal> --> +<!-- </goals> --> +<!-- </execution> --> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>default-jar</id> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <show>public</show> + <doctitle>My custom title</doctitle> + <windowtitle>My custom title</windowtitle> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>mjavadoc569.module1</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> -</project> \ No newline at end of file + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>mjavadoc569.module1</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> +</project> diff --git a/src/it/projects/MJAVADOC-568_export-to-testcase/pom.xml b/src/it/projects/MJAVADOC-568_export-to-testcase/pom.xml index 5c7b67e8..b5545bd6 100644 --- a/src/it/projects/MJAVADOC-568_export-to-testcase/pom.xml +++ b/src/it/projects/MJAVADOC-568_export-to-testcase/pom.xml @@ -40,7 +40,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>@compilerPluginVersion@</version> <configuration> <release>9</release> </configuration> @@ -75,4 +75,4 @@ <module>module2</module> </modules> -</project> \ No newline at end of file +</project> diff --git a/src/it/projects/MJAVADOC-568_jar-mixed/module2/pom.xml b/src/it/projects/MJAVADOC-568_jar-mixed/module2/pom.xml index f3f619f5..411198a3 100644 --- a/src/it/projects/MJAVADOC-568_jar-mixed/module2/pom.xml +++ b/src/it/projects/MJAVADOC-568_jar-mixed/module2/pom.xml @@ -35,7 +35,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.3.2</version> + <version>@jarPluginVersion@</version> <configuration> <archive> <manifestEntries> @@ -66,4 +66,4 @@ <version>1.0-SNAPSHOT</version> </dependency> </dependencies> -</project> \ No newline at end of file +</project> diff --git a/src/it/projects/MJAVADOC-568_manifest-splitpackage/pom.xml b/src/it/projects/MJAVADOC-568_manifest-splitpackage/pom.xml index 52c4a707..76a9991b 100644 --- a/src/it/projects/MJAVADOC-568_manifest-splitpackage/pom.xml +++ b/src/it/projects/MJAVADOC-568_manifest-splitpackage/pom.xml @@ -23,27 +23,27 @@ 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>org.apache.maven.plugins.javadoc.it</groupId> <artifactId>mjavadoc568</artifactId> <packaging>pom</packaging> <version>1.0-SNAPSHOT</version> - + <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> - + <build> <pluginManagement> <plugins> <plugin> <artifactId>maven-jar-plugin</artifactId> - <version>3.1.0</version> + <version>@jarPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>@compilerPluginVersion@</version> <configuration> <release>9</release> </configuration> @@ -73,4 +73,4 @@ <module>java-module</module> <module>mojo</module> </modules> -</project> \ No newline at end of file +</project> diff --git a/src/it/projects/MJAVADOC-569_aggr-mixed/module2/pom.xml b/src/it/projects/MJAVADOC-569_aggr-mixed/module2/pom.xml index 4e1da29a..c9d0b20c 100644 --- a/src/it/projects/MJAVADOC-569_aggr-mixed/module2/pom.xml +++ b/src/it/projects/MJAVADOC-569_aggr-mixed/module2/pom.xml @@ -30,14 +30,14 @@ </parent> <artifactId>mjavadoc569-module2</artifactId> <packaging>maven-plugin</packaging> - + <build> <pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>3.0.0</version> + <version>@jarPluginVersion@</version> <configuration> <archive> <manifestEntries> @@ -52,7 +52,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> - <version>3.6.0</version> + <version>@pluginPluginVersion@</version> <executions> <execution> <id>default-descriptor</id> @@ -84,4 +84,4 @@ <optional>true</optional> </dependency> </dependencies> -</project> \ No newline at end of file +</project> diff --git a/src/it/projects/MJAVADOC-569_aggr-mixed/pom.xml b/src/it/projects/MJAVADOC-569_aggr-mixed/pom.xml index ee1dc4e0..dd904812 100644 --- a/src/it/projects/MJAVADOC-569_aggr-mixed/pom.xml +++ b/src/it/projects/MJAVADOC-569_aggr-mixed/pom.xml @@ -60,7 +60,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>@compilerPluginVersion@</version> <configuration> <release>9</release> </configuration> @@ -84,4 +84,4 @@ <module>module2</module> </modules> -</project> \ No newline at end of file +</project> diff --git a/src/it/projects/MJAVADOC-571_aggr-empty-sourcepaths/module1/pom.xml b/src/it/projects/MJAVADOC-571_aggr-empty-sourcepaths/module1/pom.xml index 113ae910..f9005215 100644 --- a/src/it/projects/MJAVADOC-571_aggr-empty-sourcepaths/module1/pom.xml +++ b/src/it/projects/MJAVADOC-571_aggr-empty-sourcepaths/module1/pom.xml @@ -22,12 +22,12 @@ <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.plugins.javadoc.it</groupId> - <artifactId>mjavadoc571</artifactId> - <version>1.0-SNAPSHOT</version> - </parent> - <artifactId>module1</artifactId> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.maven.plugins.javadoc.it</groupId> + <artifactId>mjavadoc571</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + <artifactId>module1</artifactId> -</project> \ No newline at end of file +</project> diff --git a/src/it/projects/MJAVADOC-571_aggr-empty-sourcepaths/module2/pom.xml b/src/it/projects/MJAVADOC-571_aggr-empty-sourcepaths/module2/pom.xml index 99efcfb0..f1e1d32e 100644 --- a/src/it/projects/MJAVADOC-571_aggr-empty-sourcepaths/module2/pom.xml +++ b/src/it/projects/MJAVADOC-571_aggr-empty-sourcepaths/module2/pom.xml @@ -22,19 +22,19 @@ <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.plugins.javadoc.it</groupId> - <artifactId>mjavadoc571</artifactId> - <version>1.0-SNAPSHOT</version> - </parent> - <artifactId>module2</artifactId> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.maven.plugins.javadoc.it</groupId> + <artifactId>mjavadoc571</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + <artifactId>module2</artifactId> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>module1</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> -</project> \ No newline at end of file + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>module1</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> +</project> diff --git a/src/it/projects/MJAVADOC-571_aggr-empty-sourcepaths/pom.xml b/src/it/projects/MJAVADOC-571_aggr-empty-sourcepaths/pom.xml index 0e097840..e179c064 100644 --- a/src/it/projects/MJAVADOC-571_aggr-empty-sourcepaths/pom.xml +++ b/src/it/projects/MJAVADOC-571_aggr-empty-sourcepaths/pom.xml @@ -21,35 +21,35 @@ <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>org.apache.maven.plugins.javadoc.it</groupId> - <artifactId>mjavadoc571</artifactId> - <version>1.0-SNAPSHOT</version> - <packaging>pom</packaging> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.maven.plugins.javadoc.it</groupId> + <artifactId>mjavadoc571</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>pom</packaging> - <modules> - <module>module1</module> - <module>module2</module> - </modules> + <modules> + <module>module1</module> + <module>module2</module> + </modules> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>@project.version@</version> - </plugin> - </plugins> - </pluginManagement> - </build> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.compiler.release>11</maven.compiler.release> - </properties> -</project> \ No newline at end of file + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>@compilerPluginVersion@</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>@project.version@</version> + </plugin> + </plugins> + </pluginManagement> + </build> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.release>11</maven.compiler.release> + </properties> +</project> diff --git a/src/it/projects/MJAVADOC-575_source8-module-info/pom.xml b/src/it/projects/MJAVADOC-575_source8-module-info/pom.xml index df843c6e..5268ffaa 100644 --- a/src/it/projects/MJAVADOC-575_source8-module-info/pom.xml +++ b/src/it/projects/MJAVADOC-575_source8-module-info/pom.xml @@ -48,7 +48,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>@compilerPluginVersion@</version> <configuration> <excludes> <exclude>module-info.java</exclude> @@ -62,7 +62,7 @@ <executions> <execution> <goals> - <goal>jar</goal> + <goal>jar</goal> </goals> </execution> </executions> diff --git a/src/it/projects/MJAVADOC-580_detectLinks/pom.xml b/src/it/projects/MJAVADOC-580_detectLinks/pom.xml index 257b0037..e8f7f5da 100644 --- a/src/it/projects/MJAVADOC-580_detectLinks/pom.xml +++ b/src/it/projects/MJAVADOC-580_detectLinks/pom.xml @@ -25,7 +25,7 @@ <groupId>org.apache.maven.plugins.javadoc.it</groupId> <artifactId>mjavadoc580</artifactId> <version>1.0-SNAPSHOT</version> - + <url>https://issues.apache.org/jira/browse/MJAVADOC-580</url> <properties> @@ -38,7 +38,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>@compilerPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/src/it/projects/MJAVADOC-591_release8/pom.xml b/src/it/projects/MJAVADOC-591_release8/pom.xml index 56a01763..406d1b1b 100644 --- a/src/it/projects/MJAVADOC-591_release8/pom.xml +++ b/src/it/projects/MJAVADOC-591_release8/pom.xml @@ -42,12 +42,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>@compilerPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.22.0</version> + <version>@surefirePluginVersion@</version> </plugin> </plugins> </pluginManagement> @@ -55,7 +55,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>3.2.0</version> + <version>@jarPluginVersion@</version> <configuration> <archive> <manifestEntries> diff --git a/src/it/projects/MJAVADOC-592_detectApiLink/pom.xml b/src/it/projects/MJAVADOC-592_detectApiLink/pom.xml index 1f821d99..b9109972 100644 --- a/src/it/projects/MJAVADOC-592_detectApiLink/pom.xml +++ b/src/it/projects/MJAVADOC-592_detectApiLink/pom.xml @@ -40,7 +40,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.1</version> + <version>@compilerPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/src/it/projects/MJAVADOC-610_mrjar/pom.xml b/src/it/projects/MJAVADOC-610_mrjar/pom.xml index c7c3294e..7c9b3e23 100644 --- a/src/it/projects/MJAVADOC-610_mrjar/pom.xml +++ b/src/it/projects/MJAVADOC-610_mrjar/pom.xml @@ -38,7 +38,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.1</version> + <version>@compilerPluginVersion@</version> <executions> <execution> <id>default-compile</id> @@ -77,7 +77,7 @@ </configuration> </execution> </executions> - </plugin> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> diff --git a/src/it/projects/MJAVADOC-618_modular-war/pom.xml b/src/it/projects/MJAVADOC-618_modular-war/pom.xml index a8f2bacd..5b2bfba9 100644 --- a/src/it/projects/MJAVADOC-618_modular-war/pom.xml +++ b/src/it/projects/MJAVADOC-618_modular-war/pom.xml @@ -40,7 +40,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.1</version> + <version>@compilerPluginVersion@</version> <configuration> <source>11</source> <target>11</target> diff --git a/src/it/projects/MJAVADOC-620_top-level-package/pom.xml b/src/it/projects/MJAVADOC-620_top-level-package/pom.xml index 6564b86a..e8b3c2b8 100644 --- a/src/it/projects/MJAVADOC-620_top-level-package/pom.xml +++ b/src/it/projects/MJAVADOC-620_top-level-package/pom.xml @@ -39,7 +39,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.1</version> + <version>@compilerPluginVersion@</version> </plugin> </plugins> </pluginManagement> @@ -52,4 +52,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/src/it/projects/MJAVADOC-625_addstylesheet/pom.xml b/src/it/projects/MJAVADOC-625_addstylesheet/pom.xml index 56a7e855..61060cf5 100644 --- a/src/it/projects/MJAVADOC-625_addstylesheet/pom.xml +++ b/src/it/projects/MJAVADOC-625_addstylesheet/pom.xml @@ -1,14 +1,14 @@ <?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 +<!-- 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. --> <project xmlns="http://maven.apache.org/POM/4.0.0" @@ -32,7 +32,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>@compilerPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/src/it/projects/MJAVADOC-634-module-testreports/pom.xml b/src/it/projects/MJAVADOC-634-module-testreports/pom.xml index 83f9fdc2..0f35b4ba 100644 --- a/src/it/projects/MJAVADOC-634-module-testreports/pom.xml +++ b/src/it/projects/MJAVADOC-634-module-testreports/pom.xml @@ -36,7 +36,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.1</version> + <version>@compilerPluginVersion@</version> <configuration> <release>11</release> </configuration> diff --git a/src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulea/pom.xml b/src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulea/pom.xml index cbb8ba4b..aae4c967 100644 --- a/src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulea/pom.xml +++ b/src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulea/pom.xml @@ -1,13 +1,13 @@ -<!-- ~ 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 +<!-- ~ 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. --> <project xmlns="http://maven.apache.org/POM/4.0.0" @@ -22,7 +22,7 @@ <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>@compilerPluginVersion@</version> <configuration> <release>9</release> </configuration> diff --git a/src/it/projects/MJAVADOC-639_aggr_static_modulepath/moduleb/pom.xml b/src/it/projects/MJAVADOC-639_aggr_static_modulepath/moduleb/pom.xml index 4d25a4e3..ec04d0ff 100644 --- a/src/it/projects/MJAVADOC-639_aggr_static_modulepath/moduleb/pom.xml +++ b/src/it/projects/MJAVADOC-639_aggr_static_modulepath/moduleb/pom.xml @@ -1,15 +1,15 @@ -<!-- ~ 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 +<!-- ~ 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. --> - + <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"> @@ -22,7 +22,7 @@ <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>@compilerPluginVersion@</version> <configuration> <release>9</release> </configuration> diff --git a/src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulec/pom.xml b/src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulec/pom.xml index f68bc4f2..9ad3cd4d 100644 --- a/src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulec/pom.xml +++ b/src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulec/pom.xml @@ -1,13 +1,13 @@ -<!-- ~ 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 +<!-- ~ 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. --> <project xmlns="http://maven.apache.org/POM/4.0.0" @@ -22,14 +22,14 @@ <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>@compilerPluginVersion@</version> <configuration> <release>9</release> </configuration> </plugin> </plugins> </build> - + <dependencies> <dependency> <groupId>modulea</groupId> diff --git a/src/it/projects/MJAVADOC-639_requires_ignored/pom.xml b/src/it/projects/MJAVADOC-639_requires_ignored/pom.xml index 92ebe1eb..1ef46ac1 100644 --- a/src/it/projects/MJAVADOC-639_requires_ignored/pom.xml +++ b/src/it/projects/MJAVADOC-639_requires_ignored/pom.xml @@ -1,16 +1,16 @@ <?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 +<!-- ~ 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. --> - + <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"> @@ -40,7 +40,7 @@ <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.1</version> + <version>@compilerPluginVersion@</version> <configuration> <release>9</release> </configuration> diff --git a/src/it/projects/MJAVADOC-661_mrjar/pom.xml b/src/it/projects/MJAVADOC-661_mrjar/pom.xml index aa23a612..6e25ff5f 100644 --- a/src/it/projects/MJAVADOC-661_mrjar/pom.xml +++ b/src/it/projects/MJAVADOC-661_mrjar/pom.xml @@ -158,7 +158,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.1</version> + <version>@compilerPluginVersion@</version> <executions> <execution> <id>default-compile</id> @@ -171,7 +171,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>3.2.0</version> + <version>@jarPluginVersion@</version> </plugin> </plugins> </pluginManagement> diff --git a/src/it/projects/MJAVADOC-677_require-static-transitive/pom.xml b/src/it/projects/MJAVADOC-677_require-static-transitive/pom.xml index 95f823b6..42f88c12 100644 --- a/src/it/projects/MJAVADOC-677_require-static-transitive/pom.xml +++ b/src/it/projects/MJAVADOC-677_require-static-transitive/pom.xml @@ -44,7 +44,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.1</version> + <version>@compilerPluginVersion@</version> <configuration> <release>11</release> </configuration> @@ -64,4 +64,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/src/it/projects/MJAVADOC-679_encoding/pom.xml b/src/it/projects/MJAVADOC-679_encoding/pom.xml index d0d3d0e2..ba12d59a 100644 --- a/src/it/projects/MJAVADOC-679_encoding/pom.xml +++ b/src/it/projects/MJAVADOC-679_encoding/pom.xml @@ -42,7 +42,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>@compilerPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/src/it/projects/MJAVADOC-704_toolchains/pom.xml b/src/it/projects/MJAVADOC-704_toolchains/pom.xml index 08e2c40e..7f1de08b 100644 --- a/src/it/projects/MJAVADOC-704_toolchains/pom.xml +++ b/src/it/projects/MJAVADOC-704_toolchains/pom.xml @@ -46,7 +46,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.9.0</version> + <version>@compilerPluginVersion@</version> <configuration> <release>11</release> <jdkToolchain> diff --git a/src/it/projects/MJAVADOC-769/pom.xml b/src/it/projects/MJAVADOC-769/pom.xml index ce95bb14..0a9941d2 100644 --- a/src/it/projects/MJAVADOC-769/pom.xml +++ b/src/it/projects/MJAVADOC-769/pom.xml @@ -102,7 +102,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>3.3.0</version> + <version>@jarPluginVersion@</version> <executions> <execution> <id>default-jar</id> diff --git a/src/it/projects/MJAVADOC-770/pom.xml b/src/it/projects/MJAVADOC-770/pom.xml index 8510c2d8..1c56dbfd 100644 --- a/src/it/projects/MJAVADOC-770/pom.xml +++ b/src/it/projects/MJAVADOC-770/pom.xml @@ -42,7 +42,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>3.3.0</version> + <version>@jarPluginVersion@</version> <executions> <execution> <id>default-jar</id> diff --git a/src/it/projects/additional-dependencies-non-aggregate/pom.xml b/src/it/projects/additional-dependencies-non-aggregate/pom.xml index 3e9188cb..746d9160 100644 --- a/src/it/projects/additional-dependencies-non-aggregate/pom.xml +++ b/src/it/projects/additional-dependencies-non-aggregate/pom.xml @@ -40,7 +40,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> + <version>@compilerPluginVersion@</version> <configuration> <source>1.5</source> <target>1.5</target> @@ -82,7 +82,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> <reportSets> <reportSet> <reports> diff --git a/src/it/projects/additional-dependencies/pom.xml b/src/it/projects/additional-dependencies/pom.xml index 7e0eaa0b..48802b35 100644 --- a/src/it/projects/additional-dependencies/pom.xml +++ b/src/it/projects/additional-dependencies/pom.xml @@ -42,7 +42,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> + <version>@compilerPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -80,7 +80,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> <inherited>true</inherited> <configuration> <debug>true</debug> diff --git a/src/it/projects/dependencySource-1/MJAVADOC-280-1-distro/pom.xml b/src/it/projects/dependencySource-1/MJAVADOC-280-1-distro/pom.xml index 59d1d166..24fd821a 100644 --- a/src/it/projects/dependencySource-1/MJAVADOC-280-1-distro/pom.xml +++ b/src/it/projects/dependencySource-1/MJAVADOC-280-1-distro/pom.xml @@ -48,7 +48,7 @@ under the License. <plugins> <plugin> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> <executions> <execution> <id>javadoc-jars</id> diff --git a/src/it/projects/dependencySource-1/pom.xml b/src/it/projects/dependencySource-1/pom.xml index 7ded7365..ce28869f 100644 --- a/src/it/projects/dependencySource-1/pom.xml +++ b/src/it/projects/dependencySource-1/pom.xml @@ -25,13 +25,13 @@ under the License. <artifactId>MJAVADOC-280-1</artifactId> <version>1.0-SNAPSHOT</version> <packaging>pom</packaging> - + <modules> <module>MJAVADOC-280-1-modA</module> <module>MJAVADOC-280-1-modB</module> <module>MJAVADOC-280-1-distro</module> </modules> - + <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.compiler.source>@maven.compiler.source@</maven.compiler.source> @@ -46,14 +46,14 @@ under the License. <scope>test</scope> </dependency> </dependencies> - + <build> <pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>2.1.1</version> + <version>@sourcePluginVersion@</version> <executions> <execution> <id>attach-sources</id> diff --git a/src/it/projects/dependencySource-2/MJAVADOC-280-2-distro/pom.xml b/src/it/projects/dependencySource-2/MJAVADOC-280-2-distro/pom.xml index bdb4756a..f7f20fe8 100644 --- a/src/it/projects/dependencySource-2/MJAVADOC-280-2-distro/pom.xml +++ b/src/it/projects/dependencySource-2/MJAVADOC-280-2-distro/pom.xml @@ -57,7 +57,7 @@ under the License. <plugins> <plugin> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> <executions> <execution> <id>javadoc-jars</id> diff --git a/src/it/projects/dependencySource-2/MJAVADOC-280-2-projects/pom.xml b/src/it/projects/dependencySource-2/MJAVADOC-280-2-projects/pom.xml index b808c51b..bd83305b 100644 --- a/src/it/projects/dependencySource-2/MJAVADOC-280-2-projects/pom.xml +++ b/src/it/projects/dependencySource-2/MJAVADOC-280-2-projects/pom.xml @@ -26,13 +26,13 @@ under the License. <artifactId>MJAVADOC-280-2-projects</artifactId> <version>1.0-SNAPSHOT</version> <packaging>pom</packaging> - + <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.compiler.source>@maven.compiler.source@</maven.compiler.source> <maven.compiler.target>@maven.compiler.target@</maven.compiler.target> </properties> - + <dependencies> <dependency> <groupId>junit</groupId> @@ -41,19 +41,19 @@ under the License. <scope>test</scope> </dependency> </dependencies> - + <modules> <module>MJAVADOC-280-2-modA</module> <module>MJAVADOC-280-2-modB</module> </modules> - + <build> <pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>2.1.1</version> + <version>@sourcePluginVersion@</version> <executions> <execution> <id>attach-sources</id> diff --git a/src/it/projects/dependencySource-3/pom.xml b/src/it/projects/dependencySource-3/pom.xml index 30f7a524..5876acd4 100644 --- a/src/it/projects/dependencySource-3/pom.xml +++ b/src/it/projects/dependencySource-3/pom.xml @@ -52,7 +52,7 @@ under the License. <plugins> <plugin> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> <configuration> <detectOfflineLinks>false</detectOfflineLinks> </configuration> diff --git a/src/it/projects/dependencySource-4/MJAVADOC-280-4-distro/pom.xml b/src/it/projects/dependencySource-4/MJAVADOC-280-4-distro/pom.xml index 0b86dc58..4f356fdf 100644 --- a/src/it/projects/dependencySource-4/MJAVADOC-280-4-distro/pom.xml +++ b/src/it/projects/dependencySource-4/MJAVADOC-280-4-distro/pom.xml @@ -54,7 +54,7 @@ under the License. <plugins> <plugin> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> <executions> <execution> <id>javadoc-jars</id> diff --git a/src/it/projects/dependencySource-4/MJAVADOC-280-4-projects/pom.xml b/src/it/projects/dependencySource-4/MJAVADOC-280-4-projects/pom.xml index 409d1d14..7c606ed3 100644 --- a/src/it/projects/dependencySource-4/MJAVADOC-280-4-projects/pom.xml +++ b/src/it/projects/dependencySource-4/MJAVADOC-280-4-projects/pom.xml @@ -21,7 +21,7 @@ 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>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId> <artifactId>MJAVADOC-280-4-projects</artifactId> <version>1.0-SNAPSHOT</version> @@ -43,18 +43,18 @@ under the License. <scope>test</scope> </dependency> </dependencies> - + <modules> <module>MJAVADOC-280-4-modA</module> <module>MJAVADOC-280-4-modB</module> </modules> - + <build> <pluginManagement> <plugins> <plugin> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> <configuration> <tags> <tag><name>m.foo</name><placement>optm</placement><head>Foo:</head></tag> @@ -79,7 +79,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>2.1.1</version> + <version>@sourcePluginVersion@</version> <executions> <execution> <id>attach-sources</id> @@ -93,7 +93,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.22.0</version> + <version>@surefirePluginVersion@</version> </plugin> </plugins> </pluginManagement> diff --git a/src/it/projects/dependencySource-4/pom.xml b/src/it/projects/dependencySource-4/pom.xml index 231e7292..04b89dc3 100644 --- a/src/it/projects/dependencySource-4/pom.xml +++ b/src/it/projects/dependencySource-4/pom.xml @@ -38,7 +38,7 @@ under the License. </properties> <!-- <properties> - <javadocPluginVersion>@pom.version@</javadocPluginVersion> + <javadocPluginVersion>@project.version@</javadocPluginVersion> </properties> <build> diff --git a/src/it/projects/detectLinks/pom.xml b/src/it/projects/detectLinks/pom.xml index ad1b5701..e733032b 100644 --- a/src/it/projects/detectLinks/pom.xml +++ b/src/it/projects/detectLinks/pom.xml @@ -66,7 +66,7 @@ <plugins> <plugin> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> </plugin> </plugins> </pluginManagement> diff --git a/src/it/projects/javadoc-fix/pom.xml b/src/it/projects/javadoc-fix/pom.xml index c6537b36..b04331d3 100644 --- a/src/it/projects/javadoc-fix/pom.xml +++ b/src/it/projects/javadoc-fix/pom.xml @@ -44,12 +44,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> + <version>@compilerPluginVersion@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> <configuration> <force>true</force> <ignoreClirr>true</ignoreClirr> diff --git a/src/it/projects/output-encoding/pom.xml b/src/it/projects/output-encoding/pom.xml index e9c7a71f..4885f6b2 100644 --- a/src/it/projects/output-encoding/pom.xml +++ b/src/it/projects/output-encoding/pom.xml @@ -42,7 +42,7 @@ <plugins> <plugin> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> <configuration> <debug>true</debug> </configuration> diff --git a/src/it/projects/site-failOnError/pom.xml b/src/it/projects/site-failOnError/pom.xml index cd98ff65..31ab30ba 100644 --- a/src/it/projects/site-failOnError/pom.xml +++ b/src/it/projects/site-failOnError/pom.xml @@ -42,7 +42,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> <configuration> <failOnError>false</failOnError> </configuration> @@ -56,7 +56,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>@pom.version@</version> + <version>@project.version@</version> <configuration> <failOnError>false</failOnError> </configuration>