From d178ee9f9299aa41b5abfa6b6a8ccb172d30071d Mon Sep 17 00:00:00 2001
From: Manfred Riem <mriem@manorrock.com>
Date: Thu, 12 Sep 2024 16:43:07 -0500
Subject: [PATCH] Fixes #3959 - Limit updates by using configuration in Maven
 versions plugin (#3960)

---
 extension/apache-fileupload/pom.xml          |   1 -
 extension/eclipse-angus/pom.xml              |   2 -
 extension/eclipse-expressly/pom.xml          |   1 -
 extension/eclipselink/pom.xml                |   8 +-
 extension/hazelcast/pom.xml                  |   1 -
 extension/redhat-hibernate-validator/pom.xml |   2 -
 http/crac/pom.xml                            |   1 -
 http/grizzly/pom.xml                         |   3 -
 pom.xml                                      | 140 ++++++++++++++++++-
 9 files changed, 140 insertions(+), 19 deletions(-)

diff --git a/extension/apache-fileupload/pom.xml b/extension/apache-fileupload/pom.xml
index e632db775..277ac5517 100644
--- a/extension/apache-fileupload/pom.xml
+++ b/extension/apache-fileupload/pom.xml
@@ -24,7 +24,6 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-fileupload2-jakarta-servlet6</artifactId>
-            <version>${commons-fileupload2-jakarta-servlet6.version}</version>
             <scope>compile</scope>
         </dependency>
         <!-- test -->
diff --git a/extension/eclipse-angus/pom.xml b/extension/eclipse-angus/pom.xml
index dad1e344c..485907056 100644
--- a/extension/eclipse-angus/pom.xml
+++ b/extension/eclipse-angus/pom.xml
@@ -29,13 +29,11 @@
         <dependency>
             <groupId>org.eclipse.angus</groupId>
             <artifactId>angus-mail</artifactId>
-            <version>${angus.mail.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.angus</groupId>
             <artifactId>angus-activation</artifactId>
-            <version>${angus.activation.version}</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/extension/eclipse-expressly/pom.xml b/extension/eclipse-expressly/pom.xml
index 3137da87b..39dd1bd62 100644
--- a/extension/eclipse-expressly/pom.xml
+++ b/extension/eclipse-expressly/pom.xml
@@ -24,7 +24,6 @@
         <dependency>
             <groupId>org.glassfish.expressly</groupId>
             <artifactId>expressly</artifactId>
-            <version>${expressly.version}</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/extension/eclipselink/pom.xml b/extension/eclipselink/pom.xml
index 7e9243f0e..57034be99 100644
--- a/extension/eclipselink/pom.xml
+++ b/extension/eclipselink/pom.xml
@@ -32,22 +32,22 @@
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>eclipselink</artifactId>
-            <version>${eclipselink.version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>org.eclipse.persistence.core</artifactId>
-            <version>${eclipselink.version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>org.eclipse.persistence.jpa</artifactId>
-            <version>${eclipselink.version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>org.eclipse.persistence.json</artifactId>
-            <version>${eclipselink.version}</version>
+            <scope>compile</scope>
         </dependency>
         <!-- provided -->
         <dependency>
diff --git a/extension/hazelcast/pom.xml b/extension/hazelcast/pom.xml
index d9536ac60..0745691d3 100644
--- a/extension/hazelcast/pom.xml
+++ b/extension/hazelcast/pom.xml
@@ -15,7 +15,6 @@
         <dependency>
             <groupId>com.hazelcast</groupId>
             <artifactId>hazelcast</artifactId>
-            <version>${hazelcast.version}</version>
             <scope>compile</scope>
         </dependency>
         <!-- provided -->
diff --git a/extension/redhat-hibernate-validator/pom.xml b/extension/redhat-hibernate-validator/pom.xml
index 42c14542c..8656e16a6 100644
--- a/extension/redhat-hibernate-validator/pom.xml
+++ b/extension/redhat-hibernate-validator/pom.xml
@@ -31,13 +31,11 @@
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>${hibernate-validator.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator-cdi</artifactId>
-            <version>${hibernate-validator.version}</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/http/crac/pom.xml b/http/crac/pom.xml
index 570501325..9f882165e 100644
--- a/http/crac/pom.xml
+++ b/http/crac/pom.xml
@@ -18,7 +18,6 @@
         <dependency>
             <groupId>io.github.crac</groupId>
             <artifactId>org-crac</artifactId>
-            <version>${crac.version}</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/http/grizzly/pom.xml b/http/grizzly/pom.xml
index 7208ad461..5af4929d8 100644
--- a/http/grizzly/pom.xml
+++ b/http/grizzly/pom.xml
@@ -21,20 +21,17 @@
         <dependency>
             <groupId>org.glassfish.grizzly</groupId>
             <artifactId>grizzly-http-server</artifactId>
-            <version>${grizzly.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.glassfish.grizzly</groupId>
             <artifactId>grizzly-http2</artifactId>
-            <version>${grizzly.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.glassfish.grizzly</groupId>
             <artifactId>grizzly-npn-api</artifactId>
             <scope>compile</scope>
-            <version>${grizzly-npn-api.version}</version>
         </dependency>
         <!-- test -->
         <dependency>
diff --git a/pom.xml b/pom.xml
index 95114224c..e9ec6f2b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -188,6 +188,12 @@
 
     <dependencyManagement>
         <dependencies>
+            <!-- Apache Commons File Upload -->
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-fileupload2-jakarta-servlet6</artifactId>
+                <version>${commons-fileupload2-jakarta-servlet6.version}</version>
+            </dependency>
             <!-- Apache Maven -->
             <dependency>
                 <groupId>org.apache.maven</groupId>
@@ -204,28 +210,102 @@
                 <artifactId>maven-plugin-tools-annotations</artifactId>
                 <version>${maven-plugin-tools-annotations.version}</version>
             </dependency>
-                                                
+            <!-- Eclipse Angus -->
+            <dependency>
+                <groupId>org.eclipse.angus</groupId>
+                <artifactId>angus-mail</artifactId>
+                <version>${angus.mail.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.angus</groupId>
+                <artifactId>angus-activation</artifactId>
+                <version>${angus.activation.version}</version>
+            </dependency>
+            <!-- Eclipse Expressly -->
+            <dependency>
+                <groupId>org.glassfish.expressly</groupId>
+                <artifactId>expressly</artifactId>
+                <version>${expressly.version}</version>
+            </dependency>
+            <!-- Eclipse Grizzly -->
+            <dependency>
+                <groupId>org.glassfish.grizzly</groupId>
+                <artifactId>grizzly-http-server</artifactId>
+                <version>${grizzly.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.grizzly</groupId>
+                <artifactId>grizzly-http2</artifactId>
+                <version>${grizzly.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.grizzly</groupId>
+                <artifactId>grizzly-npn-api</artifactId>
+                <version>${grizzly-npn-api.version}</version>
+            </dependency>
+            <!-- EclipseLink -->
+            <dependency>
+                <groupId>org.eclipse.persistence</groupId>
+                <artifactId>eclipselink</artifactId>
+                <version>${eclipselink.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.persistence</groupId>
+                <artifactId>org.eclipse.persistence.core</artifactId>
+                <version>${eclipselink.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.persistence</groupId>
+                <artifactId>org.eclipse.persistence.jpa</artifactId>
+                <version>${eclipselink.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.persistence</groupId>
+                <artifactId>org.eclipse.persistence.json</artifactId>
+                <version>${eclipselink.version}</version>
+            </dependency>
             <!-- Freeport Finder -->
             <dependency>
                 <groupId>me.alexpanov</groupId>
                 <artifactId>free-port-finder</artifactId>
                 <version>${free-port-finder.version}</version>
             </dependency>
-            
             <!-- H2 database -->
             <dependency>
                 <groupId>com.h2database</groupId>
                 <artifactId>h2</artifactId>
                 <version>${h2.version}</version>
             </dependency>
-
+            <!-- Hazelcast -->
+            <dependency>
+                <groupId>com.hazelcast</groupId>
+                <artifactId>hazelcast</artifactId>
+                <version>${hazelcast.version}</version>
+            </dependency>
+            <!-- Hibernate Validator -->
+            <dependency>
+                <groupId>org.hibernate.validator</groupId>
+                <artifactId>hibernate-validator</artifactId>
+                <version>${hibernate-validator.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.hibernate.validator</groupId>
+                <artifactId>hibernate-validator-cdi</artifactId>
+                <version>${hibernate-validator.version}</version>
+            </dependency>
             <!-- HtmlUnit -->
             <dependency>
                 <groupId>net.sourceforge.htmlunit</groupId>
                 <artifactId>htmlunit</artifactId>
                 <version>${htmlunit.version}</version>
             </dependency>
-
+            <!-- Project CRaC -->
+            <dependency>
+                <groupId>io.github.crac</groupId>
+                <artifactId>org-crac</artifactId>
+                <version>${crac.version}</version>
+            </dependency>
+                        
             <!-- JBoss Arquillian -->
             <dependency>
                 <groupId>org.jboss.arquillian</groupId>
@@ -639,6 +719,58 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+                <configuration>
+                    <ruleSet>
+                        <rules>
+                            <!-- keep Eclipse Mojarra at EE 10 compliant version -->
+                            <rule>
+                                <groupId>org.glassfish</groupId>
+                                <artifactId>jakarta.faces</artifactId>
+                                <ignoreVersions>
+                                    <ignoreVersion>
+                                        <type>range</type>
+                                        <version>[4.1.0,)</version>
+                                    </ignoreVersion>
+                                </ignoreVersions>
+                            </rule>
+                            <!-- keep Eclipse Expressly at EE 10 compliant version -->
+                            <rule>
+                                <groupId>org.glassfish.expressly</groupId>
+                                <artifactId>expressly</artifactId>
+                                <ignoreVersions>
+                                    <ignoreVersion>
+                                        <type>range</type>
+                                        <version>[6.0.0-M1,)</version>
+                                    </ignoreVersion>
+                                </ignoreVersions>
+                            </rule>
+                            <!-- keep EclipseLink at EE 10 compliant version -->
+                            <rule>
+                                <groupId>org.eclipse.persistence</groupId>
+                                <ignoreVersions>
+                                    <ignoreVersion>
+                                        <type>range</type>
+                                        <version>[5.0.0-B01,)</version>
+                                    </ignoreVersion>
+                                </ignoreVersions>
+                            </rule>
+                            <!-- keep Hibernate Validator at EE 10 compliant version -->
+                            <rule>
+                                <groupId>org.hibernate.validator</groupId>
+                                <ignoreVersions>
+                                    <ignoreVersion>
+                                        <type>range</type>
+                                        <version>[9.0.0-Beta2,)</version>
+                                    </ignoreVersion>
+                                </ignoreVersions>
+                            </rule>
+                        </rules>
+                    </ruleSet>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>