Skip to content

Commit 566d75c

Browse files
committed
Exclude jetbrains annotations from tests
Was removed from main through parent pom, but was still present in tests through casc test-harness. Excluding until we pick up jenkinsci/configuration-as-code-plugin#2683
1 parent ecdba34 commit 566d75c

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,12 @@
169169
<groupId>io.jenkins.configuration-as-code</groupId>
170170
<artifactId>test-harness</artifactId>
171171
<scope>test</scope>
172+
<exclusions>
173+
<exclusion>
174+
<groupId>org.jetbrains</groupId>
175+
<artifactId>annotations</artifactId>
176+
</exclusion>
177+
</exclusions>
172178
</dependency>
173179
<dependency>
174180
<groupId>org.awaitility</groupId>

src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesPipelineTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@
9494
import org.jenkinsci.plugins.workflow.job.WorkflowRun;
9595
import org.jenkinsci.plugins.workflow.steps.durable_task.DurableTaskStep;
9696
import org.jenkinsci.plugins.workflow.test.steps.SemaphoreStep;
97-
import org.jetbrains.annotations.NotNull;
9897
import org.junit.After;
9998
import org.junit.Assert;
10099
import org.junit.Before;
@@ -941,9 +940,9 @@ public void decoratorFailure() throws Exception {
941940

942941
@TestExtension("decoratorFailure")
943942
public static class DecoratorImpl implements PodDecorator {
944-
@NotNull
943+
@NonNull
945944
@Override
946-
public Pod decorate(@NotNull KubernetesCloud kubernetesCloud, @NotNull Pod pod) {
945+
public Pod decorate(@NonNull KubernetesCloud kubernetesCloud, @NonNull Pod pod) {
947946
throw new PodDecoratorException("I always fail");
948947
}
949948
}

0 commit comments

Comments
 (0)