pool/maven-artifact-transfer
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-artifact-transfer?expand=0&rev=15

Browse Source
This commit is contained in:
Fridrich Strba 2022-05-10 12:14:02 +00:00 committed by Git OBS Bridge
parent 1a07dc5cdb
commit 150516631b
8 changed files with 315 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
0001-Compatibility-with-Maven-3.0.3-and-later.patch
View File

@ -1,8 +1,18 @@
diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java
index 854cf4a..846559a 100644
--- a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java
@@ -19,6 +19,7 @@ package org.apache.maven.shared.transfer.dependencies.collect.internal;
From e5f2d4a0133d598bc12b9d76292f6cf0c62448bf Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 12 Oct 2015 13:28:56 +0200
Subject: [PATCH] Compatibility with Maven 3.0.3 and later
---
.../Maven31ArtifactRepositoryAdapter.java | 20 +++++++++++++++++++
.../Maven31ArtifactRepositoryAdapter.java | 20 +++++++++++++++++++
2 files changed, 40 insertions(+)
diff --git a/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven31ArtifactRepositoryAdapter.java b/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven31ArtifactRepositoryAdapter.java
index d53a452..9d93f31 100644
--- a/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven31ArtifactRepositoryAdapter.java
+++ b/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven31ArtifactRepositoryAdapter.java
@@ -19,6 +19,7 @@ package org.apache.maven.shared.transfer.collection.internal;
* under the License.
*/
@ -10,7 +20,7 @@ index 854cf4a..846559a 100644
import java.util.List;
import org.apache.maven.artifact.Artifact;
@@ -263,4 +264,23 @@ class Maven31ArtifactRepositoryAdapter implements ArtifactRepository
@@ -262,4 +263,23 @@ class Maven31ArtifactRepositoryAdapter implements ArtifactRepository
}
return true;
}
@ -34,3 +44,42 @@ index 854cf4a..846559a 100644
+ }
+ }
}
diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java
index f450dfd..d5716bb 100644
--- a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java
@@ -19,6 +19,7 @@ package org.apache.maven.shared.transfer.dependencies.collect.internal;
* under the License.
*/
+import java.util.Collections;
import java.util.List;
import org.apache.maven.artifact.Artifact;
@@ -263,4 +264,23 @@ class Maven31ArtifactRepositoryAdapter implements ArtifactRepository
}
return true;
}
+
+ private List<ArtifactRepository> mirroredRepositories = Collections.emptyList();
+
+ public List<ArtifactRepository> getMirroredRepositories()
+ {
+ return mirroredRepositories;
+ }
+
+ public void setMirroredRepositories( List<ArtifactRepository> mirroredRepositories )
+ {
+ if ( mirroredRepositories != null )
+ {
+ this.mirroredRepositories = mirroredRepositories;
+ }
+ else
+ {
+ this.mirroredRepositories = Collections.emptyList();
+ }
+ }
}
--
2.29.2

176
0002-Remove-support-for-maven-3.0.X.patch Normal file
View File

@ -0,0 +1,176 @@
From 21bf966408cf1bceaa6603e45958bc30ddae8c83 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Thu, 14 Jan 2021 18:21:21 +0100
Subject: [PATCH] Remove support for maven 3.0.X
---
.../deploy/internal/DefaultArtifactDeployer.java | 8 +-------
.../internal/DefaultArtifactInstaller.java | 8 +-------
.../internal/DefaultArtifactResolver.java | 11 +----------
.../internal/DefaultDependencyCollector.java | 12 +-----------
.../internal/DefaultDependencyCollector.java | 13 +------------
.../internal/DefaultDependencyResolver.java | 13 +------------
.../internal/DefaultRepositoryManager.java | 16 +---------------
7 files changed, 7 insertions(+), 74 deletions(-)
diff --git a/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/DefaultArtifactDeployer.java b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/DefaultArtifactDeployer.java
index 11a268c..9b24335 100644
--- a/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/DefaultArtifactDeployer.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/DefaultArtifactDeployer.java
@@ -133,13 +133,7 @@ class DefaultArtifactDeployer implements ArtifactDeployer, Contextualizable
}
else
{
- org.sonatype.aether.RepositorySystem repositorySystem = container.lookup(
- org.sonatype.aether.RepositorySystem.class );
-
- org.sonatype.aether.RepositorySystemSession session = Invoker.invoke( buildingRequest,
- "getRepositorySession" );
-
- return new Maven30ArtifactDeployer( repositorySystem, session );
+ throw new UnsupportedOperationException("Maven 3.0.X is not supported");
}
}
}
diff --git a/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/DefaultArtifactInstaller.java b/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/DefaultArtifactInstaller.java
index 238e814..000bdbb 100644
--- a/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/DefaultArtifactInstaller.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/DefaultArtifactInstaller.java
@@ -150,13 +150,7 @@ class DefaultArtifactInstaller implements ArtifactInstaller, Contextualizable
}
else
{
- org.sonatype.aether.RepositorySystem repositorySystem = container.lookup(
- org.sonatype.aether.RepositorySystem.class );
-
- org.sonatype.aether.RepositorySystemSession session = Invoker.invoke( buildingRequest,
- "getRepositorySession" );
-
- return new Maven30ArtifactInstaller( repositorySystem, session );
+ throw new UnsupportedOperationException("Maven 3.0.X is not supported");
}
}
}
diff --git a/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/DefaultArtifactResolver.java b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/DefaultArtifactResolver.java
index 83d7517..cfb5b61 100644
--- a/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/DefaultArtifactResolver.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/DefaultArtifactResolver.java
@@ -146,16 +146,7 @@ class DefaultArtifactResolver implements ArtifactResolver, Contextualizable
}
else
{
- org.sonatype.aether.RepositorySystem repositorySystem = container.lookup(
- org.sonatype.aether.RepositorySystem.class );
-
- List<org.sonatype.aether.repository.RemoteRepository> aetherRepositories = Invoker.invoke(
- RepositoryUtils.class, "toRepos", List.class, buildingRequest.getRemoteRepositories() );
-
- org.sonatype.aether.RepositorySystemSession session = Invoker.invoke( buildingRequest,
- "getRepositorySession" );
-
- return new Maven30ArtifactResolver( repositorySystem, aetherRepositories, session );
+ throw new UnsupportedOperationException("Maven 3.0.X is not supported");
}
diff --git a/src/main/java/org/apache/maven/shared/transfer/collection/internal/DefaultDependencyCollector.java b/src/main/java/org/apache/maven/shared/transfer/collection/internal/DefaultDependencyCollector.java
index e6ce50e..bfb7797 100644
--- a/src/main/java/org/apache/maven/shared/transfer/collection/internal/DefaultDependencyCollector.java
+++ b/src/main/java/org/apache/maven/shared/transfer/collection/internal/DefaultDependencyCollector.java
@@ -177,17 +177,7 @@ class DefaultDependencyCollector implements DependencyCollector, Contextualizabl
}
else
{
- org.sonatype.aether.RepositorySystem m30RepositorySystem = container.lookup(
- org.sonatype.aether.RepositorySystem.class );
-
- org.sonatype.aether.RepositorySystemSession session = Invoker.invoke( buildingRequest,
- "getRepositorySession" );
-
- List<org.sonatype.aether.repository.RemoteRepository> aetherRepositories = Invoker.invoke(
- RepositoryUtils.class, "toRepos", List.class, buildingRequest.getRemoteRepositories() );
-
- return new Maven30DependencyCollector( m30RepositorySystem, artifactHandlerManager, session,
- aetherRepositories );
+ throw new UnsupportedOperationException("Maven 3.0.X is not supported");
}
}
diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/DefaultDependencyCollector.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/DefaultDependencyCollector.java
index bf84fc9..c906534 100644
--- a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/DefaultDependencyCollector.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/DefaultDependencyCollector.java
@@ -179,18 +179,7 @@ class DefaultDependencyCollector implements DependencyCollector, Contextualizabl
}
else
{
-
- org.sonatype.aether.RepositorySystem m30RepositorySystem = container.lookup(
- org.sonatype.aether.RepositorySystem.class );
-
- org.sonatype.aether.RepositorySystemSession session = Invoker.invoke( buildingRequest,
- "getRepositorySession" );
-
- List<org.sonatype.aether.repository.RemoteRepository> aetherRepositories = Invoker.invoke(
- RepositoryUtils.class, "toRepos", List.class, buildingRequest.getRemoteRepositories() );
-
- return new Maven30DependencyCollector( m30RepositorySystem, artifactHandlerManager, session,
- aetherRepositories );
+ throw new UnsupportedOperationException("Maven 3.0.X is not supported");
}
}
diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/DefaultDependencyResolver.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/DefaultDependencyResolver.java
index 28289a8..34779d2 100644
--- a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/DefaultDependencyResolver.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/DefaultDependencyResolver.java
@@ -164,18 +164,7 @@ class DefaultDependencyResolver implements DependencyResolver, Contextualizable
}
else
{
- org.sonatype.aether.RepositorySystem m30RepositorySystem = container.lookup(
- org.sonatype.aether.RepositorySystem.class );
-
- org.sonatype.aether.RepositorySystemSession session = Invoker.invoke( buildingRequest,
- "getRepositorySession" );
-
- List<org.sonatype.aether.repository.RemoteRepository> aetherRepositories = Invoker.invoke(
- RepositoryUtils.class, "toRepos", List.class, buildingRequest.getRemoteRepositories() );
-
- return new Maven30DependencyResolver( m30RepositorySystem, artifactHandlerManager, session,
- aetherRepositories );
-
+ throw new UnsupportedOperationException("Maven 3.0.X is not supported");
}
}
diff --git a/src/main/java/org/apache/maven/shared/transfer/repository/internal/DefaultRepositoryManager.java b/src/main/java/org/apache/maven/shared/transfer/repository/internal/DefaultRepositoryManager.java
index c29cc08..add22fa 100644
--- a/src/main/java/org/apache/maven/shared/transfer/repository/internal/DefaultRepositoryManager.java
+++ b/src/main/java/org/apache/maven/shared/transfer/repository/internal/DefaultRepositoryManager.java
@@ -166,21 +166,7 @@ class DefaultRepositoryManager
}
else
{
- org.sonatype.aether.RepositorySystem m30RepositorySystem =
- container.lookup( org.sonatype.aether.RepositorySystem.class );
-
- org.sonatype.aether.RepositorySystemSession session = Invoker.invoke( buildingRequest,
- "getRepositorySession" );
-
- if ( isMaven302() )
- {
- return new Maven302RepositoryManager( m30RepositorySystem, session );
-
- }
- else
- {
- return new Maven30RepositoryManager( m30RepositorySystem, session );
- }
+ throw new UnsupportedOperationException("Maven 3.0.X is not supported");
}
}
--
2.29.2

59
0003-Port-to-maven-3.8.1.patch Normal file
View File

@ -0,0 +1,59 @@
From 801cdd23a9dd9e8948f516537b0f5f09a252c5b7 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Fri, 17 Dec 2021 13:33:49 +0100
Subject: [PATCH] Port to maven 3.8.1
---
.../internal/Maven31ArtifactRepositoryAdapter.java | 12 ++++++++++++
.../internal/Maven31ArtifactRepositoryAdapter.java | 12 ++++++++++++
2 files changed, 24 insertions(+)
diff --git a/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven31ArtifactRepositoryAdapter.java b/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven31ArtifactRepositoryAdapter.java
index 9d93f31..8297fdb 100644
--- a/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven31ArtifactRepositoryAdapter.java
+++ b/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven31ArtifactRepositoryAdapter.java
@@ -207,6 +207,18 @@ class Maven31ArtifactRepositoryAdapter implements ArtifactRepository
throw new UnsupportedOperationException();
}
+ @Override
+ public boolean isBlocked()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void setBlocked(boolean blocked)
+ {
+ throw new UnsupportedOperationException();
+ }
+
@Override
public String toString()
{
diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java
index d5716bb..4669353 100644
--- a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java
@@ -207,6 +207,18 @@ class Maven31ArtifactRepositoryAdapter implements ArtifactRepository
throw new UnsupportedOperationException();
}
+ @Override
+ public boolean isBlocked()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void setBlocked(boolean blocked)
+ {
+ throw new UnsupportedOperationException();
+ }
+
@Override
public String toString()
{
--
2.31.1

3
maven-artifact-transfer-0.11.0-source-release.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8217cd5e2300c677d5d23fe6cc8de57c180738fd72834a231af0047ca1f2c347
size 193812

BIN
maven-artifact-transfer-0.13.1-source-release.zip (Stored with Git LFS) Normal file
View File

Binary file not shown.

19
maven-artifact-transfer-blocked.patch
View File

@ -1,19 +0,0 @@
--- maven-artifact-transfer-0.11.0/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java 2019-02-24 20:59:10.000000000 +0100
+++ maven-artifact-transfer-0.11.0/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java 2021-04-26 19:37:43.495274547 +0200
@@ -206,6 +206,16 @@
throw new UnsupportedOperationException();
}
+ public void setBlocked( boolean blocked )
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public boolean isBlocked()
+ {
+ throw new UnsupportedOperationException();
+ }
+
@Override
public String toString()
{

11
maven-artifact-transfer-build.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="maven-artifact-transfer" default="package" basedir=".">
<project xmlns:if="ant:if" name="maven-artifact-transfer" default="package" basedir=".">
<!-- ====================================================================== -->
<!-- Build environment properties -->
@ -8,14 +8,14 @@
<property file="build.properties"/>
<property name="project.version" value="0.11.0"/>
<property name="project.version" value="0.13.1"/>
<property name="project.groupId" value="org.apache.maven.shared"/>
<property name="project.artifactId" value="maven-artifact-transfer"/>
<property name="project.name" value="Apache Maven Artifact Transfer"/>
<property name="project.organization.name" value="The Apache Software Foundation"/>
<property name="spec.version" value="0.11"/>
<property name="spec.version" value="0.13"/>
<property name="compiler.source" value="1.8"/>
<property name="compiler.target" value="${compiler.source}"/>
@ -142,8 +142,13 @@
depends="compile-tests, junit-missing"
unless="junit.skipped"
description="Run the test cases">
<condition property="modularJava">
<javaversion atleast="9"/>
</condition>
<mkdir dir="${test.reports}"/>
<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
<jvmarg line="--add-opens java.base/java.io=ALL-UNNAMED" if:set="modularJava"/>
<jvmarg line="--add-opens java.base/java.lang=ALL-UNNAMED" if:set="modularJava"/>
<sysproperty key="basedir" value="."/>
<formatter type="xml"/>
<formatter type="plain" usefile="false"/>

19
maven-artifact-transfer.spec
View File

@ -18,16 +18,17 @@
%bcond_with tests
Name: maven-artifact-transfer
Version: 0.11.0
Version: 0.13.1
Release: 0
Summary: Apache Maven Artifact Transfer
License: Apache-2.0
Group: Development/Libraries/Java
URL: http://maven.apache.org/shared/maven-artifact-transfer
Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
URL: https://maven.apache.org/shared/maven-artifact-transfer
Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
Source1: %{name}-build.xml
Patch0: 0001-Compatibility-with-Maven-3.0.3-and-later.patch
Patch1: %{name}-blocked.patch
Patch1: 0002-Remove-support-for-maven-3.0.X.patch
Patch2: 0003-Port-to-maven-3.8.1.patch
BuildRequires: ant
BuildRequires: apache-commons-cli
BuildRequires: apache-commons-codec
@ -60,6 +61,9 @@ BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:)
BuildArch: noarch
%if %{with tests}
BuildRequires: ant-junit
BuildRequires: cglib
BuildRequires: mockito
BuildRequires: objenesis
%endif
%description
@ -77,10 +81,10 @@ This package provides %{summary}.
cp %{SOURCE1} build.xml
%patch0 -p1
%patch1 -p1
%patch2 -p1
%pom_remove_plugin :maven-shade-plugin
%pom_remove_plugin :apache-rat-plugin
%pom_remove_plugin :maven-enforcer-plugin
%pom_remove_plugin :animal-sniffer-maven-plugin
# We don't want to support legacy Maven versions (older than 3.1)
@ -90,6 +94,11 @@ find -name Maven30\*.java -delete
%build
mkdir -p lib
build-jar-repository -s lib \
%if %{with tests}
cglib/cglib \
mockito/mockito-core \
objenesis/objenesis \
%endif
atinject \
commons-cli \
commons-codec \