Skip to content

Deleting concurrency parameter to deprecated non-block-scoped variant of stage step #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 24, 2023
Merged

Deleting concurrency parameter to deprecated non-block-scoped variant of stage step #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a49d666
Deleting deprecated non-block-scoped variant of `stage` step
jglick Jan 17, 2023
6d3db74
Restore `StageActionImpl` and `CanceledCause` for compatibility of hi…
jglick Jan 18, 2023
50e56cd
SpotBugs
jglick Jan 18, 2023
98037d5
Restoring compatibility for simple `stage xxx` and only failing on at…
jglick Jan 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,18 +62,6 @@
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-step-api</artifactId>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-step-api</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-support</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-cps</artifactId>
Expand All @@ -88,17 +76,6 @@
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-basic-steps</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-durable-task-step</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
12 changes: 4 additions & 8 deletions src/main/java/org/jenkinsci/plugins/workflow/support/steps/StageStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,9 @@

import com.google.common.collect.ImmutableSet;
import hudson.Extension;
import hudson.model.Run;
import hudson.model.TaskListener;
import java.util.Set;
import edu.umd.cs.findbugs.annotations.CheckForNull;
import hudson.model.TaskListener;
import org.jenkinsci.plugins.workflow.graph.FlowNode;
import org.jenkinsci.plugins.workflow.steps.Step;
import org.jenkinsci.plugins.workflow.steps.StepContext;
Expand All @@ -40,15 +39,12 @@

/**
* A named block.
* <p>Former (deprecated) behavior:
* Marks a flow build as entering a gated “stage”, like a stage in a pipeline.
* Each job has a set of named stages, each of which acts like a semaphore with an initial permit count,
* but with the special behavior that only one build may be waiting at any time: the newest.
* Credit goes to @jtnord for implementing the {@code block} operator in {@code buildflow-extensions}, which inspired this.
*/
public final class StageStep extends Step {

public final String name;

@Deprecated
@DataBoundSetter public @CheckForNull Integer concurrency;

@DataBoundConstructor public StageStep(String name) {
Expand Down Expand Up @@ -77,7 +73,7 @@ public final class StageStep extends Step {
}

@Override public Set<? extends Class<?>> getRequiredContext() {
return ImmutableSet.of(TaskListener.class, Run.class, FlowNode.class);
return ImmutableSet.of(TaskListener.class, FlowNode.class);
}

}
Expand Down
Loading