From 8a72aae90423f32a50f28c28d4448ea4b40599f0 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mar 15 2018 14:09:59 +0000 Subject: Update to upstream version 3.5.3 --- diff --git a/.gitignore b/.gitignore index 4149e88..9ec5b30 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /apache-maven-3.4.0-SNAPSHOT-src.tar.gz /apache-maven-3.5.0-src.tar.gz /apache-maven-3.5.2-src.tar.gz +/apache-maven-3.5.3-src.tar.gz diff --git a/0001-Adapt-mvn-script.patch b/0001-Adapt-mvn-script.patch index 58bbec7..e4b6c1d 100644 --- a/0001-Adapt-mvn-script.patch +++ b/0001-Adapt-mvn-script.patch @@ -1,14 +1,14 @@ -From 48cb2294352381ef90895a9dbeb57935fb01bcee Mon Sep 17 00:00:00 2001 +From b784f1322c7aa695037c645ab523285a7fbcb561 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Wed, 1 Feb 2017 14:54:26 +0100 -Subject: [PATCH 1/2] Adapt mvn script +Subject: [PATCH 1/3] Adapt mvn script --- apache-maven/src/bin/mvn | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn -index e3a5848..defaf5f 100755 +index a554c66..818cf70 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn @@ -22,7 +22,7 @@ @@ -65,5 +65,5 @@ index e3a5848..defaf5f 100755 # For Cygwin, switch paths to Windows format before running java -- -2.13.6 +2.14.3 diff --git a/0002-Invoke-logback-via-reflection.patch b/0002-Invoke-logback-via-reflection.patch index 57e75b7..d2f3e88 100644 --- a/0002-Invoke-logback-via-reflection.patch +++ b/0002-Invoke-logback-via-reflection.patch @@ -1,7 +1,7 @@ -From 4b3b321df55c2bb73a82220f38b8267d1785b470 Mon Sep 17 00:00:00 2001 +From b7668aab514085c955820f82ddabfd392d4b97a2 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 6 Jun 2017 13:47:43 +0200 -Subject: [PATCH 2/2] Invoke logback via reflection +Subject: [PATCH 2/3] Invoke logback via reflection --- .../maven/cli/logging/impl/LogbackConfiguration.java | 19 ++++++++++++++----- @@ -49,5 +49,5 @@ index 5d9fab7..ced38cb 100644 @Override -- -2.13.6 +2.14.3 diff --git a/0003-Revert-MNG-6335-Update-Mockito-to-2.12.0.patch b/0003-Revert-MNG-6335-Update-Mockito-to-2.12.0.patch new file mode 100644 index 0000000..20878c4 --- /dev/null +++ b/0003-Revert-MNG-6335-Update-Mockito-to-2.12.0.patch @@ -0,0 +1,180 @@ +From 3ad510aeff9f75571006ec5c3453162f9cc047ff Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Tue, 13 Mar 2018 11:49:16 +0100 +Subject: [PATCH 3/3] Revert "[ MNG-6335] Update Mockito to 2.12.0" + +This reverts commit a03489b67d04a4b014ff5d1c151b331a39bf100b. +--- + .../toolchain/DefaultToolchainManagerPrivateTest.java | 15 +++++++++------ + .../maven/toolchain/DefaultToolchainManagerTest.java | 4 ++-- + .../toolchain/building/DefaultToolchainsBuilderTest.java | 14 +++++++------- + maven-embedder/pom.xml | 1 - + pom.xml | 2 +- + 5 files changed, 19 insertions(+), 17 deletions(-) + +diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java +index c937564..1e48441 100644 +--- a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java ++++ b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java +@@ -20,7 +20,8 @@ package org.apache.maven.toolchain; + */ + + import static org.junit.Assert.assertEquals; +-import static org.mockito.ArgumentMatchers.anyString; ++import static org.junit.Assert.fail; ++import static org.mockito.Matchers.anyString; + import static org.mockito.Mockito.mock; + import static org.mockito.Mockito.never; + import static org.mockito.Mockito.verify; +@@ -144,8 +145,9 @@ public class DefaultToolchainManagerPrivateTest + verify( logger, never() ).error( anyString() ); + assertEquals( 2, toolchains.length ); + } +- +- @Test ++ ++ @SuppressWarnings( "unchecked" ) ++ @Test( expected = MisconfiguredToolchainException.class ) + public void testMisconfiguredToolchain() + throws Exception + { +@@ -153,11 +155,12 @@ public class DefaultToolchainManagerPrivateTest + MavenSession session = mock( MavenSession.class ); + MavenExecutionRequest req = new DefaultMavenExecutionRequest(); + when( session.getRequest() ).thenReturn( req ); ++ when(toolchainFactory_basicType.createDefaultToolchain()).thenThrow( MisconfiguredToolchainException.class ); + + // execute +- ToolchainPrivate[] basics = toolchainManager.getToolchainsForType("basic", session); +- ++ toolchainManager.getToolchainsForType( "basic", session ); ++ + // verify +- assertEquals( 0, basics.length ); ++ fail( "Should exit with a MisconfiguredToolchainException" ); + } + } +diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java +index 84444c0..6e85c42 100644 +--- a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java ++++ b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java +@@ -20,6 +20,7 @@ package org.apache.maven.toolchain; + */ + + import static org.junit.Assert.assertEquals; ++import static org.mockito.Matchers.anyMap; + import static org.mockito.Matchers.isA; + import static org.mockito.Mockito.mock; + import static org.mockito.Mockito.verify; +@@ -38,7 +39,6 @@ import org.apache.maven.toolchain.model.ToolchainModel; + import org.codehaus.plexus.logging.Logger; + import org.junit.Before; + import org.junit.Test; +-import org.mockito.ArgumentMatchers; + import org.mockito.InjectMocks; + import org.mockito.Mock; + import org.mockito.MockitoAnnotations; +@@ -142,7 +142,7 @@ public class DefaultToolchainManagerTest + executionRequest.setToolchains( toolchainModels ); + when( session.getRequest() ).thenReturn( executionRequest ); + ToolchainPrivate basicPrivate = mock( ToolchainPrivate.class ); +- when( basicPrivate.matchesRequirements( ArgumentMatchers.anyMap() ) ).thenReturn( false ).thenReturn( true ); ++ when( basicPrivate.matchesRequirements( anyMap() ) ).thenReturn( false ).thenReturn( true ); + when( toolchainFactory_basicType.createToolchain( isA( ToolchainModel.class ) ) ).thenReturn( basicPrivate ); + + List toolchains = +diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java +index fc530df..80fca09 100644 +--- a/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java ++++ b/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java +@@ -21,7 +21,8 @@ package org.apache.maven.toolchain.building; + + import static org.junit.Assert.assertEquals; + import static org.junit.Assert.assertNotNull; +-import static org.mockito.ArgumentMatchers.any; ++import static org.mockito.Matchers.any; ++import static org.mockito.Matchers.anyMap; + import static org.mockito.Mockito.when; + + import java.io.IOException; +@@ -34,7 +35,6 @@ import org.apache.maven.toolchain.model.PersistedToolchains; + import org.apache.maven.toolchain.model.ToolchainModel; + import org.junit.Before; + import org.junit.Test; +-import org.mockito.ArgumentMatchers; + import org.mockito.InjectMocks; + import org.mockito.Mock; + import org.mockito.MockitoAnnotations; +@@ -78,7 +78,7 @@ public class DefaultToolchainsBuilderTest + toolchain.setType( "TYPE" ); + toolchain.addProvide( "key", "user_value" ); + userResult.addToolchain( toolchain ); +- when( toolchainsReader.read( any( InputStream.class ), ArgumentMatchers.anyMap()) ).thenReturn( userResult ); ++ when( toolchainsReader.read( any( InputStream.class ), anyMap() ) ).thenReturn( userResult ); + + ToolchainsBuildingResult result = toolchainBuilder.build( request ); + assertNotNull( result.getEffectiveToolchains() ); +@@ -101,7 +101,7 @@ public class DefaultToolchainsBuilderTest + toolchain.setType( "TYPE" ); + toolchain.addProvide( "key", "global_value" ); + globalResult.addToolchain( toolchain ); +- when( toolchainsReader.read( any( InputStream.class ), ArgumentMatchers.anyMap()) ).thenReturn( globalResult ); ++ when( toolchainsReader.read( any( InputStream.class ), anyMap() ) ).thenReturn( globalResult ); + + ToolchainsBuildingResult result = toolchainBuilder.build( request ); + assertNotNull( result.getEffectiveToolchains() ); +@@ -131,7 +131,7 @@ public class DefaultToolchainsBuilderTest + globalToolchain.setType( "TYPE" ); + globalToolchain.addProvide( "key", "global_value" ); + globalResult.addToolchain( globalToolchain ); +- when( toolchainsReader.read( any( InputStream.class ), ArgumentMatchers.anyMap()) ).thenReturn( globalResult ).thenReturn( userResult ); ++ when( toolchainsReader.read( any( InputStream.class ), anyMap() ) ).thenReturn( globalResult ).thenReturn( userResult ); + + ToolchainsBuildingResult result = toolchainBuilder.build( request ); + assertNotNull( result.getEffectiveToolchains() ); +@@ -150,7 +150,7 @@ public class DefaultToolchainsBuilderTest + ToolchainsBuildingRequest request = new DefaultToolchainsBuildingRequest(); + request.setGlobalToolchainsSource( new StringSource( "" ) ); + ToolchainsParseException parseException = new ToolchainsParseException( "MESSAGE", 4, 2 ); +- when( toolchainsReader.read( any( InputStream.class ), ArgumentMatchers.anyMap()) ).thenThrow( parseException ); ++ when( toolchainsReader.read( any( InputStream.class ), anyMap() ) ).thenThrow( parseException ); + + try + { +@@ -169,7 +169,7 @@ public class DefaultToolchainsBuilderTest + ToolchainsBuildingRequest request = new DefaultToolchainsBuildingRequest(); + request.setGlobalToolchainsSource( new StringSource( "", "LOCATION" ) ); + IOException ioException = new IOException( "MESSAGE" ); +- when( toolchainsReader.read( any( InputStream.class ), ArgumentMatchers.anyMap()) ).thenThrow( ioException ); ++ when( toolchainsReader.read( any( InputStream.class ), anyMap() ) ).thenThrow( ioException ); + + try + { +diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml +index dd7e166..d2825c8 100644 +--- a/maven-embedder/pom.xml ++++ b/maven-embedder/pom.xml +@@ -141,7 +141,6 @@ under the License. + + org.mockito + mockito-core +- test + + + org.fusesource.jansi +diff --git a/pom.xml b/pom.xml +index 7835415..8c13ddb 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -53,7 +53,7 @@ under the License. + 1.4 + 3.5 + 4.12 +- 2.12.0 ++ 1.10.19 + 1.7.1 + 1.24 + 3.1.0 +-- +2.14.3 + diff --git a/maven.spec b/maven.spec index 2b5db4f..a7a195c 100644 --- a/maven.spec +++ b/maven.spec @@ -4,8 +4,8 @@ Name: maven Epoch: 1 -Version: 3.5.2 -Release: 5%{?dist} +Version: 3.5.3 +Release: 1%{?dist} Summary: Java project management and project comprehension tool License: ASL 2.0 URL: http://maven.apache.org/ @@ -19,6 +19,8 @@ Patch1: 0001-Adapt-mvn-script.patch # Downstream-specific, avoids dependency on logback # Used only when %%without logback is in effect Patch2: 0002-Invoke-logback-via-reflection.patch +# We don't have mockito 2 yet +Patch3: 0003-Revert-MNG-6335-Update-Mockito-to-2.12.0.patch BuildRequires: maven-local BuildRequires: mvn(com.google.guava:guava:20.0) @@ -147,6 +149,7 @@ Summary: API documentation for %{name} %setup -q -n apache-%{name}-%{version} %patch1 -p1 +%patch3 -p1 # not really used during build, but a precaution find -name '*.jar' -not -path '*/test/*' -delete @@ -163,7 +166,6 @@ rm apache-maven/src/main/appended-resources/META-INF/LICENSE.vm %pom_remove_plugin -r :animal-sniffer-maven-plugin %pom_remove_plugin -r :apache-rat-plugin %pom_remove_plugin -r :maven-site-plugin -%pom_remove_plugin -r :maven-enforcer-plugin %pom_remove_plugin -r :buildnumber-maven-plugin sed -i " /buildNumber=/ { @@ -246,6 +248,9 @@ ln -sf %{_sysconfdir}/%{name}/logging %{buildroot}%{_datadir}/%{name}/conf %changelog +* Thu Mar 15 2018 Michael Simacek - 1:3.5.3-1 +- Update to upstream version 3.5.3 + * Thu Mar 15 2018 Mikolaj Izdebski - 1:3.5.2-5 - Don't install mvnyjp in bindir diff --git a/sources b/sources index 3b4889c..b44e887 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-maven-3.5.2-src.tar.gz) = 1aba1e60be54fe9b9daa700d0b83083314485c479825baeadc92aa6fe40aefc12cf123caf48b8d2622fcd656c4de5d27cb5a706e38fab8ad6b1abaa6ca108696 +SHA512 (apache-maven-3.5.3-src.tar.gz) = 366fe99b47a4b01b474d298cfce5e2cec5898012f05e8d3e2338ec95a15ade89bbfbd87d83019933b9c9b52da756ac7718cf3166ca606b4c6b2e029695fe38f8