You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2023/02/12 00:49:07 UTC
[maven-help-plugin] 01/01: Prepare for Doxia 2.0.0
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch doxia-2.0.0
in repository https://gitbox.apache.org/repos/asf/maven-help-plugin.git
commit cd27e51d9e693c59202ed82e9031348e8b40ebe0
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Dec 3 01:16:45 2022 +0100
Prepare for Doxia 2.0.0
---
pom.xml | 12 ++++++------
.../java/org/apache/maven/plugins/help/SystemMojo.java | 16 ++++------------
2 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index fa53630..f0cf88b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
</parent>
<artifactId>maven-help-plugin</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-M1-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Maven Help Plugin</name>
@@ -70,7 +70,7 @@
<properties>
<javaVersion>8</javaVersion>
<mavenVersion>3.2.5</mavenVersion>
- <mavenPluginToolsVersion>3.6.4</mavenPluginToolsVersion>
+ <mavenPluginToolsVersion>3.7.1</mavenPluginToolsVersion>
<project.build.outputTimestamp>2022-08-14T12:24:27Z</project.build.outputTimestamp>
</properties>
@@ -139,12 +139,12 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.1.1</version>
+ <version>4.0.0-M4</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-exec</artifactId>
- <version>1.6.0</version>
+ <version>2.0.0-M4</version>
<exclusions>
<exclusion>
<groupId>org.apache.maven</groupId>
@@ -171,7 +171,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.4.2</version>
+ <version>3.5.0</version>
</dependency>
<!-- misc -->
@@ -188,7 +188,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.8.1</version> <!-- commons-lang3 > 3.8.1 requires at least Java 8 -->
+ <version>3.12.0</version>
</dependency>
<!-- test -->
diff --git a/src/main/java/org/apache/maven/plugins/help/SystemMojo.java b/src/main/java/org/apache/maven/plugins/help/SystemMojo.java
index 722cea7..7b4da2b 100644
--- a/src/main/java/org/apache/maven/plugins/help/SystemMojo.java
+++ b/src/main/java/org/apache/maven/plugins/help/SystemMojo.java
@@ -73,20 +73,12 @@ public class SystemMojo
message.append( StringUtils.repeat( "=", LINE_LENGTH ) ).append( LS );
message.append( "Environment Variables" ).append( LS );
message.append( StringUtils.repeat( "=", LINE_LENGTH ) ).append( LS );
- try
+ Properties envVars = CommandLineUtils.getSystemEnvVars();
+ for ( String key : envVars.stringPropertyNames() )
{
- Properties envVars = CommandLineUtils.getSystemEnvVars();
- for ( String key : envVars.stringPropertyNames() )
- {
- message.append( LS );
- message.append( key ).append( "=" ).append( envVars.getProperty( key ) );
- }
- }
- catch ( IOException e )
- {
- getLog().warn( "Unable to get the environment variables: " + e.getMessage() );
+ message.append( LS );
+ message.append( key ).append( "=" ).append( envVars.getProperty( key ) );
}
-
message.append( LS );
if ( output != null )