#4 Add patch for SUREFIRE-1897
Merged 6 months ago by mizdebsk. Opened 6 months ago by mizdebsk.
rpms/ mizdebsk/plexus-languages fix-SUREFIRE-1897  into  rawhide

@@ -0,0 +1,39 @@ 

+ From fbe59511ace6372b09cd34ca465d92bf69fa4edb Mon Sep 17 00:00:00 2001

+ From: rfscholte <rfscholte@apache.org>

+ Date: Fri, 26 Mar 2021 21:08:15 +0100

+ Subject: [PATCH] #70 Jars of which modulename extraction cause an exception

+  should end up on the classpath

+ 

+ ---

+  .../codehaus/plexus/languages/java/jpms/LocationManager.java   | 3 +++

+  .../codehaus/plexus/languages/java/jpms/LocationManagerIT.java | 1 +

+  2 files changed, 4 insertions(+)

+ 

+ diff --git a/plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/LocationManager.java b/plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/LocationManager.java

+ index bec925a..94c094c 100644

+ --- a/plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/LocationManager.java

+ +++ b/plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/LocationManager.java

+ @@ -205,6 +205,9 @@ public class LocationManager

+              catch ( Exception e )

+              {

+                  result.getPathExceptions().put( t, e );

+ +

+ +                pathElements.put( t, null );

+ +

+                  continue;

+              }

+              

+ diff --git a/plexus-java/src/test/java/org/codehaus/plexus/languages/java/jpms/LocationManagerIT.java b/plexus-java/src/test/java/org/codehaus/plexus/languages/java/jpms/LocationManagerIT.java

+ index 41ddc75..c79a29f 100644

+ --- a/plexus-java/src/test/java/org/codehaus/plexus/languages/java/jpms/LocationManagerIT.java

+ +++ b/plexus-java/src/test/java/org/codehaus/plexus/languages/java/jpms/LocationManagerIT.java

+ @@ -132,5 +132,6 @@ public class LocationManagerIT

+          ResolvePathsResult<Path> result = locationManager.resolvePaths( request );

+          

+          assertThat( result.getPathExceptions().size(), is( 1 ) );

+ +        assertThat( result.getClasspathElements().size(), is(1) );

+      }

+  }

+ -- 

+ 2.33.1

+ 

file modified
+10 -1
@@ -2,7 +2,7 @@ 

  

  Name:           plexus-languages

  Version:        1.0.6

- Release:        3%{?dist}

+ Release:        4%{?dist}

  Summary:        Plexus Languages

  License:        ASL 2.0

  URL:            https://github.com/codehaus-plexus/plexus-languages
@@ -14,6 +14,11 @@ 

  # Sources contain bundled jars that we cannot verify for licensing

  Source2:        generate-tarball.sh

  

+ # Upstream patch: Jars of which modulename extraction cause an exception should end up on the classpath

+ # https://github.com/codehaus-plexus/plexus-languages/issues/70

+ # https://issues.apache.org/jira/browse/SUREFIRE-1897

+ Patch0:         0001-70-Jars-of-which-modulename-extraction-cause-an-exce.patch

+ 

  BuildRequires:  maven-local

  %if %{with bootstrap}

  BuildRequires:  javapackages-bootstrap
@@ -34,6 +39,7 @@ 

  

  %prep

  %setup -q -n plexus-languages-plexus-languages-%{version}

+ %patch0 -p1

  

  cp %{SOURCE1} .

  
@@ -53,6 +59,9 @@ 

  %license LICENSE-2.0.txt

  

  %changelog

+ * Wed Nov 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0.6-4

+ - Add patch for SUREFIRE-1897

+ 

  * Tue Jul 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.6-3

  - Second attempt - Rebuilt for

    https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild