This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch young-braid in repository https://gitbox.apache.org/repos/asf/maven.git
commit 8f71a54552de54cee38535dca4a157b4844a0485 Author: Guillaume Nodet <[email protected]> AuthorDate: Wed May 20 14:49:37 2026 +0200 Sync DefaultTypeProvider and dependency-types.apt across impl and compat The two DefaultTypeProvider copies (impl/maven-impl and compat/maven-resolver-provider) had drifted out of sync: - fatjar type was missing from the impl provider - test-java-source type was missing from the compat provider - CLASSPATH_PROCESSOR and MODULAR_PROCESSOR ordering was inconsistent Both dependency-types.apt files also had copy-paste errors from the test-jar row (bogus "tests" classifier on modular-jar, classpath-jar, and fatjar) and were missing fatjar's includesDependencies=true flag. Added the missing processor types and test-java-source to both docs. Co-Authored-By: Claude Opus 4.6 <[email protected]> --- .../repository/internal/type/DefaultTypeProvider.java | 9 +++++---- .../src/site/apt/dependency-types.apt | 14 +++++++++++--- .../maven/impl/resolver/type/DefaultTypeProvider.java | 1 + impl/maven-impl/src/site/apt/dependency-types.apt | 14 +++++++++++--- 4 files changed, 28 insertions(+), 10 deletions(-) diff --git a/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/type/DefaultTypeProvider.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/type/DefaultTypeProvider.java index 6d2e84ef4d..30efe88193 100644 --- a/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/type/DefaultTypeProvider.java +++ b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/type/DefaultTypeProvider.java @@ -56,6 +56,7 @@ public Collection<DefaultType> types() { false, JavaPathType.CLASSES, JavaPathType.PATCH_MODULE), + new DefaultType(Type.TEST_JAVA_SOURCE, Language.JAVA_FAMILY, "jar", "test-sources", false), new DefaultType(Type.MODULAR_JAR, Language.JAVA_FAMILY, "jar", null, false, JavaPathType.MODULES), new DefaultType(Type.CLASSPATH_JAR, Language.JAVA_FAMILY, "jar", null, false, JavaPathType.CLASSES), new DefaultType(Type.FATJAR, Language.JAVA_FAMILY, "jar", null, true, JavaPathType.CLASSES), @@ -68,19 +69,19 @@ public Collection<DefaultType> types() { JavaPathType.PROCESSOR_CLASSES, JavaPathType.PROCESSOR_MODULES), new DefaultType( - Type.MODULAR_PROCESSOR, + Type.CLASSPATH_PROCESSOR, Language.JAVA_FAMILY, "jar", null, false, - JavaPathType.PROCESSOR_MODULES), + JavaPathType.PROCESSOR_CLASSES), new DefaultType( - Type.CLASSPATH_PROCESSOR, + Type.MODULAR_PROCESSOR, Language.JAVA_FAMILY, "jar", null, false, - JavaPathType.PROCESSOR_CLASSES), + JavaPathType.PROCESSOR_MODULES), // j2ee types new DefaultType("ejb", Language.JAVA_FAMILY, "jar", null, false, JavaPathType.CLASSES), new DefaultType("ejb-client", Language.JAVA_FAMILY, "jar", "client", false, JavaPathType.CLASSES), diff --git a/compat/maven-resolver-provider/src/site/apt/dependency-types.apt b/compat/maven-resolver-provider/src/site/apt/dependency-types.apt index a059faaae0..1d9b4b7a6b 100644 --- a/compat/maven-resolver-provider/src/site/apt/dependency-types.apt +++ b/compat/maven-resolver-provider/src/site/apt/dependency-types.apt @@ -49,12 +49,20 @@ Default Dependency Types Reference | <<<javadoc>>> | <<<javadoc>>> | <<<jar>>> | java | classes | | *-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ | <<<test-jar>>> | <<<tests>>> | <<<jar>>> | java | classes, patch module | | +*-----------------------+------------------+------------+-----------+-----------------------+-----------------------+ +| <<<test-java-source>>> * | <<<test-sources>>> | <<<jar>>> | java | | | +*-----------------------+------------------+------------+-----------+-----------------------+-----------------------+ +| <<<modular-jar>>> * | | <<<jar>>> | java | modules | | *-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ -| <<<modular-jar>>> * | <<<tests>>> | <<<jar>>> | java | modules | | +| <<<classpath-jar>>> * | | <<<jar>>> | java | classes | | *-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ -| <<<classpath-jar>>> * | <<<tests>>> | <<<jar>>> | java | classes | | +| <<<fatjar>>> * | | <<<jar>>> | java | classes | <<<true>>> | *-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ -| <<<fatjar>>> * | <<<tests>>> | <<<jar>>> | java | classes | | +| <<<processor>>> * | | <<<jar>>> | java | processor classes, processor modules | | +*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ +| <<<classpath-processor>>> * | | <<<jar>>> | java | processor classes | | +*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ +| <<<modular-processor>>> * | | <<<jar>>> | java | processor modules | | *-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ || Java/Jakarta EE || || || || || || *-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/type/DefaultTypeProvider.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/type/DefaultTypeProvider.java index b0eead6840..75c6e9fd8e 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/type/DefaultTypeProvider.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/type/DefaultTypeProvider.java @@ -60,6 +60,7 @@ public Collection<DefaultType> types() { new DefaultType(Type.TEST_JAVA_SOURCE, Language.JAVA_FAMILY, "jar", "test-sources", false), new DefaultType(Type.MODULAR_JAR, Language.JAVA_FAMILY, "jar", null, false, JavaPathType.MODULES), new DefaultType(Type.CLASSPATH_JAR, Language.JAVA_FAMILY, "jar", null, false, JavaPathType.CLASSES), + new DefaultType(Type.FATJAR, Language.JAVA_FAMILY, "jar", null, true, JavaPathType.CLASSES), new DefaultType( Type.PROCESSOR, Language.JAVA_FAMILY, diff --git a/impl/maven-impl/src/site/apt/dependency-types.apt b/impl/maven-impl/src/site/apt/dependency-types.apt index 10bb5f02a0..f8cfef73a2 100644 --- a/impl/maven-impl/src/site/apt/dependency-types.apt +++ b/impl/maven-impl/src/site/apt/dependency-types.apt @@ -49,12 +49,20 @@ Default Dependency Types Reference | <<<javadoc>>> | <<<javadoc>>> | <<<jar>>> | java | classes | | *-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ | <<<test-jar>>> | <<<tests>>> | <<<jar>>> | java | classes, patch module | | +*-----------------------+------------------+------------+-----------+-----------------------+-----------------------+ +| <<<test-java-source>>> * | <<<test-sources>>> | <<<jar>>> | java | | | +*-----------------------+------------------+------------+-----------+-----------------------+-----------------------+ +| <<<modular-jar>>> * | | <<<jar>>> | java | modules | | *-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ -| <<<modular-jar>>> * | <<<tests>>> | <<<jar>>> | java | modules | | +| <<<classpath-jar>>> * | | <<<jar>>> | java | classes | | *-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ -| <<<classpath-jar>>> * | <<<tests>>> | <<<jar>>> | java | classes | | +| <<<fatjar>>> * | | <<<jar>>> | java | classes | <<<true>>> | *-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ -| <<<fatjar>>> * | <<<tests>>> | <<<jar>>> | java | classes | | +| <<<processor>>> * | | <<<jar>>> | java | processor classes, processor modules | | +*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ +| <<<classpath-processor>>> * | | <<<jar>>> | java | processor classes | | +*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ +| <<<modular-processor>>> * | | <<<jar>>> | java | processor modules | | *-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ || Java/Jakarta EE || || || || || || *-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
