You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2022/04/18 16:11:43 UTC

[maven-jenkins-env] branch master updated (1728c91 -> 5ed08d6)

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

slachiewicz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git


    from 1728c91  fix windows
     new 8d11918  Switch to Maven 3.8.5 (Linux)
     new 5ed08d6  Drop unused Java (9,10,12,13,14,15,16)/Maven (3.0.5) versions

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:
 .gitignore             |  2 ++
 vars/jenkinsEnv.groovy | 46 +++++++++++++++++++++++-----------------------
 2 files changed, 25 insertions(+), 23 deletions(-)
 create mode 100644 .gitignore


[maven-jenkins-env] 02/02: Drop unused Java (9,10,12,13,14,15,16)/Maven (3.0.5) versions

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

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git

commit 5ed08d64f542d565c56ca8bd91acad040b01298a
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon Apr 18 18:11:15 2022 +0200

    Drop unused Java (9,10,12,13,14,15,16)/Maven (3.0.5) versions
---
 vars/jenkinsEnv.groovy | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/vars/jenkinsEnv.groovy b/vars/jenkinsEnv.groovy
index a33abd4..56274df 100644
--- a/vars/jenkinsEnv.groovy
+++ b/vars/jenkinsEnv.groovy
@@ -43,22 +43,22 @@ class jenkinsEnv implements Serializable {
 				return 'jdk_1.7_latest'
 			case '8':
 				return 'jdk_1.8_latest'
-			case '9':
-				return 'jdk_1.9_latest'
-			case '10':
-				return 'jdk_10_latest'
+//			case '9':
+//				return 'jdk_1.9_latest'
+//			case '10':
+//				return 'jdk_10_latest'
 			case '11':
 				return 'jdk_11_latest'
-			case '12':
-				return 'jdk_12_latest'
-			case '13':
-				return 'jdk_13_latest'
-			case '14':
-				return 'jdk_14_latest'
-			case '15':
-				return 'jdk_15_latest'
-			case '16':
-				return 'jdk_16_latest'
+//			case '12':
+//				return 'jdk_12_latest'
+//			case '13':
+//				return 'jdk_13_latest'
+//			case '14':
+//				return 'jdk_14_latest'
+//			case '15':
+//				return 'jdk_15_latest'
+//			case '16':
+//				return 'jdk_16_latest'
 			case '17':
 				return 'jdk_17_latest'
 			case '18':
@@ -71,8 +71,8 @@ class jenkinsEnv implements Serializable {
         switch (os) {
             case 'linux':
                 switch(version) {
-                    case ~/^3\.0\.[x5]$/:
-                        return 'maven_3.0.5'
+//                    case ~/^3\.0\.[x5]$/:
+//                        return 'maven_3.0.5'
                     case ~/^3\.1\.[x1]$/:
                         return 'maven_3.1.1'
                     case ~/^3\.2\.[x5]$/:
@@ -92,8 +92,8 @@ class jenkinsEnv implements Serializable {
                 }
             case 'windows':
                 switch(version) {
-                    case ~/^3\.0\.[x5]$/:
-                        return 'maven_3.0.5_windows'
+//                    case ~/^3\.0\.[x5]$/:
+//                        return 'maven_3.0.5_windows'
                     case ~/^3\.1\.[x1]$/:
                         return 'maven_3.1.1_windows'
                     case ~/^3\.2\.[x5]$/:
@@ -125,8 +125,8 @@ class jenkinsEnv implements Serializable {
     }
     def mavenForJdk(String version) {
         switch(version) {
-            case '6':
-                return '3.0.x'
+//            case '6':
+//                return '3.0.x'
             default:
                 return '3.6.x'
         }


[maven-jenkins-env] 01/02: Switch to Maven 3.8.5 (Linux)

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

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git

commit 8d11918ab820d36b4f6bc4cb047b6312cbb8243e
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon Apr 18 18:07:29 2022 +0200

    Switch to Maven 3.8.5 (Linux)
---
 .gitignore             | 2 ++
 vars/jenkinsEnv.groovy | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fd1b092
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/.idea/
+*.iml
\ No newline at end of file
diff --git a/vars/jenkinsEnv.groovy b/vars/jenkinsEnv.groovy
index d2a1d19..a33abd4 100644
--- a/vars/jenkinsEnv.groovy
+++ b/vars/jenkinsEnv.groovy
@@ -84,11 +84,11 @@ class jenkinsEnv implements Serializable {
                     case ~/^3\.6\.[x3]$/:
                         return 'maven_3.6.3'
                     case ~/^3\.8\.x$/:
-                        return 'maven_3.8.4'
+                        return 'maven_3.8.5'
                     case '3.x.x':
-                        return 'maven_3.8.4'
+                        return 'maven_3.8.5'
                     default:
-                        return 'maven_3.8.4'
+                        return 'maven_3.8.5'
                 }
             case 'windows':
                 switch(version) {