Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package plexus-cli for openSUSE:Factory
checked in at 2022-05-20 17:50:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plexus-cli (Old)
and /work/SRC/openSUSE:Factory/.plexus-cli.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plexus-cli"
Fri May 20 17:50:40 2022 rev:5 rq:978179 version:1.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/plexus-cli/plexus-cli.changes 2022-03-20
20:56:56.814647177 +0100
+++ /work/SRC/openSUSE:Factory/.plexus-cli.new.1538/plexus-cli.changes
2022-05-20 17:51:13.259253042 +0200
@@ -1,0 +2,12 @@
+Thu May 19 07:38:31 UTC 2022 - Fridrich Strba <fst...@suse.com>
+
+- Added patches:
+ * 0001-Do-not-use-commons-cli-deprecated-classes.patch
+ + the GnuParser and OptionBuilder classes are deprecated
+ in commons-cli since version 1.3
+ + port to the recommended DefaultParser and Option.builder(...)
+ * 0002-No-unchecked-operations.patch
+ + replace raw java.util.List with typed java.util.List<E>
+ interface
+
+-------------------------------------------------------------------
New:
----
0001-Do-not-use-commons-cli-deprecated-classes.patch
0002-No-unchecked-operations.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plexus-cli.spec ++++++
--- /var/tmp/diff_new_pack.DXpxPS/_old 2022-05-20 17:51:13.747253487 +0200
+++ /var/tmp/diff_new_pack.DXpxPS/_new 2022-05-20 17:51:13.755253494 +0200
@@ -27,6 +27,8 @@
Source0: %{name}-%{version}.tar.xz
Source1: LICENSE-2.0.txt
Source100: %{name}-build.xml
+Patch0: 0001-Do-not-use-commons-cli-deprecated-classes.patch
+Patch1: 0002-No-unchecked-operations.patch
BuildRequires: ant
BuildRequires: apache-commons-cli
BuildRequires: fdupes
@@ -60,6 +62,8 @@
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
cp -p %{SOURCE1} .
cp -p %{SOURCE100} build.xml
++++++ 0001-Do-not-use-commons-cli-deprecated-classes.patch ++++++
>From 50b6e1d26fdcecbfa40302d6b8f4ea6dbecb3e93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.st...@bluewin.ch>
Date: Thu, 19 May 2022 09:30:24 +0200
Subject: [PATCH 1/2] Do not use commons-cli deprecated classes
---
.../plexus/tools/cli/AbstractCli.java | 32 +++++++++----------
.../codehaus/plexus/tools/cli/TestCli.java | 4 +--
2 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java
b/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java
index 1763c5a..e173774 100644
--- a/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java
+++ b/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java
@@ -18,9 +18,9 @@ package org.codehaus.plexus.tools.cli;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.GnuParser;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.codehaus.plexus.ContainerConfiguration;
@@ -49,17 +49,17 @@ public abstract class AbstractCli
// These are standard options that we would want to use for all our
projects.
//
----------------------------------------------------------------------------
- public static final char QUIET = 'q';
+ public static final String QUIET = "q";
- public static final char DEBUG = 'X';
+ public static final String DEBUG = "X";
- public static final char ERRORS = 'e';
+ public static final String ERRORS = "e";
- public static final char HELP = 'h';
+ public static final String HELP = "h";
- public static final char VERSION = 'v';
+ public static final String VERSION = "v";
- public static final char SET_SYSTEM_PROPERTY = 'D';
+ public static final String SET_SYSTEM_PROPERTY = "D";
//
----------------------------------------------------------------------------
// Abstract methods
@@ -346,19 +346,17 @@ public abstract class AbstractCli
options = new Options();
options.addOption(
- OptionBuilder.withLongOpt( "define" ).hasArg().withDescription(
"Define a system property" ).create(
- SET_SYSTEM_PROPERTY ) );
+ Option.builder( SET_SYSTEM_PROPERTY ).longOpt( "define"
).hasArg().desc( "Define a system property" ).build() );
options.addOption(
- OptionBuilder.withLongOpt( "help" ).withDescription( "Display help
information" ).create( HELP ) );
+ Option.builder( HELP ).longOpt( "help" ).desc( "Display help
information" ).build() );
options.addOption(
- OptionBuilder.withLongOpt( "version" ).withDescription( "Display
version information" ).create( VERSION ) );
+ Option.builder( VERSION ).longOpt( "version" ).desc( "Display
version information" ).build() );
options.addOption(
- OptionBuilder.withLongOpt( "quiet" ).withDescription( "Quiet
output - only show errors" ).create( QUIET ) );
+ Option.builder( QUIET ).longOpt( "quiet" ).desc( "Quiet output -
only show errors" ).build() );
options.addOption(
- OptionBuilder.withLongOpt( "debug" ).withDescription( "Produce
execution debug output" ).create( DEBUG ) );
+ Option.builder( DEBUG ).longOpt( "debug" ).desc( "Produce
execution debug output" ).build() );
options.addOption(
- OptionBuilder.withLongOpt( "errors" ).withDescription( "Produce
execution error messages" ).create(
- ERRORS ) );
+ Option.builder( ERRORS ).longOpt( "errors" ).desc( "Produce
execution error messages" ).build() );
return buildCliOptions( options );
}
@@ -369,7 +367,7 @@ public abstract class AbstractCli
// We need to eat any quotes surrounding arguments...
String[] cleanArgs = cleanArgs( args );
- CommandLineParser parser = new GnuParser();
+ CommandLineParser parser = new DefaultParser();
return parser.parse( buildDefaultCliOptions(), cleanArgs );
}
diff --git a/src/test/java/org/codehaus/plexus/tools/cli/TestCli.java
b/src/test/java/org/codehaus/plexus/tools/cli/TestCli.java
index 35b1a31..416edcc 100644
--- a/src/test/java/org/codehaus/plexus/tools/cli/TestCli.java
+++ b/src/test/java/org/codehaus/plexus/tools/cli/TestCli.java
@@ -20,7 +20,7 @@ import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.util.FileUtils;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Option;
import java.io.File;
@@ -39,7 +39,7 @@ public class TestCli
public Options buildCliOptions( Options options )
{
options.addOption(
- OptionBuilder.withLongOpt( "name" ).withDescription( "Display
name." ).hasArg().create( 'n' ) );
+ Option.builder( "n" ).longOpt( "name" ).desc( "Display name."
).hasArg().build() );
return options;
}
--
2.36.1
++++++ 0002-No-unchecked-operations.patch ++++++
>From ebc5470ee49188a0bdf07aa39138fc78c76f3698 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.st...@bluewin.ch>
Date: Thu, 19 May 2022 09:30:58 +0200
Subject: [PATCH 2/2] No unchecked operations
---
src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java
b/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java
index e173774..575c539 100644
--- a/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java
+++ b/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java
@@ -374,7 +374,7 @@ public abstract class AbstractCli
private static String[] cleanArgs( String[] args )
{
- List cleaned = new ArrayList();
+ List<String> cleaned = new ArrayList<String>();
StringBuffer currentArg = null;
--
2.36.1
