From 8795574d7e4cbfecf4ea2c25251215a455e4646c62f466a4b3675bdcb3d96731 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 2 May 2023 11:27:32 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-shared-utils?expand=0&rev=9 --- ...ore-compatibility-with-current-maven.patch | 106 +++++++++--------- maven-shared-utils-3.3.3-source-release.zip | 3 - maven-shared-utils-3.3.4-source-release.zip | 3 + maven-shared-utils-build.xml | 4 +- maven-shared-utils.spec | 4 +- 5 files changed, 60 insertions(+), 60 deletions(-) delete mode 100644 maven-shared-utils-3.3.3-source-release.zip create mode 100644 maven-shared-utils-3.3.4-source-release.zip diff --git a/0001-Restore-compatibility-with-current-maven.patch b/0001-Restore-compatibility-with-current-maven.patch index 96d04f3..1dff7f3 100644 --- a/0001-Restore-compatibility-with-current-maven.patch +++ b/0001-Restore-compatibility-with-current-maven.patch @@ -14,69 +14,69 @@ index 0103a6b..23b6d14 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java @@ -153,4 +153,22 @@ class AnsiMessageBuilder - { - return ansi.toString(); - } -+ -+ @Override -+ public MessageBuilder debug(Object message) { -+ a(message); -+ return this; -+ } -+ -+ @Override -+ public MessageBuilder info(Object message) { -+ a(message); -+ return this; -+ } -+ -+ @Override -+ public MessageBuilder error(Object message) { -+ a(message); -+ return this; -+ } - } + { + return ansi.toString(); + } ++ ++ @Override ++ public MessageBuilder debug(Object message) { ++ a(message); ++ return this; ++ } ++ ++ @Override ++ public MessageBuilder info(Object message) { ++ a(message); ++ return this; ++ } ++ ++ @Override ++ public MessageBuilder error(Object message) { ++ a(message); ++ return this; ++ } + } diff --git a/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java b/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java index b60bb4e..1dc2624 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java @@ -26,6 +26,9 @@ package org.apache.maven.shared.utils.logging; - */ - public interface MessageBuilder - { -+ MessageBuilder debug( Object message ); -+ MessageBuilder info( Object message ); -+ MessageBuilder error( Object message ); - /** - * Append message content in success style. - * By default, bold green + */ + public interface MessageBuilder + { ++ MessageBuilder debug( Object message ); ++ MessageBuilder info( Object message ); ++ MessageBuilder error( Object message ); + /** + * Append message content in success style. + * By default, bold green diff --git a/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java b/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java index 2eec001..5236e99 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java @@ -139,4 +139,22 @@ class PlainMessageBuilder - { - return buffer.toString(); - } -+ -+ @Override -+ public MessageBuilder debug(Object message) { -+ a(message); -+ return this; -+ } -+ -+ @Override -+ public MessageBuilder info(Object message) { -+ a(message); -+ return this; -+ } -+ -+ @Override -+ public MessageBuilder error(Object message) { -+ a(message); -+ return this; -+ } - } + { + return buffer.toString(); + } ++ ++ @Override ++ public MessageBuilder debug(Object message) { ++ a(message); ++ return this; ++ } ++ ++ @Override ++ public MessageBuilder info(Object message) { ++ a(message); ++ return this; ++ } ++ ++ @Override ++ public MessageBuilder error(Object message) { ++ a(message); ++ return this; ++ } + } -- 2.14.3 diff --git a/maven-shared-utils-3.3.3-source-release.zip b/maven-shared-utils-3.3.3-source-release.zip deleted file mode 100644 index 53eff77..0000000 --- a/maven-shared-utils-3.3.3-source-release.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be44a7998e8ee440960994b355b381535a149944092f768e859f986992cd6e0e -size 250352 diff --git a/maven-shared-utils-3.3.4-source-release.zip b/maven-shared-utils-3.3.4-source-release.zip new file mode 100644 index 0000000..316e17b --- /dev/null +++ b/maven-shared-utils-3.3.4-source-release.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5cccf13be755eb5bca4de69d3e27a1221bc956c243d2811866c2ce77218d82c0 +size 249609 diff --git a/maven-shared-utils-build.xml b/maven-shared-utils-build.xml index 346f097..ce86e18 100644 --- a/maven-shared-utils-build.xml +++ b/maven-shared-utils-build.xml @@ -10,11 +10,11 @@ - + - + diff --git a/maven-shared-utils.spec b/maven-shared-utils.spec index 65d98ec..6b47988 100644 --- a/maven-shared-utils.spec +++ b/maven-shared-utils.spec @@ -1,7 +1,7 @@ # # spec file for package maven-shared-utils # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %bcond_with tests Name: maven-shared-utils -Version: 3.3.3 +Version: 3.3.4 Release: 0 Summary: Maven shared utility classes License: Apache-2.0 From e970770054fa00946562686bcaafb5b1c50a2c7689845bab9cb9da3c6a6f3a20 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 3 May 2023 11:26:05 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-shared-utils?expand=0&rev=10 --- maven-shared-utils.changes | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/maven-shared-utils.changes b/maven-shared-utils.changes index 367fd94..1eec65b 100644 --- a/maven-shared-utils.changes +++ b/maven-shared-utils.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed May 3 11:24:22 UTC 2023 - Fridrich Strba + +- Upgrade to upstream version 3.3.4 + * Bug + + [MSHARED-951] - Checked exception converted to raw runtime + exception + + [MSHARED-952] - PrettyPrintXmlWriter output is platform + dependent + + [MSHARED-954] - Deprecate StringUtils.unifyLineSeparator + + [MSHARED-969] - Environment variable with null value + * Dependency upgrade + + [MSHARED-962] - Upgrade Jansi to 2.0.1 + + [MSHARED-973] - Upgrade Jansi to 2.2.0 +- Changed patch: + * 0001-Restore-compatibility-with-current-maven.patch + + rediff to changed context/line-ends + ------------------------------------------------------------------- Mon Apr 25 15:44:47 UTC 2022 - Fridrich Strba