pool/maven-reporting-exec
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-reporting-exec?expand=0&rev=14

Browse Source
This commit is contained in:
Fridrich Strba 2022-03-22 13:41:02 +00:00 committed by Git OBS Bridge
parent 297887948b
commit 1f716d024e
5 changed files with 17 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
0001-Port-to-Eclipse-Aether-and-Eclipse-Sisu.patch
View File

@ -1,75 +0,0 @@
From cf2cedf003f11e207befaa10227c19e28a92b5ca Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
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<String> 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

3
maven-reporting-exec-1.4-source-release.zip
View File

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

3
maven-reporting-exec-1.6.0-source-release.zip Normal file
View File

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

5
maven-reporting-exec.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Mar 22 13:40:40 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Build with source and target levels 8
-------------------------------------------------------------------
Sun Nov 24 17:09:42 UTC 2019 - Fridrich Strba <fstrba@suse.com>

23
maven-reporting-exec.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package maven-reporting-exec
#
# Copyright (c) 2019 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,18 +17,18 @@
Name: maven-reporting-exec
Version: 1.4
Version: 1.6.0
Release: 0
Summary: Classes to manage report plugin executions with Maven 3
License: Apache-2.0
Group: Development/Libraries/Java
URL: http://maven.apache.org/shared/maven-reporting-exec/
Source0: http://repo1.maven.org/maven2/org/apache/maven/reporting/%{name}/%{version}/%{name}-%{version}-source-release.zip
Patch0001: 0001-Port-to-Eclipse-Aether-and-Eclipse-Sisu.patch
URL: https://maven.apache.org/shared/maven-reporting-exec/
Source0: https://dlcdn.apache.org/maven/reporting/%{name}-%{version}-source-release.zip
BuildRequires: fdupes
BuildRequires: maven-local
BuildRequires: unzip
BuildRequires: mvn(org.apache.maven.plugins:maven-invoker-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-shade-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)
@ -40,6 +40,7 @@ BuildRequires: mvn(org.apache.maven:maven-settings)
BuildRequires: mvn(org.apache.maven:maven-settings-builder)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: mvn(org.eclipse.aether:aether-api)
BuildRequires: mvn(org.eclipse.aether:aether-util)
BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
@ -58,24 +59,18 @@ The API documentation of %{name}.
%prep
%setup -q
%patch0001 -p1
# convert CR+LF to LF
sed -i 's/\r//g' pom.xml src/main/java/org/apache/maven/reporting/exec/*
%pom_remove_plugin org.apache.maven.plugins:maven-enforcer-plugin
# Build against Maven 3.x, Eclipse Aether and Eclipse Sisu
%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 \
%{mvn_build} -f -- \
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-- -Dmaven.compiler.release=6
-Dmaven.compiler.release=8 \
%endif
-Dsource=8
%install
%mvn_install