Merge pull request #334 from jenkinsci/cleanup-jakarta

Cleanup deprecated code
jenkinsci · Feb 18, 2025 · 13b7ffd · 13b7ffd
2 parents ee4daae + c3a71a2
commit 13b7ffd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 22 deletions.
diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -32,7 +32,6 @@
     <!-- Test Library Dependencies Versions -->
     <xmlunit.version>2.10.0</xmlunit.version>
     <testcontainers.version>1.20.4</testcontainers.version>
-    <job-dsl.version>1.87</job-dsl.version>
 
     <arcmutate.git.version>2.0.0</arcmutate.git.version>
   </properties>
@@ -303,7 +302,6 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>job-dsl</artifactId>
-      <version>${job-dsl.version}</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -418,7 +416,7 @@
     <connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
     <developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
     <url>https://github.com/${gitHubRepo}</url>
-    <tag>v2.0.0</tag>
+    <tag>${scmTag}</tag>
   </scm>
 
   <repositories>

diff --git a/plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/CoverageViewModel.java b/plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/CoverageViewModel.java
@@ -1,21 +1,5 @@
 package io.jenkins.plugins.coverage.metrics.steps;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.NavigableSet;
-import java.util.NoSuchElementException;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 
@@ -33,8 +17,24 @@
 import edu.hm.hafner.util.VisibleForTesting;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableSet;
+import java.util.NoSuchElementException;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.bind.JavaScriptMethod;
 import hudson.model.Api;
 import hudson.model.ModelObject;
@@ -482,7 +482,7 @@ public boolean isSourceFileAvailable(final FileNode coverageNode) {
      */
     @SuppressWarnings("unused") // Called by jelly view
     @CheckForNull
-    public Object getDynamic(final String link, final StaplerRequest request, final StaplerResponse response) {
+    public Object getDynamic(final String link, final StaplerRequest2 request, final StaplerResponse2 response) {
         if (MODIFIED_LINES_API_URL.equals(link)) {
             return new ModifiedLinesCoverageApiModel(node);
         }