This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new cac84d41fe Bump org.apache.maven:maven-parent from 44 to 45 (#2490)
cac84d41fe is described below
commit cac84d41feb67ba1f416df5ee31d9f211855cfd6
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Fri Jul 4 09:35:00 2025 +0200
Bump org.apache.maven:maven-parent from 44 to 45 (#2490)
* Bump org.apache.maven:maven-parent from 44 to 45
Bumps
[org.apache.maven:maven-parent](https://github.com/apache/maven-parent) from 44
to 45.
- [Release notes](https://github.com/apache/maven-parent/releases)
- [Commits](https://github.com/apache/maven-parent/commits)
---
updated-dependencies:
- dependency-name: org.apache.maven:maven-parent
dependency-version: '45'
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <[email protected]>
* fix format
* cleanups duplicate configs with new parent
---------
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Slawomir Jaranowski <[email protected]>
---
.../UserPropertiesArtifactRelocationSource.java | 3 ++-
.../UserPropertiesArtifactRelocationSource.java | 3 ++-
pom.xml | 25 +---------------------
3 files changed, 5 insertions(+), 26 deletions(-)
diff --git
a/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/relocation/UserPropertiesArtifactRelocationSource.java
b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/relocation/UserPropertiesArtifactRelocationSource.java
index 37a7c3b416..b469672b79 100644
---
a/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/relocation/UserPropertiesArtifactRelocationSource.java
+++
b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/relocation/UserPropertiesArtifactRelocationSource.java
@@ -203,7 +203,8 @@ private static Artifact parseArtifact(String coords) {
case 4 -> new DefaultArtifact(parts[0], parts[1], "*", parts[2],
parts[3]);
case 5 -> new DefaultArtifact(parts[0], parts[1], parts[2],
parts[3], parts[4]);
default -> throw new IllegalArgumentException("Bad artifact
coordinates " + coords
- + ", expected format is
<groupId>:<artifactId>[:<extension>[:<classifier>]]:<version>");};
+ + ", expected format is
<groupId>:<artifactId>[:<extension>[:<classifier>]]:<version>");
+ };
return s;
}
}
diff --git
a/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/relocation/UserPropertiesArtifactRelocationSource.java
b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/relocation/UserPropertiesArtifactRelocationSource.java
index 966ceaa06f..a6425adc65 100644
---
a/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/relocation/UserPropertiesArtifactRelocationSource.java
+++
b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/relocation/UserPropertiesArtifactRelocationSource.java
@@ -199,7 +199,8 @@ private static Artifact parseArtifact(String coords) {
case 4 -> new DefaultArtifact(parts[0], parts[1], "*", parts[2],
parts[3]);
case 5 -> new DefaultArtifact(parts[0], parts[1], parts[2],
parts[3], parts[4]);
default -> throw new IllegalArgumentException("Bad artifact
coordinates " + coords
- + ", expected format is
<groupId>:<artifactId>[:<extension>[:<classifier>]]:<version>");};
+ + ", expected format is
<groupId>:<artifactId>[:<extension>[:<classifier>]]:<version>");
+ };
return s;
}
}
diff --git a/pom.xml b/pom.xml
index 1aa6312d70..746e6737d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>44</version>
+ <version>45</version>
<relativePath />
</parent>
@@ -703,34 +703,11 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.5.2</version>
<configuration>
<forkNode
implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"
/>
<argLine>-Xmx256m @{jacocoArgLine}</argLine>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- <configuration>
- <licenseText>Licensed to the Apache Software Foundation (ASF)
under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.</licenseText>
- </configuration>
- </plugin>
<!-- enforce backwards compatibility -->
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
