[maven-jenkins-lib] branch master updated: Scripts not permitted to use method java.util.Collection stream

[rf...@apache.org]

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-jenkins-lib.git


The following commit(s) were added to refs/heads/master by this push:
     new 1f667fe  Scripts not permitted to use method java.util.Collection stream
1f667fe is described below

commit 1f667fe5a5b22ce4f8c9bbe0e3e8b7a336a27209
Author: rfscholte <rf...@apache.org>
AuthorDate: Fri Jun 29 15:30:22 2018 +0200

    Scripts not permitted to use method java.util.Collection stream
---
 vars/asfMavenTlpPlgnBuild.groovy | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/vars/asfMavenTlpPlgnBuild.groovy b/vars/asfMavenTlpPlgnBuild.groovy
index 83f6af1..d2dfeda 100644
--- a/vars/asfMavenTlpPlgnBuild.groovy
+++ b/vars/asfMavenTlpPlgnBuild.groovy
@@ -41,7 +41,7 @@ def call(Map params = [:]) {
     for (String os in oses) {
       for (def mvn in mavens) {
 	    def jdk = jenkinsEnv.jdkForMaven(mvn)
-		jdks = removeFromCollection(jdks,jdk)
+		jdks = jdks.findAll{ it != jdk }
 	    doCreateTask( os, jdk, mvn, tasks )
       }
       for (def jdk in jdks) {
@@ -86,13 +86,6 @@ def call(Map params = [:]) {
   }
 }
 
-// org.jenkinsci.plugins.scriptsecurity.sandbox.RejectedAccessException:
-//    Scripts not permitted to use method java.util.Collection remove java.lang.Object
-def removeFromCollection( list, item )
-{
-  list.stream().filter{ it != item }.collect()
-} 
-
 def doCreateTask( os, jdk, maven, tasks )
 {
 	String label = jenkinsEnv.labelForOS(os);