Skip to content

Commit 867dc73

Browse files
michael-omichael-o
committed
[MJAVADOC-781] Upgrade plugins and components (in ITs)
This closes #250
1 parent 0104ab2 commit 867dc73

File tree

88 files changed

+2877
-2864
lines changed

Some content is hidden

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

88 files changed

+2877
-2864
lines changed

‎pom.xml

+25-8
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,16 @@ under the License.
118118
<aetherVersion>1.0.0.v20140518</aetherVersion>
119119
<!-- https://cwiki.apache.org/confluence/x/VIHOCg#MavenEcosystemCleanup-ResolverandMaven -->
120120
<plexus-java.version>1.2.0</plexus-java.version>
121-
<jetty.version>9.4.51.v20230217</jetty.version>
121+
<jetty.version>9.4.53.v20231009</jetty.version>
122122
<!-- for ITs -->
123+
<compilerPluginVersion>3.11.0</compilerPluginVersion>
124+
<sourcePluginVersion>3.3.0</sourcePluginVersion>
125+
<surefirePluginVersion>3.2.2</surefirePluginVersion>
126+
<enforcerPluginVersion>3.4.1</enforcerPluginVersion>
127+
<pluginPluginVersion>3.10.1</pluginPluginVersion>
128+
<jarPluginVersion>3.3.0</jarPluginVersion>
123129
<sitePluginVersion>3.12.1</sitePluginVersion>
124-
<projectInfoReportsPluginVersion>3.4.2</projectInfoReportsPluginVersion>
130+
<projectInfoReportsPluginVersion>3.5.0</projectInfoReportsPluginVersion>
125131
<project.build.outputTimestamp>2023-11-03T20:32:23Z</project.build.outputTimestamp>
126132
<slf4jVersion>1.7.36</slf4jVersion>
127133
</properties>
@@ -214,7 +220,7 @@ under the License.
214220
<dependency>
215221
<groupId>org.apache.maven</groupId>
216222
<artifactId>maven-archiver</artifactId>
217-
<version>3.6.0</version>
223+
<version>3.6.1</version>
218224
</dependency>
219225
<dependency>
220226
<groupId>org.apache.maven.shared</groupId>
@@ -229,6 +235,7 @@ under the License.
229235
<dependency>
230236
<groupId>org.apache.maven.shared</groupId>
231237
<artifactId>maven-common-artifact-filters</artifactId>
238+
<!-- Do not upgrades, leads to IT failures, needs analysis -->
232239
<version>3.2.0</version>
233240
</dependency>
234241
<!-- Doxia -->
@@ -263,12 +270,12 @@ under the License.
263270
<dependency>
264271
<groupId>org.apache.commons</groupId>
265272
<artifactId>commons-lang3</artifactId>
266-
<version>3.12.0</version>
273+
<version>3.14.0</version>
267274
</dependency>
268275
<dependency>
269276
<groupId>org.apache.commons</groupId>
270277
<artifactId>commons-text</artifactId>
271-
<version>1.10.0</version>
278+
<version>1.11.0</version>
272279
</dependency>
273280
<dependency>
274281
<groupId>org.apache.httpcomponents</groupId>
@@ -296,7 +303,10 @@ under the License.
296303
<dependency>
297304
<groupId>org.codehaus.plexus</groupId>
298305
<artifactId>plexus-utils</artifactId>
299-
<version>3.5.1</version>
306+
</dependency>
307+
<dependency>
308+
<groupId>org.codehaus.plexus</groupId>
309+
<artifactId>plexus-xml</artifactId>
300310
</dependency>
301311
<dependency>
302312
<groupId>org.codehaus.plexus</groupId>
@@ -306,12 +316,13 @@ under the License.
306316
<dependency>
307317
<groupId>org.codehaus.plexus</groupId>
308318
<artifactId>plexus-archiver</artifactId>
309-
<version>4.8.0</version>
319+
<version>4.9.0</version>
310320
</dependency>
311321
<dependency>
312322
<groupId>commons-io</groupId>
313323
<artifactId>commons-io</artifactId>
314-
<version>2.13.0</version>
324+
<version>2.15.0</version>
325+
<scope>test</scope>
315326
</dependency>
316327
<dependency>
317328
<groupId>org.codehaus.plexus</groupId>
@@ -407,6 +418,12 @@ under the License.
407418
<version>3.24.2</version>
408419
<scope>test</scope>
409420
</dependency>
421+
<dependency>
422+
<groupId>org.slf4j</groupId>
423+
<artifactId>slf4j-api</artifactId>
424+
<version>${slf4jVersion}</version>
425+
<scope>test</scope>
426+
</dependency>
410427
<dependency>
411428
<groupId>org.slf4j</groupId>
412429
<artifactId>slf4j-simple</artifactId>

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

+75-75
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,75 @@
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-
23-
<groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
24-
<artifactId>maven-javadoc-test</artifactId>
25-
<packaging>pom</packaging>
26-
<version>1.0-SNAPSHOT</version>
27-
<name>Maven Javadoc Test</name>
28-
29-
<modules>
30-
<module>test-module</module>
31-
</modules>
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-
39-
<build>
40-
<pluginManagement>
41-
<plugins>
42-
<plugin>
43-
<artifactId>maven-javadoc-plugin</artifactId>
44-
<version>@pom.version@</version>
45-
</plugin>
46-
<plugin>
47-
<artifactId>maven-site-plugin</artifactId>
48-
<version>@sitePluginVersion@</version>
49-
</plugin>
50-
</plugins>
51-
</pluginManagement>
52-
<plugins>
53-
<plugin>
54-
<artifactId>maven-javadoc-plugin</artifactId>
55-
<configuration>
56-
<debug>true</debug>
57-
</configuration>
58-
<executions>
59-
<execution>
60-
<id>javadoc</id>
61-
<inherited>false</inherited>
62-
<phase>package</phase>
63-
<goals>
64-
<goal>javadoc</goal>
65-
</goals>
66-
<configuration>
67-
<aggregate>false</aggregate>
68-
<sourcepath>test-module/src/main/java</sourcepath>
69-
</configuration>
70-
</execution>
71-
</executions>
72-
</plugin>
73-
</plugins>
74-
</build>
75-
</project>
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+
23+
<groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
24+
<artifactId>maven-javadoc-test</artifactId>
25+
<packaging>pom</packaging>
26+
<version>1.0-SNAPSHOT</version>
27+
<name>Maven Javadoc Test</name>
28+
29+
<modules>
30+
<module>test-module</module>
31+
</modules>
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+
39+
<build>
40+
<pluginManagement>
41+
<plugins>
42+
<plugin>
43+
<artifactId>maven-javadoc-plugin</artifactId>
44+
<version>@project.version@</version>
45+
</plugin>
46+
<plugin>
47+
<artifactId>maven-site-plugin</artifactId>
48+
<version>@sitePluginVersion@</version>
49+
</plugin>
50+
</plugins>
51+
</pluginManagement>
52+
<plugins>
53+
<plugin>
54+
<artifactId>maven-javadoc-plugin</artifactId>
55+
<configuration>
56+
<debug>true</debug>
57+
</configuration>
58+
<executions>
59+
<execution>
60+
<id>javadoc</id>
61+
<inherited>false</inherited>
62+
<phase>package</phase>
63+
<goals>
64+
<goal>javadoc</goal>
65+
</goals>
66+
<configuration>
67+
<aggregate>false</aggregate>
68+
<sourcepath>test-module/src/main/java</sourcepath>
69+
</configuration>
70+
</execution>
71+
</executions>
72+
</plugin>
73+
</plugins>
74+
</build>
75+
</project>

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

+51-51
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
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-
23-
<groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
24-
<artifactId>parent</artifactId>
25-
<version>1.0-SNAPSHOT</version>
26-
<packaging>pom</packaging>
27-
28-
<name>Maven Javadoc Test</name>
29-
30-
<modules>
31-
<module>res1</module>
32-
<module>res2</module>
33-
<module>test</module>
34-
</modules>
35-
36-
<properties>
37-
<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>
40-
</properties>
41-
42-
<build>
43-
<pluginManagement>
44-
<plugins>
45-
<plugin>
46-
<artifactId>maven-javadoc-plugin</artifactId>
47-
<version>@pom.version@</version>
48-
</plugin>
49-
</plugins>
50-
</pluginManagement>
51-
</build>
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+
23+
<groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
24+
<artifactId>parent</artifactId>
25+
<version>1.0-SNAPSHOT</version>
26+
<packaging>pom</packaging>
27+
28+
<name>Maven Javadoc Test</name>
29+
30+
<modules>
31+
<module>res1</module>
32+
<module>res2</module>
33+
<module>test</module>
34+
</modules>
35+
36+
<properties>
37+
<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>
40+
</properties>
41+
42+
<build>
43+
<pluginManagement>
44+
<plugins>
45+
<plugin>
46+
<artifactId>maven-javadoc-plugin</artifactId>
47+
<version>@project.version@</version>
48+
</plugin>
49+
</plugins>
50+
</pluginManagement>
51+
</build>
5252
</project>

0 commit comments

Comments
 (0)