Merge pull request #966 from jbescos/upgradeASM
Ugrade ASM to support higher JDK versions
diff --git a/Jenkinsfile b/Jenkinsfile
index 611bc77..382078e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020-2021 Contributors to Eclipse Foundation. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -15,8 +15,8 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-env.label = "ci-pod-${UUID.randomUUID().toString()}"
pipeline {
+ agent any
options {
// keep at most 50 builds
buildDiscarder(logRotator(numToKeepStr: '50'))
@@ -27,60 +27,17 @@
// global timeout
timeout(time: 20, unit: 'MINUTES')
}
- agent {
- kubernetes {
- label "${env.label}"
- defaultContainer 'jnlp'
- yaml """
-apiVersion: v1
-kind: Pod
-metadata:
-spec:
- volumes:
- - name: maven-repo-shared-storage
- persistentVolumeClaim:
- claimName: glassfish-maven-repo-storage
- - name: maven-repo-local-storage
- emptyDir: {}
- containers:
- - name: jnlp
- image: jenkins/jnlp-slave:alpine
- imagePullPolicy: IfNotPresent
- env:
- - name: JAVA_TOOL_OPTIONS
- value: -Xmx1G
- resources:
- limits:
- memory: "1Gi"
- cpu: "1"
- - name: build-container
- image: ee4jglassfish/ci:jdk-8.181
- args:
- - cat
- tty: true
- imagePullPolicy: Always
- volumeMounts:
- - mountPath: "/home/jenkins/.m2/repository"
- name: maven-repo-shared-storage
- - mountPath: "/home/jenkins/.m2/repository/org/glassfish/hk2"
- name: maven-repo-local-storage
- resources:
- limits:
- memory: "7Gi"
- cpu: "3"
-"""
- }
- }
stages {
stage('build') {
+ agent any
+ tools {
+ jdk 'oracle-jdk8-latest'
+ maven 'apache-maven-latest'
+ }
steps {
- container('build-container') {
- timeout(time: 10, unit: 'MINUTES') {
- sh 'mvn clean install'
- junit testResults: '**/target/surefire-reports/*.xml', allowEmptyResults: true
- }
- }
+ sh 'mvn -V -B -C clean install'
+ junit testResults: '**/target/surefire-reports/*.xml', allowEmptyResults: true
}
}
}
-}
+}
\ No newline at end of file
