Skip to content
Permalink
Browse files
[JENKINS-50633] - Pick up Pipeline: CPS version with JENKINS-50752
  • Loading branch information
oleg-nenashev committed Apr 26, 2018
1 parent 9f3d3e1 commit 44165d639385cede4367bd4360cbd15339f8542f
Showing with 4 additions and 18 deletions.
  1. +3 −3 pom.xml
  2. +1 −15 src/main/java/org/jenkinsci/plugins/pipeline/utility/steps/maven/WriteMavenPomStep.java
@@ -55,7 +55,7 @@
</developers>

<properties>
<jenkins.version>2.73.1</jenkins.version>
<jenkins.version>2.73.2</jenkins.version>
<java.level>8</java.level>
<workflow-step-api.version>2.14</workflow-step-api.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -91,7 +91,7 @@
<!-- Require upper bound dependencies error -->
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-api</artifactId>
<version>2.25</version>
<version>2.27</version>
</dependency>
<dependency>
<!-- Require upper bound dependencies error -->
@@ -102,7 +102,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-cps</artifactId>
<version>2.48-20180409.134424-2</version>
<version>2.48</version> <!-- JENKINS-50752 fix is required for writeMavenPom() -->
<optional>true</optional>
</dependency>
<dependency>
@@ -32,7 +32,6 @@
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.jenkinsci.plugins.structs.describable.UninstantiatedDescribable;
import org.jenkinsci.plugins.workflow.actions.ArgumentsAction;
import org.jenkinsci.plugins.workflow.cps.actions.ArgumentsActionFilteringStepDescriptor;
import org.jenkinsci.plugins.workflow.steps.AbstractStepDescriptorImpl;
import org.jenkinsci.plugins.workflow.steps.AbstractStepImpl;
import org.jenkinsci.plugins.workflow.steps.AbstractSynchronousNonBlockingStepExecution;
@@ -106,7 +105,7 @@ public StepExecution start(StepContext context) throws Exception {
}

@Extension
public static class DescriptorImpl extends StepDescriptor implements ArgumentsActionFilteringStepDescriptor {
public static class DescriptorImpl extends StepDescriptor {

public DescriptorImpl() {

@@ -127,19 +126,6 @@ public String getFunctionName() {
public String getDisplayName() {
return "Write a maven project file.";
}

@Nonnull
@Override
public Map<String, Object> filterForAction(@Nonnull Step step, @Nonnull Map<String, Object> map) {
if (step instanceof WriteMavenPomStep) {
Map<String, Object> args = new HashMap<>(map);
if (args.containsKey("model")) {
args.replace("model", ArgumentsAction.NotStoredReason.MASKED_VALUE);
}
return args;
}
return map;
}
}

public static class Execution extends SynchronousNonBlockingStepExecution<Void> {

0 comments on commit 44165d6

Please sign in to comment.