Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#596: Fixed build with Java 21 #606

Merged
merged 17 commits into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions dependencies.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions doc/changes/changes_4.5.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ This release allows customization of the java version in `actions/setup-java` st

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

## Refactoring

* #596: Fixed build with Java 21

## Dependency Updates

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

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

#### Plugin Dependency Updates

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

#### Plugin Dependency Updates

* Added `org.apache.maven.plugins:maven-javadoc-plugin:3.11.1`
* Updated `org.apache.maven.plugins:maven-site-plugin:3.9.1` to `3.21.0`
* Updated `org.apache.maven.plugins:maven-surefire-plugin:3.5.1` to `3.5.2`
* Updated `org.codehaus.mojo:versions-maven-plugin:2.17.1` to `2.18.0`
Expand Down
4 changes: 4 additions & 0 deletions maven-project-crawler/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@
<artifactId>semver4j</artifactId>
</dependency>
<!-- test -->
<dependency>
<groupId>com.exasol</groupId>
<artifactId>project-keeper-shared-test-setup</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import com.exasol.projectkeeper.shared.dependencies.ProjectDependency;
import com.exasol.projectkeeper.shared.dependencychanges.NewDependency;
import com.exasol.projectkeeper.shared.mavenprojectcrawler.*;
import com.exasol.projectkeeper.test.TestMavenModel;

@Tag("integration")
class MavenProjectCrawlerMojoIT {
Expand Down
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed duplicate class

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;

import com.exasol.projectkeeper.TestMavenModel;
import com.exasol.projectkeeper.TestRepo;
import com.exasol.projectkeeper.pom.MavenProjectFromFileReader;
import com.exasol.projectkeeper.shared.dependencies.BaseDependency.Type;
import com.exasol.projectkeeper.shared.dependencychanges.DependencyChangeReport;
import com.exasol.projectkeeper.shared.dependencychanges.UpdatedDependency;
import com.exasol.projectkeeper.test.TestMavenModel;

class DependencyUpdateReaderTest {

Expand Down Expand Up @@ -93,4 +93,4 @@ public MavenProject readProject(final File pomFile) {
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;

import com.exasol.projectkeeper.TestMavenModel;
import com.exasol.projectkeeper.TestRepo;
import com.exasol.projectkeeper.test.TestMavenModel;

class LastReleasePomFileReaderTest {
private static final String CURRENT_VERSION = "1.0.0";
Expand Down Expand Up @@ -159,4 +159,4 @@ private String makeRelease(final TestRepo git, final String name, final Path dir
git.addAll().commit().createTag(name);
return Files.readString(directory.resolve("pom.xml"));
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ public abstract class AbstractProjectKeeperMojo extends AbstractMojo {
@Parameter(defaultValue = "${session}", readonly = true)
private MavenSession session;

AbstractProjectKeeperMojo() {
}

/**
* Get a project-keeper core.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
@Mojo(name = "fix")
// [impl->dsn~mvn-fix-goal~1]
public class ProjectKeeperFixMojo extends AbstractProjectKeeperMojo {
ProjectKeeperFixMojo() {
}

@Override
protected void runProjectKeeper(final ProjectKeeper projectKeeper) throws MojoFailureException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
*/
@Mojo(name = "update-dependencies")
public class ProjectKeeperUpdateDependenciesMojo extends AbstractProjectKeeperMojo {
ProjectKeeperUpdateDependenciesMojo() {
}

@Override
protected void runProjectKeeper(final ProjectKeeper projectKeeper) throws MojoFailureException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
@Mojo(name = "verify", defaultPhase = LifecyclePhase.PACKAGE)
// [impl->dsn~mvn-verify-goal~1]
public class ProjectKeeperVerifyMojo extends AbstractProjectKeeperMojo {
ProjectKeeperVerifyMojo() {
}

@Override
protected void runProjectKeeper(final ProjectKeeper projectKeeper) throws MojoFailureException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
*/
@Mojo(name = "verify-release")
public class ProjectKeeperVerifyReleaseMojo extends AbstractProjectKeeperMojo {
ProjectKeeperVerifyReleaseMojo() {
}

@Override
protected void runProjectKeeper(final ProjectKeeper projectKeeper) throws MojoFailureException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
public class ApStyleFormatter {

/**
* Convert string to a human readable value.
*
* @param string name to be converted
* @return human readable format for input string
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
*/
public class LicenseNameReader {

LicenseNameReader() {
}

/**
* Read the name of the license (first line of LICENSE file).
*
Expand Down
Loading
Loading