Update to upstream version 1.1.2

This commit is contained in:
Mikolaj Izdebski 2023-08-23 07:13:31 +02:00
parent 64d740723e
commit e3a0f52271
4 changed files with 7 additions and 42 deletions

1
.gitignore vendored
View File

@ -8,3 +8,4 @@
/plexus-languages-1.0.5.tar.gz
/plexus-languages-1.0.6.tar.gz
/plexus-languages-1.1.1.tar.gz
/plexus-languages-1.1.2.tar.gz

View File

@ -1,39 +0,0 @@
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

View File

@ -1,8 +1,8 @@
%bcond_with bootstrap
Name: plexus-languages
Version: 1.1.1
Release: 5%{?dist}
Version: 1.1.2
Release: 1%{?dist}
Summary: Plexus Languages
License: ASL 2.0
URL: https://github.com/codehaus-plexus/plexus-languages
@ -51,6 +51,9 @@ cp %{SOURCE1} .
%license LICENSE-2.0.txt
%changelog
* Wed Aug 23 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.2-1
- Update to upstream version 1.1.2
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

View File

@ -1,2 +1,2 @@
SHA512 (plexus-languages-1.1.1.tar.gz) = 8976f0c49457b961fafa2f2297c8ce3e3e6275fcc95f0ed986435cfc6b5d2a05a035c1c0a9b804d66082011a8fd49c301ffd1c61b32b2a535ea0321bdbebae5b
SHA512 (plexus-languages-1.1.2.tar.gz) = fe5ec7dd0941c29a95ea31a817c90800df5f8f2fd5fa8aaeb413a06e6a29ea009498ac54d4c0d6eb21bf0deb08e76fb3190bc74666bafdb36af204c07994ec23
SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8