Skip to content

Commit 2e6896a

Browse files
authored
general version update, java 25, checkstyle (#6)
* general version update, java 25, checkstyle * fix ci
1 parent 70e7098 commit 2e6896a

File tree

9 files changed

+35
-242
lines changed

9 files changed

+35
-242
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v5
1515
- uses: aboutbits/github-actions-java/setup-with-maven@v4
1616
with:
17-
java-version: 21
17+
java-version: 25
1818
- name: Test
1919
env:
2020
GITHUB_USER_NAME: ${{ github.actor }}

.github/workflows/maven-settings.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,16 @@
2020
<url>https://maven.pkg.github.com/aboutbits/*</url>
2121
</repository>
2222
</repositories>
23+
<pluginRepositories>
24+
<pluginRepository>
25+
<id>central</id>
26+
<url>https://repo1.maven.org/maven2</url>
27+
</pluginRepository>
28+
<pluginRepository>
29+
<id>github</id>
30+
<url>https://maven.pkg.github.com/aboutbits/*</url>
31+
</pluginRepository>
32+
</pluginRepositories>
2333
</profile>
2434
</profiles>
2535

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: aboutbits/github-actions-base/git-setup@v2
2020
- uses: aboutbits/github-actions-java/setup-with-maven@v4
2121
with:
22-
java-version: 21
22+
java-version: 25
2323
- uses: aboutbits/github-actions-java/set-version-with-maven@v4
2424
with:
2525
version: "${{ github.event.inputs.version }}"

.idea/checkstyle-idea.xml

Lines changed: 10 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

checkstyle-suppressions.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

checkstyle.xml

Lines changed: 0 additions & 207 deletions
This file was deleted.

pom.xml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<description>Mapstruct extensions like custom naming strategies.</description>
1010

1111
<properties>
12-
<java.version>21</java.version>
13-
<mapstruct.version>1.5.5.Final</mapstruct.version>
12+
<java.version>25</java.version>
13+
<mapstruct.version>1.6.3</mapstruct.version>
1414
</properties>
1515

1616
<dependencies>
@@ -31,7 +31,7 @@
3131
<plugin>
3232
<groupId>org.apache.maven.plugins</groupId>
3333
<artifactId>maven-compiler-plugin</artifactId>
34-
<version>3.11.0</version>
34+
<version>3.14.1</version>
3535
<configuration>
3636
<source>${java.version}</source>
3737
<target>${java.version}</target>
@@ -40,12 +40,10 @@
4040
<plugin>
4141
<groupId>org.apache.maven.plugins</groupId>
4242
<artifactId>maven-checkstyle-plugin</artifactId>
43-
<version>3.2.1</version>
43+
<version>3.6.0</version>
4444
<configuration>
4545
<configLocation>checkstyle.xml</configLocation>
46-
<suppressionsFileExpression>
47-
checkstyle-suppressions.xml
48-
</suppressionsFileExpression>
46+
<suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
4947
<includeTestSourceDirectory>true</includeTestSourceDirectory>
5048
<consoleOutput>true</consoleOutput>
5149
<failsOnError>true</failsOnError>
@@ -64,7 +62,12 @@
6462
<dependency>
6563
<groupId>com.puppycrawl.tools</groupId>
6664
<artifactId>checkstyle</artifactId>
67-
<version>10.3.4</version>
65+
<version>12.3.0</version>
66+
</dependency>
67+
<dependency>
68+
<groupId>it.aboutbits</groupId>
69+
<artifactId>java-checkstyle-config</artifactId>
70+
<version>1.1.0</version>
6871
</dependency>
6972
</dependencies>
7073
</plugin>

src/main/java/it/aboutbits/mapstruct/spi/CustomAccessorNamingStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ protected boolean isFluentSetter(ExecutableElement method) {
1212
}
1313

1414
protected boolean isWitherMethod(ExecutableElement method) {
15-
String methodName = method.getSimpleName().toString();
15+
var methodName = method.getSimpleName().toString();
1616
return methodName.length() > 4 && methodName.startsWith("with") && Character.isUpperCase(methodName.charAt(4));
1717
}
1818
}

0 commit comments

Comments
 (0)