diff --git a/0001-Restore-compatibility-with-current-maven.patch b/0001-Restore-compatibility-with-current-maven.patch new file mode 100644 index 0000000..0051408 --- /dev/null +++ b/0001-Restore-compatibility-with-current-maven.patch @@ -0,0 +1,82 @@ +From e3d2a29743e1b36beaf1063567da9dfd2e5a8aa8 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Mon, 26 Feb 2018 16:21:04 +0100 +Subject: [PATCH] Restore compatibility with current maven + +--- + .../maven/shared/utils/logging/AnsiMessageBuilder.java | 18 ++++++++++++++++++ + .../maven/shared/utils/logging/MessageBuilder.java | 3 +++ + .../shared/utils/logging/PlainMessageBuilder.java | 18 ++++++++++++++++++ + 3 files changed, 39 insertions(+) + +diff --git a/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java b/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java +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; ++ } + } +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 +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; ++ } + } +-- +2.14.3 + diff --git a/maven-shared-utils-3.2.1-source-release.zip b/maven-shared-utils-3.2.1-source-release.zip new file mode 100644 index 0000000..b64e2b1 Binary files /dev/null and b/maven-shared-utils-3.2.1-source-release.zip differ diff --git a/maven-shared-utils.spec b/maven-shared-utils.spec new file mode 100644 index 0000000..45bfc3f --- /dev/null +++ b/maven-shared-utils.spec @@ -0,0 +1,47 @@ +Name: maven-shared-utils +Version: 3.2.1 +Release: 2 +Summary: The functional replacement of plexus-utils in maven +License: ASL 2.0 +URL: https://maven.apache.org/shared/maven-shared-utils +BuildArch: noarch + +Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip +Patch0001: 0001-Restore-compatibility-with-current-maven.patch + +BuildRequires: maven-local mvn(com.google.code.findbugs:jsr305) mvn(commons-io:commons-io) +BuildRequires: mvn(junit:junit) mvn(org.apache.commons:commons-lang3) mvn(org.apache.maven:maven-core) +BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness) mvn(org.apache.maven.shared:maven-shared-components:pom:) +BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) mvn(org.fusesource.jansi:jansi) mvn(org.hamcrest:hamcrest-core) + +%description +This package can be the functional replacement of plexus-utils in Maven. +At the same time, the package has many hightlights, such as: a lot of methods +got cleaned up, generics got added and a lot of unused code dropped. + +%package help +Summary: Help documentation for %{name} +Provides: %{name}-javadoc = %{version}-%{release} +Obsoletes: %{name}-javadoc < %{version}-%{release} + +%description help +Man pages and other related help documents for %{name}. + +%prep +%autosetup -n %{name}-%{version} -p1 +%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin + +%build +%mvn_build + +%install +%mvn_install + +%files -f .mfiles +%license LICENSE NOTICE + +%files help -f .mfiles-javadoc + +%changelog +* Thur Feb 20 2020 zhusongbao - 3.2.1-2 +- Package init