You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2019/05/07 19:49:39 UTC
[jspwiki] branch master updated (e1c2d25 -> 672bee0)
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git.
from e1c2d25 enable build stacktraces + update exec plugins whenever possible
new 3ee179e simplify Jenkinsfile by replacing withEnv and tool definitions with withMaven steps
new 672bee0 update surefire version to 3.0.0-M3 to see if it helps with test execution problems at builds.apache.org - no version bump
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 | 2 +-
2 files changed, 4 insertions(+), 10 deletions(-)
[jspwiki] 01/02: simplify Jenkinsfile by replacing withEnv and tool
definitions with withMaven steps
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 3ee179e8081ebf88cb1c8f547048e40200507813
Author: juanpablo <ju...@apache.org>
AuthorDate: Tue May 7 21:46:01 2019 +0200
simplify Jenkinsfile by replacing withEnv and tool definitions with withMaven steps
---
Jenkinsfile | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 6d1304e..663a38e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,12 +28,6 @@ try {
def pom
node( 'ubuntu' ) {
- def JAVA_JDK_8=tool name: 'JDK 1.8 (latest)', type: 'hudson.model.JDK'
- echo "Will use Java $JAVA_JDK_8"
-
- def MAVEN_3_LATEST=tool name: 'Maven 3 (latest)', type: 'hudson.tasks.Maven$MavenInstallation'
- echo "Will use Maven $MAVEN_3_LATEST"
-
stage( 'clean ws' ) {
cleanWs()
}
@@ -41,10 +35,10 @@ try {
stage( 'build source' ) {
dir( build ) {
git url: buildRepo, poll: true
- withEnv( [ "Path+JDK=$JAVA_JDK_8/bin", "Path+MAVEN=$MAVEN_3_LATEST/bin", "JAVA_HOME=$JAVA_JDK_8" ] ) {
+ withMaven(jdk: 'JDK 1.8 (latest)', maven: 'Maven 3 (latest)' ) {
withSonarQubeEnv( 'ASF Sonar Analysis' ) {
echo "Will use SonarQube instance at $SONAR_HOST_URL"
- sh "mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install -Pattach-additional-artifacts $SONAR_MAVEN_GOAL -e -up"
+ sh "mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install -Pattach-additional-artifacts $SONAR_MAVEN_GOAL -up"
}
pom = readMavenPom file: 'pom.xml'
writeFile file: 'target/classes/apidocs.txt', text: 'file created in order to allow aggregated javadoc generation, target/classes is needed for all modules'
@@ -55,7 +49,7 @@ try {
}
stage( 'build website' ) {
- withEnv( [ "Path+JDK=$JAVA_JDK_8/bin", "Path+MAVEN=$MAVEN_3_LATEST/bin", "JAVA_HOME=$JAVA_JDK_8" ] ) {
+ withMaven(jdk: 'JDK 1.8 (latest)', maven: 'Maven 3 (latest)' ) {
dir( jbake ) {
git branch: jbake, url: siteRepo, credentialsId: creds, poll: false
sh 'mvn clean process-resources -Dplugin.japicmp.jspwiki-new=' + pom.version
[jspwiki] 02/02: update surefire version to 3.0.0-M3 to see if it
helps with test execution problems at builds.apache.org - no version bump
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 672bee0ae301a2a3b99cb7bcd5e75e7743d1a6c3
Author: juanpablo <ju...@apache.org>
AuthorDate: Tue May 7 21:48:45 2019 +0200
update surefire version to 3.0.0-M3 to see if it helps with test execution problems at builds.apache.org - no version bump
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index e8ae528..0087605 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,7 @@
<plugin.release.version>2.5.3</plugin.release.version>
<plugin.resources.version>3.1.0</plugin.resources.version>
<plugin.source.version>3.0.1</plugin.source.version>
- <plugin.surefire.version>2.22.1</plugin.surefire.version>
+ <plugin.surefire.version>3.0.0-M3</plugin.surefire.version>
<plugin.war.version>3.2.2</plugin.war.version>
<plugin.inmemdb.version>1.4.3</plugin.inmemdb.version>
<plugin.jspc.version>3.1.0</plugin.jspc.version>