Merge remote-tracking branch 'upstream/master' into maven-cling

apache · Sep 30, 2024 · 4971b34 · 4971b34
2 parents c83c370 + 6ffdc20
commit 4971b34
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
@@ -163,7 +163,6 @@ under the License.
           <artifactId>apache-rat-plugin</artifactId>
           <configuration>
             <excludes combine.children="append">
-              <exclude>src/assembly/maven/bin/m2.conf</exclude>
               <!-- these are partial scripts, resulting in mvn scripts -->
               <exclude>src/assembly/shared/init</exclude>
               <exclude>src/assembly/shared/init.cmd</exclude>

diff --git a/apache-maven/src/assembly/maven/bin/m2.conf b/apache-maven/src/assembly/maven/bin/m2.conf
@@ -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.
+#
+
 # main is org.apache.maven.cli.MavenCli from plexus.core
 main is org.apache.maven.cling.MavenCling from plexus.core
 

diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/PathModularizationCache.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/PathModularizationCache.java
@@ -178,10 +178,11 @@ Optional<String> warningForFilenameBasedAutomodules(Collection<Path> modulePaths
         if (automodulesDetected.isEmpty()) {
             return Optional.empty();
         }
+        String lineSeparator = System.lineSeparator();
         var joiner = new StringJoiner(
-                ", ",
-                "Filename-based automodules detected on the module-path: ",
-                "Please don't publish this project to a public artifact repository.");
+                lineSeparator + "  - ",
+                "Filename-based automodules detected on the module-path: " + lineSeparator + "  - ",
+                lineSeparator + "Please don't publish this project to a public artifact repository.");
         automodulesDetected.forEach(joiner::add);
         return Optional.of(joiner.toString());
     }