Merge pull request #120 from jenkinsci/cleanup

Remove annotation-api dependency

.github/workflows/ci.yml

@@ -13,12 +13,7 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest, macos-latest, windows-latest]
-        jdk: [17]
-        include:
-          - platform: ubuntu-latest
-            jdk: 11
-          - platform: macos-latest
-            jdk: 11
+        jdk: [17, 21]
 
     runs-on: ${{ matrix.platform }}
     name: on ${{ matrix.platform }} with JDK ${{ matrix.jdk }}
@@ -32,6 +27,10 @@ jobs:
           java-version: '${{ matrix.jdk }}'
           check-latest: true
           cache: 'maven'
+      - name: Set up Maven
+        uses: stCarolas/setup-maven@v4
+        with:
+          maven-version: 3.9.5
       - name: Build with Maven
         env:
           BROWSER: chrome-container

README.adoc

@@ -2,7 +2,7 @@
 
 = Prism Jenkins Plugin
 
-image:https://ci.jenkins.io/job/Plugins/job/prism-api-plugin/job/main/badge/icon?subject=Jenkins%20CI[Jenkins, link=https://ci.jenkins.io/job/Plugins/job/prism-api-plugin/job/master/]
+image:https://ci.jenkins.io/job/Plugins/job/prism-api-plugin/job/main/badge/icon?subject=Jenkins%20CI[Jenkins, link=https://ci.jenkins.io/job/Plugins/job/prism-api-plugin/job/main/]
 image:https://github.com/jenkinsci/prism-api-plugin/workflows/GitHub%20CI/badge.svg?branch=main[GitHub Actions, link=https://github.com/jenkinsci/prism-api-plugin/actions]
 image:https://img.shields.io/github/issues-pr/jenkinsci/prism-api-plugin.svg[GitHub pull requests, link=https://github.com/jenkinsci/prism-api-plugin/pulls]
 

etc/assertj-templates/assertion_class_template.txt

@@ -0,0 +1,26 @@
+package ${package};
+${imports}
+/**
+ * {@link ${class_to_assert}} specific assertions - Generated by CustomAssertionGenerator.
+ */
+@edu.hm.hafner.util.Generated(value="assertj-assertions-generator")
+public class ${custom_assertion_class} extends AbstractObjectAssert<${custom_assertion_class}, ${class_to_assert}> {
+
+  /**
+   * Creates a new <code>{@link ${custom_assertion_class}}</code> to make assertions on actual ${class_to_assert}.
+   * @param actual the ${class_to_assert} we want to make assertions on.
+   */
+  public ${custom_assertion_class}(${class_to_assert} actual) {
+    super(actual, ${custom_assertion_class}.class);
+  }
+
+  /**
+   * An entry point for ${custom_assertion_class} to follow AssertJ standard <code>assertThat()</code> statements.<br>
+   * With a static import, one can write directly: <code>assertThat(my${class_to_assert})</code> and get specific assertion with code completion.
+   * @param actual the ${class_to_assert} we want to make assertions on.
+   * @return a new <code>{@link ${custom_assertion_class}}</code>
+   */
+  @org.assertj.core.util.CheckReturnValue
+  public static ${custom_assertion_class} assertThat(${class_to_assert} actual) {
+    return new ${custom_assertion_class}(actual);
+  }

etc/assertj-templates/assertions_entry_point_class_template.txt

@@ -5,7 +5,7 @@ package ${package};
  * type-specific assertion objects.
  */
 @edu.umd.cs.findbugs.annotations.SuppressFBWarnings("NM")
-@javax.annotation.Generated(value="assertj-assertions-generator")
+@edu.hm.hafner.util.Generated(value="assertj-assertions-generator")
 public class Assertions extends org.assertj.core.api.Assertions {
 ${all_assertions_entry_points}
   /**

etc/assertj-templates/soft_assertions_entry_point_class_template.txt

@@ -4,7 +4,7 @@ package ${package};
  * Entry point for soft assertions of different data types.
  */
 @edu.umd.cs.findbugs.annotations.SuppressFBWarnings("NM")
-@javax.annotation.Generated(value="assertj-assertions-generator")
+@edu.hm.hafner.util.Generated(value="assertj-assertions-generator")
 public class SoftAssertions extends org.assertj.core.api.AutoCloseableSoftAssertions {
 ${all_assertions_entry_points}
 }

src/test/java/io/jenkins/plugins/prism/FilePermissionEnforcerTest.java

@@ -3,7 +3,7 @@
 import java.io.File;
 
 import org.junit.jupiter.api.Test;
-import org.jvnet.hudson.test.Issue;
+import org.junitpioneer.jupiter.Issue;
 
 import hudson.FilePath;
 

src/test/java/io/jenkins/plugins/prism/SanitizerTest.java

@@ -3,7 +3,7 @@
 import java.io.IOException;
 
 import org.junit.jupiter.api.Test;
-import org.jvnet.hudson.test.Issue;
+import org.junitpioneer.jupiter.Issue;
 
 import hudson.markup.MarkupFormatter;