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.

Sign up for GitHub

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

#596: Fixed build with Java 21 #606

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
76b695a
#597: Move workflows into ci-build.yml
kaklakariada Nov 21, 2024
27f90a4
Improve usability: add available jobs to error message
kaklakariada Nov 21, 2024
8e5f1dc
Increment minor version
kaklakariada Nov 21, 2024
6fda61e
Fix compiler warnings with Java 21
kaklakariada Nov 21, 2024
ed431fe
Fix Java 21 build
kaklakariada Nov 21, 2024
b9f592a
Fix cancelled jobs due to concurrency
kaklakariada Nov 21, 2024
4f15235
Adapt unit test
kaklakariada Nov 21, 2024
b15d005
Fix integration tests
kaklakariada Nov 21, 2024
affcc7f
Fix sonar warnings
kaklakariada Nov 21, 2024
1f12731
Rename job
kaklakariada Nov 21, 2024
3506638
Add unit tests
kaklakariada Nov 21, 2024
bf8b567
Fix sonar finding
kaklakariada Nov 22, 2024
1b720f5
Add unit tests
kaklakariada Nov 22, 2024
8050900
Avoid duplicating test class
kaklakariada Nov 22, 2024
cb1215c
#596: Fix build with Java 21
kaklakariada Nov 22, 2024
4956d00
Merge remote-tracking branch 'origin/main' into java-21-upgrade
kaklakariada Nov 22, 2024
43cccf4
Run PK fix
kaklakariada Nov 22, 2024
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
4 changes: 0 additions & 4 deletions .github/workflows/broken_links_checker.yml
View file
Open in desktop

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

89 changes: 86 additions & 3 deletions .github/workflows/ci-build.yml
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion .github/workflows/test_on_windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
pull_request:

jobs:
test:
test-on-windows:
runs-on: windows-latest
permissions:
contents: read
Expand Down
8 changes: 6 additions & 2 deletions .project-keeper.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ version:
excludes:
# PK can't use itself as a Maven plugin
- regex: "W-PK-CORE-151: Pom file .* contains no reference to project-keeper-maven-plugin."
# Build with Java 21 fails due to missing JavaDoc comments, see https://github.com/exasol/project-keeper/issues/596
- "E-PK-CORE-17: Missing required file: '.github/workflows/ci-build-next-java.yml'"
# No configuration necessary for aggregator POM
- "E-PK-CORE-103: Missing parent declaration in 'pom.xml'"
- "E-PK-CORE-17: Missing required file: 'pk_generated_parent.pom'"
Expand All @@ -89,6 +87,7 @@ build:
- name: "ci-build.yml"
stepCustomizations:
- action: INSERT_AFTER
job: build-and-test
stepId: setup-java
content:
name: Set up Go
Expand All @@ -98,12 +97,14 @@ build:
go-version: "1.22"
cache-dependency-path: .project-keeper.yml
- action: INSERT_AFTER
job: build-and-test
stepId: setup-go
content:
name: Install Go tools
id: install-go-tools
run: go install github.com/google/[email protected]
- action: REPLACE
job: build-and-test
stepId: build-pk-verify
content:
name: Run tests and build with Maven
Expand All @@ -115,12 +116,14 @@ build:
env:
GITHUB_TOKEN: ${{ github.token }} # Required for integration tests
- action: INSERT_AFTER
job: build-and-test
stepId: sonar-analysis
content:
name: Run project-keeper itself
id: build-pk-verify
run: mvn --batch-mode com.exasol:project-keeper-maven-plugin:verify --projects .
- action: INSERT_AFTER
job: build-and-test
stepId: build-pk-verify
content:
name: Verify that metrics.json was created
Expand All @@ -134,6 +137,7 @@ build:
- name: "dependencies_check.yml"
stepCustomizations:
- action: INSERT_AFTER
job: report_security_issues
stepId: setup-jdks
content:
name: Install Project Keeper
Expand Down
2 changes: 2 additions & 0 deletions dependencies.md
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion doc/changes/changelog.md
View file
Open in desktop

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

27 changes: 17 additions & 10 deletions doc/changes/changes_4.4.1.md → doc/changes/changes_4.5.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
# Project Keeper 4.4.1, released 2024-??-??
# Project Keeper 4.5.0, released 2024-11-22

Code name: Fix java customization

## Summary

This release allows customization of the java version in `actions/setup-java` steps.
This release allows customization of the java version in `actions/setup-java` steps. It also migrates generated workflows `broken_links_checker.yml` and `ci-build-next-java.yml` into `ci-build.yml`. This allows simplifying branch protection rules. Now only `build` is required, you can remove `next-java-compatibility` and `linkChecker`.

## Features

* #602: Fixed customization of java version in `actions/setup-java`
* #597: Migrate workflows `broken_links_checker.yml` and `ci-build-next-java.yml` into `ci-build.yml`

## Bugfixes

* #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 @@ -41,16 +46,16 @@ This release allows customization of the java version in `actions/setup-java` st

#### Compile Dependency Updates

* Updated `com.exasol:project-keeper-shared-model-classes:4.4.0` to `4.4.1`
* Updated `com.exasol:project-keeper-shared-model-classes:4.4.0` to `4.5.0`

#### Runtime Dependency Updates

* Updated `com.exasol:project-keeper-java-project-crawler:4.4.0` to `4.4.1`
* Updated `com.exasol:project-keeper-java-project-crawler:4.4.0` to `4.5.0`

#### Test Dependency Updates

* Updated `com.exasol:maven-project-version-getter:1.2.0` to `1.2.1`
* Updated `com.exasol:project-keeper-shared-test-setup:4.4.0` to `4.4.1`
* Updated `com.exasol:project-keeper-shared-test-setup:4.4.0` to `4.5.0`
* Updated `nl.jqno.equalsverifier:equalsverifier:3.17.1` to `3.17.3`

#### Plugin Dependency Updates
Expand All @@ -67,12 +72,12 @@ This release allows customization of the java version in `actions/setup-java` st

#### Compile Dependency Updates

* Updated `com.exasol:project-keeper-core:4.4.0` to `4.4.1`
* Updated `com.exasol:project-keeper-core:4.4.0` to `4.5.0`

#### Test Dependency Updates

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

#### Plugin Dependency Updates

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

#### Compile Dependency Updates

* Updated `com.exasol:project-keeper-core:4.4.0` to `4.4.1`
* Updated `com.exasol:project-keeper-core:4.4.0` to `4.5.0`

#### Test Dependency Updates

Expand All @@ -110,11 +115,12 @@ This release allows customization of the java version in `actions/setup-java` st

#### Compile Dependency Updates

* Updated `com.exasol:project-keeper-shared-model-classes:4.4.0` to `4.4.1`
* Updated `com.exasol:project-keeper-shared-model-classes:4.4.0` to `4.5.0`

#### 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 @@ -132,10 +138,11 @@ This release allows customization of the java version in `actions/setup-java` st

#### Compile Dependency Updates

* Updated `com.exasol:project-keeper-shared-model-classes:4.4.0` to `4.4.1`
* Updated `com.exasol:project-keeper-shared-model-classes:4.4.0` to `4.5.0`

#### 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
View file
Open in desktop
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
1 change: 1 addition & 0 deletions maven-project-crawler/src/test/java/com/exasol/projectkeeper/MavenProjectCrawlerMojoIT.java
View file
Open in desktop
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
61 changes: 0 additions & 61 deletions maven-project-crawler/src/test/java/com/exasol/projectkeeper/TestMavenModel.java
View file
Open in desktop
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.

Loading
Loading