Dependency updates to newer versions

mgorovoy · Apr 26, 2022 · 556afc4 · 556afc4
1 parent 4ee91e3
commit 556afc4
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -19,43 +19,49 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.0.5.RELEASE</version>
+      <version>5.3.19</version>
     </dependency>
 
     <dependency>
       <groupId>commons-configuration</groupId>
       <artifactId>commons-configuration</artifactId>
-      <version>1.5</version>
+      <version>1.10</version>
     </dependency>
 
     <dependency>
       <groupId>commons-chain</groupId>
       <artifactId>commons-chain</artifactId>
       <version>1.2</version>
     </dependency>
-
+
+      <dependency>
+          <groupId>commons-digester</groupId>
+          <artifactId>commons-digester</artifactId>
+          <version>2.1</version>
+      </dependency>
+
     <dependency>
       <groupId>commons-pool</groupId>
       <artifactId>commons-pool</artifactId>
-      <version>1.5.4</version>
+      <version>1.6</version>
     </dependency>
 
     <dependency>
       <groupId>net.sf.ehcache</groupId>
       <artifactId>ehcache-core</artifactId>
-      <version>2.4.0</version>
+      <version>2.6.11</version>
     </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.5.8</version>
+      <version>1.7.36</version>
     </dependency>
 
     <dependency>
      <groupId>log4j</groupId>
      <artifactId>log4j</artifactId>
-     <version>1.2.15</version>
+     <version>1.2.17</version>
      <exclusions>
 		<exclusion>
             <groupId>javax.jms</groupId>

diff --git a/core/src/main/java/net/jradius/server/config/XMLConfiguration.java b/core/src/main/java/net/jradius/server/config/XMLConfiguration.java
@@ -23,13 +23,12 @@
 import java.io.Reader;
 
 import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.HierarchicalXMLConfiguration;
 
 /**
  * JRadius XML Configuration Parser.
  * @author David Bird
  */
-public class XMLConfiguration extends HierarchicalXMLConfiguration
+public class XMLConfiguration extends org.apache.commons.configuration.XMLConfiguration
 {
     XMLConfiguration(Reader reader) throws ConfigurationException
     {

diff --git a/extended/pom.xml b/extended/pom.xml
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.56</version>
+      <version>1.70</version>
     </dependency>
 
   </dependencies>

diff --git a/extended/src/main/java/net/jradius/client/auth/EAPTLSAuthenticator.java b/extended/src/main/java/net/jradius/client/auth/EAPTLSAuthenticator.java
@@ -60,6 +60,7 @@
 import org.bouncycastle.asn1.pkcs.DHParameter;
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
 import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
+import org.bouncycastle.asn1.pkcs.RSAPrivateKey;
 import org.bouncycastle.asn1.pkcs.RSAPrivateKeyStructure;
 import org.bouncycastle.asn1.sec.ECPrivateKey;
 import org.bouncycastle.asn1.sec.SECNamedCurves;
@@ -595,8 +596,7 @@ public static AsymmetricKeyParameter createKey(
         AlgorithmIdentifier     algId = keyInfo.getPrivateKeyAlgorithm();
         if (algId.getAlgorithm().equals(PKCSObjectIdentifiers.rsaEncryption))
         {
-            RSAPrivateKeyStructure  keyStructure = new RSAPrivateKeyStructure((ASN1Sequence)keyInfo.getPrivateKey());
-
+            RSAPrivateKey keyStructure=RSAPrivateKey.getInstance(keyInfo.parsePrivateKey());
             return new RSAPrivateCrtKeyParameters(
                                         keyStructure.getModulus(),
                                         keyStructure.getPublicExponent(),

diff --git a/server/pom.xml b/server/pom.xml
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context-support</artifactId>
-      <version>3.0.5.RELEASE</version>
+      <version>5.3.19</version>
     </dependency>
 
   </dependencies>