[arch-commits] Commit in maven/trunk (0001-MNG-6642.patch PKGBUILD)

[Christian Hesse]

    Date: Wednesday, July 24, 2019 @ 20:51:01
  Author: eworm
Revision: 492717

upgpkg: maven 3.6.1-2

fix MNG-6642

Added:
  maven/trunk/0001-MNG-6642.patch
Modified:
  maven/trunk/PKGBUILD

---------------------+
 0001-MNG-6642.patch |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD            |   10 +++++++++-
 2 files changed, 55 insertions(+), 1 deletion(-)

Added: 0001-MNG-6642.patch
===================================================================
--- 0001-MNG-6642.patch	                        (rev 0)
+++ 0001-MNG-6642.patch	2019-07-24 20:51:01 UTC (rev 492717)
@@ -0,0 +1,46 @@
+commit 763f76cf833cddd6630add035c541ac54bbe381d
+Author: Sylwester Lachiewicz <slachiewicz at apache.org>
+Date:   Sat Oct 13 04:16:44 2018 +0200
+
+    [MNG-6642] Revert "[MNG-5995] Remove dependency to maven-compat (#185)"
+    
+    This partially reverts commit bb3ec5da71d26d105972392f0a20bc61bc5d8c53 to restore working with Tycho P2 repository.
+
+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 );

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-24 18:59:04 UTC (rev 492716)
+++ PKGBUILD	2019-07-24 20:51:01 UTC (rev 492717)
@@ -4,7 +4,7 @@
 
 pkgname=maven
 pkgver=3.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Java project management and project comprehension tool'
 url='https://maven.apache.org'
 arch=('any')
@@ -13,6 +13,7 @@
 makedepends=('maven' 'java-environment=8')
 backup=('opt/maven/conf/settings.xml')
 source=(https://www-eu.apache.org/dist/maven/maven-3/${pkgver}/source/apache-maven-${pkgver}-src.tar.gz{,.asc}
+        0001-MNG-6642.patch
         maven.sh)
 # https://www.apache.org/dist/maven/KEYS
 validpgpkeys=(
@@ -21,8 +22,15 @@
 )
 sha256sums=('025921fff6ba827a25413ffc08fb1933565eb1f07ee2d3f228911913ee4f3c3f'
             'SKIP'
+            '70858a5052fdcc93823f34fd6716200c433eec3990cef2058c186ef52fb9882d'
             '17d9b8efa6a922907110026273443bcc8d83e061e14ac82cb5052b483acc9b76')
 
+prepare() {
+  cd apache-maven-${pkgver}
+
+  patch -Np1 -i ../0001-MNG-6642.patch
+}
+
 build() {
   cd apache-maven-${pkgver}