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 2022/12/03 00:17:31 UTC
[maven-help-plugin] branch doxia-2.0.0 updated (ad3be1c -> bd1c590)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch doxia-2.0.0
in repository https://gitbox.apache.org/repos/asf/maven-help-plugin.git
discard ad3be1c Prepare for Doxia 2.0.0
new bd1c590 Prepare for Doxia 2.0.0
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ad3be1c)
\
N -- N -- N refs/heads/doxia-2.0.0 (bd1c590)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[maven-help-plugin] 01/01: Prepare for Doxia 2.0.0
Posted by mi...@apache.org.
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 bd1c590fa61bf29f57663f9454a485009249eadd
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Dec 3 01:16:45 2022 +0100
Prepare for Doxia 2.0.0
---
pom.xml | 10 +++++-----
.../java/org/apache/maven/plugins/help/SystemMojo.java | 16 ++++------------
2 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index fa53630..c4c38df 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-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Maven Help Plugin</name>
@@ -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-M3</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-exec</artifactId>
- <version>1.6.0</version>
+ <version>2.0.0-M3</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 )