pool/maven-common-artifact-filters
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Fridrich Strba 2023-09-04 20:45:21 +00:00 committed by Git OBS Bridge
parent e6c606987f
commit 99e2b00dfd
5 changed files with 16 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
0001-Remove-Maven-3.0-specific-code.patch
View File

@ -1,55 +0,0 @@
From 2adad987d89aa6ab94fa1351756730c3c09dd35d Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
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<org.sonatype.aether.graph.Dependency> dependencies =
- (List<org.sonatype.aether.graph.Dependency>) 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

BIN
maven-common-artifact-filters-3.0.1-source-release.zip (Stored with Git LFS)
View File

Binary file not shown.

BIN
maven-common-artifact-filters-3.3.2-source-release.zip (Stored with Git LFS) Normal file
View File

Binary file not shown.

108
maven-common-artifact-filters-build.xml
View File

@ -10,11 +10,11 @@
<property name="project.groupId" value="org.apache.maven.shared"/>
<property name="project.artifactId" value="maven-common-artifact-filters"/>
<property name="project.version" value="3.0.1"/>
<property name="project.version" value="3.3.2"/>
<property name="project.name" value="Apache Maven Common Artifact Filters"/>
<property name="project.organization.name" value="${project.organization.name}"/>
<property name="spec.version" value="3.0"/>
<property name="spec.version" value="3.3"/>
<property name="compiler.source" value="1.8"/>
<property name="compiler.target" value="${compiler.source}"/>
@ -24,10 +24,7 @@
<property name="build.outputDir" value="${build.dir}/classes"/>
<property name="build.srcDir" value="src/main/java"/>
<property name="build.resourceDir" value="src/main/resources"/>
<property name="build.testOutputDir" value="${build.dir}/test-classes"/>
<property name="build.testDir" value="src/test/java"/>
<property name="build.testResourceDir" value="src/test/resources"/>
<property name="test.reports" value="${build.dir}/test-reports"/>
<property name="reporting.outputDirectory" value="${build.dir}/site"/>
<!-- ====================================================================== -->
@ -39,11 +36,6 @@
<include name="**/*.jar"/>
</fileset>
</path>
<path id="build.test.classpath">
<fileset dir="lib">
<include name="**/*.jar"/>
</fileset>
</path>
<!-- ====================================================================== -->
<!-- Cleaning up target -->
@ -76,98 +68,6 @@
</javac>
</target>
<!-- ====================================================================== -->
<!-- Test-compilation target -->
<!-- ====================================================================== -->
<target name="compile-tests"
depends="compile"
description="Compile the test code"
unless="test.skip">
<mkdir dir="${build.testOutputDir}"/>
<javac destdir="${build.testOutputDir}"
nowarn="false"
debug="true"
encoding="UTF-8"
optimize="false"
deprecation="true"
target="${compiler.target}"
verbose="false"
fork="false"
source="${compiler.source}">
<src>
<pathelement location="${build.testDir}"/>
</src>
<classpath>
<path refid="build.test.classpath"/>
<pathelement location="${build.outputDir}"/>
</classpath>
</javac>
</target>
<!-- ====================================================================== -->
<!-- Run all tests -->
<!-- ====================================================================== -->
<target name="test"
depends="compile-tests, junit-missing"
unless="junit.skipped"
description="Run the test cases">
<mkdir dir="${test.reports}"/>
<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
<sysproperty key="basedir" value="."/>
<formatter type="xml"/>
<formatter type="plain" usefile="false"/>
<classpath>
<path refid="build.test.classpath"/>
<pathelement location="${build.outputDir}"/>
<pathelement location="${build.testOutputDir}"/>
</classpath>
<batchtest todir="${test.reports}" unless="test">
<fileset dir="${build.testDir}">
<include name="**/Test*.java"/>
<include name="**/*Test.java"/>
<include name="**/*TestCase.java"/>
<exclude name="**/*Abstract*Test*.java"/>
</fileset>
</batchtest>
<batchtest todir="${test.reports}" if="test">
<fileset dir="${build.testDir}">
<include name="**/${test}.java"/>
<exclude name="**/*Abstract*Test*.java"/>
</fileset>
</batchtest>
</junit>
</target>
<target name="test-junit-present">
<available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
</target>
<target name="test-junit-status"
depends="test-junit-present">
<condition property="junit.missing">
<and>
<isfalse value="${junit.present}"/>
<isfalse value="${test.skip}"/>
</and>
</condition>
<condition property="junit.skipped">
<or>
<isfalse value="${junit.present}"/>
<istrue value="${test.skip}"/>
</or>
</condition>
</target>
<target name="junit-missing"
depends="test-junit-status"
if="junit.missing">
<echo>=================================== WARNING ===================================</echo>
<echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
<echo>===============================================================================</echo>
</target>
<!-- ====================================================================== -->
<!-- Javadoc target -->
<!-- ====================================================================== -->
@ -201,7 +101,7 @@
<!-- Package target -->
<!-- ====================================================================== -->
<target name="package" depends="compile,test" description="Package the application">
<target name="package" depends="compile" description="Package the application">
<jar jarfile="${build.dir}/${build.finalName}.jar"
compress="true"
index="false"

41
maven-common-artifact-filters.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package maven-common-artifact-filters
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,17 +16,15 @@
#
%bcond_with tests
Name: maven-common-artifact-filters
Version: 3.0.1
Version: 3.3.2
Release: 0
Summary: Maven Common Artifact Filters
License: Apache-2.0
Group: Development/Libraries/Java
URL: http://maven.apache.org/shared/
Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
URL: https://maven.apache.org/shared/
Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
Source1: %{name}-build.xml
Patch0: 0001-Remove-Maven-3.0-specific-code.patch
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: javapackages-local
@ -35,19 +33,12 @@ BuildRequires: maven-resolver-api
BuildRequires: maven-resolver-util
BuildRequires: maven-shared-utils
BuildRequires: sisu-plexus
BuildRequires: slf4j
BuildRequires: unzip
BuildRequires: xmvn-install
BuildRequires: xmvn-resolve
BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:)
BuildArch: noarch
%if %{with tests}
BuildRequires: ant-junit
BuildRequires: apache-commons-lang3
BuildRequires: easymock
BuildRequires: maven-plugin-testing-harness
BuildRequires: plexus-archiver
BuildRequires: plexus-utils
%endif
%description
A collection of ready-made filters to control inclusion/exclusion of artifacts
@ -63,12 +54,8 @@ This package contains javadoc for %{name}.
%prep
%setup -q
cp %{SOURCE1} build.xml
%patch0 -p1
# We don't want to support legacy Maven versions (older than 3.1)
%pom_remove_dep org.sonatype.sisu:
%pom_remove_dep org.sonatype.aether:
find -name SonatypeAether\*.java -delete
%pom_xpath_remove pom:project/pom:parent/pom:relativePath
%build
mkdir -p lib
@ -81,23 +68,13 @@ build-jar-repository -s lib \
maven-resolver/maven-resolver-api \
maven-resolver/maven-resolver-util \
maven-shared-utils/maven-shared-utils \
org.eclipse.sisu.plexus
%if %{with tests}
build-jar-repository -s lib \
commons-lang3 \
easymock \
maven-plugin-testing/maven-plugin-testing-harness \
plexus/archiver \
plexus/utils
%endif
org.eclipse.sisu.plexus \
slf4j/api
%{ant} \
%if %{without tests}
-Dtest.skip=true \
%endif
jar javadoc
%mvn_artifact pom.xml target/%{name}-%{version}.jar
%{mvn_artifact} pom.xml target/%{name}-%{version}.jar
%install
%mvn_install