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>

‎src/it/projects/MJAVADOC-278/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-320/pom.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,11 @@
3636
<module>module3</module>
3737
</modules>
3838

39-
<properties>
40-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
41-
</properties>
39+
<properties>
40+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
41+
<maven.compiler.source>@maven.compiler.source@</maven.compiler.source>
42+
<maven.compiler.target>@maven.compiler.target@</maven.compiler.target>
43+
</properties>
4244

4345
<build>
4446
<pluginManagement>

‎src/it/projects/MJAVADOC-369/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-414/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
<dependencies>

‎src/it/projects/MJAVADOC-420_fixparam/pom.xml

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

2929
<url>https://issues.apache.org/jira/browse/MJAVADOC-420</url>
3030

31+
<properties>
32+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
33+
<maven.compiler.source>@maven.compiler.source@</maven.compiler.source>
34+
<maven.compiler.target>@maven.compiler.target@</maven.compiler.target>
35+
</properties>
36+
3137
<build>
3238
<pluginManagement>
3339
<plugins>

‎src/it/projects/MJAVADOC-434_fixcompile/pom.xml

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

2929
<url>https://issues.apache.org/jira/browse/MJAVADOC-434</url>
3030

31+
<properties>
32+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
33+
<maven.compiler.source>@maven.compiler.source@</maven.compiler.source>
34+
<maven.compiler.target>@maven.compiler.target@</maven.compiler.target>
35+
</properties>
36+
3137
<build>
3238
<pluginManagement>
3339
<plugins>

‎src/it/projects/MJAVADOC-437/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-444/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-449_aggr_modulepath/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
<groupId>org.apache.maven.plugins</groupId>
3030
<artifactId>maven-javadoc-plugin</artifactId>
3131
<version>@project.version@</version>
32+
<configuration>
33+
<release>9</release>
34+
</configuration>
3235
</plugin>
3336
</plugins>
3437
</build>

‎src/it/projects/MJAVADOC-452_fix-duplicateparams/pom.xml

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

2929
<url>https://issues.apache.org/jira/browse/MJAVADOC-452</url>
3030

31+
<properties>
32+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
33+
<maven.compiler.source>@maven.compiler.source@</maven.compiler.source>
34+
<maven.compiler.target>@maven.compiler.target@</maven.compiler.target>
35+
</properties>
36+
3137
<build>
3238
<pluginManagement>
3339
<plugins>

‎src/it/projects/MJAVADOC-494_aggregate-repositories/pom.xml

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

2525
<properties>
2626
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
27+
<maven.compiler.source>@maven.compiler.source@</maven.compiler.source>
28+
<maven.compiler.target>@maven.compiler.target@</maven.compiler.target>
2729
</properties>
2830

2931
<repositories>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,15 @@
4040
<build>
4141
<pluginManagement>
4242
<plugins>
43+
<plugin>
44+
<groupId>org.apache.maven.plugins</groupId>
45+
<artifactId>maven-compiler-plugin</artifactId>
46+
<version>3.8.1</version>
47+
<configuration>
48+
<source>@maven.compiler.source@</source>
49+
<target>@maven.compiler.target@</target>
50+
</configuration>
51+
</plugin>
4352
<plugin>
4453
<groupId>org.apache.maven.plugins</groupId>
4554
<artifactId>maven-javadoc-plugin</artifactId>

‎src/it/projects/MJAVADOC-506_excl-module-info/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
<excludes>
5252
<exclude>module-info.java</exclude>
5353
</excludes>
54+
<source>@maven.compiler.source@</source>
55+
<target>@maven.compiler.target@</target>
5456
</configuration>
5557
</plugin>
5658
<plugin>

‎src/it/projects/MJAVADOC-526_aggr-managedDeps/pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,13 @@
2929
<packaging>pom</packaging>
3030

3131
<url>https://issues.apache.org/jira/browse/MJAVADOC-526</url>
32-
32+
33+
<properties>
34+
<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>
37+
</properties>
38+
3339
<build>
3440
<pluginManagement>
3541
<plugins>

‎src/it/projects/MJAVADOC-551 spaces/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-552_fix-author/pom.xml

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

2929
<url>https://issues.apache.org/jira/browse/MJAVADOC-552</url>
3030

31+
<properties>
32+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
33+
<maven.compiler.source>@maven.compiler.source@</maven.compiler.source>
34+
<maven.compiler.target>@maven.compiler.target@</maven.compiler.target>
35+
</properties>
36+
3137
<build>
3238
<pluginManagement>
3339
<plugins>

‎src/it/projects/MJAVADOC-558_fix-unknownthrows/pom.xml

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

2929
<url>https://issues.apache.org/jira/browse/MJAVADOC-558</url>
3030

31+
<properties>
32+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
33+
<maven.compiler.source>@maven.compiler.source@</maven.compiler.source>
34+
<maven.compiler.target>@maven.compiler.target@</maven.compiler.target>
35+
</properties>
36+
3137
<build>
3238
<pluginManagement>
3339
<plugins>

‎src/it/projects/MJAVADOC-575_source8-module-info/pom.xml

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

3232
<properties>
3333
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
34+
<maven.compiler.source>@maven.compiler.source@</maven.compiler.source>
35+
<maven.compiler.target>@maven.compiler.target@</maven.compiler.target>
3436
</properties>
3537

3638
<dependencies>

‎src/it/projects/MJAVADOC-590_nooverview/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@
2121

2222
<url>https://issues.apache.org/jira/browse/MJAVADOC-590</url>
2323

24+
<properties>
25+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
26+
<maven.compiler.source>@maven.compiler.source@</maven.compiler.source>
27+
<maven.compiler.target>@maven.compiler.target@</maven.compiler.target>
28+
</properties>
29+
2430
<build>
2531
<plugins>
2632
<plugin>

‎src/it/projects/MJAVADOC-610_mrjar/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,13 @@
4040
<artifactId>maven-compiler-plugin</artifactId>
4141
<version>3.8.1</version>
4242
<executions>
43+
<execution>
44+
<id>default-compile</id>
45+
<configuration>
46+
<source>@maven.compiler.source@</source>
47+
<target>@maven.compiler.target@</target>
48+
</configuration>
49+
</execution>
4350
<execution>
4451
<id>jdk9</id>
4552
<goals>

‎src/it/projects/MJAVADOC-611_dependencyLinks/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-613-aggregate-exclude/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-619_copyright-year/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
<project.build.outputTimestamp>2020-03-12T06:39:23Z</project.build.outputTimestamp>
3234
</properties>
3335

‎src/it/projects/MJAVADOC-620_no-dot-in-version/app/pom.xml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
-->
19+
20+
<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">
21+
<modelVersion>4.0.0</modelVersion>
22+
<parent>
23+
<groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
24+
<artifactId>maven-MJAVADOC-620</artifactId>
25+
<version>1.0-SNAPSHOT</version>
26+
</parent>
27+
<artifactId>maven-MJAVADOC-620-test</artifactId>
28+
29+
<dependencies>
30+
<dependency>
31+
<groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
32+
<artifactId>maven-MJAVADOC620-jar</artifactId>
33+
<version>1-SNAPSHOT</version>
34+
</dependency>
35+
</dependencies>
36+
37+
</project>

‎src/it/projects/MJAVADOC-620_no-dot-in-version/src/main/java/TestUsage.java renamed to ‎src/it/projects/MJAVADOC-620_no-dot-in-version/app/src/main/java/TestUsage.java

File renamed without changes.

0 commit comments

Comments
 (0)