Compare commits
No commits in common. 'c9' and 'c8-stream-201902' have entirely different histories.
c9
...
c8-stream-
@ -1 +1 @@
|
||||
SOURCES/maven-shared-utils-3.3.4-source-release.zip
|
||||
SOURCES/maven-shared-utils-3.2.1-source-release.zip
|
||||
|
||||
@ -1 +1 @@
|
||||
56437c40076ab4057fe535bd6a60ef905878eba7 SOURCES/maven-shared-utils-3.3.4-source-release.zip
|
||||
015559e466938c7e9053603d37b96ef3e03b802b SOURCES/maven-shared-utils-3.2.1-source-release.zip
|
||||
|
||||
@ -1,82 +1,82 @@
|
||||
From 0466ed821db9af6ad856b011566148b3ad0d0267 Mon Sep 17 00:00:00 2001
|
||||
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 1/3] Restore compatibility with current maven
|
||||
Subject: [PATCH] Restore compatibility with current maven
|
||||
|
||||
---
|
||||
.../utils/logging/AnsiMessageBuilder.java | 18 ++++++++++++++++++
|
||||
.../shared/utils/logging/MessageBuilder.java | 3 +++
|
||||
.../utils/logging/PlainMessageBuilder.java | 18 ++++++++++++++++++
|
||||
.../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 2d59bc9..77c93ae 100644
|
||||
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 060e824..a3b3025 100644
|
||||
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 6a7b56e..1a5889a 100644
|
||||
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.26.2
|
||||
2.14.3
|
||||
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
From 932f9b15bd62255f81c66b564f748fff6ec84c86 Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
Date: Thu, 24 Sep 2020 20:17:56 +0200
|
||||
Subject: [PATCH 3/3] Avoid setting POSIX attributes for symbolic links
|
||||
|
||||
---
|
||||
src/main/java/org/apache/maven/shared/utils/io/FileUtils.java | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
|
||||
index a3be324..a396d99 100644
|
||||
--- a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
|
||||
+++ b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
|
||||
@@ -1973,9 +1973,9 @@ public class FileUtils
|
||||
}
|
||||
}
|
||||
}
|
||||
- }
|
||||
|
||||
- copyFilePermissions( from, to );
|
||||
+ copyFilePermissions( from, to );
|
||||
+ }
|
||||
}
|
||||
|
||||
/**
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@ -0,0 +1,79 @@
|
||||
From 613f27fe7ff4a89c21689a16f6f6b9b3e0b7c347 Mon Sep 17 00:00:00 2001
|
||||
From: Marian Koncek <mkoncek@redhat.com>
|
||||
Date: Thu, 29 Aug 2019 15:04:46 +0200
|
||||
Subject: [PATCH] Port to hamcrest 2.1
|
||||
|
||||
---
|
||||
.../shared/utils/reflection/ReflectorTest.java | 14 +++++++-------
|
||||
1 file changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java b/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java
|
||||
index 0088361..09f6048 100644
|
||||
--- a/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java
|
||||
+++ b/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java
|
||||
@@ -50,7 +50,7 @@ public class ReflectorTest
|
||||
public void newInstanceClassNull()
|
||||
throws Exception
|
||||
{
|
||||
- assertThat( reflector.newInstance( Object.class, null ), is( Object.class ) );
|
||||
+ assertThat( reflector.newInstance( Object.class, null ), isA( Object.class ) );
|
||||
}
|
||||
|
||||
@Test( expected = NullPointerException.class )
|
||||
@@ -64,7 +64,7 @@ public class ReflectorTest
|
||||
public void newInstanceClassEmptyArray()
|
||||
throws Exception
|
||||
{
|
||||
- assertThat( reflector.newInstance( Object.class, new Object[0] ), is( Object.class ) );
|
||||
+ assertThat( reflector.newInstance( Object.class, new Object[0] ), isA( Object.class ) );
|
||||
}
|
||||
|
||||
@Test( expected = ReflectorException.class )
|
||||
@@ -156,7 +156,7 @@ public class ReflectorTest
|
||||
public void getSingletonClassNull()
|
||||
throws Exception
|
||||
{
|
||||
- assertThat( reflector.getSingleton( (Class<?>)Object.class, (Object)null ), is( Object.class ) );
|
||||
+ assertThat( reflector.getSingleton( (Class<?>)Object.class, (Object)null ), isA( Object.class ) );
|
||||
}
|
||||
|
||||
@Test( expected = NullPointerException.class )
|
||||
@@ -170,7 +170,7 @@ public class ReflectorTest
|
||||
public void getSingletonClassEmptyArray()
|
||||
throws Exception
|
||||
{
|
||||
- assertThat( reflector.getSingleton( Object.class, new Object[0] ), is( Object.class ) );
|
||||
+ assertThat( reflector.getSingleton( Object.class, new Object[0] ), isA( Object.class ) );
|
||||
}
|
||||
|
||||
@Test( expected = ReflectorException.class )
|
||||
@@ -787,7 +787,7 @@ public class ReflectorTest
|
||||
public void invokeStaticClassNullNull()
|
||||
throws Exception
|
||||
{
|
||||
- assertThat( reflector.invokeStatic( Object.class, (String)null, (Object)null ), is( Object.class ) );
|
||||
+ assertThat( reflector.invokeStatic( Object.class, (String)null, (Object)null ), isA( Object.class ) );
|
||||
}
|
||||
|
||||
@Test( expected = NullPointerException.class )
|
||||
@@ -801,7 +801,7 @@ public class ReflectorTest
|
||||
public void invokeStaticClassNullEmptyArray()
|
||||
throws Exception
|
||||
{
|
||||
- assertThat( reflector.invokeStatic( Object.class, null, new Object[0] ), is( Object.class ) );
|
||||
+ assertThat( reflector.invokeStatic( Object.class, null, new Object[0] ), isA( Object.class ) );
|
||||
}
|
||||
|
||||
@Test( expected = NullPointerException.class )
|
||||
@@ -829,7 +829,7 @@ public class ReflectorTest
|
||||
public void invokeStaticClassEmptyEmptyArray()
|
||||
throws Exception
|
||||
{
|
||||
- assertThat( reflector.invokeStatic( Object.class, "", new Object[0] ), is( Object.class ) );
|
||||
+ assertThat( reflector.invokeStatic( Object.class, "", new Object[0] ), isA( Object.class ) );
|
||||
}
|
||||
|
||||
@Test( expected = IllegalArgumentException.class )
|
||||
--
|
||||
2.21.0
|
||||
|
||||
Loading…
Reference in new issue