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 1c7d9ad [MJDEPS-26] Plugin doesn't recognized latest Java8 output
1c7d9ad is described below
commit 1c7d9adb5eafeb199b780a82b10118239bc6e750
Author: rfscholte <[email protected]>
AuthorDate: Fri Jul 2 14:06:50 2021 +0200
[MJDEPS-26] Plugin doesn't recognized latest Java8 output
---
src/it/unsupported-api_main/verify.groovy | 2 +-
src/it/unsupported-api_test/verify.groovy | 2 +-
.../maven/plugins/jdeps/consumers/JDepsConsumer.java | 3 ++-
.../maven/plugins/jdeps/consumers/JDepsConsumerTest.java | 15 +++++++++++++++
4 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/it/unsupported-api_main/verify.groovy
b/src/it/unsupported-api_main/verify.groovy
index b7aa41b..7648909 100644
--- a/src/it/unsupported-api_main/verify.groovy
+++ b/src/it/unsupported-api_main/verify.groovy
@@ -20,4 +20,4 @@
def buildLog = new File( basedir, 'build.log' )
-assert buildLog.readLines().dropWhile{ !(it =~ /Found offending packages\:$/)
}.getAt(1) ==~ /\[ERROR\]\s+sun\.misc -> JDK internal API \(.+\)/
+assert buildLog.readLines().dropWhile{ !(it =~ /Found offending packages\:$/)
}.getAt(1) ==~ /\[ERROR\]\s+sun\.misc -> JDK (removed )?internal API.*/
diff --git a/src/it/unsupported-api_test/verify.groovy
b/src/it/unsupported-api_test/verify.groovy
index 5e97e6c..88ad755 100644
--- a/src/it/unsupported-api_test/verify.groovy
+++ b/src/it/unsupported-api_test/verify.groovy
@@ -20,4 +20,4 @@
def buildLog = new File( basedir, 'build.log' )
-assert buildLog.readLines().dropWhile{ !(it =~ /Found offending packages\:$/)
}.getAt(1) ==~ /\[ERROR\]\s+sun\.misc -> JDK internal API \(.+\)/
\ No newline at end of file
+assert buildLog.readLines().dropWhile{ !(it =~ /Found offending packages\:$/)
}.getAt(1) ==~ /\[ERROR\]\s+sun\.misc -> JDK (removed )?internal API.*/
\ No newline at end of file
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 7d9df41..a251785 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
@@ -43,7 +43,8 @@ public class JDepsConsumer
* JDK8 Linux: JDK internal API (JDK removed internal API)
* JDK9: JDK internal API (java.base)
*/
- private static final Pattern JDKINTERNALAPI = Pattern.compile(
".+->\\s([a-z\\.]+)\\s+(JDK internal API .+)" );
+ private static final Pattern JDKINTERNALAPI =
+ Pattern.compile( ".+->\\s([a-z\\.]+)\\s+(JDK (?:removed )?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 aafad5c..ed60478 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
@@ -59,6 +59,21 @@ public class JDepsConsumerTest
}
@Test
+ public void testJDKInternalAPI_Java8_291()
+ {
+ 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 removed
internal API" );
+
+ assertEquals( 1, consumer.getOffendingPackages().size() );
+ assertEquals( "JDK removed internal API",
consumer.getOffendingPackages().get( "sun.misc" ) );
+ assertEquals( 0, consumer.getProfiles().size() );
+ }
+
+ @Test
public void testProfile()
{
consumer = new JDepsConsumer();
