From a1dbb725da80489b71f527526c02643877df25a7 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Sun, 29 Sep 2024 11:46:33 +1000
Subject: [PATCH 1/3] Jetty 12.0.x add Eclipse Dash License plugin as part the
 build process (#12224)

* Issue #12195 add eclipse dash profile to run license-check tool
* upgrade hazelcast

---------

Signed-off-by: Olivier Lamy <olamy@apache.org>
---
 Jenkinsfile |  2 +-
 pom.xml     | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 5fc23c3f560d..9301838efc89 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -127,7 +127,7 @@ def mavenBuild(jdk, cmdline, mvnName) {
           }
           runLaunchable ("verify")
           runLaunchable ("record build --name jetty-12.0.x")
-          sh "mvn $extraArgs -DsettingsPath=$GLOBAL_MVN_SETTINGS -Dmaven.repo.uri=http://nexus-service.nexus.svc.cluster.local:8081/repository/maven-public/ -ntp -s $GLOBAL_MVN_SETTINGS -Dmaven.repo.local=.repository -Pci -V -B -e -U $cmdline"
+          sh "mvn $extraArgs -DsettingsPath=$GLOBAL_MVN_SETTINGS -Dmaven.repo.uri=http://nexus-service.nexus.svc.cluster.local:8081/repository/maven-public/ -ntp -s $GLOBAL_MVN_SETTINGS -Dmaven.repo.local=.repository -Pci -Peclipse-dash -V -B -e -U $cmdline"
           if(saveHome()) {
             archiveArtifacts artifacts: ".repository/org/eclipse/jetty/jetty-home/**/jetty-home-*", allowEmptyArchive: true, onlyIfSuccessful: false
           }
diff --git a/pom.xml b/pom.xml
index 45ab820e7766..c25679dad278 100644
--- a/pom.xml
+++ b/pom.xml
@@ -193,7 +193,7 @@
     <guava.version>33.2.1-jre</guava.version>
     <guice.version>7.0.0</guice.version>
     <hamcrest.version>2.2</hamcrest.version>
-    <hazelcast.version>5.4.0</hazelcast.version>
+    <hazelcast.version>5.5.0</hazelcast.version>
     <hibernate.search.version>7.1.1.Final</hibernate.search.version>
     <infinispan.docker.image.name>infinispan/server</infinispan.docker.image.name>
     <infinispan.docker.image.version>15.0.5.Final</infinispan.docker.image.version>
@@ -2378,6 +2378,53 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>eclipse-dash</id>
+      <pluginRepositories>
+        <pluginRepository>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+          <id>dash-licenses-releases</id>
+          <url>https://repo.eclipse.org/content/repositories/dash-licenses-releases/</url>
+        </pluginRepository>
+        <pluginRepository>
+          <releases>
+            <enabled>false</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+          <id>dash-licenses-snapshots</id>
+          <url>https://repo.eclipse.org/content/repositories/dash-licenses-snapshots/</url>
+        </pluginRepository>
+      </pluginRepositories>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.dash</groupId>
+            <artifactId>license-tool-plugin</artifactId>
+            <version>1.1.0</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>license-check</goal>
+                </goals>
+                <phase>verify</phase>
+                <configuration>
+                  <!-- Works with approval for Hazelcast https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/15797 -->
+                  <excludeGroupIds>com.hazelcast</excludeGroupIds>
+                  <failWhenReviewNeeded>true</failWhenReviewNeeded>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>update-version</id>
       <build>

From e8ac3799bc9cadedefea83e68590f16c58e5546b Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Sun, 29 Sep 2024 12:12:16 +1000
Subject: [PATCH 2/3] upgrade weld version to 6.0.0.Beta4

Signed-off-by: Olivier Lamy <olamy@apache.org>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ed417ab89f11..98ee3d1f43fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -235,7 +235,7 @@
     <ee11.jersey.version>4.0.0-M1</ee11.jersey.version>
     <ee11.jsp.impl.version>11.0.0-M21</ee11.jsp.impl.version>
     <ee11.mail.impl.version>2.0.1</ee11.mail.impl.version>
-    <ee11.weld.version>6.0.0.Beta1</ee11.weld.version>
+    <ee11.weld.version>6.0.0.Beta4</ee11.weld.version>
 
     <ee8.jakarta.activation.api.version>1.2.2</ee8.jakarta.activation.api.version>
     <ee8.jakarta.annotation.api.version>1.3.5</ee8.jakarta.annotation.api.version>

From cb422900f66415ff93982940922a82ad402d802b Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Sun, 29 Sep 2024 21:35:22 +1000
Subject: [PATCH 3/3] weld is only use for testing purpose

Signed-off-by: Olivier Lamy <olamy@apache.org>
---
 pom.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 98ee3d1f43fc..2e64fa80f0b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2536,8 +2536,11 @@
                 </goals>
                 <phase>verify</phase>
                 <configuration>
-                  <!-- Works with approval for Hazelcast https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/15797 -->
-                  <excludeGroupIds>com.hazelcast</excludeGroupIds>
+                  <!--
+                    Works with approval for Hazelcast https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/15797
+                    org.jboss.weld only used for testing
+                  -->
+                  <excludeGroupIds>com.hazelcast,org.jboss.weld</excludeGroupIds>
                   <failWhenReviewNeeded>true</failWhenReviewNeeded>
                 </configuration>
               </execution>