Skip to content

Commit

Permalink
Merge pull request #125 from oleg-nenashev/JENKINS-57441-workaround
Browse files Browse the repository at this point in the history
JENKINS-57441 workaround + demo update
  • Loading branch information
oleg-nenashev authored May 14, 2019
2 parents 997cbcd + d97edd6 commit 17a4516
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions demo/cwp/packager-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,35 +14,35 @@ buildSettings:
source:
dir: ./source
docker:
base: "jenkins/jenkins:2.150.2"
base: "jenkins/jenkins:2.164.2"
tag: "jenkins-experimental/jenkinsfile-runner-demo"
build: false
war:
groupId: "org.jenkins-ci.main"
artifactId: "jenkins-war"
source:
version: "2.150.2"
version: "2.164.2"
plugins:
- groupId: "org.jenkins-ci.plugins.workflow"
artifactId: "workflow-job"
source:
version: "2.24"
version: "2.32"
- groupId: "org.jenkins-ci.plugins.workflow"
artifactId: "workflow-cps"
source:
version: "2.48"
version: "2.67"
- groupId: "org.jenkins-ci.plugins.workflow"
artifactId: "workflow-api"
source:
version: "2.27"
version: "2.33"
- groupId: "org.jenkins-ci.plugins.workflow"
artifactId: "workflow-step-api"
source:
version: "2.14"
version: "2.19"
- groupId: "org.jenkins-ci.plugins"
artifactId: "pipeline-utility-steps"
source:
version: "2.1.0"
version: "2.3.0"
- groupId: "org.jenkins-ci.plugins"
artifactId: "cloudbees-folder"
source:
Expand All @@ -54,7 +54,7 @@ plugins:
- groupId: "org.jenkins-ci.plugins"
artifactId: "structs"
source:
version: "1.14"
version: "1.17"
- groupId: "org.jenkins-ci.plugins"
artifactId: "scm-api"
source:
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ THE SOFTWARE.
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.level>8</java.level>
<jenkins.version>2.164.2</jenkins.version>
<jetty.version>9.4.12.v20180830</jetty.version>
<jetty.version>9.4.5.v20170502</jetty.version>
<!--TODO: Reenable once all the issues are fixed (JENKINS-57353)-->
<findbugs.failOnError>false</findbugs.failOnError>
</properties>
Expand Down

0 comments on commit 17a4516

Please sign in to comment.