[struts] 02/02: Uses proper labels for tools

2020-11-04 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 27d91caf15fe92371f03faae300b0679f83ba9ea
Author: Lukasz Lenart 
AuthorDate: Thu Nov 5 07:27:25 2020 +0100

Uses proper labels for tools
---
 Jenkinsfile | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ac7516d..be834d1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -30,8 +30,8 @@ pipeline {
 label 'ubuntu'
   }
   tools {
-jdk 'JDK 11 (latest)'
-maven 'Maven (latest)'
+jdk 'jdk_11_latest'
+maven 'maven_3_latest'
   }
   environment {
 MAVEN_OPTS = "-Xmx1024m"
@@ -66,8 +66,8 @@ pipeline {
 label 'ubuntu'
   }
   tools {
-jdk 'JDK 1.9 (latest)'
-maven 'Maven (latest)'
+jdk 'jdk_1.9_latest'
+maven 'maven_3_latest'
   }
   environment {
 MAVEN_OPTS = "-Xmx1024m"
@@ -102,8 +102,8 @@ pipeline {
 label 'ubuntu'
   }
   tools {
-jdk 'JDK 1.8 (latest)'
-maven 'Maven (latest)'
+jdk 'jdk_1.8_latest'
+maven 'maven_3_latest'
   }
   environment {
 MAVEN_OPTS = "-Xmx1024m"



[struts] 01/02: Fixes a problem with broken site configuration

2020-11-04 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 3933688c5ff2f36db8b71829db8bf0751c04024f
Author: Lukasz Lenart 
AuthorDate: Thu Nov 5 07:27:10 2020 +0100

Fixes a problem with broken site configuration
---
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8daf1b2..1fcaaca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -478,7 +478,7 @@
 org.apache.maven.plugins
 maven-project-info-reports-plugin
 
-
false
+false
 
 
 
@@ -765,6 +765,7 @@
 
 org.apache.commons
 commons-digester3
+3.2
 true
 



[struts] branch master updated (81f42aa -> 27d91ca)

2020-11-04 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git.


from 81f42aa  Merge pull request #444 from peutch/patch-2
 new 3933688  Fixes a problem with broken site configuration
 new 27d91ca  Uses proper labels for tools

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:
 Jenkinsfile | 12 ++--
 pom.xml |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)



[struts] branch struts-2-5-x updated: Uses proper tools labels

2020-11-04 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch struts-2-5-x
in repository https://gitbox.apache.org/repos/asf/struts.git


The following commit(s) were added to refs/heads/struts-2-5-x by this push:
 new f6365e7  Uses proper tools labels
f6365e7 is described below

commit f6365e73637b8a874474b9f0a166760b3706bcd6
Author: Lukasz Lenart 
AuthorDate: Thu Nov 5 08:08:44 2020 +0100

Uses proper tools labels
---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f0c8a1e..10edbdb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,8 +9,8 @@ pipeline {
 disableConcurrentBuilds()
   }
   tools {
-jdk 'JDK 1.7 (latest)'
-maven 'Maven 3 (latest)'
+jdk 'jdk_1.7_latest'
+maven 'maven_3_latest'
   }
   triggers {
 pollSCM 'H/15 * * * *'