You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2026/06/27 23:23:08 UTC
(maven) branch master updated (60dc6342b4 -> 684a3fd122)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
from 60dc6342b4 Fix mvn.cmd jvm.config read failing silently on Windows CI
new 7ffc6d57df [#12303] Fix CI-friendly ${revision} not interpolated for non-build POM reads
new d821aeff3d Fix IT compilation: adapt to master's NIO2 Path API
new 7b8cc3239e Fix Spotless formatting violation in DefaultModelBuilder
new 081740dfc4 Fix Spotless formatting: merge split string literal
new 684a3fd122 Fix Spotless formatting: place exception arg on same line as message string (#12380)
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../maven/impl/model/DefaultModelBuilder.java | 24 ++++++++++++
...2303CIFriendlyRevisionRemoteResourcesTest.java} | 25 +++++--------
.../child-b/pom.xml | 21 +++++++++++
.../child/pom.xml | 13 +++++++
.../pom.xml | 41 +++++++++++++++++++++
.../resource-bundle/1.0/resource-bundle-1.0.jar | Bin 0 -> 833 bytes
.../resource-bundle/1.0/resource-bundle-1.0.pom | 9 +++++
.../resource-bundle/pom.xml | 9 +++++
.../resources/META-INF/maven/remote-resources.xml | 6 +++
.../resource-bundle/src/main/resources/NOTICE.txt | 1 +
.../settings-template.xml} | 22 +++++------
11 files changed, 144 insertions(+), 27 deletions(-)
copy its/core-it-suite/src/test/java/org/apache/maven/it/{MavenITmng3814BogusProjectCycleTest.java => MavenITgh12303CIFriendlyRevisionRemoteResourcesTest.java} (61%)
create mode 100644 its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/child-b/pom.xml
create mode 100644 its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/child/pom.xml
create mode 100644 its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/pom.xml
create mode 100644 its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/repo/org/apache/maven/its/gh12303/resource-bundle/1.0/resource-bundle-1.0.jar
create mode 100644 its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/repo/org/apache/maven/its/gh12303/resource-bundle/1.0/resource-bundle-1.0.pom
create mode 100644 its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/resource-bundle/pom.xml
create mode 100644 its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/resource-bundle/src/main/resources/META-INF/maven/remote-resources.xml
create mode 100644 its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/resource-bundle/src/main/resources/NOTICE.txt
copy its/core-it-suite/src/test/resources/{gh-11055-di-service-injection/src/it/settings.xml => gh-12303-ci-friendly-revision-remote-resources/settings-template.xml} (57%)
(maven) 03/05: Fix Spotless formatting violation in DefaultModelBuilder
Posted by gn...@apache.org.
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
commit 7b8cc3239e597573581e1140e6e61f8d32d20cc7
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jun 26 06:12:52 2026 +0000
Fix Spotless formatting violation in DefaultModelBuilder
Co-Authored-By: Claude Opus 4.6 <no...@anthropic.com>
---
.../src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java
index f212b38dd3..bd0b5a5d5e 100644
--- a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java
+++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java
@@ -1762,8 +1762,7 @@ Model doReadFileModel(Set<Path> activeModelReads) throws ModelBuilderException {
.build();
} catch (ModelBuilderException e) {
logger.debug(
- "Could not read root model properties for CI-friendly"
- + " version interpolation",
+ "Could not read root model properties for CI-friendly" + " version interpolation",
e);
}
}
(maven) 04/05: Fix Spotless formatting: merge split string literal
Posted by gn...@apache.org.
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
commit 081740dfc4b27f92c942daf310f21e87bb75061d
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jun 26 06:16:56 2026 +0000
Fix Spotless formatting: merge split string literal
Co-Authored-By: Claude Opus 4.6 <no...@anthropic.com>
---
.../src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java
index bd0b5a5d5e..99ffa0add5 100644
--- a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java
+++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java
@@ -1762,7 +1762,7 @@ Model doReadFileModel(Set<Path> activeModelReads) throws ModelBuilderException {
.build();
} catch (ModelBuilderException e) {
logger.debug(
- "Could not read root model properties for CI-friendly" + " version interpolation",
+ "Could not read root model properties for CI-friendly version interpolation",
e);
}
}
(maven) 01/05: [#12303] Fix CI-friendly ${revision} not interpolated for non-build POM reads
Posted by gn...@apache.org.
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
commit 7ffc6d57dfb3d0a6af8532bb83d7eaae277ef31b
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Jun 23 15:04:33 2026 +0200
[#12303] Fix CI-friendly ${revision} not interpolated for non-build POM reads
Port of #12322 to master.
In doReadFileModel(), the CI-friendly version interpolation was only
performed inside the isBuildRequest() block. When plugins like
maven-remote-resources-plugin resolve the project's own POM through
the non-build code path, ${revision} was left uninterpolated, causing
"Invalid Version Range Request" errors.
Add an else branch that performs CI-friendly version interpolation
for non-build requests as well.
Co-Authored-By: Claude Opus 4.6 <no...@anthropic.com>
---
.../maven/impl/model/DefaultModelBuilder.java | 24 ++++++++++
...12303CIFriendlyRevisionRemoteResourcesTest.java | 51 +++++++++++++++++++++
.../child-b/pom.xml | 21 +++++++++
.../child/pom.xml | 13 ++++++
.../pom.xml | 41 +++++++++++++++++
.../resource-bundle/1.0/resource-bundle-1.0.jar | Bin 0 -> 833 bytes
.../resource-bundle/1.0/resource-bundle-1.0.pom | 9 ++++
.../resource-bundle/pom.xml | 9 ++++
.../resources/META-INF/maven/remote-resources.xml | 6 +++
.../resource-bundle/src/main/resources/NOTICE.txt | 1 +
.../settings-template.xml | 33 +++++++++++++
11 files changed, 208 insertions(+)
diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java
index 28a917c948..f89f9d4f92 100644
--- a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java
+++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java
@@ -1741,6 +1741,30 @@ Model doReadFileModel(Set<Path> activeModelReads) throws ModelBuilderException {
model = model.withProperties(newProps);
}
model = model.withProfiles(merge(model.getProfiles(), userProps));
+ } else {
+ if (modelSource.getPath() != null) {
+ model = model.withPomFile(modelSource.getPath());
+ }
+ if (rootDirectory != null) {
+ try {
+ Map<String, String> properties =
+ getEnhancedProperties(model, rootDirectory, activeModelReads);
+ model = model.with()
+ .version(replaceCiFriendlyVersion(properties, model.getVersion()))
+ .parent(
+ model.getParent() != null
+ ? model.getParent()
+ .withVersion(replaceCiFriendlyVersion(
+ properties,
+ model.getParent()
+ .getVersion()))
+ : null)
+ .build();
+ } catch (ModelBuilderException e) {
+ logger.debug("Could not read root model properties for CI-friendly"
+ + " version interpolation: " + e.getMessage());
+ }
+ }
}
for (var transformer : transformers) {
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh12303CIFriendlyRevisionRemoteResourcesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh12303CIFriendlyRevisionRemoteResourcesTest.java
new file mode 100644
index 0000000000..b1ab171af6
--- /dev/null
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh12303CIFriendlyRevisionRemoteResourcesTest.java
@@ -0,0 +1,51 @@
+/*
+ * 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.
+ */
+package org.apache.maven.it;
+
+import java.io.File;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * Verify that CI-friendly {@code ${revision}} versions are properly interpolated
+ * when the {@code maven-remote-resources-plugin} resolves the project's own artifact
+ * through the legacy resolver path.
+ *
+ * @see <a href="https://github.com/apache/maven/issues/12303">gh-12303</a>
+ */
+class MavenITgh12303CIFriendlyRevisionRemoteResourcesTest extends AbstractMavenIntegrationTestCase {
+
+ MavenITgh12303CIFriendlyRevisionRemoteResourcesTest() {
+ super("[4.0.0-rc-3,)");
+ }
+
+ @Test
+ void testCiFriendlyRevisionWithRemoteResources() throws Exception {
+ File testDir = extractResources("/gh-12303-ci-friendly-revision-remote-resources");
+
+ Verifier verifier = newVerifier(testDir.getAbsolutePath());
+ verifier.deleteArtifacts("org.apache.maven.its.gh12303");
+ verifier.filterFile("settings-template.xml", "settings.xml");
+ verifier.addCliArgument("--settings");
+ verifier.addCliArgument("settings.xml");
+ verifier.addCliArgument("process-resources");
+ verifier.execute();
+ verifier.verifyErrorFreeLog();
+ }
+}
diff --git a/its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/child-b/pom.xml b/its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/child-b/pom.xml
new file mode 100644
index 0000000000..bcf2f609a2
--- /dev/null
+++ b/its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/child-b/pom.xml
@@ -0,0 +1,21 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.its.gh12303</groupId>
+ <artifactId>parent</artifactId>
+ <version>${revision}</version>
+ </parent>
+
+ <artifactId>child-b</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.gh12303</groupId>
+ <artifactId>child</artifactId>
+ <version>${revision}</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/child/pom.xml b/its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/child/pom.xml
new file mode 100644
index 0000000000..892c520eb6
--- /dev/null
+++ b/its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/child/pom.xml
@@ -0,0 +1,13 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.its.gh12303</groupId>
+ <artifactId>parent</artifactId>
+ <version>${revision}</version>
+ </parent>
+
+ <artifactId>child</artifactId>
+</project>
diff --git a/its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/pom.xml b/its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/pom.xml
new file mode 100644
index 0000000000..8ac1c1b6fa
--- /dev/null
+++ b/its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/pom.xml
@@ -0,0 +1,41 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.gh12303</groupId>
+ <artifactId>parent</artifactId>
+ <version>${revision}</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>child</module>
+ <module>child-b</module>
+ </modules>
+
+ <properties>
+ <revision>1.0.0-SNAPSHOT</revision>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.7.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+ <resourceBundle>org.apache.maven.its.gh12303:resource-bundle:1.0</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/repo/org/apache/maven/its/gh12303/resource-bundle/1.0/resource-bundle-1.0.jar b/its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/repo/org/apache/maven/its/gh12303/resource-bundle/1.0/resource-bundle-1.0.jar
new file mode 100644
index 0000000000..6f1b5c0898
Binary files /dev/null and b/its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/repo/org/apache/maven/its/gh12303/resource-bundle/1.0/resource-bundle-1.0.jar differ
diff --git a/its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/repo/org/apache/maven/its/gh12303/resource-bundle/1.0/resource-bundle-1.0.pom b/its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/repo/org/apache/maven/its/gh12303/resource-bundle/1.0/resource-bundle-1.0.pom
new file mode 100644
index 0000000000..c3199b2598
--- /dev/null
+++ b/its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/repo/org/apache/maven/its/gh12303/resource-bundle/1.0/resource-bundle-1.0.pom
@@ -0,0 +1,9 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.gh12303</groupId>
+ <artifactId>resource-bundle</artifactId>
+ <version>1.0</version>
+</project>
diff --git a/its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/resource-bundle/pom.xml b/its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/resource-bundle/pom.xml
new file mode 100644
index 0000000000..c3199b2598
--- /dev/null
+++ b/its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/resource-bundle/pom.xml
@@ -0,0 +1,9 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.gh12303</groupId>
+ <artifactId>resource-bundle</artifactId>
+ <version>1.0</version>
+</project>
diff --git a/its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/resource-bundle/src/main/resources/META-INF/maven/remote-resources.xml b/its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/resource-bundle/src/main/resources/META-INF/maven/remote-resources.xml
new file mode 100644
index 0000000000..45c118bebd
--- /dev/null
+++ b/its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/resource-bundle/src/main/resources/META-INF/maven/remote-resources.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<remoteResourcesBundle>
+ <remoteResources>
+ <remoteResource>NOTICE.txt</remoteResource>
+ </remoteResources>
+</remoteResourcesBundle>
diff --git a/its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/resource-bundle/src/main/resources/NOTICE.txt b/its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/resource-bundle/src/main/resources/NOTICE.txt
new file mode 100644
index 0000000000..a2e56e1ac4
--- /dev/null
+++ b/its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/resource-bundle/src/main/resources/NOTICE.txt
@@ -0,0 +1 @@
+Test notice file for IT gh-12303.
diff --git a/its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/settings-template.xml b/its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/settings-template.xml
new file mode 100644
index 0000000000..7e5ab0f680
--- /dev/null
+++ b/its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/settings-template.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings>
+ <profiles>
+ <profile>
+ <id>it-repo</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>local-repo</id>
+ <url>@baseurl@/repo</url>
+ <releases>
+ <enabled>true</enabled>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>central-plugins</id>
+ <url>https://repo.maven.apache.org/maven2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
+</settings>
(maven) 02/05: Fix IT compilation: adapt to master's NIO2 Path API
Posted by gn...@apache.org.
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
commit d821aeff3d44b81c74771d0bdb61ba516d84e3b8
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Jun 23 15:27:07 2026 +0200
Fix IT compilation: adapt to master's NIO2 Path API
The IT was copied from maven-4.0.x but master's
AbstractMavenIntegrationTestCase was migrated to NIO2 (no version
range constructor, extractResources returns Path).
Co-Authored-By: Claude Opus 4.6 <no...@anthropic.com>
---
.../java/org/apache/maven/impl/model/DefaultModelBuilder.java | 6 ++++--
.../MavenITgh12303CIFriendlyRevisionRemoteResourcesTest.java | 10 +++-------
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java
index f89f9d4f92..f212b38dd3 100644
--- a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java
+++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java
@@ -1761,8 +1761,10 @@ Model doReadFileModel(Set<Path> activeModelReads) throws ModelBuilderException {
: null)
.build();
} catch (ModelBuilderException e) {
- logger.debug("Could not read root model properties for CI-friendly"
- + " version interpolation: " + e.getMessage());
+ logger.debug(
+ "Could not read root model properties for CI-friendly"
+ + " version interpolation",
+ e);
}
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh12303CIFriendlyRevisionRemoteResourcesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh12303CIFriendlyRevisionRemoteResourcesTest.java
index b1ab171af6..3d02d183dd 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh12303CIFriendlyRevisionRemoteResourcesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh12303CIFriendlyRevisionRemoteResourcesTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.maven.it;
-import java.io.File;
+import java.nio.file.Path;
import org.junit.jupiter.api.Test;
@@ -31,15 +31,11 @@
*/
class MavenITgh12303CIFriendlyRevisionRemoteResourcesTest extends AbstractMavenIntegrationTestCase {
- MavenITgh12303CIFriendlyRevisionRemoteResourcesTest() {
- super("[4.0.0-rc-3,)");
- }
-
@Test
void testCiFriendlyRevisionWithRemoteResources() throws Exception {
- File testDir = extractResources("/gh-12303-ci-friendly-revision-remote-resources");
+ Path testDir = extractResources("/gh-12303-ci-friendly-revision-remote-resources");
- Verifier verifier = newVerifier(testDir.getAbsolutePath());
+ Verifier verifier = newVerifier(testDir.toAbsolutePath());
verifier.deleteArtifacts("org.apache.maven.its.gh12303");
verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
(maven) 05/05: Fix Spotless formatting: place exception arg on same line as message string (#12380)
Posted by gn...@apache.org.
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
commit 684a3fd122aeeb921c4bb9dbbcb6a344c201ed55
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jun 26 16:55:11 2026 +0200
Fix Spotless formatting: place exception arg on same line as message string (#12380)
Co-authored-by: Claude Opus 4.6 <no...@anthropic.com>
---
.../src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java
index 99ffa0add5..205b9eda93 100644
--- a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java
+++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java
@@ -1762,8 +1762,7 @@ Model doReadFileModel(Set<Path> activeModelReads) throws ModelBuilderException {
.build();
} catch (ModelBuilderException e) {
logger.debug(
- "Could not read root model properties for CI-friendly version interpolation",
- e);
+ "Could not read root model properties for CI-friendly version interpolation", e);
}
}
}