This is an automated email from the ASF dual-hosted git repository.
mbuenger 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 6f0294df45 Maven Parent 46 (#11637)
6f0294df45 is described below
commit 6f0294df4534ab162ddcd547ec4f60fcf5769d0c
Author: Tamas Cservenak <[email protected]>
AuthorDate: Sat Jan 10 06:49:06 2026 +0100
Maven Parent 46 (#11637)
* Maven Parent 46
w/ some slight updates
* Do run RAT on submodules
* Fixes
I missed parent rat in plugins
Just alter config, nothing more
---
apache-maven/pom.xml | 2 +-
.../apache/maven/api/annotations/package-info.java | 20 ++++++-
.../java/org/apache/maven/api/di/package-info.java | 19 +++++++
.../apache/maven/api/toolchain/package-info.java | 20 ++++++-
.../apache/maven/impl/resolver/package-info.java | 20 ++++++-
impl/maven-support/pom.xml | 18 +++++++
impl/maven-xml/BENCHMARKS.md | 19 +++++++
.../apache/maven/internal/xml/package-info.java | 20 ++++++-
pom.xml | 63 ++++++++++------------
9 files changed, 161 insertions(+), 40 deletions(-)
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index eaeb5c76ae..4e77d0ded8 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -221,7 +221,7 @@ under the License.
<plugin>
<groupId>eu.maveniverse.maven.plugins</groupId>
<artifactId>bom-builder3</artifactId>
- <version>1.3.1</version>
+ <version>1.3.2</version>
<executions>
<execution>
<id>skinny-bom</id>
diff --git
a/api/maven-api-annotations/src/main/java/org/apache/maven/api/annotations/package-info.java
b/api/maven-api-annotations/src/main/java/org/apache/maven/api/annotations/package-info.java
index 220a5c3814..e836d502e3 100644
---
a/api/maven-api-annotations/src/main/java/org/apache/maven/api/annotations/package-info.java
+++
b/api/maven-api-annotations/src/main/java/org/apache/maven/api/annotations/package-info.java
@@ -1,4 +1,22 @@
-// CHECKSTYLE_OFF: RegexpHeader
+/*
+ * 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.
+ */
+
/**
* This package contains non-functional annotations which are
* used to tag various elements and help users understanding
diff --git
a/api/maven-api-di/src/main/java/org/apache/maven/api/di/package-info.java
b/api/maven-api-di/src/main/java/org/apache/maven/api/di/package-info.java
index 8cda82936a..8ba28e9488 100644
--- a/api/maven-api-di/src/main/java/org/apache/maven/api/di/package-info.java
+++ b/api/maven-api-di/src/main/java/org/apache/maven/api/di/package-info.java
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
/**
* A dependency injection framework for Maven that provides JSR-330 style
annotations
* for managing object lifecycle and dependencies within Maven's build process.
diff --git
a/api/maven-api-toolchain/src/main/java/org/apache/maven/api/toolchain/package-info.java
b/api/maven-api-toolchain/src/main/java/org/apache/maven/api/toolchain/package-info.java
index 04661e78d2..1609356422 100644
---
a/api/maven-api-toolchain/src/main/java/org/apache/maven/api/toolchain/package-info.java
+++
b/api/maven-api-toolchain/src/main/java/org/apache/maven/api/toolchain/package-info.java
@@ -1,4 +1,22 @@
-// CHECKSTYLE_OFF: RegexpHeader
+/*
+ * 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.
+ */
+
/**
* Provides classes for managing Maven toolchains, which allow projects to use
specific
* tool installations (like JDKs, compilers, or other build tools) across
different
diff --git
a/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/package-info.java
b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/package-info.java
index 79148736b1..2581712683 100644
---
a/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/package-info.java
+++
b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/package-info.java
@@ -1,4 +1,22 @@
-// CHECKSTYLE_OFF: RegexpHeader
+/*
+ * 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.
+ */
+
/**
* <a href="https://maven.apache.org/resolver/";>Maven Resolver</a> extensions
for utilizing the Maven POM and Maven
* repository metadata.
diff --git a/impl/maven-support/pom.xml b/impl/maven-support/pom.xml
index 234d50eb9f..65f1eb0a7c 100644
--- a/impl/maven-support/pom.xml
+++ b/impl/maven-support/pom.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
<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>
diff --git a/impl/maven-xml/BENCHMARKS.md b/impl/maven-xml/BENCHMARKS.md
index a55794264e..0bc7508676 100644
--- a/impl/maven-xml/BENCHMARKS.md
+++ b/impl/maven-xml/BENCHMARKS.md
@@ -1,3 +1,22 @@
+<!--
+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.
+-->
+
# XmlPlexusConfiguration Performance Benchmarks
This directory contains JMH (Java Microbenchmark Harness) benchmarks to
measure the performance improvements in the optimized `XmlPlexusConfiguration`
implementation.
diff --git
a/impl/maven-xml/src/main/java/org/apache/maven/internal/xml/package-info.java
b/impl/maven-xml/src/main/java/org/apache/maven/internal/xml/package-info.java
index 2115ad9342..dcbd7807bf 100644
---
a/impl/maven-xml/src/main/java/org/apache/maven/internal/xml/package-info.java
+++
b/impl/maven-xml/src/main/java/org/apache/maven/internal/xml/package-info.java
@@ -1,4 +1,22 @@
-// CHECKSTYLE_OFF: RegexpHeader
+/*
+ * 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.
+ */
+
/**
* Contains implementation of the {@link org.apache.maven.api.xml.XmlNode}
interface and related classes.
*/
diff --git a/pom.xml b/pom.xml
index 4a8b2cda36..27cfc7e313 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>45</version>
+ <version>46</version>
<relativePath />
</parent>
@@ -157,11 +157,11 @@ under the License.
<jmhVersion>1.37</jmhVersion>
<junitVersion>6.0.2</junitVersion>
<jxpathVersion>1.4.0</jxpathVersion>
- <logbackClassicVersion>1.5.23</logbackClassicVersion>
+ <logbackClassicVersion>1.5.24</logbackClassicVersion>
<mockitoVersion>5.21.0</mockitoVersion>
<plexusInteractivityVersion>1.5.1</plexusInteractivityVersion>
<plexusInterpolationVersion>1.29</plexusInterpolationVersion>
- <plexusTestingVersion>2.0.2</plexusTestingVersion>
+ <plexusTestingVersion>2.1.0</plexusTestingVersion>
<plexusXmlVersion>4.1.0</plexusXmlVersion>
<resolverVersion>2.0.14</resolverVersion>
<securityDispatcherVersion>4.1.0</securityDispatcherVersion>
@@ -720,7 +720,7 @@ under the License.
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
- <version>0.25.1</version>
+ <version>0.25.2</version>
<executions>
<execution>
<goals>
@@ -804,6 +804,30 @@ under the License.
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>Jenkinsfile</exclude>
+ <exclude>**/.gitattributes</exclude>
+ <exclude>src/main/resources/META-INF/services/**</exclude>
+ <exclude>src/test/resources*/**</exclude>
+ <exclude>src/test/projects/**</exclude>
+ <exclude>src/test/remote-repo/**</exclude>
+ <exclude>its/**</exclude>
+ <exclude>**/*.odg</exclude>
+ <exclude>**/*.svg</exclude>
+ <exclude>.asf.yaml</exclude>
+ <exclude>.mvn/**</exclude>
+ <exclude>.jbang/**</exclude>
+ <!--
+ ! Excluded the license files itself cause they do not have a
license of themselves.
+ -->
+ <exclude>src/main/appended-resources/licenses/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -826,37 +850,6 @@ under the License.
</asfExtOptions>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <executions>
- <execution>
- <id>rat-check</id>
- <inherited>false</inherited>
- <configuration>
- <excludes>
- <exclude>Jenkinsfile</exclude>
- <exclude>**/.gitattributes</exclude>
- <exclude>src/test/resources*/**</exclude>
- <exclude>src/test/projects/**</exclude>
- <exclude>src/test/remote-repo/**</exclude>
- <exclude>its/**</exclude>
- <exclude>**/*.odg</exclude>
- <exclude>**/*.svg</exclude>
- <exclude>.asf.yaml</exclude>
- <exclude>.mvn/**</exclude>
- <exclude>.jbang/**</exclude>
- <!--
- ! Excluded the license files itself cause they do not have
have a license of themselves.
- -->
-
<exclude>src/main/appended-resources/licenses/EPL-1.0.txt</exclude>
-
<exclude>src/main/appended-resources/licenses/unrecognized-aopalliance-1.0.txt</exclude>
-
<exclude>src/main/appended-resources/licenses/unrecognized-javax.annotation-api-1.3.2.txt</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
