Skip to content

Commit b1d7cb4

Browse files
committed
General maintenance
1 parent 19e4fc0 commit b1d7cb4

File tree

6 files changed

+21
-53
lines changed

6 files changed

+21
-53
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
.~lock*
1515
*.kate-swp
1616
**/internal/*
17-
17+
**/tool/Migrate*.java

pom.xml

Lines changed: 14 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
35
<modelVersion>4.0.0</modelVersion>
46

57
<parent>
68
<groupId>org.basepom</groupId>
79
<artifactId>basepom-oss</artifactId>
8-
<version>63</version>
10+
<version>66</version>
911
</parent>
1012

1113
<groupId>io.github.spannm</groupId>
@@ -15,7 +17,7 @@
1517

1618
<name>${project.artifactId}</name>
1719
<description>Solutions to LeetCode coding problems</description>
18-
<url>https://github.com/${developerId}/${project.artifactId}</url>
20+
<url>${githubBaseUrl}${project.artifactId}</url>
1921
<inceptionYear>2023</inceptionYear>
2022

2123
<licenses>
@@ -36,17 +38,22 @@
3638

3739
<properties>
3840
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
41+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
3942

43+
<!-- The minimum JDK version required to build. -->
4044
<project.build.systemJdk>17</project.build.systemJdk>
45+
<!-- The default build target. -->
4146
<project.build.targetJdk>17</project.build.targetJdk>
4247

4348
<developerId>spannm</developerId>
49+
<githubBaseUrl>https://github.com/${developerId}/</githubBaseUrl>
4450

4551
<dep.plugin.sortpom.version>4.0.0</dep.plugin.sortpom.version>
4652

4753
<dep.javapoet.version>1.13.0</dep.javapoet.version>
4854
<dep.slf4j.version>2.0.17</dep.slf4j.version>
49-
<dep.junit.version>5.13.4</dep.junit.version>
55+
56+
<dep.junit.version>6.0.1</dep.junit.version>
5057
<dep.assertj.version>3.27.3</dep.assertj.version>
5158

5259
<basepom.check.fail-dependency>false</basepom.check.fail-dependency>
@@ -60,18 +67,6 @@
6067
<basepom.site.skip-deploy>false</basepom.site.skip-deploy>
6168
</properties>
6269

63-
<dependencyManagement>
64-
<dependencies>
65-
<dependency>
66-
<groupId>org.junit</groupId>
67-
<artifactId>junit-bom</artifactId>
68-
<version>${dep.junit.version}</version>
69-
<type>pom</type>
70-
<scope>import</scope>
71-
</dependency>
72-
</dependencies>
73-
</dependencyManagement>
74-
7570
<dependencies>
7671

7772
<dependency>
@@ -97,37 +92,8 @@
9792

9893
<dependency>
9994
<groupId>org.junit.jupiter</groupId>
100-
<artifactId>junit-jupiter-api</artifactId>
101-
<scope>test</scope>
102-
</dependency>
103-
104-
<dependency>
105-
<groupId>org.junit.jupiter</groupId>
106-
<artifactId>junit-jupiter-params</artifactId>
107-
<scope>test</scope>
108-
</dependency>
109-
110-
<dependency>
111-
<groupId>org.junit.platform</groupId>
112-
<artifactId>junit-platform-launcher</artifactId>
113-
<scope>test</scope>
114-
</dependency>
115-
116-
<dependency>
117-
<groupId>org.junit.platform</groupId>
118-
<artifactId>junit-platform-engine</artifactId>
119-
<scope>test</scope>
120-
</dependency>
121-
122-
<dependency>
123-
<groupId>org.junit.jupiter</groupId>
124-
<artifactId>junit-jupiter-engine</artifactId>
125-
<scope>test</scope>
126-
</dependency>
127-
128-
<dependency>
129-
<groupId>org.junit.platform</groupId>
130-
<artifactId>junit-platform-commons</artifactId>
95+
<artifactId>junit-jupiter</artifactId>
96+
<version>${dep.junit.version}</version>
13197
<scope>test</scope>
13298
</dependency>
13399

@@ -191,7 +157,7 @@
191157
<properties>
192158
<!-- skip _compiling_ the tests -->
193159
<maven.test.skip>true</maven.test.skip>
194-
<!-- skip test execution -->
160+
<!-- skip execution of tests -->
195161
<skipTests>true</skipTests>
196162

197163
<maven.javadoc.skip>true</maven.javadoc.skip>

src/test/java/io/github/spannm/leetcode/dep/SudokuTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.junit.jupiter.params.provider.Arguments;
1010
import org.junit.jupiter.params.provider.ArgumentsProvider;
1111
import org.junit.jupiter.params.provider.ArgumentsSource;
12+
import org.junit.jupiter.params.support.ParameterDeclarations;
1213

1314
import java.util.stream.Stream;
1415

@@ -208,7 +209,7 @@ void test() {
208209

209210
static class BoardsProvider implements ArgumentsProvider {
210211
@Override
211-
public Stream<? extends Arguments> provideArguments(ExtensionContext _context) {
212+
public Stream<Arguments> provideArguments(ParameterDeclarations _parameters, ExtensionContext _context) {
212213
return Stream.of(
213214
BOARD1,
214215
BOARD_CONCEPTIS1,

src/test/java/io/github/spannm/leetcode/lc0/lc0000/Problem0036Test.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import org.junit.jupiter.params.provider.Arguments;
99
import org.junit.jupiter.params.provider.ArgumentsProvider;
1010
import org.junit.jupiter.params.provider.ArgumentsSource;
11+
import org.junit.jupiter.params.support.ParameterDeclarations;
1112

1213
import java.util.stream.Stream;
1314

@@ -22,7 +23,7 @@ void test(@ConvertWith(CsvToCharMatrix.class) char[][] _sudoku, boolean _expecte
2223

2324
static class SudokuArgumentsProvider implements ArgumentsProvider {
2425
@Override
25-
public Stream<? extends Arguments> provideArguments(ExtensionContext _context) {
26+
public Stream<Arguments> provideArguments(ParameterDeclarations _parameters, ExtensionContext _context) {
2627
return Stream.of(
2728
Arguments.of("""
2829
[[5,3,.,.,7,.,.,.,.]

src/test/java/io/github/spannm/leetcode/lc0/lc0000/Problem0037Test.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import org.junit.jupiter.params.provider.Arguments;
99
import org.junit.jupiter.params.provider.ArgumentsProvider;
1010
import org.junit.jupiter.params.provider.ArgumentsSource;
11+
import org.junit.jupiter.params.support.ParameterDeclarations;
1112

1213
import java.util.stream.Stream;
1314

@@ -23,7 +24,7 @@ void test(@ConvertWith(CsvToCharMatrix.class) char[][] _input, @ConvertWith(CsvT
2324

2425
static class SudokuArgumentsProvider implements ArgumentsProvider {
2526
@Override
26-
public Stream<? extends Arguments> provideArguments(ExtensionContext _context) {
27+
public Stream<Arguments> provideArguments(ParameterDeclarations _parameters, ExtensionContext _context) {
2728
return Stream.of(
2829
Arguments.of("""
2930
[[5,3,.,.,7,.,.,.,.]

src/test/resources/team/pmd-rules.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@
9292
<rule ref="category/java/errorprone.xml/UnconditionalIfStatement" />
9393
<rule ref="category/java/errorprone.xml/UnnecessaryConversionTemporary" />
9494
<rule ref="category/java/errorprone.xml/UnusedNullCheckInEquals" />
95-
<rule ref="category/java/errorprone.xml/UselessOperationOnImmutable" />
9695

9796
<rule ref="category/java/multithreading.xml/AvoidThreadGroup" />
9897
<rule ref="category/java/multithreading.xml/DontCallThreadRun" />

0 commit comments

Comments
 (0)