Merge remote-tracking branch 'origin/dependency-updates'

jenkinsci · Sep 29, 2023 · 0448b72 · 0448b72
2 parents 659f76a + c7fb7d7
commit 0448b72
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 44 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.71</version>
+        <version>4.73</version>
         <relativePath />
     </parent>
 

diff --git a/src/test/java/hudson/plugins/performance/TrendReportGraphsTest.java b/src/test/java/hudson/plugins/performance/TrendReportGraphsTest.java
@@ -4,7 +4,6 @@
 import hudson.model.FreeStyleProject;
 import hudson.plugins.performance.reports.PerformanceReport;
 import hudson.plugins.performance.reports.PerformanceReportTest;
-import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
@@ -15,11 +14,6 @@ public class TrendReportGraphsTest {
     @Rule
     public JenkinsRule j = new JenkinsRule();
 
-    @After
-    public void shutdown() throws Exception {
-        j.after();
-    }
-
     @Test
     public void test() throws Exception {
         FreeStyleProject project = j.createFreeStyleProject();

diff --git a/src/test/java/hudson/plugins/performance/actions/PerformanceProjectActionTest.java b/src/test/java/hudson/plugins/performance/actions/PerformanceProjectActionTest.java
@@ -5,7 +5,6 @@
 import hudson.plugins.performance.details.GraphConfigurationDetail;
 import hudson.plugins.performance.details.TestSuiteReportDetail;
 import hudson.plugins.performance.details.TrendReportDetail;
-import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -27,12 +26,6 @@ public class PerformanceProjectActionTest {
     @Mock
     private StaplerRequest staplerRequest;
 
-    @After
-    public void shutdown() throws Exception {
-        j.after();
-    }
-
-
     @Test
     public void testDynamic() throws Exception {
         FreeStyleProject freeStyleProject = j.createFreeStyleProject("testProject");

diff --git a/src/test/java/hudson/plugins/performance/constraints/ConstraintTest.java b/src/test/java/hudson/plugins/performance/constraints/ConstraintTest.java
@@ -5,7 +5,6 @@
 import java.util.List;
 
 import hudson.plugins.performance.constraints.blocks.TestCaseBlock;
-import org.junit.After;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
@@ -28,11 +27,6 @@ public class ConstraintTest {
     @Rule
     public JenkinsRule j = new JenkinsRule();
 
-    @After
-    public void shutdown() throws Exception {
-        j.after();
-    }
-
     /**
      * Testing: Escalation.INFORMATION
      * Build must stay successful if the value is exceeded.

diff --git a/src/test/java/hudson/plugins/performance/descriptors/ConstraintDescriptorTest.java b/src/test/java/hudson/plugins/performance/descriptors/ConstraintDescriptorTest.java
@@ -2,7 +2,6 @@
 
 import hudson.plugins.performance.constraints.AbsoluteConstraint;
 import hudson.plugins.performance.constraints.RelativeConstraint;
-import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
@@ -14,11 +13,6 @@ public class ConstraintDescriptorTest {
     @Rule
     public JenkinsRule j = new JenkinsRule();
 
-    @After
-    public void shutdown() throws Exception {
-        j.after();
-    }
-
     @Test
     public void name() throws Exception {
         ConstraintDescriptor descriptor = ConstraintDescriptor.getById(AbsoluteConstraint.DescriptorImpl.class.getName());

diff --git a/...st/java/hudson/plugins/performance/descriptors/PerformanceReportParserDescriptorTest.java b/...st/java/hudson/plugins/performance/descriptors/PerformanceReportParserDescriptorTest.java
@@ -7,7 +7,6 @@
 import hudson.plugins.performance.parsers.JmeterSummarizerParser;
 import hudson.plugins.performance.parsers.TaurusParser;
 import hudson.plugins.performance.parsers.WrkSummarizerParser;
-import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
@@ -19,11 +18,6 @@ public class PerformanceReportParserDescriptorTest {
     @Rule
     public JenkinsRule j = new JenkinsRule();
 
-    @After
-    public void shutdown() throws Exception {
-        j.after();
-    }
-
     @Test
     public void name() throws Exception {
         PerformanceReportParserDescriptor descriptor = PerformanceReportParserDescriptor.getById(IagoParser.DescriptorImpl.class.getName());

diff --git a/src/test/java/hudson/plugins/performance/details/GraphConfigurationDetailTest.java b/src/test/java/hudson/plugins/performance/details/GraphConfigurationDetailTest.java
@@ -1,7 +1,6 @@
 package hudson.plugins.performance.details;
 
 import hudson.model.FreeStyleProject;
-import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -24,11 +23,6 @@ public class GraphConfigurationDetailTest {
     @Mock
     private StaplerRequest request;
 
-    @After
-    public void shutdown() throws Exception {
-        j.after();
-    }
-
     @Test
     public void testDefault() throws Exception {
         FreeStyleProject project = j.createFreeStyleProject("testProject");

diff --git a/src/test/java/hudson/plugins/performance/details/TestSuiteReportDetailTest.java b/src/test/java/hudson/plugins/performance/details/TestSuiteReportDetailTest.java
@@ -21,7 +21,6 @@
 import hudson.plugins.performance.reports.PerformanceReport;
 import hudson.plugins.performance.reports.UriReport;
 import org.jfree.data.category.CategoryDataset;
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -68,11 +67,6 @@ public void setUp() throws Exception {
         uriReportMap.put(TEST_URI, getUriReport());
     }
 
-    @After
-    public void shutdown() throws Exception {
-        j.after();
-    }
-
     private UriReport getUriReport() {
         UriReport uriReport = new UriReport(report, TEST_URI, TEST_URI);
         final HttpSample sample1 = new HttpSample();