From 1028afcf24ba35eedf1ebbbe62bd9418e06fb7f6 Mon Sep 17 00:00:00 2001
From: rfscholte <rfscholte@apache.org>
Date: Thu, 13 May 2021 22:49:49 +0200
Subject: [PATCH] [MJAVADOC-592] Prepare integration tests

---
 pom.xml                                       |  7 +-
 src/it/projects/MJAVADOC-110/pom.xml          |  2 +
 src/it/projects/MJAVADOC-126/pom.xml          |  2 +
 .../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 ++
 .../projects/MJAVADOC-434_fixcompile/pom.xml  |  6 ++
 src/it/projects/MJAVADOC-437/pom.xml          |  2 +
 src/it/projects/MJAVADOC-444/pom.xml          |  2 +
 .../MJAVADOC-449_aggr_modulepath/pom.xml      |  3 +
 .../MJAVADOC-452_fix-duplicateparams/pom.xml  |  6 ++
 .../pom.xml                                   |  2 +
 src/it/projects/MJAVADOC-497/pom.xml          |  9 +++
 .../MJAVADOC-506_excl-module-info/pom.xml     |  2 +
 .../MJAVADOC-526_aggr-managedDeps/pom.xml     |  8 +-
 src/it/projects/MJAVADOC-551 spaces/pom.xml   |  2 +
 .../projects/MJAVADOC-552_fix-author/pom.xml  |  6 ++
 .../MJAVADOC-558_fix-unknownthrows/pom.xml    |  6 ++
 .../MJAVADOC-575_source8-module-info/pom.xml  |  2 +
 .../projects/MJAVADOC-590_nooverview/pom.xml  |  6 ++
 src/it/projects/MJAVADOC-610_mrjar/pom.xml    |  7 ++
 .../MJAVADOC-611_dependencyLinks/pom.xml      |  2 +
 .../MJAVADOC-613-aggregate-exclude/pom.xml    |  2 +
 .../MJAVADOC-619_copyright-year/pom.xml       |  2 +
 .../app/pom.xml                               | 37 +++++++++
 .../{ => 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                               | 36 +++++++++
 .../{ => 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 +-
 .../MJAVADOC-625_addstylesheet/pom.xml        |  6 ++
 .../pom.xml                                   |  2 +
 .../MJAVADOC-672_multiline-tag/pom.xml        |  2 +
 .../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, 263 insertions(+), 129 deletions(-)
 create mode 100644 src/it/projects/MJAVADOC-620_no-dot-in-version/app/pom.xml
 rename src/it/projects/MJAVADOC-620_no-dot-in-version/{ => app}/src/main/java/TestUsage.java (100%)
 rename src/it/projects/MJAVADOC-620_no-dot-in-version/{maven-MJAVADOC620-jar => lib}/pom.xml (86%)
 rename src/it/projects/MJAVADOC-620_no-dot-in-version/{maven-MJAVADOC620-jar => lib}/src/main/java/somepackage/Test.java (100%)
 create mode 100644 src/it/projects/MJAVADOC-620_top-level-package/app/pom.xml
 rename src/it/projects/MJAVADOC-620_top-level-package/{ => app}/src/main/java/TestUsage.java (100%)
 rename src/it/projects/MJAVADOC-620_top-level-package/{maven-MJAVADOC620-jar => lib}/pom.xml (85%)
 rename src/it/projects/MJAVADOC-620_top-level-package/{maven-MJAVADOC620-jar => lib}/src/main/java/Test.java (100%)

diff --git a/pom.xml b/pom.xml
index c4eea6101..a4af53255 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 8f96b3ab0..c9653e429 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 357be14b2..8493c182a 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 c11907e42..617610684 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 2557da122..9fdf871b6 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 d4b95e413..73563ba78 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 5373ded08..83d0b3245 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 2009f0c02..1992ed7f0 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 b0fbef379..f1248b39b 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 111f31830..54cae562a 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 7fb23d9dd..cc8a22056 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 f9a40c414..80af454d8 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 c581ce004..0504d2f93 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 35f380e28..b49de2268 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 0bfedd398..09bae44a5 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 6d6a0ce1b..34f9934fc 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 be64d03fc..cff096729 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 d4178e1cf..9f073a8f3 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 d77f74d8f..57af5af5b 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 c5e142ce8..4e1c32d4e 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 83dc12d88..78d4f3dc3 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 c664cd7a3..1b186344f 100644
--- a/src/it/projects/MJAVADOC-497/pom.xml
+++ b/src/it/projects/MJAVADOC-497/pom.xml
@@ -40,6 +40,15 @@
   <build>
     <pluginManagement>
       <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>
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 b2472aeb7..df1f5502a 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 e44f89f3c..a29bfda2f 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 6270acfa3..3f4b86859 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 d8e2f3146..a3a327b16 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 c05ea6ffb..d15d8cda8 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 68ed8e299..df843c6e7 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 caab701bf..b1f0eb50c 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 70adfa32b..c7c3294e4 100644
--- a/src/it/projects/MJAVADOC-610_mrjar/pom.xml
+++ b/src/it/projects/MJAVADOC-610_mrjar/pom.xml
@@ -40,6 +40,13 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <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>
diff --git a/src/it/projects/MJAVADOC-611_dependencyLinks/pom.xml b/src/it/projects/MJAVADOC-611_dependencyLinks/pom.xml
index 5049d7d2c..f6b4acdb4 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 0e0c3fc98..0f305e864 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 d009ed4c4..a42dfdfbc 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/app/pom.xml b/src/it/projects/MJAVADOC-620_no-dot-in-version/app/pom.xml
new file mode 100644
index 000000000..f3f1c9738
--- /dev/null
+++ b/src/it/projects/MJAVADOC-620_no-dot-in-version/app/pom.xml
@@ -0,0 +1,37 @@
+<!--
+  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">
+  <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>
+  <artifactId>maven-MJAVADOC-620-test</artifactId>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+      <artifactId>maven-MJAVADOC620-jar</artifactId>
+      <version>1-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+
+</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 30638151e..40b6e12e8 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 6e87c0076..3ebeb6140 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 f857e7675..702d25531 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 bd4c872f9..d3e860a67 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/app/pom.xml b/src/it/projects/MJAVADOC-620_top-level-package/app/pom.xml
new file mode 100644
index 000000000..ae00f1480
--- /dev/null
+++ b/src/it/projects/MJAVADOC-620_top-level-package/app/pom.xml
@@ -0,0 +1,36 @@
+<!--
+  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">
+  <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>
+  <artifactId>maven-MJAVADOC-620-test</artifactId>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+      <artifactId>maven-MJAVADOC620-jar</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+</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 30638151e..95bc3d673 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 003661770..56e32f915 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 fc405dd5b..6564b86ac 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 ec34b192a..d59fb14b4 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 fea976f61..56a7e8551 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 2573892b2..fd62f9384 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 c8ed6a1a4..6b8f46705 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 042318ccf..7e0eaa0b1 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 1a913feb6..7ded73650 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 284d57ab4..b808c51bb 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 7ad0ef461..80307e610 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 f1a28617f..30f7a524d 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 fb19c7943..409d1d149 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 df6f8d93a..231e7292a 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 7cc3958c1..ad1b57015 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 424448fc2..c6537b366 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>