From 434b98ceeb2d9ef7d678804736de57db682c7f5a Mon Sep 17 00:00:00 2001
From: Enrico Vianello <enrico.vianello@cnaf.infn.it>
Date: Wed, 13 Dec 2023 11:59:58 +0100
Subject: [PATCH] Upgrade Struts version

---
 Jenkinsfile               | 11 +++--------
 voms-admin-server/pom.xml |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7555af91..c3345b66 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,14 +3,7 @@ def kubeLabel = getKubeLabel()
 
 pipeline {
 
-  agent {
-    kubernetes {
-      label "${kubeLabel}"
-      cloud 'Kube mwdevel'
-      defaultContainer 'runner'
-      inheritFrom 'ci-template'
-    }
-  }
+  agent none
 
   parameters {
     booleanParam(name: 'BUILD_DOCKER_IMAGES', defaultValue: false, 
@@ -27,6 +20,7 @@ pipeline {
   stages{
 
     stage('build') {
+      agent { label 'java11' }
       steps {
         git(url: 'https://github.com/italiangrid/voms-admin-server.git', branch: env.BRANCH_NAME)
         sh 'mvn -B -U -P prod,EMI clean package'
@@ -34,6 +28,7 @@ pipeline {
     }
 
     stage('build-docker-images') {
+      agent { label 'docker' }
       when {
         expression { return params.BUILD_DOCKER_IMAGES }
       }
diff --git a/voms-admin-server/pom.xml b/voms-admin-server/pom.xml
index 57d7b071..c05ff6b2 100644
--- a/voms-admin-server/pom.xml
+++ b/voms-admin-server/pom.xml
@@ -38,7 +38,7 @@
 		<api.version>${project.version}</api.version>
 		<interface-version>2.0.2</interface-version>
 
-		<struts.version>2.5.30</struts.version>
+		<struts.version>2.5.33</struts.version>
 		<struts.bootstrap.plugin.version>2.5.2</struts.bootstrap.plugin.version>
 		<struts.jquery.plugin.version>4.0.3</struts.jquery.plugin.version>
 		<hibernate.version>5.2.17.Final</hibernate.version>