You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2017/12/09 15:27:18 UTC
[maven-jdeps-plugin] 06/34: Make it work with JDK8 as well
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jdeps-plugin.git
commit 71a1b2692e41ed9fec96f91b1330f1976eebe8b5
Author: Robert Scholte <rf...@apache.org>
AuthorDate: Sat Feb 7 14:09:13 2015 +0000
Make it work with JDK8 as well
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1658060 13f79535-47bb-0310-9956-ffa450edef68
---
src/it/unsupported-api_main/invoker.properties | 3 +--
src/it/unsupported-api_main/verify.groovy | 3 ++-
src/it/unsupported-api_test/invoker.properties | 3 +--
src/it/unsupported-api_test/verify.groovy | 3 ++-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/it/unsupported-api_main/invoker.properties b/src/it/unsupported-api_main/invoker.properties
index 2cb9732..b3c8cf7 100644
--- a/src/it/unsupported-api_main/invoker.properties
+++ b/src/it/unsupported-api_main/invoker.properties
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
+invoker.java.version=1.8+
invoker.goals=process-classes
-# JDK1.8 exits with 0 when hitting a failure
-invoker.java.version=1.9+
invoker.buildResult=failure
diff --git a/src/it/unsupported-api_main/verify.groovy b/src/it/unsupported-api_main/verify.groovy
index e0e8e5d..44f643d 100644
--- a/src/it/unsupported-api_main/verify.groovy
+++ b/src/it/unsupported-api_main/verify.groovy
@@ -21,4 +21,5 @@
def LS = System.getProperty("line.separator")
def buildLog = new File( basedir, 'build.log' )
-assert buildLog.text.contains( "Found offending packages:${LS} sun.misc -> JDK internal API (java.base)" );
\ No newline at end of file
+assert buildLog.text.contains( "Found offending packages:${LS} sun.misc -> JDK internal API (java.base)" ) ||
+ buildLog.text.contains( "Found offending packages:${LS} sun.misc -> JDK internal API (rt.jar)" )
\ No newline at end of file
diff --git a/src/it/unsupported-api_test/invoker.properties b/src/it/unsupported-api_test/invoker.properties
index da3dd2f..5e5c350 100644
--- a/src/it/unsupported-api_test/invoker.properties
+++ b/src/it/unsupported-api_test/invoker.properties
@@ -15,8 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-# JDK1.8 exits with 0 when hitting a failure
-invoker.java.version=1.9+
+invoker.java.version=1.8+
invoker.goals.1=process-classes
invoker.buildResult.1=success
diff --git a/src/it/unsupported-api_test/verify.groovy b/src/it/unsupported-api_test/verify.groovy
index e0e8e5d..44f643d 100644
--- a/src/it/unsupported-api_test/verify.groovy
+++ b/src/it/unsupported-api_test/verify.groovy
@@ -21,4 +21,5 @@
def LS = System.getProperty("line.separator")
def buildLog = new File( basedir, 'build.log' )
-assert buildLog.text.contains( "Found offending packages:${LS} sun.misc -> JDK internal API (java.base)" );
\ No newline at end of file
+assert buildLog.text.contains( "Found offending packages:${LS} sun.misc -> JDK internal API (java.base)" ) ||
+ buildLog.text.contains( "Found offending packages:${LS} sun.misc -> JDK internal API (rt.jar)" )
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.