#578: Fix automatic dependency update

exasol · Jun 3, 2024 · 912ef3d · 912ef3d
1 parent 7bc1ed1
commit 912ef3d
Show file tree

Hide file tree

Showing 16 changed files with 142 additions and 56 deletions.
diff --git a/.github/workflows/dependencies_update.yml b/.github/workflows/dependencies_update.yml
diff --git a/dependencies.md b/dependencies.md
diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md
diff --git a/doc/changes/changes_4.3.2.md b/doc/changes/changes_4.3.2.md
@@ -0,0 +1,98 @@
+# Project Keeper 4.3.2, released 2024-06-03
+
+Code name: Fix automatic dependency update
+
+## Summary
+
+This release fixes creation of the automatic dependency update Pull Request. Due to restrictions of GitHub workflows it is not possible to run `project-keeper fix` which potentially updates other workflows. Please follow the instructions in the generated Pull Request and run PK fix manually. See #578 for details.
+
+## Bugfixes
+
+* #578: Fixed automatic dependency update
+
+## Dependency Updates
+
+### Project Keeper Shared Model Classes
+
+#### Plugin Dependency Updates
+
+* Updated `org.apache.maven.plugins:maven-enforcer-plugin:3.4.1` to `3.5.0`
+* Updated `org.apache.maven.plugins:maven-javadoc-plugin:3.6.3` to `3.7.0`
+* Updated `org.sonarsource.scanner.maven:sonar-maven-plugin:3.11.0.3922` to `4.0.0.4121`
+* Updated `org.sonatype.plugins:nexus-staging-maven-plugin:1.6.13` to `1.7.0`
+
+### Project Keeper Core
+
+#### Compile Dependency Updates
+
+* Updated `com.exasol:project-keeper-shared-model-classes:4.3.1` to `4.3.2`
+
+#### Runtime Dependency Updates
+
+* Updated `com.exasol:project-keeper-java-project-crawler:4.3.1` to `4.3.2`
+
+#### Test Dependency Updates
+
+* Updated `com.exasol:project-keeper-shared-test-setup:4.3.1` to `4.3.2`
+
+#### Plugin Dependency Updates
+
+* Updated `org.apache.maven.plugins:maven-enforcer-plugin:3.4.1` to `3.5.0`
+* Updated `org.apache.maven.plugins:maven-javadoc-plugin:3.6.3` to `3.7.0`
+* Updated `org.sonarsource.scanner.maven:sonar-maven-plugin:3.11.0.3922` to `4.0.0.4121`
+* Updated `org.sonatype.plugins:nexus-staging-maven-plugin:1.6.13` to `1.7.0`
+
+### Project Keeper Command Line Interface
+
+#### Compile Dependency Updates
+
+* Updated `com.exasol:project-keeper-core:4.3.1` to `4.3.2`
+* Updated `org.apache.maven:maven-model:3.9.6` to `3.9.7`
+
+#### Test Dependency Updates
+
+* Updated `com.exasol:project-keeper-shared-test-setup:4.3.1` to `4.3.2`
+
+#### Plugin Dependency Updates
+
+* Updated `org.apache.maven.plugins:maven-enforcer-plugin:3.4.1` to `3.5.0`
+* Updated `org.apache.maven.plugins:maven-javadoc-plugin:3.6.3` to `3.7.0`
+* Updated `org.sonarsource.scanner.maven:sonar-maven-plugin:3.11.0.3922` to `4.0.0.4121`
+* Updated `org.sonatype.plugins:nexus-staging-maven-plugin:1.6.13` to `1.7.0`
+
+### Project Keeper Maven Plugin
+
+#### Compile Dependency Updates
+
+* Updated `com.exasol:project-keeper-core:4.3.1` to `4.3.2`
+
+#### Plugin Dependency Updates
+
+* Updated `org.apache.maven.plugins:maven-enforcer-plugin:3.4.1` to `3.5.0`
+* Updated `org.apache.maven.plugins:maven-javadoc-plugin:3.6.3` to `3.7.0`
+* Updated `org.sonarsource.scanner.maven:sonar-maven-plugin:3.11.0.3922` to `4.0.0.4121`
+* Updated `org.sonatype.plugins:nexus-staging-maven-plugin:1.6.13` to `1.7.0`
+
+### Project Keeper Java Project Crawler
+
+#### Compile Dependency Updates
+
+* Updated `com.exasol:project-keeper-shared-model-classes:4.3.1` to `4.3.2`
+
+#### Plugin Dependency Updates
+
+* Updated `org.apache.maven.plugins:maven-enforcer-plugin:3.4.1` to `3.5.0`
+* Updated `org.apache.maven.plugins:maven-javadoc-plugin:3.6.3` to `3.7.0`
+* Updated `org.sonarsource.scanner.maven:sonar-maven-plugin:3.11.0.3922` to `4.0.0.4121`
+* Updated `org.sonatype.plugins:nexus-staging-maven-plugin:1.6.13` to `1.7.0`
+
+### Project Keeper Shared Test Setup
+
+#### Compile Dependency Updates
+
+* Updated `com.exasol:project-keeper-shared-model-classes:4.3.1` to `4.3.2`
+
+#### Plugin Dependency Updates
+
+* Updated `org.apache.maven.plugins:maven-enforcer-plugin:3.4.1` to `3.5.0`
+* Updated `org.sonarsource.scanner.maven:sonar-maven-plugin:3.11.0.3922` to `4.0.0.4121`
diff --git a/maven-project-crawler/pk_generated_parent.pom b/maven-project-crawler/pk_generated_parent.pom
diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml
@@ -28,10 +28,10 @@
         </repository>
     </distributionManagement>
     <properties>
-        <revision>4.3.1</revision>
+        <revision>4.3.2</revision>
         <!-- Integration test ProjectKeeperMojoIT starts a Maven build which requires Java 17. -->
         <java.version>17</java.version>
-        <maven.version>3.9.6</maven.version>
+        <maven.version>3.9.7</maven.version>
         <minimum.maven.version>3.6.3</minimum.maven.version>
         <junit.version>5.10.2</junit.version>
         <xmlunit.version>2.10.0</xmlunit.version>
@@ -89,7 +89,7 @@
             <dependency>
                 <groupId>org.apache.maven.plugin-tools</groupId>
                 <artifactId>maven-plugin-annotations</artifactId>
-                <version>3.13.0</version>
+                <version>3.13.1</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>

diff --git a/project-keeper-cli/pk_generated_parent.pom b/project-keeper-cli/pk_generated_parent.pom
diff --git a/project-keeper-maven-plugin/pk_generated_parent.pom b/project-keeper-maven-plugin/pk_generated_parent.pom
diff --git a/project-keeper/pk_generated_parent.pom b/project-keeper/pk_generated_parent.pom
diff --git a/project-keeper/src/main/resources/maven_templates/maven-enforcer-plugin.xml b/project-keeper/src/main/resources/maven_templates/maven-enforcer-plugin.xml
@@ -1,7 +1,7 @@
 <plugin>
     <groupId>org.apache.maven.plugins</groupId>
     <artifactId>maven-enforcer-plugin</artifactId>
-    <version>3.4.1</version>
+    <version>3.5.0</version>
     <executions>
         <execution>
             <id>enforce-maven</id>

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
@@ -1,7 +1,7 @@
 <plugin>
     <groupId>org.apache.maven.plugins</groupId>
     <artifactId>maven-javadoc-plugin</artifactId>
-    <version>3.6.3</version>
+    <version>3.7.0</version>
     <executions>
         <execution>
             <id>attach-javadocs</id>

diff --git a/project-keeper/src/main/resources/maven_templates/nexus-staging-maven-plugin.xml b/project-keeper/src/main/resources/maven_templates/nexus-staging-maven-plugin.xml
@@ -1,7 +1,7 @@
 <plugin>
     <groupId>org.sonatype.plugins</groupId>
     <artifactId>nexus-staging-maven-plugin</artifactId>
-    <version>1.6.13</version>
+    <version>1.7.0</version>
     <configuration>
         <autoReleaseAfterClose>true</autoReleaseAfterClose>
         <serverId>ossrh</serverId>
@@ -18,4 +18,4 @@
             </goals>
         </execution>
     </executions>
-</plugin>
+</plugin>
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
@@ -1,5 +1,5 @@
 <plugin>
     <groupId>org.sonarsource.scanner.maven</groupId>
     <artifactId>sonar-maven-plugin</artifactId>
-    <version>3.11.0.3922</version>
+    <version>4.0.0.4121</version>
 </plugin>
diff --git a/project-keeper/src/main/resources/templates/.github/workflows/dependencies_update.yml b/project-keeper/src/main/resources/templates/.github/workflows/dependencies_update.yml
@@ -62,19 +62,6 @@ jobs:
         env:
           CREATED_ISSUES: ${{ inputs.vulnerability_issues }}
 
-      - name: Project Keeper Fix
-        id: project-keeper-fix
-        run: |
-          mvn --batch-mode com.exasol:project-keeper-maven-plugin:fix --projects .
-
-      - name: Project Keeper Fix for updated Project Keeper version
-        id: project-keeper-fix-2
-        # Calling PK fix a second time is necessary because the first invocation potentially updated PK itself.
-        # So we need to run PK fix again with the latest PK version.
-        # [impl->dsn~dependency-updater.workflow.start-pk-fix~1]
-        run: |
-          mvn --batch-mode com.exasol:project-keeper-maven-plugin:fix --projects .
-
       - name: Generate Pull Request comment
         id: pr-comment
         # [impl->dsn~dependency-updater.workflow.create-pull-request~1]
@@ -89,7 +76,11 @@ jobs:
             echo 'It updates dependencies.' >> "$GITHUB_OUTPUT"
           fi
           echo >> "$GITHUB_OUTPUT"
-          echo '# ⚠️ This PR does not trigger CI workflows by default ⚠️' >> "$GITHUB_OUTPUT"
+          echo '# ⚠️ Notes ⚠️' >> "$GITHUB_OUTPUT"
+          echo '## Run PK fix manually' >> "$GITHUB_OUTPUT"
+          echo 'Due to restrictions workflow `dependencies_update.yml` can't update other workflows, see https://github.com/exasol/project-keeper/issues/578 for details.' >> "$GITHUB_OUTPUT"
+          echo 'Please checkout this PR locally and run `mvn com.exasol:project-keeper-maven-plugin:fix --projects .`' >> "$GITHUB_OUTPUT"
+          echo '## This PR does not trigger CI workflows' >> "$GITHUB_OUTPUT"
           echo 'Please click the **Close pull request** button and then **Reopen pull request** to trigger running checks.' >> "$GITHUB_OUTPUT"
           echo 'See https://github.com/exasol/project-keeper/issues/534 for details.' >> "$GITHUB_OUTPUT"
           echo 'EOF' >> "$GITHUB_OUTPUT"