[struts] branch docker-build updated: Uses wrapper instead of clean mvn command
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch docker-build
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/docker-build by this push:
new 3305fcb Uses wrapper instead of clean mvn command
3305fcb is described below
commit 3305fcb768cb3639e6e9e9a586d3da0dbc90c51a
Author: Lukasz Lenart
AuthorDate: Thu Aug 29 09:00:12 2019 +0200
Uses wrapper instead of clean mvn command
---
Jenkinsfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 2f2ad59..8c7ad64 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,8 +31,9 @@ pipeline {
steps {
sh 'echo $JAVA_HOME'
sh 'echo $MAVEN_OPTS'
+sh 'java --version'
sh 'mvn -v'
-sh 'mvn clean test -DskipWiki'
+sh './mvnw clean test -DskipWiki'
}
}
}
[struts] branch docker-build updated: Fixes small typo
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch docker-build
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/docker-build by this push:
new c8483e7 Fixes small typo
c8483e7 is described below
commit c8483e73f9b34ff03212112f009009d2a24f6e5f
Author: Lukasz Lenart
AuthorDate: Thu Aug 29 09:04:37 2019 +0200
Fixes small typo
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 8c7ad64..5e24858 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,7 +31,7 @@ pipeline {
steps {
sh 'echo $JAVA_HOME'
sh 'echo $MAVEN_OPTS'
-sh 'java --version'
+sh 'java -version'
sh 'mvn -v'
sh './mvnw clean test -DskipWiki'
}
[struts] branch docker-build updated: Uses $JAVA_HOME var to test java version
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch docker-build
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/docker-build by this push:
new 03bd96d Uses $JAVA_HOME var to test java version
03bd96d is described below
commit 03bd96d959cb2fba2f45c629f11c96f95d413892
Author: Lukasz Lenart
AuthorDate: Thu Aug 29 09:08:46 2019 +0200
Uses $JAVA_HOME var to test java version
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 5e24858..e9da02f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,7 +31,7 @@ pipeline {
steps {
sh 'echo $JAVA_HOME'
sh 'echo $MAVEN_OPTS'
-sh 'java -version'
+sh '$JAVA_HOME/java -version'
sh 'mvn -v'
sh './mvnw clean test -DskipWiki'
}
[struts] branch master updated: Fix typo in MultiselectInterceptor javadoc
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
The following commit(s) were added to refs/heads/master by this push:
new dca0dd2 Fix typo in MultiselectInterceptor javadoc
new 0c19fbf Merge pull request #363 from
sehaas/fix_typo_MultiselectInterceptor
dca0dd2 is described below
commit dca0dd224fde5501cba3aeeccce660bc4842c9c8
Author: Sebastian Haas
AuthorDate: Thu Aug 29 11:40:06 2019 +0200
Fix typo in MultiselectInterceptor javadoc
---
.../java/org/apache/struts2/interceptor/MultiselectInterceptor.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/core/src/main/java/org/apache/struts2/interceptor/MultiselectInterceptor.java
b/core/src/main/java/org/apache/struts2/interceptor/MultiselectInterceptor.java
index 64cab74..b11c3b7 100644
---
a/core/src/main/java/org/apache/struts2/interceptor/MultiselectInterceptor.java
+++
b/core/src/main/java/org/apache/struts2/interceptor/MultiselectInterceptor.java
@@ -29,7 +29,7 @@ import java.util.Map;
/**
* Just as the CheckboxInterceptor checks that if only the hidden field is
present, so too does this interceptor. If
* the "__multiselect_" request parameter is present and its visible
counterpart is not, set a new request parameter to an
- * empty Sting.
+ * empty String.
*/
public class MultiselectInterceptor extends AbstractInterceptor {
private static final long serialVersionUID = 1L;
@@ -37,7 +37,7 @@ public class MultiselectInterceptor extends
AbstractInterceptor {
/**
* Just as the CheckboxInterceptor checks that if only the hidden field is
present, so too does this interceptor.
* If the "__multiselect_" request parameter is present and its visible
counterpart is not, set a new request parameter
- * to an empty Sting.
+ * to an empty String.
*
* @param ai ActionInvocation
* @return the result of the action
[struts] branch docker-build updated: Avoids using tools and bases on the image only
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch docker-build
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/docker-build by this push:
new 40d7e52 Avoids using tools and bases on the image only
40d7e52 is described below
commit 40d7e52273296fc61c0916e1a3d253d795aaab3d
Author: Lukasz Lenart
AuthorDate: Fri Aug 30 08:34:18 2019 +0200
Avoids using tools and bases on the image only
---
Jenkinsfile | 10 ++
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index e9da02f..77a4255 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,27 +10,21 @@ pipeline {
timeout(80)
disableConcurrentBuilds()
}
- tools {
-jdk 'JDK 1.8 (latest)'
- }
triggers {
pollSCM 'H/15 * * * *'
}
- environment {
-MAVEN_OPTS = '-Xmx1024m -XX:MaxPermSize=256m'
- }
stages {
stage('Docker build') {
agent {
docker {
image 'maven:3-jdk-8-slim'
args '-v $HOME/.m2:/root/.m2'
- args '-e MAVEN_OPTS=$MAVEN_OPTS'
+ args '-e MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=256m"'
}
}
steps {
sh 'echo $JAVA_HOME'
-sh 'echo $MAVEN_OPTS'
+sh 'which java'
sh '$JAVA_HOME/java -version'
sh 'mvn -v'
sh './mvnw clean test -DskipWiki'
[struts] branch docker-build updated: Drops java checking commands
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch docker-build
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/docker-build by this push:
new d898a82 Drops java checking commands
d898a82 is described below
commit d898a824b6e74adbc8e8e50baef774a7fc278d9e
Author: Lukasz Lenart
AuthorDate: Fri Aug 30 08:41:50 2019 +0200
Drops java checking commands
---
Jenkinsfile | 3 ---
1 file changed, 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 77a4255..3ce108e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -23,9 +23,6 @@ pipeline {
}
}
steps {
-sh 'echo $JAVA_HOME'
-sh 'which java'
-sh '$JAVA_HOME/java -version'
sh 'mvn -v'
sh './mvnw clean test -DskipWiki'
}
[struts] branch docker-build updated: Splits build into stages
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch docker-build
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/docker-build by this push:
new 823fcc5 Splits build into stages
823fcc5 is described below
commit 823fcc51288fa9379769967d924476961c295ba8
Author: Lukasz Lenart
AuthorDate: Fri Aug 30 08:57:25 2019 +0200
Splits build into stages
---
Jenkinsfile | 31 ++-
1 file changed, 22 insertions(+), 9 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 3ce108e..b54c155 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,6 +4,10 @@ pipeline {
node {
label 'ubuntu'
}
+docker {
+ image 'maven:3-jdk-8-slim'
+ args '-v $HOME/.m2:/root/.m2 -e MAVEN_OPTS="-Xmx1024m"'
+}
}
options {
buildDiscarder logRotator(daysToKeepStr: '14', numToKeepStr: '10')
@@ -14,17 +18,26 @@ pipeline {
pollSCM 'H/15 * * * *'
}
stages {
-stage('Docker build') {
- agent {
-docker {
- image 'maven:3-jdk-8-slim'
- args '-v $HOME/.m2:/root/.m2'
- args '-e MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=256m"'
-}
- }
+stage('Maven version') {
steps {
sh 'mvn -v'
-sh './mvnw clean test -DskipWiki'
+ }
+}
+
+stage('Build') {
+ steps {
+sh 'mvn -B -DskipTests -DskipWiki clean package'
+ }
+}
+
+stage('Test') {
+ steps {
+sh 'mvn test'
+ }
+ post {
+always {
+ junit 'target/surefire-reports/*.xml'
+}
}
}
}
[struts] branch docker-build updated: Fixes wrong label definition
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch docker-build
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/docker-build by this push:
new c397181 Fixes wrong label definition
c397181 is described below
commit c39718153845274042ee1fddb263779c7adbc8bc
Author: Lukasz Lenart
AuthorDate: Fri Aug 30 08:59:13 2019 +0200
Fixes wrong label definition
---
Jenkinsfile | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index b54c155..d4bc43c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,9 +1,7 @@
#!groovy
pipeline {
agent {
-node {
- label 'ubuntu'
-}
+label 'ubuntu'
docker {
image 'maven:3-jdk-8-slim'
args '-v $HOME/.m2:/root/.m2 -e MAVEN_OPTS="-Xmx1024m"'
