PR#1: Sync with @mbi - rpms/maven - src.fedoraproject.org

		`@@ -1,14 +1,14 @@`
		`- From 46041685a82b861bc8616bb603e341adb740a302 Mon Sep 17 00:00:00 2001`
		`+ From 7f6fe1e63da317cb497da815f8d90cd6873f0351 Mon Sep 17 00:00:00 2001`
		`From: Michael Simacek <msimacek@redhat.com>`
		`Date: Wed, 1 Feb 2017 14:54:26 +0100`
		`- Subject: [PATCH 1/3] Adapt mvn script`
		`+ Subject: [PATCH 1/4] 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 a554c66..818cf70 100755`
		`+ index a554c6617..818cf70b8 100755`
		`--- a/apache-maven/src/bin/mvn`
		`+++ b/apache-maven/src/bin/mvn`
		`@@ -22,7 +22,7 @@`
		`@@ -65,5 +65,5 @@`

		`# For Cygwin, switch paths to Windows format before running java`
		`--`
		`- 2.17.1`
		`+ 2.20.1`

0002-Invoke-logback-via-reflection.patch

file modified

+5 -5

		`@@ -1,17 +1,17 @@`
		`- From 4e1e32e3a96c6876a22cca6743288b8c8df4adb0 Mon Sep 17 00:00:00 2001`
		`+ From a676bedf0fe2386b3afd5da817202acaf271eaa1 Mon Sep 17 00:00:00 2001`
		`From: Michael Simacek <msimacek@redhat.com>`
		`Date: Tue, 6 Jun 2017 13:47:43 +0200`
		`- Subject: [PATCH 2/3] Invoke logback via reflection`
		`+ Subject: [PATCH 2/4] Invoke logback via reflection`

		`---`
		`.../logging/impl/LogbackConfiguration.java \| 19 ++++++++++++++-----`
		`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`
		`- index 5d9fab7..ced38cb 100644`
		`+ index 5d9fab744..ced38cb5a 100644`
		`--- 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`
		`- @@ -35,22 +35,31 @@ public class LogbackConfiguration`
		`+ @@ -35,22 +35,31 @@`
		`@Override`
		`public void setRootLoggerLevel( Level level )`
		`{`
		`@@ -49,5 +49,5 @@`

		`@Override`
		`--`
		`- 2.17.1`
		`+ 2.20.1`

0003-Revert-MNG-6335-Update-Mockito-to-2.12.0.patch

file removed

-180

		`@@ -1,180 +0,0 @@`
		`- From 6b5e263ebd03be9551c4e6aa394ac2334fff7c03 Mon Sep 17 00:00:00 2001`
		`- From: Michael Simacek <msimacek@redhat.com>`
		`- 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.`
		`- ---`
		`- .../DefaultToolchainManagerPrivateTest.java \| 15 +++++++++------`
		`- .../toolchain/DefaultToolchainManagerTest.java \| 4 ++--`
		`- .../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.<String, String>anyMap() ) ).thenReturn( false ).thenReturn( true );`
		`- + when( basicPrivate.matchesRequirements( anyMap() ) ).thenReturn( false ).thenReturn( true );`
		`- when( toolchainFactory_basicType.createToolchain( isA( ToolchainModel.class ) ) ).thenReturn( basicPrivate );`
		`-`
		`- List<Toolchain> 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.<String, Object>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.<String, Object>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.<String, Object>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.<String, Object>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.<String, Object>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 8a00565..2a9668b 100644`
		`- --- a/maven-embedder/pom.xml`
		`- +++ b/maven-embedder/pom.xml`
		`- @@ -141,7 +141,6 @@ under the License.`
		`- <dependency>`
		`- <groupId>org.mockito</groupId>`
		`- <artifactId>mockito-core</artifactId>`
		`- - <scope>test</scope>`
		`- </dependency>`
		`- <dependency>`
		`- <groupId>org.fusesource.jansi</groupId>`
		`- diff --git a/pom.xml b/pom.xml`
		`- index ef1d0b0..77b3395 100644`
		`- --- a/pom.xml`
		`- +++ b/pom.xml`
		`- @@ -53,7 +53,7 @@ under the License.`
		`- <commonsCliVersion>1.4</commonsCliVersion>`
		`- <commonsLangVersion>3.5</commonsLangVersion>`
		`- <junitVersion>4.12</junitVersion>`
		`- - <mockitoVersion>2.12.0</mockitoVersion>`
		`- + <mockitoVersion>1.10.19</mockitoVersion>`
		`- <plexusVersion>1.7.1</plexusVersion>`
		`- <plexusInterpolationVersion>1.24</plexusInterpolationVersion>`
		`- <plexusUtilsVersion>3.1.0</plexusUtilsVersion>`
		`- --`
		`- 2.17.1`
		`-`

maven.spec

file modified

+20 -21

		`@@ -1,13 +1,11 @@`
		`- %bcond_without logback`
		`-`
		`- %global bundled_slf4j_version 1.7.25`
		`+ %global bundled_slf4j_version 1.7.26`
		`%global homedir %{_datadir}/%{name}%{?maven_version_suffix}`
		`%global confdir %{_sysconfdir}/%{name}%{?maven_version_suffix}`

		`Name: maven`
		`Epoch: 1`
		`- Version: 3.5.4`
		`- Release: 5%{?dist}`
		`+ Version: 3.6.1`
		`+ Release: 2%{?dist}`
		`Summary: Java project management and project comprehension tool`
		`# maven itself is ASL 2.0`
		`# bundled slf4j is MIT`
		`@@ -15,7 +13,7 @@`
		`URL: http://maven.apache.org/`
		`BuildArch: noarch`

		`- Source0: http://archive.apache.org/dist/%{name}/%{name}-3/%{version}/source/apache-%{name}-%{version}-src.tar.gz`
		`+ Source0: http://archive.apache.org/dist/%{name}/%{name}-3/%{version}/sources/apache-%{name}-%{version}-src.tar.gz`
		`Source1: maven-bash-completion`
		`Source2: mvn.1`

		`@@ -23,11 +21,8 @@`
		`# 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)`
		`BuildRequires: mvn(com.google.inject:guice::no_aop:)`
		`BuildRequires: mvn(commons-cli:commons-cli)`
		`BuildRequires: mvn(commons-jxpath:commons-jxpath)`
		`@@ -48,30 +43,28 @@`
		`BuildRequires: mvn(org.apache.maven.wagon:wagon-file)`
		`BuildRequires: mvn(org.apache.maven.wagon:wagon-http::shaded:)`
		`BuildRequires: mvn(org.apache.maven.wagon:wagon-provider-api)`
		`- BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin)`
		`+ BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin) >= 1.10.0`
		`BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)`
		`BuildRequires: mvn(org.codehaus.plexus:plexus-classworlds)`
		`BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)`
		`BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)`
		`BuildRequires: mvn(org.codehaus.plexus:plexus-interpolation)`
		`- BuildRequires: mvn(org.codehaus.plexus:plexus-utils)`
		`+ BuildRequires: mvn(org.codehaus.plexus:plexus-utils) >= 3.2.0`
		`BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject)`
		`BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)`
		`BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin)`
		`BuildRequires: mvn(org.fusesource.jansi:jansi)`
		`- BuildRequires: mvn(org.mockito:mockito-core)`
		`+ BuildRequires: mvn(org.mockito:mockito-core) >= 2`
		`BuildRequires: mvn(org.slf4j:jcl-over-slf4j)`
		`BuildRequires: mvn(org.slf4j:slf4j-api)`
		`BuildRequires: mvn(org.slf4j:slf4j-simple)`
		`BuildRequires: mvn(org.sonatype.plexus:plexus-cipher)`
		`BuildRequires: mvn(org.sonatype.plexus:plexus-sec-dispatcher)`
		`- BuildRequires: mvn(xmlunit:xmlunit)`
		`+ BuildRequires: mvn(org.xmlunit:xmlunit-core)`
		`+ BuildRequires: mvn(org.xmlunit:xmlunit-matchers)`

		`BuildRequires: slf4j-sources = %{bundled_slf4j_version}`

		`- %if %{with logback}`
		`- BuildRequires: mvn(ch.qos.logback:logback-classic)`
		`- %endif`

		`Requires: %{name}-lib = %{epoch}:%{version}-%{release}`

		`@@ -98,7 +91,7 @@`
		`Requires: cdi-api`
		`Requires: geronimo-annotation`
		`Requires: google-guice`
		`- Requires: guava20`
		`+ Requires: guava`
		`Requires: hawtjni-runtime`
		`Requires: httpcomponents-client`
		`Requires: httpcomponents-core`
		`@@ -159,7 +152,7 @@`
		`%setup -q -n apache-%{name}-%{version}`

		`%patch1 -p1`
		`- %patch3 -p1`
		`+ %patch2 -p1`

		`# not really used during build, but a precaution`
		`find -name '.jar' -not -path '/test/*' -delete`
		`@@ -187,10 +180,7 @@`

		`%mvn_package :apache-maven __noinstall`

		`- %if %{without logback}`
		`%pom_remove_dep -r :logback-classic`
		`- %patch2 -p1`
		`- %endif`

		`%mvn_alias :maven-resolver-provider :maven-aether-provider`

		`@@ -275,6 +265,15 @@`


		`%changelog`
		`+ * Wed Apr 17 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.1-2`
		`+ - Update to Mockito 2`
		`+`
		`+ * Sat Apr 13 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.1-1`
		`+ - Update to upstream version 3.6.1`
		`+`
		`+ * Fri Apr 12 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.5.4-6`
		`+ - Update SLF4J version to 1.7.26`
		`+`
		`* Mon Jul 30 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:3.5.4-2`
		`- Require javapackages-tools for maven-lib.`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (apache-maven-3.5.4-src.tar.gz) = faf3c13af3350d056fd49aa3d0a631533a0340332bda8f88a9d8a4c489ec291981b29354a9ed6ff7a8565e0b79eaf16803f908067c5dbd16820cd9025852b39f`
		`+ SHA512 (apache-maven-3.6.1-src.tar.gz) = 11a31022cffa0518584703fffd9fce998332ac5f6c2a50db3b590e90f3bdd1508d9e0cb5ba89a699ef6536b237bcc96166cfde3d45bce6346fa21b05b4d12bf8`

no initial comment

churchyard commented 5 years ago

It doesn't build.

DEBUG util.py:554:  BUILDSTDERR: No matching package to install: 'mvn(org.codehaus.modello:modello-maven-plugin) >= 1.10.0'
DEBUG util.py:554:  BUILDSTDERR: No matching package to install: 'mvn(org.codehaus.plexus:plexus-utils) >= 3.2.0'
DEBUG util.py:554:  BUILDSTDERR: No matching package to install: 'mvn(org.xmlunit:xmlunit-core)'
DEBUG util.py:554:  BUILDSTDERR: No matching package to install: 'mvn(org.xmlunit:xmlunit-matchers)'
DEBUG util.py:554:  BUILDSTDERR: No matching package to install: 'slf4j-sources = 1.7.26'
DEBUG util.py:554:  BUILDSTDERR: Not all dependencies satisfied

churchyard commented 5 years ago

Let's just cherry-pick the top commit: Update to Mockito 2

churchyard commented 5 years ago

https://src.fedoraproject.org/rpms/maven/pull-request/2