This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch maven-3.10.x
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/maven-3.10.x by this push:
new e02b2cae6a [3.10.x] Bump to parent POM 48 (#12025)
e02b2cae6a is described below
commit e02b2cae6a3805d5ac8b95ac0aa6243e27fa16e1
Author: Tamas Cservenak <[email protected]>
AuthorDate: Mon May 11 19:42:46 2026 +0200
[3.10.x] Bump to parent POM 48 (#12025)
---
.../org/apache/maven/model/building/DefaultModelBuilder.java | 12 +++++++-----
pom.xml | 2 +-
src/site/site.xml | 8 +-------
3 files changed, 9 insertions(+), 13 deletions(-)
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 9d3a23f5a6..59161899ee 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -485,8 +485,9 @@ void performFor(String value, String locationKey,
Consumer<String> mutator) {
nt.performFor(pa.getName(), "name", pa::setName);
nt.performFor(pa.getValue(), "value", pa::setValue);
});
- a.map(Activation::getJdk).ifPresent(ja -> new
Interpolation(activation, interpolator::interpolate)
- .performFor(ja, "jdk", activation::setJdk));
+ a.map(Activation::getJdk)
+ .ifPresent(ja -> new Interpolation(activation,
interpolator::interpolate)
+ .performFor(ja, "jdk", activation::setJdk));
}
return interpolatedActivations;
}
@@ -794,9 +795,10 @@ private Model interpolateModel(Model model,
ModelBuildingRequest request, ModelP
// restore profiles with any activation to their value before full
interpolation
List<Profile> interpolatedProfiles = model.getProfiles();
- IntStream.range(0, interpolatedProfiles.size()).forEach(i ->
interpolatedProfiles
- .get(i)
- .setActivation(originalProfiles.get(i).getActivation()));
+ IntStream.range(0, interpolatedProfiles.size())
+ .forEach(i -> interpolatedProfiles
+ .get(i)
+
.setActivation(originalProfiles.get(i).getActivation()));
return interpolatedModel;
}
diff --git a/pom.xml b/pom.xml
index eebf6c401c..9318beb382 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>47</version>
+ <version>48</version>
<relativePath />
</parent>
diff --git a/src/site/site.xml b/src/site/site.xml
index a0b727d54b..551c6e3833 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -23,12 +23,6 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
https://maven.apache.org/xsd/site-2.0.0.xsd";
name="Apache Maven">
- <bannerLeft href="https://maven.apache.org/";>
- <image src="https://maven.apache.org/images/apache-maven-project.png";
alt="Apache Maven" />
- </bannerLeft>
-
- <edit>${project.scm.url}</edit>
-
<body>
<breadcrumbs>
<item name="Ref" href="../" />
@@ -66,4 +60,4 @@ under the License.
<menu inherit="bottom" ref="modules"/>
<menu inherit="bottom" ref="reports"/>
</body>
-</site>
\ No newline at end of file
+</site>
![https://maven.apache.org/images/apache-maven-project.png"](https://maven.apache.org/images/apache-maven-project.png"){kind=link}