From 824eeca14f016d68ca5f5e7caef7d24eeb43fce1 Mon Sep 17 00:00:00 2001 From: Kezhi Xiong Date: Wed, 23 Sep 2020 21:41:26 +0800 Subject: [PATCH 1/2] Remove beta restrictions --- src/main/java/io/jenkins/plugins/checks/api/ChecksAction.java | 4 ---- .../java/io/jenkins/plugins/checks/api/ChecksAnnotation.java | 4 ---- .../java/io/jenkins/plugins/checks/api/ChecksConclusion.java | 4 ---- .../java/io/jenkins/plugins/checks/api/ChecksDetails.java | 4 ---- src/main/java/io/jenkins/plugins/checks/api/ChecksImage.java | 4 ---- src/main/java/io/jenkins/plugins/checks/api/ChecksOutput.java | 4 ---- .../java/io/jenkins/plugins/checks/api/ChecksPublisher.java | 3 --- src/main/java/io/jenkins/plugins/checks/api/ChecksStatus.java | 4 ---- 8 files changed, 31 deletions(-) diff --git a/src/main/java/io/jenkins/plugins/checks/api/ChecksAction.java b/src/main/java/io/jenkins/plugins/checks/api/ChecksAction.java index 49ec0460..0620f345 100644 --- a/src/main/java/io/jenkins/plugins/checks/api/ChecksAction.java +++ b/src/main/java/io/jenkins/plugins/checks/api/ChecksAction.java @@ -5,13 +5,9 @@ import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.Beta; - /** * An action of a check. It can be used to create actions like re-run or automatic formatting. */ -@Restricted(Beta.class) public class ChecksAction { private final String label; private final String description; diff --git a/src/main/java/io/jenkins/plugins/checks/api/ChecksAnnotation.java b/src/main/java/io/jenkins/plugins/checks/api/ChecksAnnotation.java index e7ad2507..51fa01e3 100644 --- a/src/main/java/io/jenkins/plugins/checks/api/ChecksAnnotation.java +++ b/src/main/java/io/jenkins/plugins/checks/api/ChecksAnnotation.java @@ -2,15 +2,11 @@ import java.util.Optional; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.Beta; - import static java.util.Objects.*; /** * An annotation for specific lines of code. */ -@Restricted(Beta.class) @SuppressWarnings("PMD.DataClass") public class ChecksAnnotation { private final String path; diff --git a/src/main/java/io/jenkins/plugins/checks/api/ChecksConclusion.java b/src/main/java/io/jenkins/plugins/checks/api/ChecksConclusion.java index add204f1..92c14f7a 100644 --- a/src/main/java/io/jenkins/plugins/checks/api/ChecksConclusion.java +++ b/src/main/java/io/jenkins/plugins/checks/api/ChecksConclusion.java @@ -1,14 +1,10 @@ package io.jenkins.plugins.checks.api; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.Beta; - /** * Conclusion for a specific check. One of the conclusions (except the {@link ChecksConclusion#NONE}, which is used to * represent "no conclusion yet") should be provided when the {@link ChecksStatus} of a check is set to * {@link ChecksStatus#COMPLETED}. */ -@Restricted(Beta.class) public enum ChecksConclusion { NONE, ACTION_REQUIRED, SKIPPED, CANCELED, TIME_OUT, FAILURE, NEUTRAL, SUCCESS } diff --git a/src/main/java/io/jenkins/plugins/checks/api/ChecksDetails.java b/src/main/java/io/jenkins/plugins/checks/api/ChecksDetails.java index fdb00587..e3554ed7 100644 --- a/src/main/java/io/jenkins/plugins/checks/api/ChecksDetails.java +++ b/src/main/java/io/jenkins/plugins/checks/api/ChecksDetails.java @@ -6,15 +6,11 @@ import java.util.List; import java.util.Optional; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.Beta; - import static java.util.Objects.requireNonNull; /** * Details of a check. This class is a top class which contains all parameters needed for a check. */ -@Restricted(Beta.class) @SuppressWarnings("PMD.DataClass") public class ChecksDetails { private final String name; diff --git a/src/main/java/io/jenkins/plugins/checks/api/ChecksImage.java b/src/main/java/io/jenkins/plugins/checks/api/ChecksImage.java index c12d1993..d1363a5f 100644 --- a/src/main/java/io/jenkins/plugins/checks/api/ChecksImage.java +++ b/src/main/java/io/jenkins/plugins/checks/api/ChecksImage.java @@ -5,13 +5,9 @@ import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.Beta; - /** * An image of a check. Users may use a image to show the code coverage, issues trend, etc. */ -@Restricted(Beta.class) @SuppressWarnings("PMD.DataClass") public class ChecksImage { private final String alt; diff --git a/src/main/java/io/jenkins/plugins/checks/api/ChecksOutput.java b/src/main/java/io/jenkins/plugins/checks/api/ChecksOutput.java index 56c12cd3..addd96bf 100644 --- a/src/main/java/io/jenkins/plugins/checks/api/ChecksOutput.java +++ b/src/main/java/io/jenkins/plugins/checks/api/ChecksOutput.java @@ -5,16 +5,12 @@ import java.util.List; import java.util.Optional; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.Beta; - import static java.util.Objects.*; /** * An output of a check. The output usually contains the most useful information like summary, description, * annotations, etc. */ -@Restricted(Beta.class) public class ChecksOutput { private final String title; private final String summary; diff --git a/src/main/java/io/jenkins/plugins/checks/api/ChecksPublisher.java b/src/main/java/io/jenkins/plugins/checks/api/ChecksPublisher.java index da86aa44..789e4fba 100644 --- a/src/main/java/io/jenkins/plugins/checks/api/ChecksPublisher.java +++ b/src/main/java/io/jenkins/plugins/checks/api/ChecksPublisher.java @@ -3,13 +3,10 @@ import hudson.model.Job; import hudson.model.TaskListener; import io.jenkins.plugins.util.PluginLogger; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.Beta; /** * A general publisher for publishing checks to different platforms. */ -@Restricted(Beta.class) public abstract class ChecksPublisher { /** * Publishes checks to platforms. diff --git a/src/main/java/io/jenkins/plugins/checks/api/ChecksStatus.java b/src/main/java/io/jenkins/plugins/checks/api/ChecksStatus.java index 1af7494a..cf80924d 100644 --- a/src/main/java/io/jenkins/plugins/checks/api/ChecksStatus.java +++ b/src/main/java/io/jenkins/plugins/checks/api/ChecksStatus.java @@ -1,12 +1,8 @@ package io.jenkins.plugins.checks.api; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.Beta; - /** * Status for a specific check. */ -@Restricted(Beta.class) public enum ChecksStatus { NONE, QUEUED, IN_PROGRESS, COMPLETED } From e3606444147e3c3d7f019c1e6e5dec42e0a956c0 Mon Sep 17 00:00:00 2001 From: Kezhi Xiong Date: Fri, 25 Sep 2020 23:22:58 +0800 Subject: [PATCH 2/2] Ignore semver check for removing beta restriction. --- pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 898476bc..dd77728c 100644 --- a/pom.xml +++ b/pom.xml @@ -101,14 +101,13 @@ org.revapi revapi-maven-plugin - [0-9.]* - false true - java.missing.* - Dependencies are not being checked, so they are reported as missing + java.annotation.removed + org.kohsuke.accmod.Restricted + Beta restriction should be safe to remove.