You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2026/01/27 08:04:25 UTC
(maven) branch maven-3.9.x updated (ad172677bd -> d898a51c17)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git
from ad172677bd Bump actions/checkout from 6.0.1 to 6.0.2 (#11666)
new 71656a56b8 Bump org.apache.maven:maven-parent from 45 to 47
new d898a51c17 Fix build
The 2 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:
apache-maven/pom.xml | 4 +-
.../main/java/org/apache/maven/embedder/App.java | 19 +++++++++
.../java/org/apache/maven/embedder/AppTest.java | 19 +++++++++
.../apache/maven/model/io/xpp3/package-info.java | 20 +++++++++-
.../org/apache/maven/model/merge/package-info.java | 20 +++++++++-
.../java/org/apache/maven/model/package-info.java | 20 +++++++++-
.../maven/repository/internal/package-info.java | 20 +++++++++-
pom.xml | 45 ++++++++--------------
8 files changed, 133 insertions(+), 34 deletions(-)
(maven) 02/02: Fix build
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git
commit d898a51c17e6370289371467b3af3f0ac7624dbf
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Sun Jan 25 14:50:08 2026 +0100
Fix build
- fix configuration for pache-rat-plugin
- add missing license headers
---
apache-maven/pom.xml | 4 +-
.../main/java/org/apache/maven/embedder/App.java | 19 ++++++++++
.../java/org/apache/maven/embedder/AppTest.java | 19 ++++++++++
.../apache/maven/model/io/xpp3/package-info.java | 20 +++++++++-
.../org/apache/maven/model/merge/package-info.java | 20 +++++++++-
.../java/org/apache/maven/model/package-info.java | 20 +++++++++-
.../maven/repository/internal/package-info.java | 20 +++++++++-
pom.xml | 43 ++++++++--------------
8 files changed, 132 insertions(+), 33 deletions(-)
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 9ee7897aff..c576385aff 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -124,8 +124,10 @@ under the License.
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
- <excludes combine.children="append">
+ <excludes>
<exclude>src/bin/m2.conf</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>
diff --git a/maven-embedder/src/examples/simple-project/src/main/java/org/apache/maven/embedder/App.java b/maven-embedder/src/examples/simple-project/src/main/java/org/apache/maven/embedder/App.java
index fa855723a1..7059c51f17 100644
--- a/maven-embedder/src/examples/simple-project/src/main/java/org/apache/maven/embedder/App.java
+++ b/maven-embedder/src/examples/simple-project/src/main/java/org/apache/maven/embedder/App.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.
+ */
+
package org.apache.maven.embedder;
diff --git a/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java b/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java
index 0e08403353..32eb805832 100644
--- a/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java
+++ b/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.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.
+ */
+
package org.apache.maven.embedder;
diff --git a/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java b/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java
index 68205b86df..0f49f89b65 100644
--- a/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java
+++ b/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java
@@ -1,4 +1,22 @@
-// CHECKSTYLE_OFF: RegexpHeader|LineLength
+/*
+ * 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.
+ */
+
/**
* XML reader and writer classes for Maven POM, generated from <code>maven.mdo</code> model.
* These classes use
diff --git a/maven-model/src/main/java/org/apache/maven/model/merge/package-info.java b/maven-model/src/main/java/org/apache/maven/model/merge/package-info.java
index d7d9113899..3e80d94317 100644
--- a/maven-model/src/main/java/org/apache/maven/model/merge/package-info.java
+++ b/maven-model/src/main/java/org/apache/maven/model/merge/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.
+ */
+
/**
* POM merger.
*/
diff --git a/maven-model/src/main/java/org/apache/maven/model/package-info.java b/maven-model/src/main/java/org/apache/maven/model/package-info.java
index 1cae134410..03df27cabe 100644
--- a/maven-model/src/main/java/org/apache/maven/model/package-info.java
+++ b/maven-model/src/main/java/org/apache/maven/model/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.
+ */
+
/**
* Maven POM (Project Object Model) classes, generated from <code>maven.mdo</code> model.
* The root class is {@link org.apache.maven.model.Model}.
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/package-info.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/package-info.java
index e745bf7326..f9741b2141 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/package-info.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/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/pom.xml b/pom.xml
index 44c2c17ae2..e1c6590af3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,7 +130,6 @@ under the License.
<classWorldsVersion>2.9.0</classWorldsVersion>
<commonsCliVersion>1.11.0</commonsCliVersion>
<commonsIoVersion>2.21.0</commonsIoVersion>
- <junitVersion>4.13.2</junitVersion>
<hamcrestVersion>3.0</hamcrestVersion>
<mockitoVersion>4.11.0</mockitoVersion>
<plexusVersion>2.2.0</plexusVersion>
@@ -597,6 +596,21 @@ under the License.
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/.gitattributes</exclude>
+ <exclude>src/test/resources*/**</exclude>
+ <exclude>src/test/projects/**</exclude>
+ <exclude>src/test/remote-repo/**</exclude>
+ <exclude>**/*.odg</exclude>
+ <exclude>**/*.svg</exclude>
+ <exclude>.asf.yaml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -635,33 +649,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>**/.gitattributes</exclude>
- <exclude>src/test/resources*/**</exclude>
- <exclude>src/test/projects/**</exclude>
- <exclude>src/test/remote-repo/**</exclude>
- <exclude>**/*.odg</exclude>
- <exclude>**/*.svg</exclude>
- <exclude>.asf.yaml</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>
(maven) 01/02: Bump org.apache.maven:maven-parent from 45 to 47
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 71656a56b8b310b87b88559dd1ab6c2a1beffab5
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Wed Jan 14 01:07:21 2026 +0000
Bump org.apache.maven:maven-parent from 45 to 47
Bumps [org.apache.maven:maven-parent](https://github.com/apache/maven-parent) from 45 to 47.
- [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: '47'
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <su...@github.com>
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 2f3527c950..44c2c17ae2 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>47</version>
<relativePath />
</parent>