Skip to content

Commit a0fd85c

Browse files
authored
#596: Fixed build with Java 21 (#606)
1 parent 8b88d4b commit a0fd85c

38 files changed

+285
-97
lines changed

dependencies.md

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

doc/changes/changes_4.5.0.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ This release allows customization of the java version in `actions/setup-java` st
1515

1616
* #598: Reverted changes to PK's template for IDE Eclipse `javax.annotation.Nonnull`
1717

18+
## Refactoring
19+
20+
* #596: Fixed build with Java 21
21+
1822
## Dependency Updates
1923

2024
### Project Keeper Root Project
@@ -116,6 +120,7 @@ This release allows customization of the java version in `actions/setup-java` st
116120
#### Test Dependency Updates
117121

118122
* Updated `com.exasol:maven-project-version-getter:1.2.0` to `1.2.1`
123+
* Added `com.exasol:project-keeper-shared-test-setup:4.5.0`
119124

120125
#### Plugin Dependency Updates
121126

@@ -137,6 +142,7 @@ This release allows customization of the java version in `actions/setup-java` st
137142

138143
#### Plugin Dependency Updates
139144

145+
* Added `org.apache.maven.plugins:maven-javadoc-plugin:3.11.1`
140146
* Updated `org.apache.maven.plugins:maven-site-plugin:3.9.1` to `3.21.0`
141147
* Updated `org.apache.maven.plugins:maven-surefire-plugin:3.5.1` to `3.5.2`
142148
* Updated `org.codehaus.mojo:versions-maven-plugin:2.17.1` to `2.18.0`

maven-project-crawler/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@
4242
<artifactId>semver4j</artifactId>
4343
</dependency>
4444
<!-- test -->
45+
<dependency>
46+
<groupId>com.exasol</groupId>
47+
<artifactId>project-keeper-shared-test-setup</artifactId>
48+
</dependency>
4549
<dependency>
4650
<groupId>org.apache.maven</groupId>
4751
<artifactId>maven-core</artifactId>

maven-project-crawler/src/test/java/com/exasol/projectkeeper/MavenProjectCrawlerMojoIT.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import com.exasol.projectkeeper.shared.dependencies.ProjectDependency;
2626
import com.exasol.projectkeeper.shared.dependencychanges.NewDependency;
2727
import com.exasol.projectkeeper.shared.mavenprojectcrawler.*;
28+
import com.exasol.projectkeeper.test.TestMavenModel;
2829

2930
@Tag("integration")
3031
class MavenProjectCrawlerMojoIT {

maven-project-crawler/src/test/java/com/exasol/projectkeeper/TestMavenModel.java

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

maven-project-crawler/src/test/java/com/exasol/projectkeeper/validators/changesfile/DependencyUpdateReaderTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
import org.junit.jupiter.api.Test;
2121
import org.junit.jupiter.api.io.TempDir;
2222

23-
import com.exasol.projectkeeper.TestMavenModel;
2423
import com.exasol.projectkeeper.TestRepo;
2524
import com.exasol.projectkeeper.pom.MavenProjectFromFileReader;
2625
import com.exasol.projectkeeper.shared.dependencies.BaseDependency.Type;
2726
import com.exasol.projectkeeper.shared.dependencychanges.DependencyChangeReport;
2827
import com.exasol.projectkeeper.shared.dependencychanges.UpdatedDependency;
28+
import com.exasol.projectkeeper.test.TestMavenModel;
2929

3030
class DependencyUpdateReaderTest {
3131

@@ -93,4 +93,4 @@ public MavenProject readProject(final File pomFile) {
9393
}
9494
}
9595
}
96-
}
96+
}

maven-project-crawler/src/test/java/com/exasol/projectkeeper/validators/changesfile/LastReleasePomFileReaderTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import org.junit.jupiter.api.Test;
1818
import org.junit.jupiter.api.io.TempDir;
1919

20-
import com.exasol.projectkeeper.TestMavenModel;
2120
import com.exasol.projectkeeper.TestRepo;
21+
import com.exasol.projectkeeper.test.TestMavenModel;
2222

2323
class LastReleasePomFileReaderTest {
2424
private static final String CURRENT_VERSION = "1.0.0";
@@ -159,4 +159,4 @@ private String makeRelease(final TestRepo git, final String name, final Path dir
159159
git.addAll().commit().createTag(name);
160160
return Files.readString(directory.resolve("pom.xml"));
161161
}
162-
}
162+
}

project-keeper-maven-plugin/src/main/java/com/exasol/projectkeeper/plugin/AbstractProjectKeeperMojo.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ public abstract class AbstractProjectKeeperMojo extends AbstractMojo {
2727
@Parameter(defaultValue = "${session}", readonly = true)
2828
private MavenSession session;
2929

30+
AbstractProjectKeeperMojo() {
31+
}
32+
3033
/**
3134
* Get a project-keeper core.
3235
*

project-keeper-maven-plugin/src/main/java/com/exasol/projectkeeper/plugin/ProjectKeeperFixMojo.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
@Mojo(name = "fix")
1515
// [impl->dsn~mvn-fix-goal~1]
1616
public class ProjectKeeperFixMojo extends AbstractProjectKeeperMojo {
17+
ProjectKeeperFixMojo() {
18+
}
1719

1820
@Override
1921
protected void runProjectKeeper(final ProjectKeeper projectKeeper) throws MojoFailureException {

project-keeper-maven-plugin/src/main/java/com/exasol/projectkeeper/plugin/ProjectKeeperUpdateDependenciesMojo.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
*/
1414
@Mojo(name = "update-dependencies")
1515
public class ProjectKeeperUpdateDependenciesMojo extends AbstractProjectKeeperMojo {
16+
ProjectKeeperUpdateDependenciesMojo() {
17+
}
1618

1719
@Override
1820
protected void runProjectKeeper(final ProjectKeeper projectKeeper) throws MojoFailureException {

project-keeper-maven-plugin/src/main/java/com/exasol/projectkeeper/plugin/ProjectKeeperVerifyMojo.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
@Mojo(name = "verify", defaultPhase = LifecyclePhase.PACKAGE)
1616
// [impl->dsn~mvn-verify-goal~1]
1717
public class ProjectKeeperVerifyMojo extends AbstractProjectKeeperMojo {
18+
ProjectKeeperVerifyMojo() {
19+
}
1820

1921
@Override
2022
protected void runProjectKeeper(final ProjectKeeper projectKeeper) throws MojoFailureException {

project-keeper-maven-plugin/src/main/java/com/exasol/projectkeeper/plugin/ProjectKeeperVerifyReleaseMojo.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
*/
1414
@Mojo(name = "verify-release")
1515
public class ProjectKeeperVerifyReleaseMojo extends AbstractProjectKeeperMojo {
16+
ProjectKeeperVerifyReleaseMojo() {
17+
}
1618

1719
@Override
1820
protected void runProjectKeeper(final ProjectKeeper projectKeeper) throws MojoFailureException {

project-keeper/src/main/java/com/exasol/projectkeeper/ApStyleFormatter.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
public class ApStyleFormatter {
77

88
/**
9+
* Convert string to a human readable value.
10+
*
911
* @param string name to be converted
1012
* @return human readable format for input string
1113
*/

project-keeper/src/main/java/com/exasol/projectkeeper/LicenseNameReader.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
*/
1212
public class LicenseNameReader {
1313

14+
LicenseNameReader() {
15+
}
16+
1417
/**
1518
* Read the name of the license (first line of LICENSE file).
1619
*

0 commit comments

Comments
 (0)