pool/maven
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=9

Browse Source
This commit is contained in:
Fridrich Strba 2019-11-22 05:38:17 +00:00 committed by Git OBS Bridge
parent 2eaf9c3f59
commit 2d668b324e
6 changed files with 8 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,52 +0,0 @@
From 56d10f48ebb2cdaf3882dc8afbef65a2ab529040 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/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

3
apache-maven-3.6.1-src.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:025921fff6ba827a25413ffc08fb1933565eb1f07ee2d3f228911913ee4f3c3f
size 2744445

3
apache-maven-3.6.2-src.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7ed94655b4098729de292a13c96765bb90a407bb6feb64f201a9444aebde69d1
size 2758845

4
apache-maven-build.tar.xz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8c6021f53a5d54c0370a9a8a4b63d53506e8ae92b2386267affb441755322f5d
size 5176
oid sha256:c4fa863ff5c595ef38b608853ffc472043e2cca06b4e45bdbe7fc533f3ea9b6d
size 5212

6
maven.changes
View File

@ -1,7 +1,7 @@
-------------------------------------------------------------------
Thu Nov 21 15:53:17 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Upgrade to upstream version 3.6.1
- Upgrade to upstream version 3.6.2
- Modified patche:
* 0002-Invoke-logback-via-reflection.patch
+ adapt to changed context
@ -9,9 +9,7 @@ Thu Nov 21 15:53:17 UTC 2019 - Fridrich Strba <fstrba@suse.com>
* 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
- Added patche:
* 0004-Use-non-shaded-HTTP-wagon.patch
+ we don't use/distribute shared wagon-http

4
maven.spec
View File

@ -21,7 +21,7 @@
%global confdir %{_sysconfdir}/%{name}%{?maven_version_suffix}
%bcond_with logback
Name: maven
Version: 3.6.1
Version: 3.6.2
Release: 0
Summary: Java project management and project comprehension tool
# maven itself is ASL 2.0
@ -37,7 +37,6 @@ 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
Patch4: 0004-Use-non-shaded-HTTP-wagon.patch
BuildRequires: ant
BuildRequires: apache-commons-cli
@ -182,7 +181,6 @@ BuildArch: noarch
%setup -q -n apache-%{name}-%{version} -a10
%patch1 -p1
%patch3 -p1
%patch4 -p1
# not really used during build, but a precaution