From 99e2b00dfd90063af3197c3d6452bedda0963694bc85b4b6b0135d4f89d6af14 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 4 Sep 2023 20:45:21 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-common-artifact-filters?expand=0&rev=5 --- 0001-Remove-Maven-3.0-specific-code.patch | 55 --------- ...-artifact-filters-3.0.1-source-release.zip | 3 - ...-artifact-filters-3.3.2-source-release.zip | 3 + maven-common-artifact-filters-build.xml | 108 +----------------- maven-common-artifact-filters.spec | 41 ++----- 5 files changed, 16 insertions(+), 194 deletions(-) delete mode 100644 0001-Remove-Maven-3.0-specific-code.patch delete mode 100644 maven-common-artifact-filters-3.0.1-source-release.zip create mode 100644 maven-common-artifact-filters-3.3.2-source-release.zip diff --git a/0001-Remove-Maven-3.0-specific-code.patch b/0001-Remove-Maven-3.0-specific-code.patch deleted file mode 100644 index eb101f6..0000000 --- a/0001-Remove-Maven-3.0-specific-code.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 2adad987d89aa6ab94fa1351756730c3c09dd35d Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Mon, 12 Oct 2015 13:03:40 +0200 -Subject: [PATCH] Remove Maven 3.0 specific code - ---- - .../collection/ArtifactTransitivityFilter.java | 32 +--------------------- - 1 file changed, 1 insertion(+), 31 deletions(-) - -diff --git a/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java b/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java -index 7db1664..df749db 100644 ---- a/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java -+++ b/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java -@@ -116,37 +116,7 @@ public class ArtifactTransitivityFilter - } - else - { -- try -- { -- @SuppressWarnings( "unchecked" ) List dependencies = -- (List) Invoker.invoke( resolutionResult, -- "getDependencies" ); -- -- for ( org.sonatype.aether.graph.Dependency dependency : dependencies ) -- { -- Artifact mavenArtifact = -- (Artifact) Invoker.invoke( RepositoryUtils.class, "toArtifact", -- org.sonatype.aether.artifact.Artifact.class, -- dependency.getArtifact() ); -- -- transitiveArtifacts.add( mavenArtifact.getDependencyConflictId() ); -- } -- } -- catch ( IllegalAccessException e ) -- { -- // don't want to pollute method signature with ReflectionExceptions -- throw new RuntimeException( e.getMessage(), e ); -- } -- catch ( InvocationTargetException e ) -- { -- // don't want to pollute method signature with ReflectionExceptions -- throw new RuntimeException( e.getMessage(), e ); -- } -- catch ( NoSuchMethodException e ) -- { -- // don't want to pollute method signature with ReflectionExceptions -- throw new RuntimeException( e.getMessage(), e ); -- } -+ throw new RuntimeException( "Maven older than 3.1 are not supported" ); - } - } - } --- -2.7.4 - diff --git a/maven-common-artifact-filters-3.0.1-source-release.zip b/maven-common-artifact-filters-3.0.1-source-release.zip deleted file mode 100644 index d272558..0000000 --- a/maven-common-artifact-filters-3.0.1-source-release.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:657ba86bbaa54d368e5c6ebd61559b5505cefdb0b128d100161ca89ad8b4ad61 -size 105661 diff --git a/maven-common-artifact-filters-3.3.2-source-release.zip b/maven-common-artifact-filters-3.3.2-source-release.zip new file mode 100644 index 0000000..9d4f4e4 --- /dev/null +++ b/maven-common-artifact-filters-3.3.2-source-release.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87c0aeefbbf775d95b8c2bed8059ceb4cec0965d81208a4e0eca866777ea90bf +size 113047 diff --git a/maven-common-artifact-filters-build.xml b/maven-common-artifact-filters-build.xml index 508344f..62accd9 100644 --- a/maven-common-artifact-filters-build.xml +++ b/maven-common-artifact-filters-build.xml @@ -10,11 +10,11 @@ - + - + @@ -24,10 +24,7 @@ - - - - + @@ -39,11 +36,6 @@ - - - - - @@ -76,98 +68,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - =================================== WARNING =================================== - JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed. - =============================================================================== - - @@ -201,7 +101,7 @@ - +