From 566d75caa25bfd241f1625da949482c05d8d41e5 Mon Sep 17 00:00:00 2001 From: Vincent Latombe Date: Fri, 23 May 2025 09:50:29 +0200 Subject: [PATCH] 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 https://github.com/jenkinsci/configuration-as-code-plugin/pull/2683 --- pom.xml | 6 ++++++ .../plugins/kubernetes/pipeline/KubernetesPipelineTest.java | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index a5165a84b..628e790f1 100644 --- a/pom.xml +++ b/pom.xml @@ -169,6 +169,12 @@ io.jenkins.configuration-as-code test-harness test + + + org.jetbrains + annotations + + org.awaitility diff --git a/src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesPipelineTest.java b/src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesPipelineTest.java index a7b43a915..9bf52f86d 100644 --- a/src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesPipelineTest.java +++ b/src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesPipelineTest.java @@ -94,7 +94,6 @@ import org.jenkinsci.plugins.workflow.job.WorkflowRun; import org.jenkinsci.plugins.workflow.steps.durable_task.DurableTaskStep; import org.jenkinsci.plugins.workflow.test.steps.SemaphoreStep; -import org.jetbrains.annotations.NotNull; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -941,9 +940,9 @@ public void decoratorFailure() throws Exception { @TestExtension("decoratorFailure") public static class DecoratorImpl implements PodDecorator { - @NotNull + @NonNull @Override - public Pod decorate(@NotNull KubernetesCloud kubernetesCloud, @NotNull Pod pod) { + public Pod decorate(@NonNull KubernetesCloud kubernetesCloud, @NonNull Pod pod) { throw new PodDecoratorException("I always fail"); } }