rpms/maven
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to upstream version 3.5.4

Browse Source
This commit is contained in:
Michael Simacek 2018-06-28 16:42:23 +02:00
parent 3c370677c9
commit 666068fe9c
6 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -20,3 +20,4 @@
/apache-maven-3.5.0-src.tar.gz /apache-maven-3.5.0-src.tar.gz
/apache-maven-3.5.2-src.tar.gz /apache-maven-3.5.2-src.tar.gz
/apache-maven-3.5.3-src.tar.gz /apache-maven-3.5.3-src.tar.gz
/apache-maven-3.5.4-src.tar.gz

4
0001-Adapt-mvn-script.patch
View File

@ -1,4 +1,4 @@
From b784f1322c7aa695037c645ab523285a7fbcb561 Mon Sep 17 00:00:00 2001 From 46041685a82b861bc8616bb603e341adb740a302 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com> From: Michael Simacek <msimacek@redhat.com>
Date: Wed, 1 Feb 2017 14:54:26 +0100 Date: Wed, 1 Feb 2017 14:54:26 +0100
Subject: [PATCH 1/3] Adapt mvn script Subject: [PATCH 1/3] Adapt mvn script
@ -65,5 +65,5 @@ index a554c66..818cf70 100755
# For Cygwin, switch paths to Windows format before running java # For Cygwin, switch paths to Windows format before running java
-- --
2.14.3 2.17.1

6
0002-Invoke-logback-via-reflection.patch
View File

@ -1,10 +1,10 @@
From b7668aab514085c955820f82ddabfd392d4b97a2 Mon Sep 17 00:00:00 2001 From 4e1e32e3a96c6876a22cca6743288b8c8df4adb0 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com> From: Michael Simacek <msimacek@redhat.com>
Date: Tue, 6 Jun 2017 13:47:43 +0200 Date: Tue, 6 Jun 2017 13:47:43 +0200
Subject: [PATCH 2/3] Invoke logback via reflection Subject: [PATCH 2/3] Invoke logback via reflection
--- ---
.../maven/cli/logging/impl/LogbackConfiguration.java | 19 ++++++++++++++----- .../logging/impl/LogbackConfiguration.java | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-) 1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java
@ -49,5 +49,5 @@ index 5d9fab7..ced38cb 100644
@Override @Override
-- --
2.14.3 2.17.1

14
0003-Revert-MNG-6335-Update-Mockito-to-2.12.0.patch
View File

@ -1,13 +1,13 @@
From 3ad510aeff9f75571006ec5c3453162f9cc047ff Mon Sep 17 00:00:00 2001 From 6b5e263ebd03be9551c4e6aa394ac2334fff7c03 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com> From: Michael Simacek <msimacek@redhat.com>
Date: Tue, 13 Mar 2018 11:49:16 +0100 Date: Tue, 13 Mar 2018 11:49:16 +0100
Subject: [PATCH 3/3] Revert "[ MNG-6335] Update Mockito to 2.12.0" Subject: [PATCH 3/3] Revert "[ MNG-6335] Update Mockito to 2.12.0"
This reverts commit a03489b67d04a4b014ff5d1c151b331a39bf100b. This reverts commit a03489b67d04a4b014ff5d1c151b331a39bf100b.
--- ---
.../toolchain/DefaultToolchainManagerPrivateTest.java | 15 +++++++++------ .../DefaultToolchainManagerPrivateTest.java | 15 +++++++++------
.../maven/toolchain/DefaultToolchainManagerTest.java | 4 ++-- .../toolchain/DefaultToolchainManagerTest.java | 4 ++--
.../toolchain/building/DefaultToolchainsBuilderTest.java | 14 +++++++------- .../building/DefaultToolchainsBuilderTest.java | 14 +++++++-------
maven-embedder/pom.xml | 1 - maven-embedder/pom.xml | 1 -
pom.xml | 2 +- pom.xml | 2 +-
5 files changed, 19 insertions(+), 17 deletions(-) 5 files changed, 19 insertions(+), 17 deletions(-)
@ -151,7 +151,7 @@ index fc530df..80fca09 100644
try try
{ {
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index dd7e166..d2825c8 100644 index 8a00565..2a9668b 100644
--- a/maven-embedder/pom.xml --- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml
@@ -141,7 +141,6 @@ under the License. @@ -141,7 +141,6 @@ under the License.
@ -163,7 +163,7 @@ index dd7e166..d2825c8 100644
<dependency> <dependency>
<groupId>org.fusesource.jansi</groupId> <groupId>org.fusesource.jansi</groupId>
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 7835415..8c13ddb 100644 index ef1d0b0..77b3395 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -53,7 +53,7 @@ under the License. @@ -53,7 +53,7 @@ under the License.
@ -176,5 +176,5 @@ index 7835415..8c13ddb 100644
<plexusInterpolationVersion>1.24</plexusInterpolationVersion> <plexusInterpolationVersion>1.24</plexusInterpolationVersion>
<plexusUtilsVersion>3.1.0</plexusUtilsVersion> <plexusUtilsVersion>3.1.0</plexusUtilsVersion>
-- --
2.14.3 2.17.1

7
maven.spec
View File

@ -6,8 +6,8 @@
Name: maven Name: maven
Epoch: 1 Epoch: 1
Version: 3.5.3 Version: 3.5.4
Release: 2%{?dist} Release: 1%{?dist}
Summary: Java project management and project comprehension tool Summary: Java project management and project comprehension tool
License: ASL 2.0 License: ASL 2.0
URL: http://maven.apache.org/ URL: http://maven.apache.org/
@ -267,6 +267,9 @@ update-alternatives --install %{_bindir}/mvn mvn %{homedir}/bin/mvn %{?maven_alt
%changelog %changelog
* Mon Jun 25 2018 Michael Simacek <msimacek@redhat.com> - 1:3.5.4-1
- Update to upstream version 3.5.4
* Wed Apr 18 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.5.3-2 * Wed Apr 18 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.5.3-2
- Introduce alternatives - Introduce alternatives

2
sources
View File

@ -1 +1 @@
SHA512 (apache-maven-3.5.3-src.tar.gz) = 366fe99b47a4b01b474d298cfce5e2cec5898012f05e8d3e2338ec95a15ade89bbfbd87d83019933b9c9b52da756ac7718cf3166ca606b4c6b2e029695fe38f8 SHA512 (apache-maven-3.5.4-src.tar.gz) = faf3c13af3350d056fd49aa3d0a631533a0340332bda8f88a9d8a4c489ec291981b29354a9ed6ff7a8565e0b79eaf16803f908067c5dbd16820cd9025852b39f