You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2018/08/01 18:43:06 UTC
[maven-jdeps-plugin] branch master updated: Match different output
Java8 between Windows and Linux
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jdeps-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 17f8458 Match different output Java8 between Windows and Linux
17f8458 is described below
commit 17f84582ff91278fca7dab950894ec84f9f191ea
Author: rfscholte <rf...@apache.org>
AuthorDate: Wed Aug 1 20:42:59 2018 +0200
Match different output Java8 between Windows and Linux
---
.../maven/plugins/jdeps/consumers/JDepsConsumer.java | 7 ++++---
.../maven/plugins/jdeps/consumers/JDepsConsumerTest.java | 15 +++++++++++++++
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/jdeps/consumers/JDepsConsumer.java b/src/main/java/org/apache/maven/plugins/jdeps/consumers/JDepsConsumer.java
index c193fa1..7d9df41 100644
--- a/src/main/java/org/apache/maven/plugins/jdeps/consumers/JDepsConsumer.java
+++ b/src/main/java/org/apache/maven/plugins/jdeps/consumers/JDepsConsumer.java
@@ -39,10 +39,11 @@ public class JDepsConsumer
{
/**
- * JDK8: JDK internal API (rt.jar)
- * JDK9: JDK internal API (java.base)
+ * JDK8 Windows: JDK internal API (rt.jar)
+ * JDK8 Linux: JDK internal API (JDK removed internal API)
+ * JDK9: JDK internal API (java.base)
*/
- private static final Pattern JDKINTERNALAPI = Pattern.compile( "\\s+->\\s([a-z\\.]+)\\s+(JDK internal API .+)" );
+ private static final Pattern JDKINTERNALAPI = Pattern.compile( ".+->\\s([a-z\\.]+)\\s+(JDK internal API .+)" );
/**
* <dl>
diff --git a/src/test/java/org/apache/maven/plugins/jdeps/consumers/JDepsConsumerTest.java b/src/test/java/org/apache/maven/plugins/jdeps/consumers/JDepsConsumerTest.java
index ba32463..aafad5c 100644
--- a/src/test/java/org/apache/maven/plugins/jdeps/consumers/JDepsConsumerTest.java
+++ b/src/test/java/org/apache/maven/plugins/jdeps/consumers/JDepsConsumerTest.java
@@ -42,6 +42,21 @@ public class JDepsConsumerTest
assertEquals( "JDK internal API (java.base)", consumer.getOffendingPackages().get( "sun.misc" ) );
assertEquals( 0, consumer.getProfiles().size() );
}
+
+ @Test
+ public void testJDKInternalAPI_Linux_Java8()
+ {
+ consumer = new JDepsConsumer();
+ consumer.consumeLine( "classes -> JDK removed internal API" );
+ consumer.consumeLine( "classes -> java.base" );
+ consumer.consumeLine( " <unnamed> -> java.io java.base" );
+ consumer.consumeLine( " <unnamed> -> java.lang java.base" );
+ consumer.consumeLine( " <unnamed> -> sun.misc JDK internal API (JDK removed internal API)" );
+
+ assertEquals( 1, consumer.getOffendingPackages().size() );
+ assertEquals( "JDK internal API (JDK removed internal API)", consumer.getOffendingPackages().get( "sun.misc" ) );
+ assertEquals( 0, consumer.getProfiles().size() );
+ }
@Test
public void testProfile()