Skip to content
This repository was archived by the owner on Sep 13, 2024. It is now read-only.

Commit ba5139e

Browse files
committed
Ignore PlexusRequirementTest on Java17 unless testing with guice5
1 parent d94fd91 commit ba5139e

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

org.eclipse.sisu.plexus/pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,9 @@
285285
<additionalClasspathElement>${project.build.directory}/guice3/guava.jar</additionalClasspathElement>
286286
<additionalClasspathElement>${project.build.directory}/guice3/guice.jar</additionalClasspathElement>
287287
</additionalClasspathElements>
288+
<systemPropertyVariables>
289+
<guiceVersion>guice3</guiceVersion>
290+
</systemPropertyVariables>
288291
</configuration>
289292
</execution>
290293
<execution>
@@ -299,6 +302,9 @@
299302
<additionalClasspathElement>${project.build.directory}/guice4/guava.jar</additionalClasspathElement>
300303
<additionalClasspathElement>${project.build.directory}/guice4/guice.jar</additionalClasspathElement>
301304
</additionalClasspathElements>
305+
<systemPropertyVariables>
306+
<guiceVersion>guice4</guiceVersion>
307+
</systemPropertyVariables>
302308
</configuration>
303309
</execution>
304310
<execution>
@@ -314,6 +320,9 @@
314320
<additionalClasspathElement>${project.build.directory}/guice423/guava.jar</additionalClasspathElement>
315321
<additionalClasspathElement>${project.build.directory}/guice423/guice.jar</additionalClasspathElement>
316322
</additionalClasspathElements>
323+
<systemPropertyVariables>
324+
<guiceVersion>guice423</guiceVersion>
325+
</systemPropertyVariables>
317326
</configuration>
318327
</execution>
319328
<execution>
@@ -329,6 +338,9 @@
329338
<additionalClasspathElement>${project.build.directory}/guice5/guava.jar</additionalClasspathElement>
330339
<additionalClasspathElement>${project.build.directory}/guice5/guice.jar</additionalClasspathElement>
331340
</additionalClasspathElements>
341+
<systemPropertyVariables>
342+
<guiceVersion>guice5</guiceVersion>
343+
</systemPropertyVariables>
332344
</configuration>
333345
</execution>
334346
</executions>

org.eclipse.sisu.plexus/src/test/java/org/eclipse/sisu/plexus/PlexusRequirementTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,12 @@ public void testBadDeferredRole()
594594
public void testPlexus121Compatibility()
595595
throws Exception
596596
{
597+
if ( "17".equals( System.getProperty( "java.specification.version", "undefined" ) )
598+
&& !"guice5".equals( System.getProperty( "guiceVersion", "undefined" ) ) )
599+
{
600+
return; // skip test on Java17 + guice3/4, is not working
601+
}
602+
597603
final List<URL> urls = new ArrayList<URL>();
598604
urls.add( new File( "target/dependency/plexus-component-annotations-1.2.1.jar" ).toURI().toURL() );
599605
Collections.addAll( urls, new URLClassSpace( getClass().getClassLoader() ).getURLs() );

0 commit comments

Comments
 (0)