diff --git a/0001-Port-to-Eclipse-Aether-and-Eclipse-Sisu.patch b/0001-Port-to-Eclipse-Aether-and-Eclipse-Sisu.patch deleted file mode 100644 index 883d9dd..0000000 --- a/0001-Port-to-Eclipse-Aether-and-Eclipse-Sisu.patch +++ /dev/null @@ -1,74 +0,0 @@ -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 deleted file mode 100644 index 460d59d..0000000 Binary files a/maven-reporting-exec-1.4-source-release.zip and /dev/null differ diff --git a/maven-reporting-exec-2.0.0-M1-source-release.zip b/maven-reporting-exec-2.0.0-M1-source-release.zip new file mode 100644 index 0000000..ca2f370 Binary files /dev/null and b/maven-reporting-exec-2.0.0-M1-source-release.zip differ diff --git a/maven-reporting-exec.spec b/maven-reporting-exec.spec index f0ec04e..7c23dec 100644 --- a/maven-reporting-exec.spec +++ b/maven-reporting-exec.spec @@ -1,12 +1,11 @@ Name: maven-reporting-exec -Version: 1.4 +Version: 2.0.0 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 +Source0: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/%{name}/%{version}-M1/%{name}-%{version}-M1-source-release.zip BuildRequires: maven-local mvn(org.apache.maven:maven-artifact) BuildRequires: mvn(org.apache.maven:maven-core) mvn(org.apache.maven:maven-model) @@ -20,6 +19,7 @@ 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) +BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) Requires: java-headless %description @@ -32,17 +32,13 @@ Summary: API documentation for %{name} The API documentation of %{name}. %prep -%setup -qn %{name}-%{version} -%patch0001 -p1 +%autosetup -n %{name}-%{version}-M1 # convert CR+LF to LF sed -i 's/\r//g' pom.xml src/main/java/org/apache/maven/reporting/exec/* +sed -i 's/class ReportPlugin/public class ReportPlugin/g' src/main/java/org/apache/maven/reporting/exec/ReportPlugin.java # 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 @@ -57,5 +53,8 @@ sed -i 's/\r//g' pom.xml src/main/java/org/apache/maven/reporting/exec/* %doc LICENSE NOTICE %changelog +* Tue Jan 23 2024 Ge Wang 2.0.0-1 +- Update to version 2.0.0 + * Tue Aug 11 2020 maminjie - 1.4-1 - package init