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/09/30 20:50:45 UTC
(maven) branch maven-4.0.x updated: Remove duplicate settings.v4 classes from maven-settings
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch maven-4.0.x
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/maven-4.0.x by this push:
new 6230e37a11 Remove duplicate settings.v4 classes from maven-settings
6230e37a11 is described below
commit 6230e37a116bcc00f947134ccec2e126e56e709e
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon Sep 28 16:16:45 2026 +0200
Remove duplicate settings.v4 classes from maven-settings
maven-support already generates org.apache.maven.settings.v4 from the
same settings.mdo, so maven-settings shipped byte-identical copies of
the 11 classes. Depend on maven-support instead, as maven-model and
maven-toolchain-model do; do not re-add the generation here.
(cherry picked from commit 55f9b31b96de135e635bc1b8138f17ac00459eda)
---
compat/maven-settings/pom.xml | 23 ++++-------------------
1 file changed, 4 insertions(+), 19 deletions(-)
diff --git a/compat/maven-settings/pom.xml b/compat/maven-settings/pom.xml
index bb3b7b7f76..645f4d699b 100644
--- a/compat/maven-settings/pom.xml
+++ b/compat/maven-settings/pom.xml
@@ -48,6 +48,10 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>maven-xml</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-support</artifactId>
+ </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-xml</artifactId>
@@ -85,25 +89,6 @@ under the License.
</params>
</configuration>
<executions>
- <execution>
- <id>velocity</id>
- <goals>
- <goal>velocity</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <templates>
- <template>merger.vm</template>
- <template>transformer.vm</template>
- <template>reader-stax.vm</template>
- <template>writer-stax.vm</template>
- </templates>
- <params combine.children="append">
- <param>locationTracking=true</param>
- <param>generateLocationClasses=true</param>
- </params>
- </configuration>
- </execution>
<execution>
<id>v3</id>
<goals>