Skip to content

Commit c56ec0a

Browse files
michael-omichael-o
committed
[MJAVADOC-741] Upgrade plugins and components
1 parent d02fd90 commit c56ec0a

2 files changed

Lines changed: 17 additions & 62 deletions

File tree

‎pom.xml‎

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,11 @@ under the License.
117117
<wagonVersion>2.4</wagonVersion>
118118
<aetherVersion>1.0.0.v20140518</aetherVersion>
119119
<!-- https://cwiki.apache.org/confluence/x/VIHOCg#MavenEcosystemCleanup-ResolverandMaven -->
120-
<plexus-java.version>1.1.0</plexus-java.version>
121-
<jetty.version>9.4.43.v20210629</jetty.version>
120+
<plexus-java.version>1.1.2</plexus-java.version>
121+
<jetty.version>9.4.50.v20221201</jetty.version>
122122
<!-- for ITs -->
123123
<sitePluginVersion>3.12.1</sitePluginVersion>
124-
<projectInfoReportsPluginVersion>3.2.2</projectInfoReportsPluginVersion>
124+
<projectInfoReportsPluginVersion>3.4.2</projectInfoReportsPluginVersion>
125125
<project.build.outputTimestamp>2022-08-10T19:51:10Z</project.build.outputTimestamp>
126126
<slf4jVersion>1.7.36</slf4jVersion>
127127
</properties>
@@ -219,12 +219,12 @@ under the License.
219219
<dependency>
220220
<groupId>org.apache.maven.shared</groupId>
221221
<artifactId>maven-invoker</artifactId>
222-
<version>3.1.0</version>
222+
<version>3.2.0</version>
223223
</dependency>
224224
<dependency>
225225
<groupId>org.apache.maven.shared</groupId>
226226
<artifactId>maven-common-artifact-filters</artifactId>
227-
<version>3.1.1</version>
227+
<version>3.2.0</version>
228228
</dependency>
229229

230230
<!-- Doxia -->
@@ -262,18 +262,18 @@ under the License.
262262
<dependency>
263263
<groupId>org.apache.httpcomponents</groupId>
264264
<artifactId>httpclient</artifactId>
265-
<version>4.5.13</version>
265+
<version>4.5.14</version>
266266
</dependency>
267267
<dependency>
268268
<groupId>org.apache.httpcomponents</groupId>
269269
<artifactId>httpcore</artifactId>
270-
<version>4.4.15</version>
270+
<version>4.4.16</version>
271271
</dependency>
272272

273273
<dependency>
274274
<groupId>com.thoughtworks.qdox</groupId>
275275
<artifactId>qdox</artifactId>
276-
<version>2.0.1</version>
276+
<version>2.0.3</version>
277277
</dependency>
278278

279279
<!-- Plexus -->
@@ -285,7 +285,7 @@ under the License.
285285
<dependency>
286286
<groupId>org.codehaus.plexus</groupId>
287287
<artifactId>plexus-utils</artifactId>
288-
<version>3.4.2</version>
288+
<version>3.5.0</version>
289289
</dependency>
290290
<dependency>
291291
<groupId>commons-io</groupId>
@@ -371,7 +371,7 @@ under the License.
371371
<dependency>
372372
<groupId>org.assertj</groupId>
373373
<artifactId>assertj-core</artifactId>
374-
<version>3.23.1</version>
374+
<version>3.24.2</version>
375375
<scope>test</scope>
376376
</dependency>
377377
<dependency>
@@ -407,11 +407,6 @@ under the License.
407407
</excludes>
408408
</configuration>
409409
</plugin>
410-
<plugin>
411-
<groupId>org.apache.maven.plugins</groupId>
412-
<artifactId>maven-jxr-plugin</artifactId>
413-
<version>3.1.1</version>
414-
</plugin>
415410
<plugin>
416411
<groupId>org.apache.maven.plugins</groupId>
417412
<artifactId>maven-javadoc-plugin</artifactId>
@@ -420,11 +415,6 @@ under the License.
420415
<failOnWarnings>false</failOnWarnings>
421416
</configuration>
422417
</plugin>
423-
<plugin>
424-
<groupId>org.apache.maven.plugins</groupId>
425-
<artifactId>maven-project-info-reports-plugin</artifactId>
426-
<version>3.1.2</version>
427-
</plugin>
428418
</plugins>
429419
</pluginManagement>
430420
<plugins>
@@ -504,7 +494,7 @@ under the License.
504494
<plugin>
505495
<groupId>org.codehaus.mojo</groupId>
506496
<artifactId>mrm-maven-plugin</artifactId>
507-
<version>1.2.0</version>
497+
<version>1.5.0</version>
508498
<executions>
509499
<execution>
510500
<id>repository</id>

‎src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java‎

Lines changed: 6 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,27 +1006,17 @@ private static InvocationResult invoke(
10061006

10071007
/**
10081008
* @param log a logger could be null
1009-
* @return the Maven home defined in the <code>maven.home</code> system property or defined in <code>M2_HOME</code>
1010-
* system env variables or null if never set.
1009+
* @return the Maven home defined in the <code>maven.home</code> system property
1010+
* or null if never set.
10111011
* @since 2.6
10121012
*/
10131013
private static String getMavenHome(Log log) {
10141014
String mavenHome = System.getProperty("maven.home");
1015-
if (mavenHome == null) {
1016-
try {
1017-
mavenHome = CommandLineUtils.getSystemEnvVars().getProperty("M2_HOME");
1018-
} catch (IOException e) {
1019-
if (log != null && log.isDebugEnabled()) {
1020-
log.debug("IOException: " + e.getMessage());
1021-
}
1022-
}
1023-
}
10241015

10251016
File m2Home = new File(mavenHome);
10261017
if (!m2Home.exists()) {
10271018
if (log != null && log.isErrorEnabled()) {
1028-
log.error("Cannot find Maven application directory. Either specify 'maven.home' system property, or "
1029-
+ "M2_HOME environment variable.");
1019+
log.error("Cannot find Maven application directory. Either specify 'maven.home' system property.");
10301020
}
10311021
}
10321022

@@ -1039,16 +1029,7 @@ private static String getMavenHome(Log log) {
10391029
* @since 2.6
10401030
*/
10411031
private static String getMavenOpts(Log log) {
1042-
String mavenOpts = null;
1043-
try {
1044-
mavenOpts = CommandLineUtils.getSystemEnvVars().getProperty("MAVEN_OPTS");
1045-
} catch (IOException e) {
1046-
if (log != null && log.isDebugEnabled()) {
1047-
log.debug("IOException: " + e.getMessage());
1048-
}
1049-
}
1050-
1051-
return mavenOpts;
1032+
return CommandLineUtils.getSystemEnvVars().getProperty("MAVEN_OPTS");
10521033
}
10531034

10541035
/**
@@ -1061,14 +1042,7 @@ private static String getMavenOpts(Log log) {
10611042
private static File getJavaHome(Log log) {
10621043
File javaHome = null;
10631044

1064-
String javaHomeValue = null;
1065-
try {
1066-
javaHomeValue = CommandLineUtils.getSystemEnvVars().getProperty("JAVA_HOME");
1067-
} catch (IOException e) {
1068-
if (log != null && log.isDebugEnabled()) {
1069-
log.debug("IOException: " + e.getMessage());
1070-
}
1071-
}
1045+
String javaHomeValue = CommandLineUtils.getSystemEnvVars().getProperty("JAVA_HOME");
10721046

10731047
// if maven.home is set, we can assume JAVA_HOME must be used for testing
10741048
if (System.getProperty("maven.home") == null || javaHomeValue == null) {
@@ -1100,16 +1074,7 @@ private static File getJavaHome(Log log) {
11001074
* @since 2.6
11011075
*/
11021076
private static String getJavaOpts(Log log) {
1103-
String javaOpts = null;
1104-
try {
1105-
javaOpts = CommandLineUtils.getSystemEnvVars().getProperty("JAVA_OPTS");
1106-
} catch (IOException e) {
1107-
if (log != null && log.isDebugEnabled()) {
1108-
log.debug("IOException: " + e.getMessage());
1109-
}
1110-
}
1111-
1112-
return javaOpts;
1077+
return CommandLineUtils.getSystemEnvVars().getProperty("JAVA_OPTS");
11131078
}
11141079

11151080
/**

0 commit comments

Comments
 (0)