You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2024/03/14 18:38:40 UTC
(maven) branch MNG-8075 created (now e6f4fa74c2)
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a change to branch MNG-8075
in repository https://gitbox.apache.org/repos/asf/maven.git
at e6f4fa74c2 [MNG-8075] Allow project.baseUri in repository.url
This branch includes the following new commits:
new e6f4fa74c2 [MNG-8075] Allow project.baseUri in repository.url
The 1 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.
(maven) 01/01: [MNG-8075] Allow project.baseUri in repository.url
Posted by sj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch MNG-8075
in repository https://gitbox.apache.org/repos/asf/maven.git
commit e6f4fa74c2f9627874cfeb0767d164a7810aba3e
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Thu Mar 14 19:38:25 2024 +0100
[MNG-8075] Allow project.baseUri in repository.url
---
.../org/apache/maven/model/validation/DefaultModelValidator.java | 6 ++++--
.../validation/raw-model/repository-with-basedir-expression.xml | 8 ++++++++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
index 23c602d035..d2553c455d 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
@@ -982,10 +982,12 @@ public class DefaultModelValidator implements ModelValidator {
repository.getUrl(),
null,
repository)) {
- // only allow ${basedir} and ${project.basedir}
+ // only allow ${basedir}, ${project.basedir} or ${project.baseUri}
Matcher m = EXPRESSION_NAME_PATTERN.matcher(repository.getUrl());
while (m.find()) {
- if (!("basedir".equals(m.group(1)) || "project.basedir".equals(m.group(1)))) {
+ if (!("basedir".equals(m.group(1))
+ || "project.basedir".equals(m.group(1))
+ || "project.baseUri".equals(m.group(1)))) {
validateStringNoExpression(
prefix + prefix2 + "[" + repository.getId() + "].url",
problems,
diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/repository-with-basedir-expression.xml b/maven-model-builder/src/test/resources/poms/validation/raw-model/repository-with-basedir-expression.xml
index 3e64091da8..3057ce9231 100644
--- a/maven-model-builder/src/test/resources/poms/validation/raw-model/repository-with-basedir-expression.xml
+++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/repository-with-basedir-expression.xml
@@ -37,6 +37,14 @@ under the License.
<id>repo</id>
<url>file://${basedir}/target/remote-repo</url>
</repository>
+ <repository>
+ <id>repo-project-basedir</id>
+ <url>file://${project.basedir}/sdk/maven/repo</url>
+ </repository>
+ <repository>
+ <id>repo-project-baseUri</id>
+ <url>${project.baseUri}/sdk/maven/repo</url>
+ </repository>
</repositories>
</project>
\ No newline at end of file