You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2025/06/19 17:04:33 UTC

(maven-resolver) branch master updated: Bump org.apache.maven:maven-parent from 44 to 45 (#1499)

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git


The following commit(s) were added to refs/heads/master by this push:
     new f6c11bb1 Bump org.apache.maven:maven-parent from 44 to 45 (#1499)
f6c11bb1 is described below

commit f6c11bb181548eac7044fb13e7c29b5cb6b72a2f
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Thu Jun 19 19:04:29 2025 +0200

    Bump org.apache.maven:maven-parent from 44 to 45 (#1499)
    
    Bumps [org.apache.maven:maven-parent](https://github.com/apache/maven-parent) from 44 to 45.
    <details>
    <summary>Release notes</summary>
    <p><em>Sourced from <a href="https://github.com/apache/maven-parent/releases">org.apache.maven:maven-parent's releases</a>.</em></p>
    <blockquote>
    <h2>45</h2>
    <!-- raw HTML omitted -->
    <h2>🚀 New features and improvements</h2>
    <ul>
    <li>Use a standard tag template for releases (<a href="https://redirect.github.com/apache/maven-parent/pull/468">#468</a>) <a href="https://github.com/slawekjaranowski"><code>@​slawekjaranowski</code></a></li>
    </ul>
    <h2>🐛 Bug Fixes</h2>
    <ul>
    <li>Use spotless / palantirJavaFormat - 2.56.0 for all JDKs (<a href="https://redirect.github.com/apache/maven-parent/pull/477">#477</a>) <a href="https://github.com/slawekjaranowski"><code>@​slawekjaranowski</code></a></li>
    </ul>
    <h2>👻 Maintenance</h2>
    <ul>
    <li>Use spotless on JDK 11 - 24 only (<a href="https://redirect.github.com/apache/maven-parent/pull/479">#479</a>) <a href="https://github.com/slawekjaranowski"><code>@​slawekjaranowski</code></a></li>
    <li>Add sparsick as committer (<a href="https://redirect.github.com/apache/maven-parent/pull/478">#478</a>) <a href="https://github.com/sparsick"><code>@​sparsick</code></a></li>
    <li>move Igor to emeritus as requested (<a href="https://redirect.github.com/apache/maven-parent/pull/465">#465</a>) <a href="https://github.com/hboutemy"><code>@​hboutemy</code></a></li>
    </ul>
    <h2>🔧 Build</h2>
    <ul>
    <li>Allow manually executing release-drafter (<a href="https://redirect.github.com/apache/maven-parent/pull/480">#480</a>) <a href="https://github.com/slawekjaranowski"><code>@​slawekjaranowski</code></a></li>
    </ul>
    <h2>📦 Dependency updates</h2>
    <ul>
    <li>Bump parent to 35 (<a href="https://redirect.github.com/apache/maven-parent/pull/475">#475</a>) <a href="https://github.com/slawekjaranowski"><code>@​slawekjaranowski</code></a></li>
    <li>Bump org.junit:junit-bom from 5.13.0 to 5.13.1 (<a href="https://redirect.github.com/apache/maven-parent/pull/474">#474</a>) @<a href="https://github.com/apps/dependabot">dependabot[bot]</a></li>
    <li>Bump org.codehaus.modello:modello-maven-plugin from 2.4.0 to 2.5.1 (<a href="https://redirect.github.com/apache/maven-parent/pull/473">#473</a>) @<a href="https://github.com/apps/dependabot">dependabot[bot]</a></li>
    <li>Bump com.diffplug.spotless:spotless-maven-plugin from 2.44.3 to 2.44.5 (<a href="https://redirect.github.com/apache/maven-parent/pull/471">#471</a>) @<a href="https://github.com/apps/dependabot">dependabot[bot]</a></li>
    <li>Bump org.junit:junit-bom from 5.12.2 to 5.13.0 (<a href="https://redirect.github.com/apache/maven-parent/pull/472">#472</a>) @<a href="https://github.com/apps/dependabot">dependabot[bot]</a></li>
    <li>Bump version.sisu-maven-plugin from 0.9.0.M3 to 0.9.0.M4 (<a href="https://redirect.github.com/apache/maven-parent/pull/469">#469</a>) @<a href="https://github.com/apps/dependabot">dependabot[bot]</a></li>
    <li>Bump org.junit:junit-bom from 5.12.1 to 5.12.2 (<a href="https://redirect.github.com/apache/maven-parent/pull/466">#466</a>) @<a href="https://github.com/apps/dependabot">dependabot[bot]</a></li>
    <li>Bump org.codehaus.mojo:extra-enforcer-rules from 1.9.0 to 1.10.0 (<a href="https://redirect.github.com/apache/maven-parent/pull/462">#462</a>) @<a href="https://github.com/apps/dependabot">dependabot[bot]</a></li>
    </ul>
    </blockquote>
    </details>
    <details>
    <summary>Commits</summary>
    <ul>
    <li>See full diff in <a href="https://github.com/apache/maven-parent/commits">compare view</a></li>
    </ul>
    </details>
    <br />
    
    [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven:maven-parent&package-manager=maven&previous-version=44&new-version=45)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
    
    Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.
    
    [//]: # (dependabot-automerge-start)
    [//]: # (dependabot-automerge-end)
    
    ---
    
    <details>
    <summary>Dependabot commands and options</summary>
    <br />
    
    You can trigger Dependabot actions by commenting on this PR:
    - `@dependabot rebase` will rebase this PR
    - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
    - `@dependabot merge` will merge this PR after your CI passes on it
    - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
    - `@dependabot cancel merge` will cancel a previously requested merge and block automerging
    - `@dependabot reopen` will reopen this PR if it is closed
    - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
    - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency
    - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
    - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
    - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
    
    </details>
---
 .../src/main/java/org/eclipse/aether/tools/CollectConfiguration.java | 3 ++-
 pom.xml                                                              | 5 +----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/maven-resolver-tools/src/main/java/org/eclipse/aether/tools/CollectConfiguration.java b/maven-resolver-tools/src/main/java/org/eclipse/aether/tools/CollectConfiguration.java
index 5b3dfa14..74654af4 100644
--- a/maven-resolver-tools/src/main/java/org/eclipse/aether/tools/CollectConfiguration.java
+++ b/maven-resolver-tools/src/main/java/org/eclipse/aether/tools/CollectConfiguration.java
@@ -200,7 +200,8 @@ public class CollectConfiguration implements Callable<Integer> {
                                                 source = switch (source) {
                                                     case "model" -> "Model properties";
                                                     case "user_properties" -> "User properties";
-                                                    default -> source;};
+                                                    default -> source;
+                                                };
                                                 String type = (values.get("type") != null
                                                         ? (String) values.get("type")
                                                         : "java.lang.String");
diff --git a/pom.xml b/pom.xml
index 1acfee7a..b4a621d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
-    <version>44</version>
+    <version>45</version>
     <relativePath />
   </parent>
 
@@ -109,9 +109,6 @@
     <testcontainersVersion>1.21.2</testcontainersVersion>
     <bouncycastleVersion>1.81</bouncycastleVersion>
 
-    <!-- Remove when parent updates -->
-    <versions.junit5>5.12.1</versions.junit5>
-
     <!-- Used by Jetty Transport (client) and Test HTTP (server) -->
     <jettyVersion>10.0.25</jettyVersion>
     <!-- used by supplier and demo only -->