Skip to content

Commit 636442b

Browse files
michael-omichael-o
committed
Improve ITs
1 parent dbca15a commit 636442b

8 files changed

Lines changed: 28 additions & 25 deletions

File tree

‎pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ under the License.
123123
<!-- for ITs -->
124124
<compilerPluginVersion>3.11.0</compilerPluginVersion>
125125
<sourcePluginVersion>3.3.0</sourcePluginVersion>
126-
<surefirePluginVersion>3.2.2</surefirePluginVersion>
127126
<enforcerPluginVersion>3.4.1</enforcerPluginVersion>
128127
<pluginPluginVersion>3.10.1</pluginPluginVersion>
129128
<jarPluginVersion>3.3.0</jarPluginVersion>

‎src/it/projects/MJAVADOC-257/mymojo/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<dependency>
4242
<groupId>org.apache.maven</groupId>
4343
<artifactId>maven-plugin-api</artifactId>
44-
<version>2.0</version>
44+
<version>@mavenVersion@</version>
4545
</dependency>
4646
</dependencies>
4747
</project>

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

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,24 @@
8181
<artifactId>maven-javadoc-plugin</artifactId>
8282
<version>@project.version@</version>
8383
<configuration>
84-
<tagletArtifacts>
85-
<tagletArtifact>
86-
<groupId>org.apache.maven.plugin-tools</groupId>
87-
<artifactId>maven-plugin-tools-javadoc</artifactId>
88-
<version>3.3</version>
89-
</tagletArtifact>
90-
</tagletArtifacts>
84+
<tags>
85+
<tag>
86+
<name>goal</name>
87+
<placement>X</placement>
88+
</tag>
89+
<tag>
90+
<name>phase</name>
91+
<placement>X</placement>
92+
</tag>
93+
<tag>
94+
<name>parameter</name>
95+
<placement>X</placement>
96+
</tag>
97+
<tag>
98+
<name>required</name>
99+
<placement>X</placement>
100+
</tag>
101+
</tags>
91102
</configuration>
92103
<reportSets>
93104
<reportSet>

‎src/it/projects/MJAVADOC-568_manifest-splitpackage/mojo/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,17 @@
5050
<dependency>
5151
<groupId>org.apache.maven</groupId>
5252
<artifactId>maven-plugin-api</artifactId>
53-
<version>3.6.0</version>
53+
<version>@mavenVersion@</version>
5454
</dependency>
5555
<dependency>
5656
<groupId>org.apache.maven</groupId>
5757
<artifactId>maven-core</artifactId>
58-
<version>3.8.1</version>
58+
<version>@mavenVersion@</version>
5959
</dependency>
6060
<dependency>
6161
<groupId>org.apache.maven.plugin-tools</groupId>
6262
<artifactId>maven-plugin-annotations</artifactId>
63-
<version>3.6.0</version>
63+
<version>@pluginPluginVersion@</version>
6464
<optional>true</optional>
6565
</dependency>
6666
<dependency>
@@ -69,4 +69,4 @@
6969
<version>${project.version}</version>
7070
</dependency>
7171
</dependencies>
72-
</project>
72+
</project>

‎src/it/projects/MJAVADOC-569_aggr-mixed/module2/pom.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@
6565
</goals>
6666
</execution>
6767
</executions>
68+
<configuration>
69+
<goalPrefix>module2</goalPrefix>
70+
</configuration>
6871
</plugin>
6972
</plugins>
7073
</build>

‎src/it/projects/MJAVADOC-569_aggr-mixed/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@
4444
<dependency>
4545
<groupId>org.apache.maven</groupId>
4646
<artifactId>maven-plugin-api</artifactId>
47-
<version>3.0</version>
47+
<version>@mavenVersion@</version>
4848
</dependency>
4949
<dependency>
5050
<groupId>org.apache.maven.plugin-tools</groupId>
5151
<artifactId>maven-plugin-annotations</artifactId>
52-
<version>3.6.0</version>
52+
<version>@pluginPluginVersion@</version>
5353
</dependency>
5454
</dependencies>
5555
</dependencyManagement>

‎src/it/projects/MJAVADOC-591_release8/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,6 @@
4444
<artifactId>maven-compiler-plugin</artifactId>
4545
<version>@compilerPluginVersion@</version>
4646
</plugin>
47-
<plugin>
48-
<groupId>org.apache.maven.plugins</groupId>
49-
<artifactId>maven-surefire-plugin</artifactId>
50-
<version>@surefirePluginVersion@</version>
51-
</plugin>
5247
</plugins>
5348
</pluginManagement>
5449
<plugins>

‎src/it/projects/dependencySource-4/MJAVADOC-280-4-projects/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,6 @@ under the License.
9090
</execution>
9191
</executions>
9292
</plugin>
93-
<plugin>
94-
<groupId>org.apache.maven.plugins</groupId>
95-
<artifactId>maven-surefire-plugin</artifactId>
96-
<version>@surefirePluginVersion@</version>
97-
</plugin>
9893
</plugins>
9994
</pluginManagement>
10095
</build>

0 commit comments

Comments
 (0)