From 6e76107918b3c0480a6bb555d56a4f11f1c17abf23419745f1aa11b2e799e11d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 21 Nov 2019 15:58:42 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=7 --- 0001-Adapt-mvn-script.patch | 21 +- 0002-Invoke-logback-via-reflection.patch | 10 +- ...MNG-5995-Remove-dependency-to-maven-.patch | 52 +++++ ...rt-MNG-6335-Update-Mockito-to-2.12.0.patch | 180 ------------------ 0004-Use-non-shaded-HTTP-wagon.patch | 51 +++++ apache-maven-3.5.4-src.tar.gz | 3 - apache-maven-3.6.1-src.tar.gz | 3 + apache-maven-build.tar.xz | 4 +- maven.changes | 18 ++ maven.spec | 14 +- 10 files changed, 145 insertions(+), 211 deletions(-) create mode 100644 0003-MNG-6642-Revert-MNG-5995-Remove-dependency-to-maven-.patch delete mode 100644 0003-Revert-MNG-6335-Update-Mockito-to-2.12.0.patch create mode 100644 0004-Use-non-shaded-HTTP-wagon.patch delete mode 100644 apache-maven-3.5.4-src.tar.gz create mode 100644 apache-maven-3.6.1-src.tar.gz diff --git a/0001-Adapt-mvn-script.patch b/0001-Adapt-mvn-script.patch index e8625cf..80246e1 100644 --- a/0001-Adapt-mvn-script.patch +++ b/0001-Adapt-mvn-script.patch @@ -1,14 +1,14 @@ -From 46041685a82b861bc8616bb603e341adb740a302 Mon Sep 17 00:00:00 2001 +From 056c94f86450c7c27f5bb11f98653c73bfe3d8e4 Mon Sep 17 00:00:00 2001 From: Michael Simacek 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(-) + apache-maven/src/bin/mvn | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn -index a554c66..818cf70 100755 +index a554c6617..0c07ba6e2 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn @@ -22,7 +22,7 @@ @@ -55,15 +55,6 @@ index a554c66..818cf70 100755 # make it fully qualified MAVEN_HOME=`cd "$MAVEN_HOME" && pwd` -@@ -102,7 +115,7 @@ if [ ! -x "$JAVACMD" ] ; then - exit 1 - fi - --CLASSWORLDS_JAR=`echo "${MAVEN_HOME}"/boot/plexus-classworlds-*.jar` -+CLASSWORLDS_JAR=`build-classpath plexus-classworlds` - CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - - # For Cygwin, switch paths to Windows format before running java -- -2.17.1 +2.21.0 diff --git a/0002-Invoke-logback-via-reflection.patch b/0002-Invoke-logback-via-reflection.patch index 5242a30..0e1300a 100644 --- a/0002-Invoke-logback-via-reflection.patch +++ b/0002-Invoke-logback-via-reflection.patch @@ -1,17 +1,17 @@ -From 4e1e32e3a96c6876a22cca6743288b8c8df4adb0 Mon Sep 17 00:00:00 2001 +From 7610a10691e680db00edcbd4ce6767a30641cd71 Mon Sep 17 00:00:00 2001 From: Michael Simacek 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 @@ index 5d9fab7..ced38cb 100644 @Override -- -2.17.1 +2.21.0 diff --git a/0003-MNG-6642-Revert-MNG-5995-Remove-dependency-to-maven-.patch b/0003-MNG-6642-Revert-MNG-5995-Remove-dependency-to-maven-.patch new file mode 100644 index 0000000..ec474b9 --- /dev/null +++ b/0003-MNG-6642-Revert-MNG-5995-Remove-dependency-to-maven-.patch @@ -0,0 +1,52 @@ +From 56d10f48ebb2cdaf3882dc8afbef65a2ab529040 Mon Sep 17 00:00:00 2001 +From: Sylwester Lachiewicz +Date: Sat, 13 Oct 2018 04:16:44 +0200 +Subject: [PATCH 3/4] [MNG-6642] Revert "[MNG-5995] Remove dependency to + maven-compat (#185)" + +This partially reverts commit bb3ec5da71d26d105972392f0a20bc61bc5d8c53 to restore working with Tycho P2 repository. +--- + .../apache/maven/project/DefaultProjectBuildingHelper.java | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java +index 0bd94a86a..3159fac6b 100644 +--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java ++++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java +@@ -33,7 +33,6 @@ + import org.apache.maven.artifact.Artifact; + import org.apache.maven.artifact.InvalidRepositoryException; + import org.apache.maven.artifact.repository.ArtifactRepository; +-import org.apache.maven.bridge.MavenRepositorySystem; + import org.apache.maven.classrealm.ClassRealmManager; + import org.apache.maven.model.Build; + import org.apache.maven.model.Extension; +@@ -45,6 +44,7 @@ + import org.apache.maven.plugin.PluginManagerException; + import org.apache.maven.plugin.PluginResolutionException; + import org.apache.maven.plugin.version.PluginVersionResolutionException; ++import org.apache.maven.repository.RepositorySystem; + import org.codehaus.plexus.PlexusContainer; + import org.codehaus.plexus.classworlds.realm.ClassRealm; + import org.codehaus.plexus.component.annotations.Component; +@@ -78,7 +78,7 @@ + private ProjectRealmCache projectRealmCache; + + @Requirement +- private MavenRepositorySystem repositorySystem; ++ private RepositorySystem repositorySystem; + + @Requirement + private MavenPluginManager pluginManager; +@@ -92,7 +92,7 @@ + + for ( Repository repository : pomRepositories ) + { +- internalRepositories.add( MavenRepositorySystem.buildArtifactRepository( repository ) ); ++ internalRepositories.add( repositorySystem.buildArtifactRepository( repository ) ); + } + + repositorySystem.injectMirror( request.getRepositorySession(), internalRepositories ); +-- +2.21.0 + 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 deleted file mode 100644 index 529ae23..0000000 --- a/0003-Revert-MNG-6335-Update-Mockito-to-2.12.0.patch +++ /dev/null @@ -1,180 +0,0 @@ -From 6b5e263ebd03be9551c4e6aa394ac2334fff7c03 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. ---- - .../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.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 8a00565..2a9668b 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 ef1d0b0..77b3395 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.17.1 - diff --git a/0004-Use-non-shaded-HTTP-wagon.patch b/0004-Use-non-shaded-HTTP-wagon.patch new file mode 100644 index 0000000..6d27b9c --- /dev/null +++ b/0004-Use-non-shaded-HTTP-wagon.patch @@ -0,0 +1,51 @@ +From c8933d155694ce37b1d4be59a744c8f7cbde6bb5 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Mon, 1 Jul 2019 09:51:56 +0200 +Subject: [PATCH 4/4] Use non-shaded HTTP wagon + +--- + apache-maven/pom.xml | 15 --------------- + pom.xml | 1 - + 2 files changed, 16 deletions(-) + +diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml +index 2686570af..d22ae121d 100644 +--- a/apache-maven/pom.xml ++++ b/apache-maven/pom.xml +@@ -63,21 +63,6 @@ under the License. + + org.apache.maven.wagon + wagon-http +- shaded +- +- +- org.apache.httpcomponents +- httpclient +- +- +- org.apache.httpcomponents +- httpcore +- +- +- org.apache.maven.wagon +- wagon-http-shared +- +- + + + org.slf4j +diff --git a/pom.xml b/pom.xml +index 237cdc39e..85436c54d 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -324,7 +324,6 @@ under the License. + org.apache.maven.wagon + wagon-http + ${wagonVersion} +- shaded + + + commons-logging +-- +2.21.0 + diff --git a/apache-maven-3.5.4-src.tar.gz b/apache-maven-3.5.4-src.tar.gz deleted file mode 100644 index 7726141..0000000 --- a/apache-maven-3.5.4-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f3ba1f1b24bbd4c345174ac616d40e26e72dad6022d56317d3ff6f7dd003e2f5 -size 2682134 diff --git a/apache-maven-3.6.1-src.tar.gz b/apache-maven-3.6.1-src.tar.gz new file mode 100644 index 0000000..9439658 --- /dev/null +++ b/apache-maven-3.6.1-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:025921fff6ba827a25413ffc08fb1933565eb1f07ee2d3f228911913ee4f3c3f +size 2744445 diff --git a/apache-maven-build.tar.xz b/apache-maven-build.tar.xz index 0c20ffd..e76095b 100644 --- a/apache-maven-build.tar.xz +++ b/apache-maven-build.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4ac2dfe92c98e7efca9cfd0f6c98fe70fc9a3a4a06901ea2030e7863b473e5d -size 5136 +oid sha256:8c6021f53a5d54c0370a9a8a4b63d53506e8ae92b2386267affb441755322f5d +size 5176 diff --git a/maven.changes b/maven.changes index b5de266..9108885 100644 --- a/maven.changes +++ b/maven.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu Nov 21 15:53:17 UTC 2019 - Fridrich Strba + +- Upgrade to upstream version 3.6.1 +- Modified patches: + * 0001-Adapt-mvn-script.patch + * 0002-Invoke-logback-via-reflection.patch + + adapt to changed context +- Removed patch: + * 0003-Revert-MNG-6335-Update-Mockito-to-2.12.0.patch + + we don't need this patch, since we are not running tests + by default +- Added patches: + * 0003-MNG-6642-Revert-MNG-5995-Remove-dependency-to-maven-.patch + + revert changes to restore working with Tycho P2 repository + * 0004-Use-non-shaded-HTTP-wagon.patch + + we don't use/distribute shared wagon-http + ------------------------------------------------------------------- Mon Apr 1 23:29:07 UTC 2019 - Jan Engelhardt diff --git a/maven.spec b/maven.spec index 23199e8..c832207 100644 --- a/maven.spec +++ b/maven.spec @@ -1,7 +1,7 @@ # # spec file for package maven # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ %global confdir %{_sysconfdir}/%{name}%{?maven_version_suffix} %bcond_with logback Name: maven -Version: 3.5.4 +Version: 3.6.1 Release: 0 Summary: Java project management and project comprehension tool # maven itself is ASL 2.0 @@ -37,8 +37,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 +Patch3: 0003-MNG-6642-Revert-MNG-5995-Remove-dependency-to-maven-.patch +Patch4: 0004-Use-non-shaded-HTTP-wagon.patch BuildRequires: ant BuildRequires: apache-commons-cli BuildRequires: apache-commons-codec @@ -71,7 +71,7 @@ BuildRequires: maven-wagon-file BuildRequires: maven-wagon-http BuildRequires: maven-wagon-http-shared BuildRequires: maven-wagon-provider-api -BuildRequires: modello +BuildRequires: modello >= 1.10 BuildRequires: objectweb-asm BuildRequires: plexus-cipher BuildRequires: plexus-classworlds @@ -89,7 +89,8 @@ BuildRequires: slf4j-sources BuildRequires: unix2dos BuildRequires: xbean BuildRequires: xmvn-install -BuildRequires: xmvn-resolve xmvn-subst +BuildRequires: xmvn-resolve +BuildRequires: xmvn-subst BuildRequires: mvn(org.apache.maven:maven-parent:pom:) Requires: %{name}-lib = %{version}-%{release} Requires(post): aaa_base @@ -182,6 +183,7 @@ BuildArch: noarch %patch1 -p1 %patch3 -p1 +%patch4 -p1 # not really used during build, but a precaution find -name '*.jar' -not -path '*/test/*' -delete