Fix some errors.

Author: uhafner

plugin/pom.xml

@@ -28,7 +28,7 @@
 
     <analysis-model-api.version>9.0.0</analysis-model-api.version>
     <analysis-model-tests.version>${analysis-model-api.version}</analysis-model-tests.version>
-    <forensics-api-plugin.version>0.8.0-rc613.886cb1cc8afe</forensics-api-plugin.version>
+    <forensics-api-plugin.version>0.7.0</forensics-api-plugin.version>
     <plugin-util-api.version>1.2.5</plugin-util-api.version>
 
     <font-awesome-api.version>5.14.0-1</font-awesome-api.version>
@@ -655,7 +655,7 @@
     <connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
     <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
-    <tag>v8.4.2</tag>
+    <tag>${scmTag}</tag>
   </scm>
 
   <repositories>

plugin/src/test/java/io/jenkins/plugins/analysis/core/model/AggregationActionTest.java

@@ -14,7 +14,6 @@
 import io.jenkins.plugins.analysis.core.restapi.AggregationApi;
 import io.jenkins.plugins.analysis.core.restapi.ToolApi;
 import io.jenkins.plugins.analysis.core.testutil.JobStubs;
-import io.jenkins.plugins.analysis.core.testutil.SoftAssertions;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
@@ -31,11 +30,9 @@ class AggregationActionTest {
     void shouldNotReturnIconFileName() {
         AggregationAction action = new AggregationAction();
 
-        SoftAssertions.assertSoftly(softly -> {
-            softly.assertThat(action.getIconFileName()).isNull();
-            softly.assertThat(action.getDisplayName()).isEqualTo(Messages.Aggregation_Name());
-            softly.assertThat(action.getUrlName()).isEqualTo("warnings-ng");
-        });
+        assertThat(action.getIconFileName()).isNull();
+        assertThat(action.getDisplayName()).isEqualTo(Messages.Aggregation_Name());
+        assertThat(action.getUrlName()).isEqualTo("warnings-ng");
     }
 
     @Test
@@ -90,7 +87,6 @@ private ResultAction createAction(final String id, final String name, final int
 
         when(resultAction.getId()).thenReturn(id);
         when(resultAction.getDisplayName()).thenReturn(name);
-        when(resultAction.getAbsoluteUrl()).thenReturn("http://example.com/");
         when(resultAction.getUrlName()).thenReturn("job/build/" + id);
         when(resultAction.getResult()).thenReturn(result);
 

plugin/src/test/java/io/jenkins/plugins/analysis/core/testutil/SoftAssertions.java

@@ -22,7 +22,6 @@
 import io.jenkins.plugins.util.JenkinsFacade;
 
 import static io.jenkins.plugins.analysis.core.testutil.Assertions.*;
-import static io.jenkins.plugins.analysis.core.testutil.SoftAssertions.*;
 import static io.jenkins.plugins.analysis.core.util.ModelValidation.*;
 import static org.mockito.Mockito.*;
 
@@ -58,13 +57,11 @@ void shouldAcceptId(final String id) {
     void shouldValidateCharsets() {
         ModelValidation model = new ModelValidation();
 
-        assertSoftly(softly -> {
-            softly.assertThat(model.validateCharset("")).isOk();
-            softly.assertThat(model.validateCharset("UTF-8")).isOk();
-            softly.assertThat(model.validateCharset("Some wrong text"))
-                    .isError()
-                    .hasMessage(createWrongEncodingErrorMessage());
-        });
+        assertThat(model.validateCharset("")).isOk();
+        assertThat(model.validateCharset("UTF-8")).isOk();
+        assertThat(model.validateCharset("Some wrong text"))
+                .isError()
+                .hasMessage(createWrongEncodingErrorMessage());
     }
 
     @Test
@@ -78,7 +75,7 @@ void shouldContainDefaultCharsets() {
     @Test
     void shouldFallbackToPlatformCharset() {
         ModelValidation model = new ModelValidation();
-        
+
         assertThat(model.getCharset("UTF-8")).isEqualTo(StandardCharsets.UTF_8);
         assertThat(model.getCharset("nothing")).isEqualTo(Charset.defaultCharset());
         assertThat(model.getCharset("")).isEqualTo(Charset.defaultCharset());
@@ -96,14 +93,12 @@ void doFillMinimumPriorityItemsShouldBeNotEmpty() {
         Option actualNormalOption = allFilters.get(1);
         Option actualLowOption = allFilters.get(2);
 
-        assertSoftly(softly -> {
-            softly.assertThat(actualHighOption.value).isEqualTo(Severity.WARNING_HIGH.getName());
-            softly.assertThat(actualHighOption.name).isEqualTo(Messages.SeverityFilter_High());
-            softly.assertThat(actualNormalOption.value).isEqualTo(Severity.WARNING_NORMAL.getName());
-            softly.assertThat(actualNormalOption.name).isEqualTo(Messages.SeverityFilter_Normal());
-            softly.assertThat(actualLowOption.value).isEqualTo(Severity.WARNING_LOW.getName());
-            softly.assertThat(actualLowOption.name).isEqualTo(Messages.SeverityFilter_Low());
-        });
+        assertThat(actualHighOption.value).isEqualTo(Severity.WARNING_HIGH.getName());
+        assertThat(actualHighOption.name).isEqualTo(Messages.SeverityFilter_High());
+        assertThat(actualNormalOption.value).isEqualTo(Severity.WARNING_NORMAL.getName());
+        assertThat(actualNormalOption.name).isEqualTo(Messages.SeverityFilter_Normal());
+        assertThat(actualLowOption.value).isEqualTo(Severity.WARNING_LOW.getName());
+        assertThat(actualLowOption.name).isEqualTo(Messages.SeverityFilter_Low());
     }
 
     @Test
@@ -124,11 +119,9 @@ void doCheckReferenceJobShouldBeOkWithValidValues() {
         when(jenkins.getJob(jobName)).thenReturn(Optional.of(job));
         ModelValidation model = new ModelValidation(jenkins);
 
-        assertSoftly(softly -> {
-            softly.assertThat(model.validateJob(jobName)).isOk();
-            softly.assertThat(model.validateJob(NO_REFERENCE_JOB)).isOk();
-            softly.assertThat(model.validateJob("")).isOk();
-        });
+        assertThat(model.validateJob(jobName)).isOk();
+        assertThat(model.validateJob(NO_REFERENCE_JOB)).isOk();
+        assertThat(model.validateJob("")).isOk();
     }
 
     @Test
@@ -159,7 +152,8 @@ void doCheckHealthyShouldBeOkWithValidValues() {
         assertThat(model.validateUnhealthy(0, 0)).isOk();
     }
 
-    @Test @Issue("JENKINS-55293")
+    @Test
+    @Issue("JENKINS-55293")
     void doCheckHealthyShouldBeNotOkWithInvalidValues() {
         ModelValidation model = new ModelValidation();
 
@@ -209,5 +203,5 @@ void shouldContainSingleElementAndPlaceHolder() {
 
         assertThat(actualModel).hasSize(2);
         assertThat(actualModel).containsExactly(NO_REFERENCE_JOB, name);
-    }   
+    }
 }