diff --git a/0001-Port-to-Eclipse-Aether-and-Eclipse-Sisu.patch b/0001-Port-to-Eclipse-Aether-and-Eclipse-Sisu.patch new file mode 100644 index 0000000..883d9dd --- /dev/null +++ b/0001-Port-to-Eclipse-Aether-and-Eclipse-Sisu.patch @@ -0,0 +1,74 @@ +From cf2cedf003f11e207befaa10227c19e28a92b5ca Mon Sep 17 00:00:00 2001 +Date: Wed, 2 Nov 2016 14:12:00 +0100 +Subject: [PATCH] Port to Eclipse Aether and Eclipse Sisu + +--- + .../exec/DefaultMavenPluginManagerHelper.java | 28 +--------------------- + .../exec/TestDefaultMavenReportExecutor.java | 10 ++++---- + 2 files changed, 6 insertions(+), 32 deletions(-) + +diff --git a/src/main/java/org/apache/maven/reporting/exec/DefaultMavenPluginManagerHelper.java b/src/main/java/org/apache/maven/reporting/exec/DefaultMavenPluginManagerHelper.java +index 4de901e..5cd3985 100644 +--- a/src/main/java/org/apache/maven/reporting/exec/DefaultMavenPluginManagerHelper.java ++++ b/src/main/java/org/apache/maven/reporting/exec/DefaultMavenPluginManagerHelper.java +@@ -94,35 +94,9 @@ public class DefaultMavenPluginManagerHelper + } + } + +- private boolean isEclipseAether() +- { +- if ( isEclipseAether == null ) +- { +- try +- { +- ClassLoader cl = Thread.currentThread().getContextClassLoader(); +- cl.loadClass( "org.sonatype.aether.graph.DependencyFilter" ); +- isEclipseAether = false; +- } +- catch ( ClassNotFoundException e ) +- { +- isEclipseAether = true; +- } +- } +- +- return isEclipseAether.booleanValue(); +- } +- + private Object createExclusionsDependencyFilter( List artifactIdsList ) + { +- if ( isEclipseAether() ) +- { +- return new org.eclipse.aether.util.filter.ExclusionsDependencyFilter( artifactIdsList ); +- } +- else +- { +- return new org.sonatype.aether.util.filter.ExclusionsDependencyFilter( artifactIdsList ); +- } ++ return new org.eclipse.aether.util.filter.ExclusionsDependencyFilter( artifactIdsList ); + } + + public PluginDescriptor getPluginDescriptor( Plugin plugin, MavenSession session ) +diff --git a/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java b/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java +index a6c37bf..adfe03a 100644 +--- a/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java ++++ b/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java +@@ -44,11 +44,11 @@ import org.codehaus.plexus.PlexusTestCase; + import org.codehaus.plexus.classworlds.realm.ClassRealm; + import org.codehaus.plexus.component.repository.exception.ComponentLookupException; + import org.codehaus.plexus.logging.Logger; +-import org.sonatype.aether.RepositorySystemSession; +-import org.sonatype.aether.artifact.Artifact; +-import org.sonatype.aether.repository.RemoteRepository; +-import org.sonatype.aether.repository.WorkspaceReader; +-import org.sonatype.aether.repository.WorkspaceRepository; ++import org.eclipse.aether.RepositorySystemSession; ++import org.eclipse.aether.artifact.Artifact; ++import org.eclipse.aether.repository.RemoteRepository; ++import org.eclipse.aether.repository.WorkspaceReader; ++import org.eclipse.aether.repository.WorkspaceRepository; + + import java.io.File; + import java.util.Collections; +-- +2.7.4 + diff --git a/maven-reporting-exec-1.4-source-release.zip b/maven-reporting-exec-1.4-source-release.zip new file mode 100644 index 0000000..460d59d Binary files /dev/null and b/maven-reporting-exec-1.4-source-release.zip differ diff --git a/maven-reporting-exec.spec b/maven-reporting-exec.spec new file mode 100644 index 0000000..f0ec04e --- /dev/null +++ b/maven-reporting-exec.spec @@ -0,0 +1,61 @@ +Name: maven-reporting-exec +Version: 1.4 +Release: 1 +BuildArch: noarch +Summary: Classes to manage report plugin executions with Maven 3 +License: ASL 2.0 +URL: http://maven.apache.org/shared/maven-reporting-exec/ +Source0: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-exec/%{version}/maven-reporting-exec-%{version}-source-release.zip +Patch0001: 0001-Port-to-Eclipse-Aether-and-Eclipse-Sisu.patch + +BuildRequires: maven-local mvn(org.apache.maven:maven-artifact) +BuildRequires: mvn(org.apache.maven:maven-core) mvn(org.apache.maven:maven-model) +BuildRequires: mvn(org.apache.maven:maven-plugin-api) mvn(org.apache.maven:maven-settings) +BuildRequires: mvn(org.apache.maven:maven-settings-builder) +BuildRequires: mvn(org.apache.maven.plugins:maven-invoker-plugin) +BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api) +BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) +BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils) +BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) +BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) +BuildRequires: mvn(org.eclipse.aether:aether-api) mvn(org.eclipse.aether:aether-util) +BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) +Requires: java-headless + +%description +Classes to manage report plugin executions with Maven 3. Contains classes for +managing and configuring reports and their execution. + +%package javadoc +Summary: API documentation for %{name} +%description javadoc +The API documentation of %{name}. + +%prep +%setup -qn %{name}-%{version} +%patch0001 -p1 + +# convert CR+LF to LF +sed -i 's/\r//g' pom.xml src/main/java/org/apache/maven/reporting/exec/* +# Build against Maven 3.x, Eclipse Aether and Eclipse Sisu +%pom_remove_plugin org.apache.maven.plugins:maven-enforcer-plugin +%pom_remove_dep org.sonatype.aether:aether-api +%pom_remove_dep org.sonatype.aether:aether-util +%pom_change_dep org.sonatype.aether:aether-connector-wagon org.eclipse.aether:aether-transport-wagon +%pom_change_dep org.sonatype.sisu:sisu-inject-plexus org.eclipse.sisu:org.eclipse.sisu.plexus + +%build +%mvn_build -f + +%install +%mvn_install + +%files -f .mfiles +%doc LICENSE NOTICE DEPENDENCIES + +%files javadoc -f .mfiles-javadoc +%doc LICENSE NOTICE + +%changelog +* Tue Aug 11 2020 maminjie - 1.4-1 +- package init diff --git a/maven-reporting-exec.yaml b/maven-reporting-exec.yaml new file mode 100644 index 0000000..8bd6d93 --- /dev/null +++ b/maven-reporting-exec.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: apache/maven-reporting-exec +tag_prefix: "maven-reporting-exec-" +seperator: "."