Skip to content

Commit f3fb201

Browse files
authored
Merge pull request #1982 from jenkinsci/dependabot/maven/edu.hm.hafner-codingstyle-pom-5.16.0
Bump edu.hm.hafner:codingstyle-pom from 5.12.0 to 5.16.0
2 parents 0ce5d91 + c48d355 commit f3fb201

File tree

6 files changed

+20
-37
lines changed

6 files changed

+20
-37
lines changed

plugin/pom.xml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,6 @@
9595
<dependency>
9696
<groupId>io.jenkins.plugins</groupId>
9797
<artifactId>plugin-util-api</artifactId>
98-
<!-- TODO: remove the version when a matching BOM is available -->
99-
<version>6.0.0</version>
10098
</dependency>
10199
<dependency>
102100
<groupId>io.jenkins.plugins</groupId>
@@ -157,8 +155,6 @@
157155
<dependency>
158156
<groupId>io.jenkins.plugins</groupId>
159157
<artifactId>forensics-api</artifactId>
160-
<!-- TODO: remove the version when a matching BOM is available -->
161-
<version>3.0.0</version>
162158
</dependency>
163159
<dependency>
164160
<groupId>io.jenkins.plugins</groupId>
@@ -218,15 +214,11 @@
218214
<groupId>io.jenkins.plugins</groupId>
219215
<artifactId>forensics-api</artifactId>
220216
<classifier>tests</classifier>
221-
<!-- TODO: remove the version when a matching BOM is available -->
222-
<version>3.0.0</version>
223217
<scope>test</scope>
224218
</dependency>
225219
<dependency>
226220
<groupId>io.jenkins.plugins</groupId>
227221
<artifactId>git-forensics</artifactId>
228-
<!-- TODO: remove the version when a matching BOM is available -->
229-
<version>3.1.0</version>
230222
<scope>test</scope>
231223
</dependency>
232224
<dependency>
@@ -307,8 +299,6 @@
307299
<dependency>
308300
<groupId>io.jenkins.plugins</groupId>
309301
<artifactId>plugin-util-api</artifactId>
310-
<!-- TODO: remove the version when a matching BOM is available -->
311-
<version>6.0.0</version>
312302
<classifier>tests</classifier>
313303
<scope>test</scope>
314304
<exclusions>
@@ -344,7 +334,7 @@
344334
<version>${testcontainers.version}</version>
345335
<scope>test</scope>
346336
</dependency>
347-
<!-- Form element path plugin to simplify location of UI elements in HtmlUnit tests -->
337+
<!-- Form element path plugin to simplify the location of UI elements in HtmlUnit tests -->
348338
<dependency>
349339
<groupId>org.jenkins-ci.plugins</groupId>
350340
<artifactId>form-element-path</artifactId>

ui-tests/etc/assertj-templates/soft_assertions_entry_point_class_template.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package ${package};
33
/**
44
* Entry point for soft assertions of different data types.
55
*/
6-
@edu.umd.cs.findbugs.annotations.SuppressFBWarnings("NM")
76
@edu.hm.hafner.util.Generated(value="assertj-assertions-generator")
87
public class SoftAssertions extends org.assertj.core.api.AutoCloseableSoftAssertions {
98
${all_assertions_entry_points}

ui-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>edu.hm.hafner</groupId>
77
<artifactId>codingstyle-pom</artifactId>
8-
<version>5.12.0</version>
8+
<version>5.16.0</version>
99
<relativePath />
1010
</parent>
1111

ui-tests/src/main/java/io/jenkins/plugins/analysis/warnings/AbstractIssuesTable.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
package io.jenkins.plugins.analysis.warnings;
22

3-
import java.util.ArrayList;
4-
import java.util.List;
5-
import java.util.stream.Collectors;
6-
73
import org.apache.commons.lang3.StringUtils;
84
import org.openqa.selenium.By;
95
import org.openqa.selenium.WebElement;
106

11-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
7+
import java.util.ArrayList;
8+
import java.util.List;
9+
import java.util.stream.Collectors;
1210

1311
import io.jenkins.plugins.analysis.warnings.IssuesTable.Header;
1412

@@ -21,7 +19,6 @@
2119
*
2220
* @author Stephan Plöderl
2321
*/
24-
@SuppressFBWarnings("EI")
2522
abstract class AbstractIssuesTable<T extends GenericTableRow> {
2623
private final AnalysisResult analysisResult;
2724
private final List<T> tableRows = new ArrayList<>();

ui-tests/src/main/java/io/jenkins/plugins/analysis/warnings/AnalysisResult.java

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
import com.google.inject.Injector;
99

10-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
11-
1210
import java.net.URL;
1311
import java.util.Collection;
1412
import java.util.List;
@@ -47,16 +45,16 @@ public AnalysisResult(final Build parent, final String id) {
4745

4846
/**
4947
* Creates an instance of the page displaying the details of the issues. This constructor is used for injecting a
50-
* filtered instance of the page (e.g. by clicking on links which open a filtered instance of a AnalysisResult.
48+
* filtered instance of the page (e.g., by clicking on links which open a filtered instance of a AnalysisResult.
5149
*
5250
* @param injector
5351
* the injector of the page
5452
* @param url
5553
* the url of the page
5654
* @param id
57-
* the id of the result page (e.g., simian or cpd)
55+
* the id of the result page (e.g., simian or cpd)
5856
*/
59-
@SuppressWarnings("unused") // Required to dynamically create page object using reflection
57+
@SuppressWarnings("unused") // Required to dynamically create a page object using reflection
6058
public AnalysisResult(final Injector injector, final URL url, final String id) {
6159
super(injector, url);
6260

@@ -71,7 +69,7 @@ public AnalysisResult(final Injector injector, final URL url, final String id) {
7169
public Tab getActiveTab() {
7270
WebElement activeTab = find(By.xpath("//a[@role='tab' and contains(@class, 'active')]"));
7371

74-
return Tab.valueWithHref(extractRelativeUrl(activeTab.getAttribute(TARGET_HREF)));
72+
return Tab.valueWithHref(extractRelativeUrl(activeTab.getDomAttribute(TARGET_HREF)));
7573
}
7674

7775
/**
@@ -81,7 +79,7 @@ public Tab getActiveTab() {
8179
*/
8280
public Collection<Tab> getAvailableTabs() {
8381
return all(By.xpath("//a[@role='tab']")).stream()
84-
.map(tab -> tab.getAttribute(TARGET_HREF))
82+
.map(tab -> tab.getDomAttribute(TARGET_HREF))
8583
.map(this::extractRelativeUrl)
8684
.map(Tab::valueWithHref)
8785
.collect(Collectors.toList());
@@ -93,7 +91,7 @@ private String extractRelativeUrl(final String absoluteUrl) {
9391

9492
/**
9593
* Returns the total number of issues. This method requires that one of the tabs is shown that shows the total
96-
* number of issues in the footer. I.e. the {@link Tab#ISSUES} and {@link Tab#BLAMES}.
94+
* number of issues in the footer. I.e., the {@link Tab#ISSUES} and {@link Tab#BLAMES}.
9795
*
9896
* @return the total number of issues
9997
*/
@@ -103,7 +101,7 @@ public int getTotal() {
103101

104102
/**
105103
* Returns the total number of new issues. This method requires that one of the tabs is shown that shows the total
106-
* number of issues in the footer. I.e. the {@link Tab#ISSUES} and {@link Tab#BLAMES}.
104+
* number of issues in the footer. I.e., the {@link Tab#ISSUES} and {@link Tab#BLAMES}.
107105
*
108106
* @return the total number of new issues
109107
*/
@@ -166,7 +164,7 @@ private WebElement selectTab(final Tab issues) {
166164

167165
/**
168166
* Opens the analysis details page, selects the tab {@link Tab#CATEGORIES} and returns the {@link PageObject} of the
169-
* categories table.
167+
* category table.
170168
*
171169
* @param tab
172170
* the tab to open
@@ -180,9 +178,9 @@ public PropertyDetailsTable openPropertiesTable(final Tab tab) {
180178

181179
/**
182180
* Opens the analysis details page, selects the tab {@link Tab#BLAMES} and returns the {@link PageObject} of the
183-
* blames table.
181+
* blame table.
184182
*
185-
* @return page object of the blames table.
183+
* @return page object of the blame table.
186184
*/
187185
public BlamesTable openBlamesTable() {
188186
openTab(Tab.BLAMES);
@@ -297,7 +295,6 @@ private WebElement getTrendChart() {
297295
/**
298296
* Clicks the next-button to cycle through the Trend Charts.
299297
*/
300-
@SuppressFBWarnings(value = "THROWS", justification = "3rd party library we cannot change")
301298
public void clickNextOnTrendCarousel() {
302299
WebElement trendChart = getTrendChart();
303300
WebElement activeChart = trendChart.findElement(By.className("active"));

ui-tests/src/test/java/io/jenkins/plugins/analysis/warnings/GitForensicsUiTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
package io.jenkins.plugins.analysis.warnings;
22

3-
import java.io.IOException;
4-
import java.net.MalformedURLException;
5-
import java.util.HashMap;
6-
import java.util.Map;
73
import javax.inject.Inject;
84

95
import org.junit.After;
@@ -14,6 +10,11 @@
1410

1511
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
1612

13+
import java.io.IOException;
14+
import java.net.MalformedURLException;
15+
import java.util.HashMap;
16+
import java.util.Map;
17+
1718
import org.jenkinsci.test.acceptance.docker.DockerContainerHolder;
1819
import org.jenkinsci.test.acceptance.docker.fixtures.GitContainer;
1920
import org.jenkinsci.test.acceptance.junit.DockerTest;
@@ -125,7 +126,6 @@ public void initGitRepository() {
125126

126127
/** Dispose the docker container. */
127128
@After
128-
@SuppressFBWarnings("BC_UNCONFIRMED_CAST_OF_RETURN_VALUE")
129129
public void disposeContainer() {
130130
gitServer.get().close();
131131
}

0 commit comments

Comments
 (0)