You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2021/05/13 21:31:15 UTC
[maven-javadoc-plugin] branch pre-MJAVADOC-592 created (now 1028afc)
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a change to branch pre-MJAVADOC-592
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.
at 1028afc [MJAVADOC-592] Prepare integration tests
This branch includes the following new commits:
new 1028afc [MJAVADOC-592] Prepare integration tests
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-javadoc-plugin] 01/01: [MJAVADOC-592] Prepare integration
tests
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch pre-MJAVADOC-592
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit 1028afcf24ba35eedf1ebbbe62bd9418e06fb7f6
Author: rfscholte <rf...@apache.org>
AuthorDate: Thu May 13 22:49:49 2021 +0200
[MJAVADOC-592] Prepare integration tests
---
pom.xml | 7 +-
src/it/projects/MJAVADOC-110/pom.xml | 2 +
src/it/projects/MJAVADOC-126/pom.xml | 2 +
.../projects/MJAVADOC-134_multiaggregate/pom.xml | 2 +
src/it/projects/MJAVADOC-172/pom.xml | 2 +
src/it/projects/MJAVADOC-180/pom.xml | 4 +-
src/it/projects/MJAVADOC-194/pom.xml | 2 +
src/it/projects/MJAVADOC-250/pom.xml | 2 +
src/it/projects/MJAVADOC-259/pom.xml | 2 +
src/it/projects/MJAVADOC-275/pom.xml | 2 +
src/it/projects/MJAVADOC-278/pom.xml | 2 +
src/it/projects/MJAVADOC-320/pom.xml | 8 ++-
src/it/projects/MJAVADOC-369/pom.xml | 2 +
src/it/projects/MJAVADOC-414/pom.xml | 2 +
src/it/projects/MJAVADOC-420_fixparam/pom.xml | 6 ++
src/it/projects/MJAVADOC-434_fixcompile/pom.xml | 6 ++
src/it/projects/MJAVADOC-437/pom.xml | 2 +
src/it/projects/MJAVADOC-444/pom.xml | 2 +
.../projects/MJAVADOC-449_aggr_modulepath/pom.xml | 3 +
.../MJAVADOC-452_fix-duplicateparams/pom.xml | 6 ++
.../MJAVADOC-494_aggregate-repositories/pom.xml | 2 +
src/it/projects/MJAVADOC-497/pom.xml | 9 +++
.../projects/MJAVADOC-506_excl-module-info/pom.xml | 2 +
.../projects/MJAVADOC-526_aggr-managedDeps/pom.xml | 8 ++-
src/it/projects/MJAVADOC-551 spaces/pom.xml | 2 +
src/it/projects/MJAVADOC-552_fix-author/pom.xml | 6 ++
.../MJAVADOC-558_fix-unknownthrows/pom.xml | 6 ++
.../MJAVADOC-575_source8-module-info/pom.xml | 2 +
src/it/projects/MJAVADOC-590_nooverview/pom.xml | 6 ++
src/it/projects/MJAVADOC-610_mrjar/pom.xml | 7 ++
.../projects/MJAVADOC-611_dependencyLinks/pom.xml | 2 +
.../MJAVADOC-613-aggregate-exclude/pom.xml | 2 +
.../projects/MJAVADOC-619_copyright-year/pom.xml | 2 +
.../{ => app}/pom.xml | 25 ++-----
.../{ => app}/src/main/java/TestUsage.java | 0
.../invoker.properties | 8 ++-
.../{maven-MJAVADOC620-jar => lib}/pom.xml | 6 +-
.../src/main/java/somepackage/Test.java | 0
.../MJAVADOC-620_no-dot-in-version/pom.xml | 14 ++--
.../MJAVADOC-620_no-dot-in-version/verify.bsh | 4 +-
.../{ => app}/pom.xml | 26 ++-----
.../{ => app}/src/main/java/TestUsage.java | 0
.../invoker.properties | 8 ++-
.../{maven-MJAVADOC620-jar => lib}/pom.xml | 9 +--
.../src/main/java/Test.java | 0
.../MJAVADOC-620_top-level-package/pom.xml | 23 +++---
.../MJAVADOC-620_top-level-package/verify.bsh | 4 +-
src/it/projects/MJAVADOC-625_addstylesheet/pom.xml | 6 ++
.../MJAVADOC-636-aggregate_module_skipped/pom.xml | 2 +
src/it/projects/MJAVADOC-672_multiline-tag/pom.xml | 2 +
src/it/projects/additional-dependencies/pom.xml | 4 +-
src/it/projects/dependencySource-1/pom.xml | 2 +
.../MJAVADOC-280-2-projects/pom.xml | 6 ++
src/it/projects/dependencySource-2/pom.xml | 81 +---------------------
src/it/projects/dependencySource-3/pom.xml | 2 +
.../MJAVADOC-280-4-projects/pom.xml | 8 ++-
src/it/projects/dependencySource-4/pom.xml | 2 +
src/it/projects/detectLinks/pom.xml | 2 +
src/it/projects/javadoc-fix/pom.xml | 4 +-
59 files changed, 200 insertions(+), 170 deletions(-)
diff --git a/pom.xml b/pom.xml
index c4eea61..a4af532 100644
--- a/pom.xml
+++ b/pom.xml
@@ -479,13 +479,10 @@ under the License.
<pomExclude>MJAVADOC-181/pom.xml</pomExclude> <!-- seems to be wrong, see comment in Jira issue -->
<pomExclude>output-encoding/pom.xml</pomExclude>
</pomExcludes>
- <properties>
+ <properties combine.self="override"/>
+ <filterProperties>
<maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
<maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
- <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
- <https.protocols>${https.protocols}</https.protocols>
- </properties>
- <filterProperties>
<mrm.3rdparty.url>${mrm.3rdparty.url}</mrm.3rdparty.url>
</filterProperties>
<environmentVariables>
diff --git a/src/it/projects/MJAVADOC-110/pom.xml b/src/it/projects/MJAVADOC-110/pom.xml
index 8f96b3a..c9653e4 100644
--- a/src/it/projects/MJAVADOC-110/pom.xml
+++ b/src/it/projects/MJAVADOC-110/pom.xml
@@ -32,6 +32,8 @@
<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>
<build>
diff --git a/src/it/projects/MJAVADOC-126/pom.xml b/src/it/projects/MJAVADOC-126/pom.xml
index 357be14..8493c18 100644
--- a/src/it/projects/MJAVADOC-126/pom.xml
+++ b/src/it/projects/MJAVADOC-126/pom.xml
@@ -35,6 +35,8 @@
<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>
<build>
diff --git a/src/it/projects/MJAVADOC-134_multiaggregate/pom.xml b/src/it/projects/MJAVADOC-134_multiaggregate/pom.xml
index c11907e..6176106 100644
--- a/src/it/projects/MJAVADOC-134_multiaggregate/pom.xml
+++ b/src/it/projects/MJAVADOC-134_multiaggregate/pom.xml
@@ -32,6 +32,8 @@
<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>
<modules>
diff --git a/src/it/projects/MJAVADOC-172/pom.xml b/src/it/projects/MJAVADOC-172/pom.xml
index 2557da1..9fdf871 100644
--- a/src/it/projects/MJAVADOC-172/pom.xml
+++ b/src/it/projects/MJAVADOC-172/pom.xml
@@ -29,6 +29,8 @@
<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>
<modules>
diff --git a/src/it/projects/MJAVADOC-180/pom.xml b/src/it/projects/MJAVADOC-180/pom.xml
index d4b95e4..73563ba 100644
--- a/src/it/projects/MJAVADOC-180/pom.xml
+++ b/src/it/projects/MJAVADOC-180/pom.xml
@@ -33,8 +33,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.4</maven.compiler.source>
- <maven.compiler.target>1.4</maven.compiler.target>
+ <maven.compiler.source>@maven.compiler.source@</maven.compiler.source>
+ <maven.compiler.target>@maven.compiler.target@</maven.compiler.target>
</properties>
<build>
diff --git a/src/it/projects/MJAVADOC-194/pom.xml b/src/it/projects/MJAVADOC-194/pom.xml
index 5373ded..83d0b32 100644
--- a/src/it/projects/MJAVADOC-194/pom.xml
+++ b/src/it/projects/MJAVADOC-194/pom.xml
@@ -33,6 +33,8 @@
<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>
<build>
diff --git a/src/it/projects/MJAVADOC-250/pom.xml b/src/it/projects/MJAVADOC-250/pom.xml
index 2009f0c..1992ed7 100644
--- a/src/it/projects/MJAVADOC-250/pom.xml
+++ b/src/it/projects/MJAVADOC-250/pom.xml
@@ -28,6 +28,8 @@
<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>
<build>
diff --git a/src/it/projects/MJAVADOC-259/pom.xml b/src/it/projects/MJAVADOC-259/pom.xml
index b0fbef3..f1248b3 100644
--- a/src/it/projects/MJAVADOC-259/pom.xml
+++ b/src/it/projects/MJAVADOC-259/pom.xml
@@ -32,6 +32,8 @@
<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>
diff --git a/src/it/projects/MJAVADOC-275/pom.xml b/src/it/projects/MJAVADOC-275/pom.xml
index 111f318..54cae56 100644
--- a/src/it/projects/MJAVADOC-275/pom.xml
+++ b/src/it/projects/MJAVADOC-275/pom.xml
@@ -43,6 +43,8 @@ under the License.
<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>
<build>
diff --git a/src/it/projects/MJAVADOC-278/pom.xml b/src/it/projects/MJAVADOC-278/pom.xml
index 7fb23d9..cc8a220 100644
--- a/src/it/projects/MJAVADOC-278/pom.xml
+++ b/src/it/projects/MJAVADOC-278/pom.xml
@@ -32,6 +32,8 @@
<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>
diff --git a/src/it/projects/MJAVADOC-320/pom.xml b/src/it/projects/MJAVADOC-320/pom.xml
index f9a40c4..80af454 100644
--- a/src/it/projects/MJAVADOC-320/pom.xml
+++ b/src/it/projects/MJAVADOC-320/pom.xml
@@ -36,9 +36,11 @@
<module>module3</module>
</modules>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
+ <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>
<build>
<pluginManagement>
diff --git a/src/it/projects/MJAVADOC-369/pom.xml b/src/it/projects/MJAVADOC-369/pom.xml
index c581ce0..0504d2f 100644
--- a/src/it/projects/MJAVADOC-369/pom.xml
+++ b/src/it/projects/MJAVADOC-369/pom.xml
@@ -32,6 +32,8 @@
<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>
diff --git a/src/it/projects/MJAVADOC-414/pom.xml b/src/it/projects/MJAVADOC-414/pom.xml
index 35f380e..b49de22 100644
--- a/src/it/projects/MJAVADOC-414/pom.xml
+++ b/src/it/projects/MJAVADOC-414/pom.xml
@@ -29,6 +29,8 @@
<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>
diff --git a/src/it/projects/MJAVADOC-420_fixparam/pom.xml b/src/it/projects/MJAVADOC-420_fixparam/pom.xml
index 0bfedd3..09bae44 100644
--- a/src/it/projects/MJAVADOC-420_fixparam/pom.xml
+++ b/src/it/projects/MJAVADOC-420_fixparam/pom.xml
@@ -28,6 +28,12 @@
<url>https://issues.apache.org/jira/browse/MJAVADOC-420</url>
+ <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>
+
<build>
<pluginManagement>
<plugins>
diff --git a/src/it/projects/MJAVADOC-434_fixcompile/pom.xml b/src/it/projects/MJAVADOC-434_fixcompile/pom.xml
index 6d6a0ce..34f9934 100644
--- a/src/it/projects/MJAVADOC-434_fixcompile/pom.xml
+++ b/src/it/projects/MJAVADOC-434_fixcompile/pom.xml
@@ -28,6 +28,12 @@
<url>https://issues.apache.org/jira/browse/MJAVADOC-434</url>
+ <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>
+
<build>
<pluginManagement>
<plugins>
diff --git a/src/it/projects/MJAVADOC-437/pom.xml b/src/it/projects/MJAVADOC-437/pom.xml
index be64d03..cff0967 100644
--- a/src/it/projects/MJAVADOC-437/pom.xml
+++ b/src/it/projects/MJAVADOC-437/pom.xml
@@ -35,6 +35,8 @@
<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>
<build>
diff --git a/src/it/projects/MJAVADOC-444/pom.xml b/src/it/projects/MJAVADOC-444/pom.xml
index d4178e1..9f073a8 100644
--- a/src/it/projects/MJAVADOC-444/pom.xml
+++ b/src/it/projects/MJAVADOC-444/pom.xml
@@ -32,6 +32,8 @@
<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>
<modules>
diff --git a/src/it/projects/MJAVADOC-449_aggr_modulepath/pom.xml b/src/it/projects/MJAVADOC-449_aggr_modulepath/pom.xml
index d77f74d..57af5af 100644
--- a/src/it/projects/MJAVADOC-449_aggr_modulepath/pom.xml
+++ b/src/it/projects/MJAVADOC-449_aggr_modulepath/pom.xml
@@ -29,6 +29,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>@project.version@</version>
+ <configuration>
+ <release>9</release>
+ </configuration>
</plugin>
</plugins>
</build>
diff --git a/src/it/projects/MJAVADOC-452_fix-duplicateparams/pom.xml b/src/it/projects/MJAVADOC-452_fix-duplicateparams/pom.xml
index c5e142c..4e1c32d 100644
--- a/src/it/projects/MJAVADOC-452_fix-duplicateparams/pom.xml
+++ b/src/it/projects/MJAVADOC-452_fix-duplicateparams/pom.xml
@@ -28,6 +28,12 @@
<url>https://issues.apache.org/jira/browse/MJAVADOC-452</url>
+ <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>
+
<build>
<pluginManagement>
<plugins>
diff --git a/src/it/projects/MJAVADOC-494_aggregate-repositories/pom.xml b/src/it/projects/MJAVADOC-494_aggregate-repositories/pom.xml
index 83dc12d..78d4f3d 100644
--- a/src/it/projects/MJAVADOC-494_aggregate-repositories/pom.xml
+++ b/src/it/projects/MJAVADOC-494_aggregate-repositories/pom.xml
@@ -24,6 +24,8 @@
<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>
<repositories>
diff --git a/src/it/projects/MJAVADOC-497/pom.xml b/src/it/projects/MJAVADOC-497/pom.xml
index c664cd7..1b18634 100644
--- a/src/it/projects/MJAVADOC-497/pom.xml
+++ b/src/it/projects/MJAVADOC-497/pom.xml
@@ -42,6 +42,15 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
+ <configuration>
+ <source>@maven.compiler.source@</source>
+ <target>@maven.compiler.target@</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>@pom.version@</version>
<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 b2472ae..df1f550 100644
--- a/src/it/projects/MJAVADOC-506_excl-module-info/pom.xml
+++ b/src/it/projects/MJAVADOC-506_excl-module-info/pom.xml
@@ -51,6 +51,8 @@
<excludes>
<exclude>module-info.java</exclude>
</excludes>
+ <source>@maven.compiler.source@</source>
+ <target>@maven.compiler.target@</target>
</configuration>
</plugin>
<plugin>
diff --git a/src/it/projects/MJAVADOC-526_aggr-managedDeps/pom.xml b/src/it/projects/MJAVADOC-526_aggr-managedDeps/pom.xml
index e44f89f..a29bfda 100644
--- a/src/it/projects/MJAVADOC-526_aggr-managedDeps/pom.xml
+++ b/src/it/projects/MJAVADOC-526_aggr-managedDeps/pom.xml
@@ -29,7 +29,13 @@
<packaging>pom</packaging>
<url>https://issues.apache.org/jira/browse/MJAVADOC-526</url>
-
+
+ <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>
+
<build>
<pluginManagement>
<plugins>
diff --git a/src/it/projects/MJAVADOC-551 spaces/pom.xml b/src/it/projects/MJAVADOC-551 spaces/pom.xml
index 6270acf..3f4b868 100644
--- a/src/it/projects/MJAVADOC-551 spaces/pom.xml
+++ b/src/it/projects/MJAVADOC-551 spaces/pom.xml
@@ -28,6 +28,8 @@
<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>
<build>
diff --git a/src/it/projects/MJAVADOC-552_fix-author/pom.xml b/src/it/projects/MJAVADOC-552_fix-author/pom.xml
index d8e2f31..a3a327b 100644
--- a/src/it/projects/MJAVADOC-552_fix-author/pom.xml
+++ b/src/it/projects/MJAVADOC-552_fix-author/pom.xml
@@ -28,6 +28,12 @@
<url>https://issues.apache.org/jira/browse/MJAVADOC-552</url>
+ <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>
+
<build>
<pluginManagement>
<plugins>
diff --git a/src/it/projects/MJAVADOC-558_fix-unknownthrows/pom.xml b/src/it/projects/MJAVADOC-558_fix-unknownthrows/pom.xml
index c05ea6f..d15d8cd 100644
--- a/src/it/projects/MJAVADOC-558_fix-unknownthrows/pom.xml
+++ b/src/it/projects/MJAVADOC-558_fix-unknownthrows/pom.xml
@@ -28,6 +28,12 @@
<url>https://issues.apache.org/jira/browse/MJAVADOC-558</url>
+ <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>
+
<build>
<pluginManagement>
<plugins>
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 68ed8e2..df843c6 100644
--- a/src/it/projects/MJAVADOC-575_source8-module-info/pom.xml
+++ b/src/it/projects/MJAVADOC-575_source8-module-info/pom.xml
@@ -31,6 +31,8 @@
<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>
diff --git a/src/it/projects/MJAVADOC-590_nooverview/pom.xml b/src/it/projects/MJAVADOC-590_nooverview/pom.xml
index caab701..b1f0eb5 100644
--- a/src/it/projects/MJAVADOC-590_nooverview/pom.xml
+++ b/src/it/projects/MJAVADOC-590_nooverview/pom.xml
@@ -21,6 +21,12 @@
<url>https://issues.apache.org/jira/browse/MJAVADOC-590</url>
+ <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>
+
<build>
<plugins>
<plugin>
diff --git a/src/it/projects/MJAVADOC-610_mrjar/pom.xml b/src/it/projects/MJAVADOC-610_mrjar/pom.xml
index 70adfa3..c7c3294 100644
--- a/src/it/projects/MJAVADOC-610_mrjar/pom.xml
+++ b/src/it/projects/MJAVADOC-610_mrjar/pom.xml
@@ -41,6 +41,13 @@
<version>3.8.1</version>
<executions>
<execution>
+ <id>default-compile</id>
+ <configuration>
+ <source>@maven.compiler.source@</source>
+ <target>@maven.compiler.target@</target>
+ </configuration>
+ </execution>
+ <execution>
<id>jdk9</id>
<goals>
<goal>compile</goal>
diff --git a/src/it/projects/MJAVADOC-611_dependencyLinks/pom.xml b/src/it/projects/MJAVADOC-611_dependencyLinks/pom.xml
index 5049d7d..f6b4acd 100644
--- a/src/it/projects/MJAVADOC-611_dependencyLinks/pom.xml
+++ b/src/it/projects/MJAVADOC-611_dependencyLinks/pom.xml
@@ -28,6 +28,8 @@
<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>
<build>
diff --git a/src/it/projects/MJAVADOC-613-aggregate-exclude/pom.xml b/src/it/projects/MJAVADOC-613-aggregate-exclude/pom.xml
index 0e0c3fc..0f305e8 100644
--- a/src/it/projects/MJAVADOC-613-aggregate-exclude/pom.xml
+++ b/src/it/projects/MJAVADOC-613-aggregate-exclude/pom.xml
@@ -32,6 +32,8 @@
<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>
<modules>
diff --git a/src/it/projects/MJAVADOC-619_copyright-year/pom.xml b/src/it/projects/MJAVADOC-619_copyright-year/pom.xml
index d009ed4..a42dfdf 100644
--- a/src/it/projects/MJAVADOC-619_copyright-year/pom.xml
+++ b/src/it/projects/MJAVADOC-619_copyright-year/pom.xml
@@ -28,6 +28,8 @@
<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>
<project.build.outputTimestamp>2020-03-12T06:39:23Z</project.build.outputTimestamp>
</properties>
diff --git a/src/it/projects/MJAVADOC-620_no-dot-in-version/pom.xml b/src/it/projects/MJAVADOC-620_no-dot-in-version/app/pom.xml
similarity index 71%
copy from src/it/projects/MJAVADOC-620_no-dot-in-version/pom.xml
copy to src/it/projects/MJAVADOC-620_no-dot-in-version/app/pom.xml
index f857e76..f3f1c97 100644
--- a/src/it/projects/MJAVADOC-620_no-dot-in-version/pom.xml
+++ b/src/it/projects/MJAVADOC-620_no-dot-in-version/app/pom.xml
@@ -19,17 +19,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>
-
- <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <parent>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>maven-MJAVADOC-620</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
<artifactId>maven-MJAVADOC-620-test</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Maven MJAVADOC-620 Test</name>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
<dependencies>
<dependency>
@@ -39,14 +34,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>@project.version@</version>
- </plugin>
- </plugins>
- </build>
-
</project>
\ No newline at end of file
diff --git a/src/it/projects/MJAVADOC-620_no-dot-in-version/src/main/java/TestUsage.java b/src/it/projects/MJAVADOC-620_no-dot-in-version/app/src/main/java/TestUsage.java
similarity index 100%
rename from src/it/projects/MJAVADOC-620_no-dot-in-version/src/main/java/TestUsage.java
rename to src/it/projects/MJAVADOC-620_no-dot-in-version/app/src/main/java/TestUsage.java
diff --git a/src/it/projects/MJAVADOC-620_no-dot-in-version/invoker.properties b/src/it/projects/MJAVADOC-620_no-dot-in-version/invoker.properties
index 3063815..40b6e12 100644
--- a/src/it/projects/MJAVADOC-620_no-dot-in-version/invoker.properties
+++ b/src/it/projects/MJAVADOC-620_no-dot-in-version/invoker.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals.1 = -f maven-MJAVADOC620-jar install
-
-invoker.goals.2 = javadoc:aggregate
+invoker.goals.1 = install
+invoker.goals.2 = install
+invoker.project.2 = lib
+invoker.goals.3 = javadoc:aggregate
+invoker.project.3 = app
\ No newline at end of file
diff --git a/src/it/projects/MJAVADOC-620_no-dot-in-version/maven-MJAVADOC620-jar/pom.xml b/src/it/projects/MJAVADOC-620_no-dot-in-version/lib/pom.xml
similarity index 86%
rename from src/it/projects/MJAVADOC-620_no-dot-in-version/maven-MJAVADOC620-jar/pom.xml
rename to src/it/projects/MJAVADOC-620_no-dot-in-version/lib/pom.xml
index 6e87c00..3ebeb61 100644
--- a/src/it/projects/MJAVADOC-620_no-dot-in-version/maven-MJAVADOC620-jar/pom.xml
+++ b/src/it/projects/MJAVADOC-620_no-dot-in-version/lib/pom.xml
@@ -19,9 +19,13 @@
<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.maven-javadoc-plugin.it</groupId>
+ <artifactId>maven-MJAVADOC-620</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
<groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
<artifactId>maven-MJAVADOC620-jar</artifactId>
<version>1-SNAPSHOT</version>
- <packaging>jar</packaging>
</project>
diff --git a/src/it/projects/MJAVADOC-620_no-dot-in-version/maven-MJAVADOC620-jar/src/main/java/somepackage/Test.java b/src/it/projects/MJAVADOC-620_no-dot-in-version/lib/src/main/java/somepackage/Test.java
similarity index 100%
rename from src/it/projects/MJAVADOC-620_no-dot-in-version/maven-MJAVADOC620-jar/src/main/java/somepackage/Test.java
rename to src/it/projects/MJAVADOC-620_no-dot-in-version/lib/src/main/java/somepackage/Test.java
diff --git a/src/it/projects/MJAVADOC-620_no-dot-in-version/pom.xml b/src/it/projects/MJAVADOC-620_no-dot-in-version/pom.xml
index f857e76..702d255 100644
--- a/src/it/projects/MJAVADOC-620_no-dot-in-version/pom.xml
+++ b/src/it/projects/MJAVADOC-620_no-dot-in-version/pom.xml
@@ -21,24 +21,18 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
- <artifactId>maven-MJAVADOC-620-test</artifactId>
+ <artifactId>maven-MJAVADOC-620</artifactId>
<version>1.0-SNAPSHOT</version>
- <packaging>jar</packaging>
+ <packaging>pom</packaging>
<name>Maven MJAVADOC-620 Test</name>
<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>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
- <artifactId>maven-MJAVADOC620-jar</artifactId>
- <version>1-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
<build>
<plugins>
<plugin>
diff --git a/src/it/projects/MJAVADOC-620_no-dot-in-version/verify.bsh b/src/it/projects/MJAVADOC-620_no-dot-in-version/verify.bsh
index bd4c872..d3e860a 100644
--- a/src/it/projects/MJAVADOC-620_no-dot-in-version/verify.bsh
+++ b/src/it/projects/MJAVADOC-620_no-dot-in-version/verify.bsh
@@ -25,14 +25,14 @@ boolean result = true;
try
{
- File target = new File( basedir, "target" );
+ File target = new File( basedir, "app/target" );
if ( !target.exists() || !target.isDirectory() )
{
System.err.println( "target file is missing or not a directory." );
return false;
}
- File apidocs = new File( basedir, "target/site/apidocs" );
+ File apidocs = new File( target, "site/apidocs" );
if ( !apidocs.exists() || !apidocs.isDirectory() )
{
System.err.println( "target/site/apidocs file is missing or not a directory." );
diff --git a/src/it/projects/MJAVADOC-620_top-level-package/pom.xml b/src/it/projects/MJAVADOC-620_top-level-package/app/pom.xml
similarity index 71%
copy from src/it/projects/MJAVADOC-620_top-level-package/pom.xml
copy to src/it/projects/MJAVADOC-620_top-level-package/app/pom.xml
index fc405dd..ae00f14 100644
--- a/src/it/projects/MJAVADOC-620_top-level-package/pom.xml
+++ b/src/it/projects/MJAVADOC-620_top-level-package/app/pom.xml
@@ -19,17 +19,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>
-
- <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <parent>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>maven-MJAVADOC-620</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
<artifactId>maven-MJAVADOC-620-test</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Maven MJAVADOC-620 Test</name>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
<dependencies>
<dependency>
@@ -38,15 +33,4 @@
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>@project.version@</version>
- </plugin>
- </plugins>
- </build>
-
</project>
\ No newline at end of file
diff --git a/src/it/projects/MJAVADOC-620_top-level-package/src/main/java/TestUsage.java b/src/it/projects/MJAVADOC-620_top-level-package/app/src/main/java/TestUsage.java
similarity index 100%
rename from src/it/projects/MJAVADOC-620_top-level-package/src/main/java/TestUsage.java
rename to src/it/projects/MJAVADOC-620_top-level-package/app/src/main/java/TestUsage.java
diff --git a/src/it/projects/MJAVADOC-620_top-level-package/invoker.properties b/src/it/projects/MJAVADOC-620_top-level-package/invoker.properties
index 3063815..95bc3d6 100644
--- a/src/it/projects/MJAVADOC-620_top-level-package/invoker.properties
+++ b/src/it/projects/MJAVADOC-620_top-level-package/invoker.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals.1 = -f maven-MJAVADOC620-jar install
-
-invoker.goals.2 = javadoc:aggregate
+invoker.goals.1 = install
+invoker.goals.2 = install
+invoker.project.2 = lib
+invoker.goals.3 = javadoc:aggregate
+invoker.project.3 = app
diff --git a/src/it/projects/MJAVADOC-620_top-level-package/maven-MJAVADOC620-jar/pom.xml b/src/it/projects/MJAVADOC-620_top-level-package/lib/pom.xml
similarity index 85%
rename from src/it/projects/MJAVADOC-620_top-level-package/maven-MJAVADOC620-jar/pom.xml
rename to src/it/projects/MJAVADOC-620_top-level-package/lib/pom.xml
index 0036617..56e32f9 100644
--- a/src/it/projects/MJAVADOC-620_top-level-package/maven-MJAVADOC620-jar/pom.xml
+++ b/src/it/projects/MJAVADOC-620_top-level-package/lib/pom.xml
@@ -19,9 +19,10 @@
<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>
+ <parent>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>maven-MJAVADOC-620</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
<artifactId>maven-MJAVADOC620-jar</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>jar</packaging>
</project>
diff --git a/src/it/projects/MJAVADOC-620_top-level-package/maven-MJAVADOC620-jar/src/main/java/Test.java b/src/it/projects/MJAVADOC-620_top-level-package/lib/src/main/java/Test.java
similarity index 100%
rename from src/it/projects/MJAVADOC-620_top-level-package/maven-MJAVADOC620-jar/src/main/java/Test.java
rename to src/it/projects/MJAVADOC-620_top-level-package/lib/src/main/java/Test.java
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 fc405dd..6564b86 100644
--- a/src/it/projects/MJAVADOC-620_top-level-package/pom.xml
+++ b/src/it/projects/MJAVADOC-620_top-level-package/pom.xml
@@ -21,25 +21,28 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
- <artifactId>maven-MJAVADOC-620-test</artifactId>
+ <artifactId>maven-MJAVADOC-620</artifactId>
<version>1.0-SNAPSHOT</version>
- <packaging>jar</packaging>
+ <packaging>pom</packaging>
<name>Maven MJAVADOC-620 Test</name>
<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>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
- <artifactId>maven-MJAVADOC620-jar</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/src/it/projects/MJAVADOC-620_top-level-package/verify.bsh b/src/it/projects/MJAVADOC-620_top-level-package/verify.bsh
index ec34b19..d59fb14 100644
--- a/src/it/projects/MJAVADOC-620_top-level-package/verify.bsh
+++ b/src/it/projects/MJAVADOC-620_top-level-package/verify.bsh
@@ -25,14 +25,14 @@ boolean result = true;
try
{
- File target = new File( basedir, "target" );
+ File target = new File( basedir, "app/target" );
if ( !target.exists() || !target.isDirectory() )
{
System.err.println( "target file is missing or not a directory." );
return false;
}
- File apidocs = new File( basedir, "target/site/apidocs" );
+ File apidocs = new File( target, "site/apidocs" );
if ( !apidocs.exists() || !apidocs.isDirectory() )
{
System.err.println( "target/site/apidocs file is missing or not a directory." );
diff --git a/src/it/projects/MJAVADOC-625_addstylesheet/pom.xml b/src/it/projects/MJAVADOC-625_addstylesheet/pom.xml
index fea976f..56a7e85 100644
--- a/src/it/projects/MJAVADOC-625_addstylesheet/pom.xml
+++ b/src/it/projects/MJAVADOC-625_addstylesheet/pom.xml
@@ -21,6 +21,12 @@
<url>https://issues.apache.org/jira/browse/MJAVADOC-625</url>
+ <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>
+
<build>
<plugins>
<plugin>
diff --git a/src/it/projects/MJAVADOC-636-aggregate_module_skipped/pom.xml b/src/it/projects/MJAVADOC-636-aggregate_module_skipped/pom.xml
index 2573892..fd62f93 100644
--- a/src/it/projects/MJAVADOC-636-aggregate_module_skipped/pom.xml
+++ b/src/it/projects/MJAVADOC-636-aggregate_module_skipped/pom.xml
@@ -32,6 +32,8 @@
<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>
<modules>
diff --git a/src/it/projects/MJAVADOC-672_multiline-tag/pom.xml b/src/it/projects/MJAVADOC-672_multiline-tag/pom.xml
index c8ed6a1..6b8f467 100644
--- a/src/it/projects/MJAVADOC-672_multiline-tag/pom.xml
+++ b/src/it/projects/MJAVADOC-672_multiline-tag/pom.xml
@@ -28,6 +28,8 @@
<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>
<build>
diff --git a/src/it/projects/additional-dependencies/pom.xml b/src/it/projects/additional-dependencies/pom.xml
index 042318c..7e0eaa0 100644
--- a/src/it/projects/additional-dependencies/pom.xml
+++ b/src/it/projects/additional-dependencies/pom.xml
@@ -33,8 +33,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.5</maven.compiler.source>
- <maven.compiler.target>1.5</maven.compiler.target>
+ <maven.compiler.source>@maven.compiler.source@</maven.compiler.source>
+ <maven.compiler.target>@maven.compiler.target@</maven.compiler.target>
</properties>
<build>
diff --git a/src/it/projects/dependencySource-1/pom.xml b/src/it/projects/dependencySource-1/pom.xml
index 1a913fe..7ded736 100644
--- a/src/it/projects/dependencySource-1/pom.xml
+++ b/src/it/projects/dependencySource-1/pom.xml
@@ -34,6 +34,8 @@ under the License.
<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>
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 284d57a..b808c51 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
@@ -27,6 +27,12 @@ under the License.
<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>
diff --git a/src/it/projects/dependencySource-2/pom.xml b/src/it/projects/dependencySource-2/pom.xml
index 7ad0ef4..80307e6 100644
--- a/src/it/projects/dependencySource-2/pom.xml
+++ b/src/it/projects/dependencySource-2/pom.xml
@@ -30,86 +30,11 @@ under the License.
<module>MJAVADOC-280-2-projects</module>
<module>MJAVADOC-280-2-distro</module>
</modules>
-
+
<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>
- <!-- <properties>
- <javadocPluginVersion>@pom.version@</javadocPluginVersion>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.4.2</version>
- <executions>
- <execution>
- <id>filter-projects</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}</outputDirectory>
- <resources>
- <resource>
- <directory>${project.artifactId}-projects</directory>
- <filtering>true</filtering>
- <targetPath>${project.artifactId}-projects</targetPath>
- </resource>
- <resource>
- <directory>${project.artifactId}-distro</directory>
- <filtering>true</filtering>
- <targetPath>${project.artifactId}-distro</targetPath>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-invoker-plugin</artifactId>
- <version>1.5</version>
- <configuration>
- <localRepositoryPath>${project.basedir}/../../local-repo</localRepositoryPath>
- <streamLogs>true</streamLogs>
- <suppressSummaries>true</suppressSummaries>
- <debug>true</debug>
- <settingsFile>${project.basedir}/../interpolated-settings.xml</settingsFile>
- </configuration>
- <executions>
- <execution>
- <id>build-projects</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <pom>${project.build.directory}/MJAVADOC-280-2-projects/pom.xml</pom>
- <goals>
- <goal>clean</goal>
- <goal>install</goal>
- </goals>
- </configuration>
- </execution>
- <execution>
- <id>build-distro</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <pom>${project.build.directory}/MJAVADOC-280-2-distro/pom.xml</pom>
- <goals>
- <goal>clean</goal>
- <goal>package</goal>
- </goals>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build> -->
</project>
diff --git a/src/it/projects/dependencySource-3/pom.xml b/src/it/projects/dependencySource-3/pom.xml
index f1a2861..30f7a52 100644
--- a/src/it/projects/dependencySource-3/pom.xml
+++ b/src/it/projects/dependencySource-3/pom.xml
@@ -34,6 +34,8 @@ under the License.
<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>
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 fb19c79..409d1d1 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
@@ -28,7 +28,13 @@ under the License.
<packaging>pom</packaging>
<name>MJAVADOC-280-4-projects</name>
-
+
+ <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>
diff --git a/src/it/projects/dependencySource-4/pom.xml b/src/it/projects/dependencySource-4/pom.xml
index df6f8d9..231e729 100644
--- a/src/it/projects/dependencySource-4/pom.xml
+++ b/src/it/projects/dependencySource-4/pom.xml
@@ -33,6 +33,8 @@ under the License.
<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>
<!-- <properties>
diff --git a/src/it/projects/detectLinks/pom.xml b/src/it/projects/detectLinks/pom.xml
index 7cc3958..ad1b570 100644
--- a/src/it/projects/detectLinks/pom.xml
+++ b/src/it/projects/detectLinks/pom.xml
@@ -36,6 +36,8 @@
<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>
diff --git a/src/it/projects/javadoc-fix/pom.xml b/src/it/projects/javadoc-fix/pom.xml
index 424448f..c6537b3 100644
--- a/src/it/projects/javadoc-fix/pom.xml
+++ b/src/it/projects/javadoc-fix/pom.xml
@@ -29,8 +29,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.4</maven.compiler.source>
- <maven.compiler.target>1.4</maven.compiler.target>
+ <maven.compiler.source>@maven.compiler.source@</maven.compiler.source>
+ <maven.compiler.target>@maven.compiler.target@</maven.compiler.target>
</properties>
<build>