Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package plexus-containers for
openSUSE:Factory checked in at 2022-05-20 17:51:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plexus-containers (Old)
and /work/SRC/openSUSE:Factory/.plexus-containers.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plexus-containers"
Fri May 20 17:51:11 2022 rev:10 rq:978272 version:2.1.1
Changes:
--------
plexus-containers.changes: same change
---
/work/SRC/openSUSE:Factory/plexus-containers/plexus-metadata-generator.changes
2022-03-24 23:00:06.304372438 +0100
+++
/work/SRC/openSUSE:Factory/.plexus-containers.new.1538/plexus-metadata-generator.changes
2022-05-20 17:52:11.055305650 +0200
@@ -1,0 +2,8 @@
+Fri May 20 12:13:42 UTC 2022 - Fridrich Strba <[email protected]>
+
+- Modified patch:
+ * plexus-metadata-generator-cli.patch
+ + Do not use the deprecated plexus-cli functions, but port
+ the generator to the recommended replacement
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plexus-component-metadata.spec ++++++
--- /var/tmp/diff_new_pack.NY1XZZ/_old 2022-05-20 17:52:11.663306203 +0200
+++ /var/tmp/diff_new_pack.NY1XZZ/_new 2022-05-20 17:52:11.671306211 +0200
@@ -116,11 +116,12 @@
%if %{without tests}
-f \
%endif
+ -- \
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
- -- -Dmaven.compiler.release=8
+ -Dmaven.compiler.release=8 \
%endif
+ -Dsource=8
-# empty line, keep
popd
%install
++++++ plexus-metadata-generator.spec ++++++
--- /var/tmp/diff_new_pack.NY1XZZ/_old 2022-05-20 17:52:11.731306265 +0200
+++ /var/tmp/diff_new_pack.NY1XZZ/_new 2022-05-20 17:52:11.739306272 +0200
@@ -85,7 +85,7 @@
mkdir -p lib
build-jar-repository -s lib %{base_name} objectweb-asm/asm
objectweb-asm/asm-commons plexus/classworlds plexus/utils jdom2/jdom2
commons-cli qdox plexus/cli
%if %{with tests}
-build-jar-repository -s lib hamcrest/core
+build-jar-repository -s lib hamcrest/core xbean/xbean-reflect
%endif
%patch1 -p1
++++++ plexus-metadata-generator-cli.patch ++++++
--- /var/tmp/diff_new_pack.NY1XZZ/_old 2022-05-20 17:52:11.827306352 +0200
+++ /var/tmp/diff_new_pack.NY1XZZ/_new 2022-05-20 17:52:11.831306356 +0200
@@ -9,7 +9,7 @@
+import java.util.Collections;
+
+import org.apache.commons.cli.CommandLine;
-+import org.apache.commons.cli.OptionBuilder;
++import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.tools.cli.AbstractCli;
@@ -17,11 +17,11 @@
+public class PlexusMetadataGeneratorCli
+ extends AbstractCli
+{
-+ public static final char SOURCE_DIRECTORY = 's';
-+ public static final char SOURCE_ENCODING = 'e';
-+ public static final char CLASSES_DIRECTORY = 'c';
-+ public static final char OUTPUT_FILE = 'o';
-+ public static final char DESCRIPTORS_DIRECTORY = 'm';
++ public static final String SOURCE_DIRECTORY = "s";
++ public static final String SOURCE_ENCODING = "e";
++ public static final String CLASSES_DIRECTORY = "c";
++ public static final String OUTPUT_FILE = "o";
++ public static final String DESCRIPTORS_DIRECTORY = "m";
+
+ public static void main( String[] args )
+ throws Exception
@@ -39,11 +39,11 @@
+ @SuppressWarnings("static-access")
+ public Options buildCliOptions( Options options )
+ {
-+ options.addOption( OptionBuilder.withLongOpt( "source"
).hasArg().withDescription( "Source directory." ).create( SOURCE_DIRECTORY ) );
-+ options.addOption( OptionBuilder.withLongOpt( "encoding"
).hasArg().withDescription( "Source file encoding." ).create( SOURCE_ENCODING )
);
-+ options.addOption( OptionBuilder.withLongOpt( "classes"
).hasArg().withDescription( "Classes directory." ).create( CLASSES_DIRECTORY )
);
-+ options.addOption( OptionBuilder.withLongOpt( "output"
).hasArg().withDescription( "Output directory." ).create( OUTPUT_FILE ) );
-+ options.addOption( OptionBuilder.withLongOpt( "descriptors"
).hasArg().withDescription( "Descriptors directory." ).create(
DESCRIPTORS_DIRECTORY ) );
++ options.addOption( Option.builder( SOURCE_DIRECTORY ).longOpt(
"source" ).hasArg().desc( "Source directory." ).build() );
++ options.addOption( Option.builder( SOURCE_ENCODING ).longOpt(
"encoding" ).hasArg().desc( "Source file encoding." ).build() );
++ options.addOption( Option.builder( CLASSES_DIRECTORY ).longOpt(
"classes" ).hasArg().desc( "Classes directory." ).build() );
++ options.addOption( Option.builder( OUTPUT_FILE ).longOpt( "output"
).hasArg().desc( "Output directory." ).build() );
++ options.addOption( Option.builder( DESCRIPTORS_DIRECTORY ).longOpt(
"descriptors" ).hasArg().desc( "Descriptors directory." ).build() );
+ return options;
+ }
+
