From 02378681e00dd739cbb6dd19edc756876079316c Mon Sep 17 00:00:00 2001
From: Darran Lofthouse <darran.lofthouse@jboss.com>
Date: Thu, 11 Jul 2024 18:06:09 +0100
Subject: [PATCH 1/2] Restore alphabetical order for plugin versions.

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2416840296cc..9fe82f8ae32f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -317,16 +317,16 @@
         <version.asciidoctor.plugin>2.2.6</version.asciidoctor.plugin>
         <version.org.jacoco>0.8.12</version.org.jacoco>
         <version.org.jboss.galleon>6.0.0.Final</version.org.jboss.galleon>
-        <version.org.wildfly.glow>1.0.0.Final</version.org.wildfly.glow>
         <version.org.jboss.wildscribe>3.1.0.Final</version.org.jboss.wildscribe>
         <version.org.wildfly.bom-builder-plugin>2.0.6.Final</version.org.wildfly.bom-builder-plugin>
         <version.org.wildfly.checkstyle-config>1.0.8.Final</version.org.wildfly.checkstyle-config>
         <version.org.wildfly.common>1.6.0.Final</version.org.wildfly.common>
-        <version.org.wildfly.unstable.annotation.api>1.0.0.Final</version.org.wildfly.unstable.annotation.api>
         <version.org.wildfly.galleon-plugins>7.1.0.Final</version.org.wildfly.galleon-plugins>
+        <version.org.wildfly.glow>1.0.0.Final</version.org.wildfly.glow>
         <version.org.wildfly.jar.plugin>11.0.2.Final</version.org.wildfly.jar.plugin>
         <version.org.wildfly.licenses.plugin>2.4.1.Final</version.org.wildfly.licenses.plugin>
         <version.org.wildfly.plugin>5.0.0.Final</version.org.wildfly.plugin>
+        <version.org.wildfly.unstable.annotation.api>1.0.0.Final</version.org.wildfly.unstable.annotation.api>
         <version.org.wildfly.wildfly-channel-plugin>1.0.9</version.org.wildfly.wildfly-channel-plugin>
         <version.verifier.plugin>1.1</version.verifier.plugin>
         <version.xml.plugin>1.0.2</version.xml.plugin>
@@ -1490,7 +1490,7 @@
                     <plugin>
                       <groupId>org.owasp</groupId>
                       <artifactId>dependency-check-maven</artifactId>
-                      <version>10.0.1</version>
+                      <version>10.0.2</version>
                       <configuration>
                           <nvdApiServerId>nvd</nvdApiServerId>
                           <suppressionFile>./sca-overrides/owasp-suppressions.xml</suppressionFile>

From 9dc1fe84f3a06a032b76db08cb35b1a446870d13 Mon Sep 17 00:00:00 2001
From: Darran Lofthouse <darran.lofthouse@jboss.com>
Date: Thu, 11 Jul 2024 18:08:21 +0100
Subject: [PATCH 2/2] [WFLY-19529] Upgrade the OWASP dependency-check plugin to
 10.0.2

Also move the version to a propery so it can be overridden from the
command line.
---
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9fe82f8ae32f..228c5554f8a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -318,6 +318,7 @@
         <version.org.jacoco>0.8.12</version.org.jacoco>
         <version.org.jboss.galleon>6.0.0.Final</version.org.jboss.galleon>
         <version.org.jboss.wildscribe>3.1.0.Final</version.org.jboss.wildscribe>
+        <version.org.owasp.dependency-check>10.0.2</version.org.owasp.dependency-check>
         <version.org.wildfly.bom-builder-plugin>2.0.6.Final</version.org.wildfly.bom-builder-plugin>
         <version.org.wildfly.checkstyle-config>1.0.8.Final</version.org.wildfly.checkstyle-config>
         <version.org.wildfly.common>1.6.0.Final</version.org.wildfly.common>
@@ -1490,7 +1491,7 @@
                     <plugin>
                       <groupId>org.owasp</groupId>
                       <artifactId>dependency-check-maven</artifactId>
-                      <version>10.0.2</version>
+                      <version>${version.org.owasp.dependency-check}</version>
                       <configuration>
                           <nvdApiServerId>nvd</nvdApiServerId>
                           <suppressionFile>./sca-overrides/owasp-suppressions.xml</suppressionFile>