Backport upstream fix for Tycho P2 integarion

0001-Adapt-mvn-script.patch

@@ -1,7 +1,7 @@
-From 7f6fe1e63da317cb497da815f8d90cd6873f0351 Mon Sep 17 00:00:00 2001
+From 9e51d86115b066cbf3d44392810b3f6fd63fdfc9 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/4] Adapt mvn script
+Subject: [PATCH 1/3] Adapt mvn script
 
 ---
  apache-maven/src/bin/mvn | 19 ++++++++++++++++---
@@ -65,5 +65,5 @@ index a554c6617..818cf70b8 100755
  
  # For Cygwin, switch paths to Windows format before running java
 -- 
-2.20.1
+2.21.0
 

0002-Invoke-logback-via-reflection.patch

@@ -1,7 +1,7 @@
-From a676bedf0fe2386b3afd5da817202acaf271eaa1 Mon Sep 17 00:00:00 2001
+From 4fa2cfaa19a0752a656b2a223a77c3af25d2de12 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/4] Invoke logback via reflection
+Subject: [PATCH 2/3] Invoke logback via reflection
 
 ---
  .../logging/impl/LogbackConfiguration.java    | 19 ++++++++++++++-----
@@ -49,5 +49,5 @@ index 5d9fab744..ced38cb5a 100644
  
      @Override
 -- 
-2.20.1
+2.21.0
 

0003-MNG-6642-Revert-MNG-5995-Remove-dependency-to-maven-.patch

@@ -0,0 +1,52 @@
+From c533aada209c517c1666989d7115672e7522aa72 Mon Sep 17 00:00:00 2001
+From: Sylwester Lachiewicz <slachiewicz@apache.org>
+Date: Sat, 13 Oct 2018 04:16:44 +0200
+Subject: [PATCH 3/3] [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
+

maven.spec

@@ -5,7 +5,7 @@
 Name:           maven
 Epoch:          1
 Version:        3.6.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Java project management and project comprehension tool
 # maven itself is ASL 2.0
 # bundled slf4j is MIT
@@ -21,6 +21,7 @@ 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
+Patch3:         0003-MNG-6642-Revert-MNG-5995-Remove-dependency-to-maven-.patch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.google.inject:guice::no_aop:)
@@ -153,6 +154,7 @@ Summary:        API documentation for %{name}
 
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # not really used during build, but a precaution
 find -name '*.jar' -not -path '*/test/*' -delete
@@ -265,6 +267,9 @@ update-alternatives --install %{_bindir}/mvn mvn %{homedir}/bin/mvn %{?maven_alt
 
 
 %changelog
+* Thu May 30 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.1-4
+- Backport upstream fix for Tycho P2 integarion
+
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.1-3
 - Mass rebuild for javapackages-tools 201901