pool/plexus-cli
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-cli?expand=0&rev=13

Browse Source
This commit is contained in:
Fridrich Strba 2022-05-19 11:56:08 +00:00 committed by Git OBS Bridge
parent 214d86cc86
commit 56208c7d38
2 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
0001-Do-not-use-commons-cli-deprecated-classes.patch
View File

@ -1,14 +1,15 @@
From 03df6f6688419f2d85116647c78e36b203c9a16a Mon Sep 17 00:00:00 2001 From 50b6e1d26fdcecbfa40302d6b8f4ea6dbecb3e93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch> From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Thu, 19 May 2022 09:30:24 +0200 Date: Thu, 19 May 2022 09:30:24 +0200
Subject: [PATCH 1/2] Do not use commons-cli deprecated classes Subject: [PATCH 1/2] Do not use commons-cli deprecated classes
--- ---
.../plexus/tools/cli/AbstractCli.java | 32 +++++++++---------- .../plexus/tools/cli/AbstractCli.java | 32 +++++++++----------
1 file changed, 15 insertions(+), 17 deletions(-) .../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 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 aac570d..de8f675 100644 index 1763c5a..e173774 100644
--- a/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java --- a/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java
+++ b/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; @@ -18,9 +18,9 @@ package org.codehaus.plexus.tools.cli;
@ -23,7 +24,7 @@ index aac570d..de8f675 100644
import org.apache.commons.cli.Options; import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException; import org.apache.commons.cli.ParseException;
import org.codehaus.plexus.ContainerConfiguration; import org.codehaus.plexus.ContainerConfiguration;
@@ -47,17 +47,17 @@ public abstract class AbstractCli @@ -49,17 +49,17 @@ public abstract class AbstractCli
// These are standard options that we would want to use for all our projects. // These are standard options that we would want to use for all our projects.
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -47,7 +48,7 @@ index aac570d..de8f675 100644
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Abstract methods // Abstract methods
@@ -344,19 +344,17 @@ public abstract class AbstractCli @@ -346,19 +346,17 @@ public abstract class AbstractCli
options = new Options(); options = new Options();
options.addOption( options.addOption(
@ -73,7 +74,7 @@ index aac570d..de8f675 100644
return buildCliOptions( options ); return buildCliOptions( options );
} }
@@ -367,7 +365,7 @@ public abstract class AbstractCli @@ -369,7 +367,7 @@ public abstract class AbstractCli
// We need to eat any quotes surrounding arguments... // We need to eat any quotes surrounding arguments...
String[] cleanArgs = cleanArgs( args ); String[] cleanArgs = cleanArgs( args );
@ -82,6 +83,28 @@ index aac570d..de8f675 100644
return parser.parse( buildDefaultCliOptions(), cleanArgs ); 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 2.36.1

8
0002-No-unchecked-operations.patch
View File

@ -1,17 +1,17 @@
From f1ab5142f755d9f8c2209a98e9a546e8a6965429 Mon Sep 17 00:00:00 2001 From ebc5470ee49188a0bdf07aa39138fc78c76f3698 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch> From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Thu, 19 May 2022 09:30:58 +0200 Date: Thu, 19 May 2022 09:30:58 +0200
Subject: [PATCH 2/2] No unchecked operations Subject: [PATCH 2/2] No unchecked operations
--- ---
.../java/org/codehaus/plexus/tools/cli/AbstractCli.java | 2 +- src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 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 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 de8f675..2f2e5a4 100644 index e173774..575c539 100644
--- a/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java --- a/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java
+++ b/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java +++ b/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java
@@ -372,7 +372,7 @@ public abstract class AbstractCli @@ -374,7 +374,7 @@ public abstract class AbstractCli
private static String[] cleanArgs( String[] args ) private static String[] cleanArgs( String[] args )
{ {