From 897e95a2e87e6b36ab4b1e1277175112257ece4f Mon Sep 17 00:00:00 2001
From: Manoj Garai <manoj.garai@stfc.ac.uk>
Date: Wed, 20 May 2026 16:00:05 +0100
Subject: [PATCH] Update java and other dependencies

---
 .github/workflows/maven.yml |  2 +-
 pom.xml                     | 36 ++++++++++++++++++++++++++----------
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index ccd56d4..f09a4fe 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -6,7 +6,7 @@ jobs:
   build:
     strategy:
       matrix:
-        java-version: [17]
+        java-version: [25]
         
     runs-on: ubuntu-latest
 
diff --git a/pom.xml b/pom.xml
index b908fd8..228e000 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,27 +8,27 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk18on</artifactId>
-            <version>1.76</version>
+            <version>1.84</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk18on</artifactId>
-            <version>1.76</version>
+            <version>1.84</version>
         </dependency>
         <dependency>
             <groupId>org.restlet.jse</groupId>
             <artifactId>org.restlet</artifactId>
-            <version>2.4.3</version>
+            <version>3.0-M1</version>
         </dependency>
         <dependency>
             <groupId>org.restlet.jse</groupId>
             <artifactId>org.restlet.ext.xml</artifactId>
-            <version>2.4.3</version>
+            <version>3.0-M1</version>
         </dependency>
         <dependency>
             <groupId>org.restlet.jse</groupId>
             <artifactId>org.restlet.ext.httpclient</artifactId>
-            <version>2.4.3</version>
+            <version>3.0-M1</version>
         </dependency> 
         <dependency>
             <groupId>junit</groupId>
@@ -39,17 +39,17 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.20.0</version>
+            <version>2.26.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.20.0</version>
+            <version>2.26.0</version>
         </dependency>
         <dependency>
             <groupId>commons-validator</groupId>
             <artifactId>commons-validator</artifactId>
-            <version>1.7</version>
+            <version>1.10.1</version>
             <type>jar</type>
         </dependency>
         <dependency>
@@ -62,6 +62,21 @@
             <artifactId>semver4j</artifactId>
             <version>3.1.0</version>
         </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-digester</groupId>
+            <artifactId>commons-digester</artifactId>
+            <version>2.1</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -77,8 +92,9 @@
     <packaging>jar</packaging>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.9</maven.compiler.source>
-        <maven.compiler.target>1.9</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
+        <maven.compiler.release>25</maven.compiler.release>
         <mainClass>uk.ngs.certwizard.gui.CertWizardMain</mainClass>
         <codeSignCert>C:\\Users\\fou43474\\OneDrive - Science and Technology Facilities Council\\Documents\\Certs\\UKRICodeSign.p12</codeSignCert>
     </properties>