Skip to content

Commit 1028afc

Browse files
rfscholterfscholte
committed
[MJAVADOC-592] Prepare integration tests
1 parent 1963ee8 commit 1028afc

File tree

59 files changed

+263
-129
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+263
-129
lines changed

‎pom.xml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -479,13 +479,10 @@ under the License.
479479
<pomExclude>MJAVADOC-181/pom.xml</pomExclude> <!-- seems to be wrong, see comment in Jira issue -->
480480
<pomExclude>output-encoding/pom.xml</pomExclude>
481481
</pomExcludes>
482-
<properties>
482+
<properties combine.self="override"/>
483+
<filterProperties>
483484
<maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
484485
<maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
485-
<!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
486-
<https.protocols>${https.protocols}</https.protocols>
487-
</properties>
488-
<filterProperties>
489486
<mrm.3rdparty.url>${mrm.3rdparty.url}</mrm.3rdparty.url>
490487
</filterProperties>
491488
<environmentVariables>

‎src/it/projects/MJAVADOC-110/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232

3333
<properties>
3434
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
35+
<maven.compiler.source>@maven.compiler.source@</maven.compiler.source>
36+
<maven.compiler.target>@maven.compiler.target@</maven.compiler.target>
3537
</properties>
3638

3739
<build>

‎src/it/projects/MJAVADOC-126/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535

3636
<properties>
3737
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
38+
<maven.compiler.source>@maven.compiler.source@</maven.compiler.source>
39+
<maven.compiler.target>@maven.compiler.target@</maven.compiler.target>
3840
</properties>
3941

4042
<build>

‎src/it/projects/MJAVADOC-134_multiaggregate/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232

3333
<properties>
3434
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
35+
<maven.compiler.source>@maven.compiler.source@</maven.compiler.source>
36+
<maven.compiler.target>@maven.compiler.target@</maven.compiler.target>
3537
</properties>
3638

3739
<modules>

‎src/it/projects/MJAVADOC-172/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929

3030
<properties>
3131
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
32+
<maven.compiler.source>@maven.compiler.source@</maven.compiler.source>
33+
<maven.compiler.target>@maven.compiler.target@</maven.compiler.target>
3234
</properties>
3335

3436
<modules>

‎src/it/projects/MJAVADOC-180/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333

3434
<properties>
3535
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
36-
<maven.compiler.source>1.4</maven.compiler.source>
37-
<maven.compiler.target>1.4</maven.compiler.target>
36+
<maven.compiler.source>@maven.compiler.source@</maven.compiler.source>
37+
<maven.compiler.target>@maven.compiler.target@</maven.compiler.target>
3838
</properties>
3939

4040
<build>

‎src/it/projects/MJAVADOC-194/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333

3434
<properties>
3535
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
36+
<maven.compiler.source>@maven.compiler.source@</maven.compiler.source>
37+
<maven.compiler.target>@maven.compiler.target@</maven.compiler.target>
3638
</properties>
3739

3840
<build>

‎src/it/projects/MJAVADOC-250/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828

2929
<properties>
3030
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
31+
<maven.compiler.source>@maven.compiler.source@</maven.compiler.source>
32+
<maven.compiler.target>@maven.compiler.target@</maven.compiler.target>
3133
</properties>
3234

3335
<build>

‎src/it/projects/MJAVADOC-259/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232

3333
<properties>
3434
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
35+
<maven.compiler.source>@maven.compiler.source@</maven.compiler.source>
36+
<maven.compiler.target>@maven.compiler.target@</maven.compiler.target>
3537
</properties>
3638

3739
<dependencies>

‎src/it/projects/MJAVADOC-275/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ under the License.
4343

4444
<properties>
4545
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
46+
<maven.compiler.source>@maven.compiler.source@</maven.compiler.source>
47+
<maven.compiler.target>@maven.compiler.target@</maven.compiler.target>
4648
</properties>
4749

4850
<build>

0 commit comments

Comments
 (0)