diff --git a/dependencies.md b/dependencies.md index da0cae6e..b6e32fc6 100644 --- a/dependencies.md +++ b/dependencies.md @@ -45,7 +45,7 @@ | [Apache Maven Clean Plugin][31] | [Apache-2.0][1] | | [Apache Maven Install Plugin][32] | [Apache-2.0][1] | | [Apache Maven Resources Plugin][33] | [Apache-2.0][1] | -| [Apache Maven Site Plugin][34] | [Apache License, Version 2.0][1] | +| [Apache Maven Site Plugin][34] | [Apache-2.0][1] | | [SonarQube Scanner for Maven][35] | [GNU LGPL 3][36] | | [Apache Maven Toolchains Plugin][37] | [Apache-2.0][1] | | [Apache Maven Compiler Plugin][38] | [Apache-2.0][1] | @@ -111,7 +111,7 @@ | [Apache Maven Clean Plugin][31] | [Apache-2.0][1] | | [Apache Maven Install Plugin][32] | [Apache-2.0][1] | | [Apache Maven Resources Plugin][33] | [Apache-2.0][1] | -| [Apache Maven Site Plugin][34] | [Apache License, Version 2.0][1] | +| [Apache Maven Site Plugin][34] | [Apache-2.0][1] | | [SonarQube Scanner for Maven][35] | [GNU LGPL 3][36] | | [Apache Maven Toolchains Plugin][37] | [Apache-2.0][1] | | [Apache Maven JAR Plugin][69] | [Apache-2.0][1] | @@ -167,7 +167,7 @@ | [Apache Maven Clean Plugin][31] | [Apache-2.0][1] | | [Apache Maven Install Plugin][32] | [Apache-2.0][1] | | [Apache Maven Resources Plugin][33] | [Apache-2.0][1] | -| [Apache Maven Site Plugin][34] | [Apache License, Version 2.0][1] | +| [Apache Maven Site Plugin][34] | [Apache-2.0][1] | | [SonarQube Scanner for Maven][35] | [GNU LGPL 3][36] | | [Apache Maven Toolchains Plugin][37] | [Apache-2.0][1] | | [Apache Maven Compiler Plugin][38] | [Apache-2.0][1] | @@ -224,7 +224,7 @@ | [Apache Maven Clean Plugin][31] | [Apache-2.0][1] | | [Apache Maven Install Plugin][32] | [Apache-2.0][1] | | [Apache Maven Resources Plugin][33] | [Apache-2.0][1] | -| [Apache Maven Site Plugin][34] | [Apache License, Version 2.0][1] | +| [Apache Maven Site Plugin][34] | [Apache-2.0][1] | | [SonarQube Scanner for Maven][35] | [GNU LGPL 3][36] | | [Apache Maven Toolchains Plugin][37] | [Apache-2.0][1] | | [Maven Plugin Plugin][78] | [Apache-2.0][1] | @@ -284,7 +284,7 @@ | [Apache Maven Clean Plugin][31] | [Apache-2.0][1] | | [Apache Maven Install Plugin][32] | [Apache-2.0][1] | | [Apache Maven Resources Plugin][33] | [Apache-2.0][1] | -| [Apache Maven Site Plugin][34] | [Apache License, Version 2.0][1] | +| [Apache Maven Site Plugin][34] | [Apache-2.0][1] | | [SonarQube Scanner for Maven][35] | [GNU LGPL 3][36] | | [Apache Maven Toolchains Plugin][37] | [Apache-2.0][1] | | [Apache Maven Compiler Plugin][38] | [Apache-2.0][1] | @@ -325,7 +325,7 @@ | [Apache Maven Clean Plugin][31] | [Apache-2.0][1] | | [Apache Maven Install Plugin][32] | [Apache-2.0][1] | | [Apache Maven Resources Plugin][33] | [Apache-2.0][1] | -| [Apache Maven Site Plugin][34] | [Apache License, Version 2.0][1] | +| [Apache Maven Site Plugin][34] | [Apache-2.0][1] | | [SonarQube Scanner for Maven][35] | [GNU LGPL 3][36] | | [Apache Maven Toolchains Plugin][37] | [Apache-2.0][1] | | [Apache Maven Compiler Plugin][38] | [Apache-2.0][1] | @@ -375,7 +375,7 @@ [32]: https://maven.apache.org/plugins/maven-install-plugin/ [33]: https://maven.apache.org/plugins/maven-resources-plugin/ [34]: https://maven.apache.org/plugins/maven-site-plugin/ -[35]: http://sonarsource.github.io/sonar-scanner-maven/ +[35]: http://docs.sonarqube.org/display/PLUG/Plugin+Library/sonar-maven-plugin [36]: http://www.gnu.org/licenses/lgpl.txt [37]: https://maven.apache.org/plugins/maven-toolchains-plugin/ [38]: https://maven.apache.org/plugins/maven-compiler-plugin/ diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md index 4bdd59bf..66c7c704 100644 --- a/doc/changes/changelog.md +++ b/doc/changes/changelog.md @@ -1,5 +1,6 @@ # Changes +* [4.4.1](changes_4.4.1.md) * [4.4.0](changes_4.4.0.md) * [4.3.3](changes_4.3.3.md) * [4.3.2](changes_4.3.2.md) diff --git a/doc/changes/changes_4.4.1.md b/doc/changes/changes_4.4.1.md new file mode 100644 index 00000000..e30d3af3 --- /dev/null +++ b/doc/changes/changes_4.4.1.md @@ -0,0 +1,138 @@ +# Project Keeper 4.4.1, released 2024-??-?? + +Code name: Fix java customization + +## Summary + +This release allows customization of the java version in `actions/setup-java` steps. + +## Features + +* #602: Fixed customization of java version in `actions/setup-java` + +## Dependency Updates + +### Project Keeper Root Project + +#### Plugin Dependency Updates + +* Updated `org.itsallcode:openfasttrace-maven-plugin:2.2.0` to `2.3.0` + +### Project Keeper Shared Model Classes + +#### Test Dependency Updates + +* Updated `nl.jqno.equalsverifier:equalsverifier:3.17.1` to `3.17.3` + +#### Plugin Dependency Updates + +* Updated `org.apache.maven.plugins:maven-deploy-plugin:3.1.2` to `3.1.3` +* Updated `org.apache.maven.plugins:maven-javadoc-plugin:3.10.1` to `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` +* Updated `org.sonarsource.scanner.maven:sonar-maven-plugin:4.0.0.4121` to `5.0.0.4389` + +### Project Keeper Core + +#### Compile Dependency Updates + +* Updated `com.exasol:project-keeper-shared-model-classes:4.4.0` to `4.4.1` + +#### Runtime Dependency Updates + +* Updated `com.exasol:project-keeper-java-project-crawler:4.4.0` to `4.4.1` + +#### 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 `nl.jqno.equalsverifier:equalsverifier:3.17.1` to `3.17.3` + +#### Plugin Dependency Updates + +* Updated `org.apache.maven.plugins:maven-deploy-plugin:3.1.2` to `3.1.3` +* Updated `org.apache.maven.plugins:maven-failsafe-plugin:3.5.1` to `3.5.2` +* Updated `org.apache.maven.plugins:maven-javadoc-plugin:3.10.1` to `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` +* Updated `org.sonarsource.scanner.maven:sonar-maven-plugin:4.0.0.4121` to `5.0.0.4389` + +### Project Keeper Command Line Interface + +#### Compile Dependency Updates + +* Updated `com.exasol:project-keeper-core:4.4.0` to `4.4.1` + +#### 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` + +#### Plugin Dependency Updates + +* Updated `org.apache.maven.plugins:maven-deploy-plugin:3.1.2` to `3.1.3` +* Updated `org.apache.maven.plugins:maven-failsafe-plugin:3.5.1` to `3.5.2` +* Updated `org.apache.maven.plugins:maven-javadoc-plugin:3.10.1` to `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` +* Updated `org.sonarsource.scanner.maven:sonar-maven-plugin:4.0.0.4121` to `5.0.0.4389` + +### Project Keeper Maven Plugin + +#### Compile Dependency Updates + +* Updated `com.exasol:project-keeper-core:4.4.0` to `4.4.1` + +#### Test Dependency Updates + +* Updated `com.exasol:maven-project-version-getter:1.2.0` to `1.2.1` + +#### Plugin Dependency Updates + +* Updated `org.apache.maven.plugins:maven-dependency-plugin:3.8.0` to `3.8.1` +* Updated `org.apache.maven.plugins:maven-deploy-plugin:3.1.2` to `3.1.3` +* Updated `org.apache.maven.plugins:maven-failsafe-plugin:3.5.1` to `3.5.2` +* Updated `org.apache.maven.plugins:maven-javadoc-plugin:3.10.1` to `3.11.1` +* Updated `org.apache.maven.plugins:maven-plugin-plugin:3.15.0` to `3.15.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` +* Updated `org.sonarsource.scanner.maven:sonar-maven-plugin:4.0.0.4121` to `5.0.0.4389` + +### Project Keeper Java Project Crawler + +#### Compile Dependency Updates + +* Updated `com.exasol:project-keeper-shared-model-classes:4.4.0` to `4.4.1` + +#### Test Dependency Updates + +* Updated `com.exasol:maven-project-version-getter:1.2.0` to `1.2.1` + +#### Plugin Dependency Updates + +* Updated `org.apache.maven.plugins:maven-dependency-plugin:3.8.0` to `3.8.1` +* Updated `org.apache.maven.plugins:maven-deploy-plugin:3.1.2` to `3.1.3` +* Updated `org.apache.maven.plugins:maven-failsafe-plugin:3.5.1` to `3.5.2` +* Updated `org.apache.maven.plugins:maven-javadoc-plugin:3.10.1` to `3.11.1` +* Updated `org.apache.maven.plugins:maven-plugin-plugin:3.15.0` to `3.15.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` +* Updated `org.sonarsource.scanner.maven:sonar-maven-plugin:4.0.0.4121` to `5.0.0.4389` + +### Project Keeper Shared Test Setup + +#### Compile Dependency Updates + +* Updated `com.exasol:project-keeper-shared-model-classes:4.4.0` to `4.4.1` + +#### Plugin Dependency Updates + +* 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` +* Updated `org.sonarsource.scanner.maven:sonar-maven-plugin:4.0.0.4121` to `5.0.0.4389` diff --git a/maven-project-crawler/pk_generated_parent.pom b/maven-project-crawler/pk_generated_parent.pom index eed13553..1bc4320c 100644 --- a/maven-project-crawler/pk_generated_parent.pom +++ b/maven-project-crawler/pk_generated_parent.pom @@ -78,12 +78,12 @@ org.apache.maven.plugins maven-site-plugin - 3.9.1 + 3.21.0 org.sonarsource.scanner.maven sonar-maven-plugin - 4.0.0.4121 + 5.0.0.4389 org.apache.maven.plugins @@ -183,7 +183,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.1 + 3.5.2 @@ -194,7 +194,7 @@ org.codehaus.mojo versions-maven-plugin - 2.17.1 + 2.18.0 display-updates @@ -248,7 +248,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.2 + 3.1.3 true @@ -292,7 +292,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.10.1 + 3.11.1 attach-javadocs @@ -335,7 +335,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.8.0 + 3.8.1 copy-jacoco @@ -355,7 +355,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.5.1 + 3.5.2 -Djava.util.logging.config.file=src/test/resources/logging.properties ${argLine} diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index b77148ca..6e49b2f8 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -28,7 +28,7 @@ - 4.4.0 + 4.4.1 17 3.9.9 @@ -90,7 +90,7 @@ org.apache.maven.plugin-tools maven-plugin-annotations - 3.15.0 + 3.15.1 provided @@ -156,7 +156,7 @@ com.exasol maven-project-version-getter - 1.2.0 + 1.2.1 test @@ -241,7 +241,7 @@ nl.jqno.equalsverifier equalsverifier - 3.17.1 + 3.17.3 test @@ -253,7 +253,7 @@ org.itsallcode hamcrest-auto-matcher - 0.8.1 + 0.8.2 test @@ -264,7 +264,7 @@ org.apache.maven.plugins maven-plugin-plugin - 3.15.0 + 3.15.1 diff --git a/pom.xml b/pom.xml index 7936bdf5..5c076108 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ org.itsallcode openfasttrace-maven-plugin - 2.2.0 + 2.3.0 trace-requirements diff --git a/project-keeper-cli/pk_generated_parent.pom b/project-keeper-cli/pk_generated_parent.pom index 9e019bc1..203604e7 100644 --- a/project-keeper-cli/pk_generated_parent.pom +++ b/project-keeper-cli/pk_generated_parent.pom @@ -70,12 +70,12 @@ org.apache.maven.plugins maven-site-plugin - 3.9.1 + 3.21.0 org.sonarsource.scanner.maven sonar-maven-plugin - 4.0.0.4121 + 5.0.0.4389 org.apache.maven.plugins @@ -175,7 +175,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.1 + 3.5.2 @@ -186,7 +186,7 @@ org.codehaus.mojo versions-maven-plugin - 2.17.1 + 2.18.0 display-updates @@ -290,7 +290,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.2 + 3.1.3 true @@ -334,7 +334,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.10.1 + 3.11.1 attach-javadocs @@ -377,7 +377,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.5.1 + 3.5.2 -Djava.util.logging.config.file=src/test/resources/logging.properties ${argLine} diff --git a/project-keeper-maven-plugin/pk_generated_parent.pom b/project-keeper-maven-plugin/pk_generated_parent.pom index 4ceb61cc..7dbe1911 100644 --- a/project-keeper-maven-plugin/pk_generated_parent.pom +++ b/project-keeper-maven-plugin/pk_generated_parent.pom @@ -78,12 +78,12 @@ org.apache.maven.plugins maven-site-plugin - 3.9.1 + 3.21.0 org.sonarsource.scanner.maven sonar-maven-plugin - 4.0.0.4121 + 5.0.0.4389 org.apache.maven.plugins @@ -183,7 +183,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.1 + 3.5.2 @@ -194,7 +194,7 @@ org.codehaus.mojo versions-maven-plugin - 2.17.1 + 2.18.0 display-updates @@ -248,7 +248,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.2 + 3.1.3 true @@ -292,7 +292,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.10.1 + 3.11.1 attach-javadocs @@ -335,7 +335,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.8.0 + 3.8.1 copy-jacoco @@ -355,7 +355,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.5.1 + 3.5.2 -Djava.util.logging.config.file=src/test/resources/logging.properties ${argLine} diff --git a/project-keeper/pk_generated_parent.pom b/project-keeper/pk_generated_parent.pom index 12ae6b98..f1a5a4e2 100644 --- a/project-keeper/pk_generated_parent.pom +++ b/project-keeper/pk_generated_parent.pom @@ -70,12 +70,12 @@ org.apache.maven.plugins maven-site-plugin - 3.9.1 + 3.21.0 org.sonarsource.scanner.maven sonar-maven-plugin - 4.0.0.4121 + 5.0.0.4389 org.apache.maven.plugins @@ -175,7 +175,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.1 + 3.5.2 @@ -186,7 +186,7 @@ org.codehaus.mojo versions-maven-plugin - 2.17.1 + 2.18.0 display-updates @@ -240,7 +240,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.2 + 3.1.3 true @@ -284,7 +284,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.10.1 + 3.11.1 attach-javadocs @@ -327,7 +327,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.5.1 + 3.5.2 -Djava.util.logging.config.file=src/test/resources/logging.properties ${argLine} diff --git a/project-keeper/src/main/java/com/exasol/projectkeeper/validators/files/CiBuildWorkflowGenerator.java b/project-keeper/src/main/java/com/exasol/projectkeeper/validators/files/CiBuildWorkflowGenerator.java index 4d3a6057..7859ba8d 100644 --- a/project-keeper/src/main/java/com/exasol/projectkeeper/validators/files/CiBuildWorkflowGenerator.java +++ b/project-keeper/src/main/java/com/exasol/projectkeeper/validators/files/CiBuildWorkflowGenerator.java @@ -47,11 +47,12 @@ private FileTemplate createTemplate(final FileTemplateFromResource template, fin final List customizations = workflow.map(CustomWorkflow::getSteps) .orElseGet(Collections::emptyList); final String environmentName = workflow.map(CustomWorkflow::getEnvironment).orElse(null); - return new ContentCustomizingTemplate(template, new GitHubWorkflowCustomizer( + return new ContentCustomizingTemplate(template, new GitHubWorkflowCustomizer( // + javaVersionCustomizer(), // [impl->dsn~customize-build-process.ci-build~0] new GitHubWorkflowStepCustomizer(customizations, buildJobId), // [impl->dsn~customize-build-process.ci-build.environment~1] - new GitHubWorkflowEnvironmentCustomizer(buildJobId, environmentName), javaVersionCustomizer())); + new GitHubWorkflowEnvironmentCustomizer(buildJobId, environmentName))); } private GitHubWorkflowJavaVersionCustomizer javaVersionCustomizer() { @@ -113,8 +114,8 @@ private FileTemplate createCustomizedWorkflow(final String workflowName, final S REQUIRE_EXACT); templateCustomizer.accept(template); final List customizations = findCustomizations(workflowName); - return new ContentCustomizingTemplate(template, new GitHubWorkflowCustomizer( - new GitHubWorkflowStepCustomizer(customizations, jobName), javaVersionCustomizer())); + return new ContentCustomizingTemplate(template, new GitHubWorkflowCustomizer(javaVersionCustomizer(), + new GitHubWorkflowStepCustomizer(customizations, jobName))); } enum CiTemplateType { diff --git a/project-keeper/src/main/resources/maven_templates/maven-dependency-plugin.xml b/project-keeper/src/main/resources/maven_templates/maven-dependency-plugin.xml index 754247a3..c9b8b3a8 100644 --- a/project-keeper/src/main/resources/maven_templates/maven-dependency-plugin.xml +++ b/project-keeper/src/main/resources/maven_templates/maven-dependency-plugin.xml @@ -1,7 +1,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.8.0 + 3.8.1 copy-jacoco diff --git a/project-keeper/src/main/resources/maven_templates/maven-deploy-plugin.xml b/project-keeper/src/main/resources/maven_templates/maven-deploy-plugin.xml index 7a1d2958..d8d24e9e 100644 --- a/project-keeper/src/main/resources/maven_templates/maven-deploy-plugin.xml +++ b/project-keeper/src/main/resources/maven_templates/maven-deploy-plugin.xml @@ -1,7 +1,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.2 + 3.1.3 true diff --git a/project-keeper/src/main/resources/maven_templates/maven-failsafe-plugin.xml b/project-keeper/src/main/resources/maven_templates/maven-failsafe-plugin.xml index 13fe3e57..48364110 100644 --- a/project-keeper/src/main/resources/maven_templates/maven-failsafe-plugin.xml +++ b/project-keeper/src/main/resources/maven_templates/maven-failsafe-plugin.xml @@ -1,7 +1,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.5.1 + 3.5.2 -Djava.util.logging.config.file=src/test/resources/logging.properties ${argLine} diff --git a/project-keeper/src/main/resources/maven_templates/maven-javadoc-plugin.xml b/project-keeper/src/main/resources/maven_templates/maven-javadoc-plugin.xml index 3f0a3f87..1e47a659 100644 --- a/project-keeper/src/main/resources/maven_templates/maven-javadoc-plugin.xml +++ b/project-keeper/src/main/resources/maven_templates/maven-javadoc-plugin.xml @@ -1,7 +1,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.10.1 + 3.11.1 attach-javadocs diff --git a/project-keeper/src/main/resources/maven_templates/maven-site-plugin.xml b/project-keeper/src/main/resources/maven_templates/maven-site-plugin.xml index c159e2ff..058522fd 100644 --- a/project-keeper/src/main/resources/maven_templates/maven-site-plugin.xml +++ b/project-keeper/src/main/resources/maven_templates/maven-site-plugin.xml @@ -1,5 +1,5 @@ org.apache.maven.plugins maven-site-plugin - 3.9.1 + 3.21.0 diff --git a/project-keeper/src/main/resources/maven_templates/maven-surefire-plugin.xml b/project-keeper/src/main/resources/maven_templates/maven-surefire-plugin.xml index 98203caf..b512fb9f 100644 --- a/project-keeper/src/main/resources/maven_templates/maven-surefire-plugin.xml +++ b/project-keeper/src/main/resources/maven_templates/maven-surefire-plugin.xml @@ -1,7 +1,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.1 + 3.5.2 diff --git a/project-keeper/src/main/resources/maven_templates/sonar-maven-plugin.xml b/project-keeper/src/main/resources/maven_templates/sonar-maven-plugin.xml index eb9541e5..b2ad130f 100644 --- a/project-keeper/src/main/resources/maven_templates/sonar-maven-plugin.xml +++ b/project-keeper/src/main/resources/maven_templates/sonar-maven-plugin.xml @@ -1,5 +1,5 @@ org.sonarsource.scanner.maven sonar-maven-plugin - 4.0.0.4121 + 5.0.0.4389 diff --git a/project-keeper/src/main/resources/maven_templates/versions-maven-plugin.xml b/project-keeper/src/main/resources/maven_templates/versions-maven-plugin.xml index e8400202..336c42c7 100644 --- a/project-keeper/src/main/resources/maven_templates/versions-maven-plugin.xml +++ b/project-keeper/src/main/resources/maven_templates/versions-maven-plugin.xml @@ -1,7 +1,7 @@ org.codehaus.mojo versions-maven-plugin - 2.17.1 + 2.18.0 display-updates diff --git a/project-keeper/src/test/java/com/exasol/projectkeeper/validators/files/CiBuildWorkflowGeneratorTest.java b/project-keeper/src/test/java/com/exasol/projectkeeper/validators/files/CiBuildWorkflowGeneratorTest.java index 7f091c45..ba0fe72d 100644 --- a/project-keeper/src/test/java/com/exasol/projectkeeper/validators/files/CiBuildWorkflowGeneratorTest.java +++ b/project-keeper/src/test/java/com/exasol/projectkeeper/validators/files/CiBuildWorkflowGeneratorTest.java @@ -253,6 +253,44 @@ void dependencyUpdateBuildAllStepsHaveId() { job.getSteps().forEach(step -> assertThat(step.getId(), notNullValue())); } + @Test + void customizeSetupJavaStepInCiBuild() { + final Map setupJavaStep = setupJavaStep("custom-version"); + final Job job = ciBuildContent( + BuildOptions.builder() + .workflows(List.of(CustomWorkflow.builder().workflowName("ci-build.yml") + .addStep(StepCustomization.builder().type(Type.REPLACE).stepId("setup-java") + .step(WorkflowStep.createStep(setupJavaStep)).build()) + .build()))) + .getJob("build"); + final String customJavaVersion = (String) job.getStep("setup-java").getWith().get("java-version"); + assertThat(customJavaVersion, equalTo("custom-version")); + } + + @Test + void customizeSetupJavaStepInReleaseBuild() { + final Map setupJavaStep = setupJavaStep("custom-version"); + final Job job = releaseBuildContent(BuildOptions.builder() + .workflows(List.of(CustomWorkflow.builder().workflowName("release.yml") + .addStep(StepCustomization.builder().type(Type.REPLACE).stepId("setup-jdks") + .step(WorkflowStep.createStep(setupJavaStep)).build()) + .build())) + .build()).getJob("release"); + final String customJavaVersion = (String) job.getStep("setup-java").getWith().get("java-version"); + assertThat(customJavaVersion, equalTo("custom-version")); + } + + private Map setupJavaStep(final String javaVersion) { + final Map setupJavaStep = new HashMap<>(); + setupJavaStep.put("id", "setup-java"); + setupJavaStep.put("name", "New Java"); + setupJavaStep.put("uses", "actions/setup-java@v4"); + final Map withElement = new HashMap<>(); + withElement.put("java-version", javaVersion); + setupJavaStep.put("with", withElement); + return setupJavaStep; + } + private GitHubWorkflow ciBuildContent(final BuildOptions.Builder optionsBuilder) { return ciBuildContent(optionsBuilder.build()); } diff --git a/shared-model-classes/pk_generated_parent.pom b/shared-model-classes/pk_generated_parent.pom index 95b4d559..58cdd807 100644 --- a/shared-model-classes/pk_generated_parent.pom +++ b/shared-model-classes/pk_generated_parent.pom @@ -70,12 +70,12 @@ org.apache.maven.plugins maven-site-plugin - 3.9.1 + 3.21.0 org.sonarsource.scanner.maven sonar-maven-plugin - 4.0.0.4121 + 5.0.0.4389 org.apache.maven.plugins @@ -175,7 +175,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.1 + 3.5.2 @@ -186,7 +186,7 @@ org.codehaus.mojo versions-maven-plugin - 2.17.1 + 2.18.0 display-updates @@ -240,7 +240,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.2 + 3.1.3 true @@ -284,7 +284,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.10.1 + 3.11.1 attach-javadocs diff --git a/shared-test-setup/pk_generated_parent.pom b/shared-test-setup/pk_generated_parent.pom index 7f23d6cc..2f78d5b0 100644 --- a/shared-test-setup/pk_generated_parent.pom +++ b/shared-test-setup/pk_generated_parent.pom @@ -59,12 +59,12 @@ org.apache.maven.plugins maven-site-plugin - 3.9.1 + 3.21.0 org.sonarsource.scanner.maven sonar-maven-plugin - 4.0.0.4121 + 5.0.0.4389 org.apache.maven.plugins @@ -164,7 +164,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.1 + 3.5.2 @@ -175,7 +175,7 @@ org.codehaus.mojo versions-maven-plugin - 2.17.1 + 2.18.0 display-updates