from:"cstamas"

(maven) branch master updated: [MNG-8066] Default exception handler does not handle recursion (#1558)

2024-06-06 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas 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 9ce85ef4f4 [MNG-8066] Default exception handler does not handle 
recursion (#1558)
9ce85ef4f4 is described below

commit 9ce85ef4f4469287aae8a1e43e3d6960d41b746c
Author: Tamas Cservenak 
AuthorDate: Thu Jun 6 12:31:03 2024 +0200

[MNG-8066] Default exception handler does not handle recursion (#1558)

If there is a recursion in throwable causes, Maven will hang forever, 
instead to return.

---

https://issues.apache.org/jira/browse/MNG-8066
---
 .../maven/exception/DefaultExceptionHandler.java   | 24 --
 .../exception/DefaultExceptionHandlerTest.java | 16 +++
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git 
a/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
 
b/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
index b6c4e8cca5..059e1c8e17 100644
--- 
a/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
+++ 
b/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
@@ -25,7 +25,10 @@ import java.io.IOException;
 import java.net.ConnectException;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.IdentityHashMap;
 import java.util.List;
+import java.util.Set;
 
 import org.apache.maven.lifecycle.LifecycleExecutionException;
 import org.apache.maven.model.building.ModelProblem;
@@ -88,13 +91,13 @@ Plugins:
 @Named
 @Singleton
 public class DefaultExceptionHandler implements ExceptionHandler {
-
+@Override
 public ExceptionSummary handleException(Throwable exception) {
 return handle("", exception);
 }
 
 private ExceptionSummary handle(String message, Throwable exception) {
-String reference = getReference(exception);
+String reference = getReference(Collections.newSetFromMap(new 
IdentityHashMap<>()), exception);
 
 List children = null;
 
@@ -156,8 +159,11 @@ public class DefaultExceptionHandler implements 
ExceptionHandler {
 }
 }
 
-private String getReference(Throwable exception) {
+private String getReference(Set dejaVu, Throwable exception) {
 String reference = "";
+if (!dejaVu.add(exception)) {
+return reference;
+}
 
 if (exception != null) {
 if (exception instanceof MojoExecutionException) {
@@ -187,14 +193,14 @@ public class DefaultExceptionHandler implements 
ExceptionHandler {
 }
 
 if (reference == null || reference.isEmpty()) {
-reference = getReference(cause);
+reference = getReference(dejaVu, cause);
 }
 
 if (reference == null || reference.isEmpty()) {
 reference = exception.getClass().getSimpleName();
 }
 } else if (exception instanceof LifecycleExecutionException) {
-reference = getReference(exception.getCause());
+reference = getReference(dejaVu, exception.getCause());
 } else if (isNoteworthyException(exception)) {
 reference = exception.getClass().getSimpleName();
 }
@@ -222,7 +228,8 @@ public class DefaultExceptionHandler implements 
ExceptionHandler {
 private String getMessage(String message, Throwable exception) {
 String fullMessage = (message != null) ? message : "";
 
-// To break out of possible endless loop when getCause returns "this"
+// To break out of possible endless loop when getCause returns "this", 
or dejaVu for n-level recursion (n>1)
+Set dejaVu = Collections.newSetFromMap(new 
IdentityHashMap<>());
 for (Throwable t = exception; t != null && t != t.getCause(); t = 
t.getCause()) {
 String exceptionMessage = t.getMessage();
 
@@ -247,6 +254,11 @@ public class DefaultExceptionHandler implements 
ExceptionHandler {
 } else if (!fullMessage.contains(exceptionMessage)) {
 fullMessage = join(fullMessage, exceptionMessage);
 }
+
+if (!dejaVu.add(t)) {
+fullMessage = join(fullMessage, "[CIRCULAR REFERENCE]");
+break;
+}
 }
 
 return fullMessage.trim();
diff --git 
a/maven-core/src/test/java/org/apache/maven/exception/DefaultExceptionHandlerTest.java
 
b/maven-core/src/test/java/org/apache/maven/exception/DefaultExceptionHandlerTest.java
index f3f6075533..c9a84014d2 100644
--- 
a/maven-core/src/test/java/org/apache/maven/exception/DefaultExceptionHandlerTest.java
+++ 
b/m

(maven) branch maven-3.9.x updated: [MNG-8066] Default exception handler does not handle recursion (#1558)

2024-06-06 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/maven-3.9.x by this push:
 new 865072025d [MNG-8066] Default exception handler does not handle 
recursion (#1558)
865072025d is described below

commit 865072025d98c54e2270d4e41f8d6da0ce5ab036
Author: Tamas Cservenak 
AuthorDate: Thu Jun 6 12:22:06 2024 +0200

[MNG-8066] Default exception handler does not handle recursion (#1558)

If there is a recursion in throwable causes, Maven will hang forever, 
instead to return.

---

https://issues.apache.org/jira/browse/MNG-8066
---
 .../maven/exception/DefaultExceptionHandler.java   | 24 --
 .../exception/DefaultExceptionHandlerTest.java | 16 +++
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git 
a/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
 
b/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
index 32c289c669..997656b30f 100644
--- 
a/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
+++ 
b/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
@@ -22,7 +22,10 @@ import java.io.IOException;
 import java.net.ConnectException;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.IdentityHashMap;
 import java.util.List;
+import java.util.Set;
 
 import org.apache.maven.lifecycle.LifecycleExecutionException;
 import org.apache.maven.model.building.ModelProblem;
@@ -87,13 +90,13 @@ Plugins:
  */
 @Component(role = ExceptionHandler.class)
 public class DefaultExceptionHandler implements ExceptionHandler {
-
+@Override
 public ExceptionSummary handleException(Throwable exception) {
 return handle("", exception);
 }
 
 private ExceptionSummary handle(String message, Throwable exception) {
-String reference = getReference(exception);
+String reference = getReference(Collections.newSetFromMap(new 
IdentityHashMap<>()), exception);
 
 List children = null;
 
@@ -153,8 +156,11 @@ public class DefaultExceptionHandler implements 
ExceptionHandler {
 }
 }
 
-private String getReference(Throwable exception) {
+private String getReference(Set dejaVu, Throwable exception) {
 String reference = "";
+if (!dejaVu.add(exception)) {
+return reference;
+}
 
 if (exception != null) {
 if (exception instanceof MojoExecutionException) {
@@ -186,14 +192,14 @@ public class DefaultExceptionHandler implements 
ExceptionHandler {
 }
 
 if (StringUtils.isEmpty(reference)) {
-reference = getReference(cause);
+reference = getReference(dejaVu, cause);
 }
 
 if (StringUtils.isEmpty(reference)) {
 reference = exception.getClass().getSimpleName();
 }
 } else if (exception instanceof LifecycleExecutionException) {
-reference = getReference(exception.getCause());
+reference = getReference(dejaVu, exception.getCause());
 } else if (isNoteworthyException(exception)) {
 reference = exception.getClass().getSimpleName();
 }
@@ -222,7 +228,8 @@ public class DefaultExceptionHandler implements 
ExceptionHandler {
 private String getMessage(String message, Throwable exception) {
 String fullMessage = (message != null) ? message : "";
 
-// To break out of possible endless loop when getCause returns "this"
+// To break out of possible endless loop when getCause returns "this", 
or dejaVu for n-level recursion (n>1)
+Set dejaVu = Collections.newSetFromMap(new 
IdentityHashMap<>());
 for (Throwable t = exception; t != null && t != t.getCause(); t = 
t.getCause()) {
 String exceptionMessage = t.getMessage();
 
@@ -246,6 +253,11 @@ public class DefaultExceptionHandler implements 
ExceptionHandler {
 } else if (!fullMessage.contains(exceptionMessage)) {
 fullMessage = join(fullMessage, exceptionMessage);
 }
+
+if (!dejaVu.add(t)) {
+fullMessage = join(fullMessage, "[CIRCULAR REFERENCE]");
+break;
+}
 }
 
 return fullMessage.trim();
diff --git 
a/maven-core/src/test/java/org/apache/maven/exception/DefaultExceptionHandlerTest.java
 
b/maven-core/src/test/java/org/apache/maven/exception/DefaultExceptionHandlerTest.java
index 33fe83c21d..6a14ffa1a8 100644
--- 
a/maven-core/src/test/java/org/apache/maven/exception/DefaultE

(maven) branch maven-3.9.x updated: Dependency updates (#1560)

2024-06-05 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/maven-3.9.x by this push:
 new a2fa050d9b Dependency updates (#1560)
a2fa050d9b is described below

commit a2fa050d9b61f1929742e295c1b5522608aa6c84
Author: Tamas Cservenak 
AuthorDate: Wed Jun 5 18:10:53 2024 +0200

Dependency updates (#1560)

Changes:
* commons-cli 1.8.0
* guava 32.2.1-jre

---

https://issues.apache.org/jira/browse/MNG-8144
https://issues.apache.org/jira/browse/MNG-8143
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9aa7e3847c..71d0688ccf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,7 +127,7 @@ under the License.
 8
 0.9.0.M3
 2.8.0
-1.7.0
+1.8.0
 2.16.1
 3.14.0
 4.13.2
@@ -139,7 +139,7 @@ under the License.
 
 3.5.1
 5.1.0
-33.2.0-jre
+33.2.1-jre
 1.0.2
 3.5.3
 2.0

(maven) branch maven-3.9.x updated: [MNG-8135] Profile activation based on OS properties is no longer case insensitive (#1561)

2024-06-05 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/maven-3.9.x by this push:
 new 9ee39630ad [MNG-8135] Profile activation based on OS properties is no 
longer case insensitive (#1561)
9ee39630ad is described below

commit 9ee39630ad77a5218ebb5761d1911753e4705f62
Author: Tamas Cservenak 
AuthorDate: Wed Jun 5 18:09:54 2024 +0200

[MNG-8135] Profile activation based on OS properties is no longer case 
insensitive (#1561)

Backport of 0456c7c629d6fc872073268faeb77d2bde9a1b7d

---

https://issues.apache.org/jira/browse/MNG-8135
---
 .../activation/OperatingSystemProfileActivator.java|  8 
 .../activation/OperatingSystemProfileActivatorTest.java| 14 ++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git 
a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java
 
b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java
index a9c2c76a88..63931b7f20 100644
--- 
a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java
+++ 
b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java
@@ -109,14 +109,14 @@ public class OperatingSystemProfileActivator implements 
ProfileActivator {
 reverse = true;
 test = test.substring(1);
 }
-result = actualVersion.equals(test);
+result = actualVersion.equalsIgnoreCase(test);
 }
 
 return reverse != result;
 }
 
 private boolean determineArchMatch(String expectedArch, String actualArch) 
{
-String test = expectedArch;
+String test = expectedArch.toLowerCase(Locale.ENGLISH);
 boolean reverse = false;
 
 if (test.startsWith("!")) {
@@ -130,7 +130,7 @@ public class OperatingSystemProfileActivator implements 
ProfileActivator {
 }
 
 private boolean determineNameMatch(String expectedName, String actualName) 
{
-String test = expectedName;
+String test = expectedName.toLowerCase(Locale.ENGLISH);
 boolean reverse = false;
 
 if (test.startsWith("!")) {
@@ -144,7 +144,7 @@ public class OperatingSystemProfileActivator implements 
ProfileActivator {
 }
 
 private boolean determineFamilyMatch(String family, String actualName) {
-String test = family;
+String test = family.toLowerCase(Locale.ENGLISH);
 boolean reverse = false;
 
 if (test.startsWith("!")) {
diff --git 
a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivatorTest.java
 
b/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivatorTest.java
index 7944e25503..dfda07c855 100644
--- 
a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivatorTest.java
+++ 
b/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivatorTest.java
@@ -141,4 +141,18 @@ public class OperatingSystemProfileActivatorTest extends 
AbstractProfileActivato
 assertActivation(false, profile, newContext(null, 
newProperties("windows", "99", "amd64")));
 assertActivation(true, profile, newContext(null, 
newProperties("windows", "99", "aarch64")));
 }
+
+public void testCapitalOsName() {
+ActivationOS os = new ActivationOS();
+os.setFamily("Mac");
+os.setName("Mac OS X");
+os.setArch("aarch64");
+os.setVersion("14.5");
+Profile profile = newProfile(os);
+
+assertActivation(false, profile, newContext(null, 
newProperties("linux", "6.5.0-1014-aws", "amd64")));
+assertActivation(false, profile, newContext(null, 
newProperties("windows", "1", "aarch64")));
+assertActivation(false, profile, newContext(null, 
newProperties("windows", "99", "amd64")));
+assertActivation(true, profile, newContext(null, newProperties("Mac OS 
X", "14.5", "aarch64")));
+}
 }

(maven-integration-testing) branch maven-3.9.x updated: Fix parent POM of MNG-7819 IT: it was not pom packaging.

2024-06-05 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git


The following commit(s) were added to refs/heads/maven-3.9.x by this push:
 new 5c34605e4 Fix parent POM of MNG-7819 IT: it was not pom packaging.
5c34605e4 is described below

commit 5c34605e4d6deee4ffc461dda4a5022fd9c883f7
Author: Tamas Cservenak 
AuthorDate: Wed Jun 5 14:51:22 2024 +0200

Fix parent POM of MNG-7819 IT: it was not pom packaging.
---
 .../mng7819/parent/1.0.0-SNAPSHOT/parent-1.0.0-20221014.203717-12.pom| 1 +
 1 file changed, 1 insertion(+)

diff --git 
a/core-it-suite/src/test/resources/mng-7819-file-locking-with-snapshots/repo/org/apache/maven/its/mng7819/parent/1.0.0-SNAPSHOT/parent-1.0.0-20221014.203717-12.pom
 
b/core-it-suite/src/test/resources/mng-7819-file-locking-with-snapshots/repo/org/apache/maven/its/mng7819/parent/1.0.0-SNAPSHOT/parent-1.0.0-20221014.203717-12.pom
index 25fa0db34..522fa03b0 100644
--- 
a/core-it-suite/src/test/resources/mng-7819-file-locking-with-snapshots/repo/org/apache/maven/its/mng7819/parent/1.0.0-SNAPSHOT/parent-1.0.0-20221014.203717-12.pom
+++ 
b/core-it-suite/src/test/resources/mng-7819-file-locking-with-snapshots/repo/org/apache/maven/its/mng7819/parent/1.0.0-SNAPSHOT/parent-1.0.0-20221014.203717-12.pom
@@ -5,4 +5,5 @@
 org.apache.maven.its.mng7819
 dependency
 1.0.0-SNAPSHOT
+pom

(maven-jar-plugin) branch warning updated (2fb1877 -> e90b4b5)

2024-06-04 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a change to branch warning
in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git


from 2fb1877  Add warning in strange case
 add e90b4b5  Use "common ground" for Maven3 and Maven4

No new revisions were added by this update.

Summary of changes:
 src/it/MNG-8137/verify.groovy |  2 +-
 .../org/apache/maven/plugins/jar/AbstractJarMojo.java | 19 ++-
 2 files changed, 11 insertions(+), 10 deletions(-)

(maven-jar-plugin) branch warning created (now 2fb1877)

2024-06-04 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a change to branch warning
in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git


  at 2fb1877  Add warning in strange case

This branch includes the following new commits:

 new 2fb1877  Add warning in strange case

The 1 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.

(maven-jar-plugin) 01/01: Add warning in strange case

2024-06-04 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch warning
in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git

commit 2fb18772874530c96885920f800e5568b80f727e
Author: Tamas Cservenak 
AuthorDate: Tue Jun 4 14:06:42 2024 +0200

Add warning in strange case

The least we can do is compare two language: one of known 'pom'
type and other of project artifact: if both equal, and jar
plugin is "aware" it creates JAR that is "java" language,
emit a warning.
---
 src/it/MNG-8137/invoker.properties | 18 ++
 src/it/MNG-8137/pom.xml| 42 ++
 src/it/MNG-8137/verify.groovy  | 21 +++
 .../apache/maven/plugins/jar/AbstractJarMojo.java  | 11 ++
 4 files changed, 92 insertions(+)

diff --git a/src/it/MNG-8137/invoker.properties 
b/src/it/MNG-8137/invoker.properties
new file mode 100644
index 000..b0222bb
--- /dev/null
+++ b/src/it/MNG-8137/invoker.properties
@@ -0,0 +1,18 @@
+# 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.
+
+invoker.goals = jar:jar
diff --git a/src/it/MNG-8137/pom.xml b/src/it/MNG-8137/pom.xml
new file mode 100644
index 000..4663411
--- /dev/null
+++ b/src/it/MNG-8137/pom.xml
@@ -0,0 +1,42 @@
+
+
+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/maven-v4_0_0.xsd;>
+  4.0.0
+
+  org.apache.maven.plugins.jar.it
+  mng-8137
+  pom
+  1.0
+  it-mng-8137
+
+  Project w/ pom packaging and jar:jar invoked
+
+  
+
+  
+org.apache.maven.plugins
+maven-jar-plugin
+@project.version@
+  
+
+  
+
+
diff --git a/src/it/MNG-8137/verify.groovy b/src/it/MNG-8137/verify.groovy
new file mode 100644
index 000..0917821
--- /dev/null
+++ b/src/it/MNG-8137/verify.groovy
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+String log = new File(basedir, 'build.log').text
+assert log.contains('[WARNING] Language of project is \'none\', this is most 
probably not what you want')
diff --git a/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java 
b/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java
index 9a2bc22..86d142c 100644
--- a/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java
@@ -22,10 +22,12 @@ import java.io.File;
 import java.nio.file.FileSystems;
 import java.util.Arrays;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 
 import org.apache.maven.archiver.MavenArchiveConfiguration;
 import org.apache.maven.archiver.MavenArchiver;
+import org.apache.maven.artifact.handler.ArtifactHandler;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -130,6 +132,9 @@ public abstract class AbstractJarMojo extends AbstractMojo {
 @Component
 private MavenProjectHelper projectHelper;
 
+@Component(hint = "pom")
+private ArtifactHandler pomArtifactHandler;
+
 /**
  * Require the jar plugin to build a new JAR even if none of the contents 
appear to have changed. By default, this
  * plugin looks to see

(maven) branch master updated (1af5368b23 -> 5e97703456)

2024-06-04 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git


from 1af5368b23 Remove unhelpful links that don't describe failure reasons 
from output (#1545)
 add 5e97703456 [MNG-8136] Update Eclipse Sisu to 0.9.0.M3 (#1546)

No new revisions were added by this update.

Summary of changes:
 .../main/appended-resources/META-INF/LICENSE.vm|   2 +
 .../main/appended-resources/licenses/EPL-2.0.txt   | 277 +
 .../impl/ConsumerPomBuilderTest.java   |   2 +-
 pom.xml|   7 +-
 4 files changed, 286 insertions(+), 2 deletions(-)
 create mode 100644 
apache-maven/src/main/appended-resources/licenses/EPL-2.0.txt

(maven) branch maven-3.9.x updated: [MNG-8136] Update Eclipse Sisu to 0.9.0.M3 (#1547)

2024-06-04 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/maven-3.9.x by this push:
 new 2a43483a94 [MNG-8136] Update Eclipse Sisu to 0.9.0.M3 (#1547)
2a43483a94 is described below

commit 2a43483a942dfe34852dae348bec36643592b53a
Author: Tamas Cservenak 
AuthorDate: Tue Jun 4 08:41:09 2024 +0200

[MNG-8136] Update Eclipse Sisu to 0.9.0.M3 (#1547)

Update Eclipse Sisu 0.9.0.M3 (carries ASM 9.7).

---

https://issues.apache.org/jira/browse/MNG-8136
---
 .../main/appended-resources/META-INF/LICENSE.vm|   2 +
 .../main/appended-resources/licenses/EPL-2.0.txt   | 277 +
 pom.xml|   1 +
 3 files changed, 280 insertions(+)

diff --git a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm 
b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
index b589e36e02..b87dd6ab7b 100644
--- a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
+++ b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
@@ -37,6 +37,8 @@ subject to the terms and conditions of the following licenses:
 #*  *##set ( $spdx = 'MIT' )
 #**##elseif ( $license.name == "Eclipse Public License, Version 1.0" )
 #*  *##set ( $spdx = 'EPL-1.0' )
+#**##elseif ( $license.name == "Eclipse Public License, Version 2.0" )
+#*  *##set ( $spdx = 'EPL-2.0' )
 #**##elseif ( $license.url.contains( "www.apache.org/licenses/LICENSE-2.0" 
) )
 #*  *##set ( $spdx = 'Apache-2.0' )
 #**##else
diff --git a/apache-maven/src/main/appended-resources/licenses/EPL-2.0.txt 
b/apache-maven/src/main/appended-resources/licenses/EPL-2.0.txt
new file mode 100644
index 00..e55f34467e
--- /dev/null
+++ b/apache-maven/src/main/appended-resources/licenses/EPL-2.0.txt
@@ -0,0 +1,277 @@
+Eclipse Public License - v 2.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+  a) in the case of the initial Contributor, the initial content
+ Distributed under this Agreement, and
+
+  b) in the case of each subsequent Contributor:
+ i) changes to the Program, and
+ ii) additions to the Program;
+  where such changes and/or additions to the Program originate from
+  and are Distributed by that particular Contributor. A Contribution
+  "originates" from a Contributor if it was added to the Program by
+  such Contributor itself or anyone acting on such Contributor's behalf.
+  Contributions do not include changes or additions to the Program that
+  are not Modified Works.
+
+"Contributor" means any person or entity that Distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which
+are necessarily infringed by the use or sale of its Contribution alone
+or when combined with the Program.
+
+"Program" means the Contributions Distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement
+or any Secondary License (as applicable), including Contributors.
+
+"Derivative Works" shall mean any work, whether in Source Code or other
+form, that is based on (or derived from) the Program and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship.
+
+"Modified Works" shall mean any work in Source Code or other form that
+results from an addition to, deletion from, or modification of the
+contents of the Program, including, for purposes of clarity any new file
+in Source Code form that contains any contents of the Program. Modified
+Works shall not include works that contain only declarations,
+interfaces, types, classes, structures, or files of the Program solely
+in each case in order to link to, bind by name, or subclass the Program
+or Modified Works thereof.
+
+"Distribute" means the acts of a) distributing or b) making available
+in any manner that enables the transfer of a copy.
+
+"Source Code" means the form of a Program preferred for making
+modifications, including but not limited to software source code,
+documentation source, and configuration files.
+
+"Secondary License" means either the GNU General Public License,
+Version 2.0, or any later versions of that license, including any
+exceptions or additional permissions as identified by the initial
+Contributor.
+
+2. GRANT OF RIGHTS
+
+  a) Subject to the terms of this Agreement, each Contributor hereby
+  grants Recipient a non-exclusive, worldwide, royalty-

svn commit: r1918067 - in /maven/website/components: plugins-archives/maven-shade-plugin-3.6.0/ plugins/maven-shade-plugin/

2024-05-31 Thread cstamas

Author: cstamas
Date: Fri May 31 08:51:48 2024
New Revision: 1918067

Log:
Publish Maven Shade Plugin 3.6.0 documentation

Added:
maven/website/components/plugins-archives/maven-shade-plugin-3.6.0/
  - copied from r1918066, 
maven/website/components/plugins-archives/maven-shade-plugin-LATEST/
maven/website/components/plugins/maven-shade-plugin/
  - copied from r1918066, 
maven/website/components/plugins-archives/maven-shade-plugin-LATEST/

svn commit: r69476 - /release/maven/plugins/

2024-05-31 Thread cstamas

Author: cstamas
Date: Fri May 31 08:37:44 2024
New Revision: 69476

Log:
Maven Shade Plugin 3.6.0

Added:
release/maven/plugins/maven-shade-plugin-3.6.0-source-release.zip   (with 
props)
release/maven/plugins/maven-shade-plugin-3.6.0-source-release.zip.asc   
(with props)
release/maven/plugins/maven-shade-plugin-3.6.0-source-release.zip.sha512
Removed:
release/maven/plugins/maven-shade-plugin-3.5.3-source-release.zip
release/maven/plugins/maven-shade-plugin-3.5.3-source-release.zip.asc
release/maven/plugins/maven-shade-plugin-3.5.3-source-release.zip.sha512

Added: release/maven/plugins/maven-shade-plugin-3.6.0-source-release.zip
==
Binary file - no diff available.

Propchange: release/maven/plugins/maven-shade-plugin-3.6.0-source-release.zip
--
svn:mime-type = application/zip

Added: release/maven/plugins/maven-shade-plugin-3.6.0-source-release.zip.asc
==
Binary file - no diff available.

Propchange: 
release/maven/plugins/maven-shade-plugin-3.6.0-source-release.zip.asc
--
svn:mime-type = application/pgp-signature

Added: release/maven/plugins/maven-shade-plugin-3.6.0-source-release.zip.sha512
==
--- release/maven/plugins/maven-shade-plugin-3.6.0-source-release.zip.sha512 
(added)
+++ release/maven/plugins/maven-shade-plugin-3.6.0-source-release.zip.sha512 
Fri May 31 08:37:44 2024
@@ -0,0 +1 @@
+b0a31f02918329c466abd9c7b0c01bc7baeb0fbf8ef084212800c24b937d01495614fde43771689daec9160ef43bcd93c2d87a12dfe9d4e0fd926e190f28f797
\ No newline at end of file

(maven-site) branch master updated: Maven Wrapper 3.3.2

2024-05-28 Thread cstamas

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site.git


The following commit(s) were added to refs/heads/master by this push:
 new 0b4a7ebd Maven Wrapper 3.3.2
0b4a7ebd is described below

commit 0b4a7ebdb0e6731cc3c1badacd9471191fdb37cf
Author: Tamas Cservenak 
AuthorDate: Tue May 28 20:52:09 2024 +0200

Maven Wrapper 3.3.2
---
 content/apt/plugins/index.apt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/apt/plugins/index.apt b/content/apt/plugins/index.apt
index aa15e528..ed3159e8 100644
--- a/content/apt/plugins/index.apt
+++ b/content/apt/plugins/index.apt
@@ -177,7 +177,7 @@ Available Plugins
 
*--++--++--+++
 | {{{/plugins/maven-toolchains-plugin/} <<>>}} | B  | 
3.2.0| 2024-04-21 | Allows to share configuration across plugins. | 
{{{https://gitbox.apache.org/repos/asf/maven-toolchains-plugin.git}Git}} / 
{{{https://github.com/apache/maven-toolchains-plugin/}GitHub}} | 
{{{https://issues.apache.org/jira/browse/MTOOLCHAINS}Jira MTOOLCHAINS}}
 
*--++--++--+++
-| {{{/plugins/maven-wrapper-plugin/} <<>>}}   | B  | 
3.3.1| 2024-04-25 | Download and unpack the maven wrapper distribution 
| {{{https://gitbox.apache.org/repos/asf/maven-wrapper-plugin.git}Git}} / 
{{{https://github.com/apache/maven-wrapper/}GitHub}} | 
{{{https://issues.apache.org/jira/browse/MWRAPPER}Jira MWRAPPER}}
+| {{{/plugins/maven-wrapper-plugin/} <<>>}}   | B  | 
3.3.2| 2024-05-24 | Download and unpack the maven wrapper distribution 
| {{{https://gitbox.apache.org/repos/asf/maven-wrapper-plugin.git}Git}} / 
{{{https://github.com/apache/maven-wrapper/}GitHub}} | 
{{{https://issues.apache.org/jira/browse/MWRAPPER}Jira MWRAPPER}}
 
*--++--++--+++
 
   \* <>uild or <>eporting plugin

svn commit: r1918023 [17/17] - in /maven/website/components/plugins-archives/maven-shade-plugin-LATEST: ./ apidocs/ apidocs/legal/ apidocs/org/apache/maven/plugins/maven_shade_plugin/ apidocs/org/apac

2024-05-28 Thread cstamas

Modified: 
maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/mojo/package-frame.html
==
--- 
maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/mojo/package-frame.html
 (original)
+++ 
maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/mojo/package-frame.html
 Tue May 28 15:18:17 2024
@@ -4,7 +4,7 @@
 
 
 
-Apache Maven Shade Plugin 3.5.3 Reference Package 
org.apache.maven.plugins.shade.mojo
+Apache Maven Shade Plugin 3.6.0 Reference Package 
org.apache.maven.plugins.shade.mojo
 
 
 

Modified: 
maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/mojo/package-summary.html
==
--- 
maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/mojo/package-summary.html
 (original)
+++ 
maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/mojo/package-summary.html
 Tue May 28 15:18:17 2024
@@ -4,7 +4,7 @@
 
 
 
-Apache Maven Shade Plugin 3.5.3 Reference Package 
org.apache.maven.plugins.shade.mojo
+Apache Maven Shade Plugin 3.6.0 Reference Package 
org.apache.maven.plugins.shade.mojo
 
 
 
@@ -23,7 +23,7 @@
 Index
 Help
 
-Apache Maven Shade Plugin 
3.5.3 Reference
+Apache Maven Shade Plugin 
3.6.0 Reference
 
 
 
@@ -111,7 +111,7 @@
 Index
 Help
 
-Apache Maven Shade Plugin 
3.5.3 Reference
+Apache Maven Shade Plugin 
3.6.0 Reference
 
 
 

Modified: 
maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/package-frame.html
==
--- 
maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/package-frame.html
 (original)
+++ 
maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/package-frame.html
 Tue May 28 15:18:17 2024
@@ -4,7 +4,7 @@
 
 
 
-Apache Maven Shade Plugin 3.5.3 Reference Package 
org.apache.maven.plugins.shade
+Apache Maven Shade Plugin 3.6.0 Reference Package 
org.apache.maven.plugins.shade
 
 
 

Modified: 
maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/package-summary.html
==
--- 
maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/package-summary.html
 (original)
+++ 
maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/package-summary.html
 Tue May 28 15:18:17 2024
@@ -4,7 +4,7 @@
 
 
 
-Apache Maven Shade Plugin 3.5.3 Reference Package 
org.apache.maven.plugins.shade
+Apache Maven Shade Plugin 3.6.0 Reference Package 
org.apache.maven.plugins.shade
 
 
 
@@ -23,7 +23,7 @@
 Index
 Help
 
-Apache Maven Shade Plugin 
3.5.3 Reference
+Apache Maven Shade Plugin 
3.6.0 Reference
 
 
 
@@ -106,7 +106,7 @@
 Index
 Help
 
-Apache Maven Shade Plugin 
3.5.3 Reference
+Apache Maven Shade Plugin 
3.6.0 Reference
 
 
 

Modified: 
maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/pom/package-frame.html
==
--- 
maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/pom/package-frame.html
 (original)
+++ 
maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/pom/package-frame.html
 Tue May 28 15:18:17 2024
@@ -4,7 +4,7 @@
 
 
 
-Apache Maven Shade Plugin 3.5.3 Reference Package 
org.apache.maven.plugins.shade.pom
+Apache Maven Shade Plugin 3.6.0 Reference Package 
org.apache.maven.plugins.shade.pom
 
 
 

Modified: 
maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/pom/package-summary.html
==
---

svn commit: r1918023 [7/17] - in /maven/website/components/plugins-archives/maven-shade-plugin-LATEST: ./ apidocs/ apidocs/legal/ apidocs/org/apache/maven/plugins/maven_shade_plugin/ apidocs/org/apach

2024-05-28 Thread cstamas

Modified: 
maven/website/components/plugins-archives/maven-shade-plugin-LATEST/apidocs/org/apache/maven/plugins/shade/resource/PluginXmlResourceTransformer.html
==
--- 
maven/website/components/plugins-archives/maven-shade-plugin-LATEST/apidocs/org/apache/maven/plugins/shade/resource/PluginXmlResourceTransformer.html
 (original)
+++ 
maven/website/components/plugins-archives/maven-shade-plugin-LATEST/apidocs/org/apache/maven/plugins/shade/resource/PluginXmlResourceTransformer.html
 Tue May 28 15:18:17 2024
@@ -1,25 +1,20 @@
 
 
 
-
-PluginXmlResourceTransformer (Apache Maven Shade Plugin 3.5.3 
API)
+
+PluginXmlResourceTransformer (Apache Maven Shade Plugin 3.6.0 
API)
 
 
 
 
 
 
-
 
 
 
 
 
-var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../../";
+