Update to upstream version 3.2.1 (patched temporary)
This commit is contained in:
parent
9c55a97b60
commit
fc1e8b47ff
1
.gitignore
vendored
1
.gitignore
vendored
@ -9,3 +9,4 @@
|
||||
/maven-shared-utils-3.0.0-source-release.zip
|
||||
/maven-shared-utils-3.0.1-source-release.zip
|
||||
/maven-shared-utils-3.1.0-source-release.zip
|
||||
/maven-shared-utils-3.2.1-source-release.zip
|
||||
|
||||
82
0001-Restore-compatibility-with-current-maven.patch
Normal file
82
0001-Restore-compatibility-with-current-maven.patch
Normal file
@ -0,0 +1,82 @@
|
||||
From e3d2a29743e1b36beaf1063567da9dfd2e5a8aa8 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Simacek <msimacek@redhat.com>
|
||||
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
|
||||
|
||||
@ -1,12 +1,14 @@
|
||||
Name: maven-shared-utils
|
||||
Version: 3.1.0
|
||||
Release: 6%{?dist}
|
||||
Version: 3.2.1
|
||||
Release: 0.1%{?dist}
|
||||
Summary: Maven shared utility classes
|
||||
License: ASL 2.0
|
||||
URL: http://maven.apache.org/shared/maven-shared-utils
|
||||
BuildArch: noarch
|
||||
|
||||
Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
# XXX temporary for maven upgrade
|
||||
Patch0: 0001-Restore-compatibility-with-current-maven.patch
|
||||
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(com.google.code.findbugs:jsr305)
|
||||
@ -29,12 +31,15 @@ a lot of unused code.
|
||||
|
||||
%package javadoc
|
||||
Summary: Javadoc for %{name}
|
||||
|
||||
|
||||
%description javadoc
|
||||
API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch0 -p1
|
||||
|
||||
%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
|
||||
|
||||
%build
|
||||
@ -50,6 +55,9 @@ API documentation for %{name}.
|
||||
%license LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Mon Feb 26 2018 Michael Simacek <msimacek@redhat.com> - 3.2.1-0.1
|
||||
- Update to upstream version 3.2.1 (patched temporary)
|
||||
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user