Author: rfscholte
Date: Sat Feb 7 14:09:13 2015
New Revision: 1658060
URL: http://svn.apache.org/r1658060
Log:
Make it work with JDK8 as well
Modified:
maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_main/invoker.properties
maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_main/verify.groovy
maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_test/invoker.properties
maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_test/verify.groovy
Modified:
maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_main/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_main/invoker.properties?rev=1658060&r1=1658059&r2=1658060&view=diff
==============================================================================
---
maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_main/invoker.properties
(original)
+++
maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_main/invoker.properties
Sat Feb 7 14:09:13 2015
@@ -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
Modified:
maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_main/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_main/verify.groovy?rev=1658060&r1=1658059&r2=1658060&view=diff
==============================================================================
---
maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_main/verify.groovy
(original)
+++
maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_main/verify.groovy
Sat Feb 7 14:09:13 2015
@@ -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
Modified:
maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_test/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_test/invoker.properties?rev=1658060&r1=1658059&r2=1658060&view=diff
==============================================================================
---
maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_test/invoker.properties
(original)
+++
maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_test/invoker.properties
Sat Feb 7 14:09:13 2015
@@ -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
Modified:
maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_test/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_test/verify.groovy?rev=1658060&r1=1658059&r2=1658060&view=diff
==============================================================================
---
maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_test/verify.groovy
(original)
+++
maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_test/verify.groovy
Sat Feb 7 14:09:13 2015
@@ -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
