You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2018/12/18 15:50:45 UTC

[sling-tooling-jenkins] branch feature/SLING-7245 updated (01b08dd -> 801e21b)

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a change to branch feature/SLING-7245
in repository https://gitbox.apache.org/repos/asf/sling-tooling-jenkins.git.


    from 01b08dd  SLING-7245 - Validate pull requests using Jenkins
     new a0576b4  SLING-7245 - Validate pull requests using Jenkins
     new 801e21b  SLING-7245 - Validate pull requests using Jenkins

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 vars/slingOsgiBundleBuild.groovy | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)


[sling-tooling-jenkins] 02/02: SLING-7245 - Validate pull requests using Jenkins

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch feature/SLING-7245
in repository https://gitbox.apache.org/repos/asf/sling-tooling-jenkins.git

commit 801e21bb2e14c935b7b9d2512950b78dd83b6d8a
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Dec 18 00:06:06 2018 +0100

    SLING-7245 - Validate pull requests using Jenkins
    
    Copy any overrides from the jenkins key in .sling-module.json
---
 vars/slingOsgiBundleBuild.groovy | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/vars/slingOsgiBundleBuild.groovy b/vars/slingOsgiBundleBuild.groovy
index 9bc9b45..b39eae9 100644
--- a/vars/slingOsgiBundleBuild.groovy
+++ b/vars/slingOsgiBundleBuild.groovy
@@ -29,10 +29,11 @@ def call(Map params = [:]) {
             if ( fileExists('.sling-module.json') ) {
                 overrides = readJSON file: '.sling-module.json'
                 echo "Jenkins overrides: ${overrides.jenkins}"
-                if ( overrides.jenkins?.jdks ) {
-                    buildDesc.jdks = overrides.jenkins.jdks
+                overrides.jenkins.each { entry ->
+                    buildDesc[entry] = entry;
                 }
             }
+            echo "Final build config: ${buildDesc}"
         }
 
         deploy = true


[sling-tooling-jenkins] 01/02: SLING-7245 - Validate pull requests using Jenkins

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch feature/SLING-7245
in repository https://gitbox.apache.org/repos/asf/sling-tooling-jenkins.git

commit a0576b41b039d737ae5b91abf3b590b790fda612
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Dec 18 00:06:06 2018 +0100

    SLING-7245 - Validate pull requests using Jenkins
    
    Support all JDK versions from 8 to 11
---
 vars/slingOsgiBundleBuild.groovy | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vars/slingOsgiBundleBuild.groovy b/vars/slingOsgiBundleBuild.groovy
index 7afadff..9bc9b45 100644
--- a/vars/slingOsgiBundleBuild.groovy
+++ b/vars/slingOsgiBundleBuild.groovy
@@ -1,5 +1,6 @@
 def call(Map params = [:]) {
-    def availableJDKs = [ 8: 'JDK 1.8 (latest)', 9: 'JDK 1.9 (latest)']
+
+    def availableJDKs = [ 8: 'JDK 1.8 (latest)', 9: 'JDK 1.9 (latest)', 10: 'JDK 10 (latest)', 11: 'JDK 11 (latest)' ]
     def mvnVersion = 'Maven 3.3.9'
     // defaults for the build
     def buildDesc = [