- Updated license headers for year 2024

- Upgraded managed dependencies:
  - Spring: 6.1.3
  - Logback: 1.4.14

- Removed logback-ext-spring from managed dependencies

pom.xml

@@ -25,9 +25,9 @@
         <!-- This version must match the MAJOR.MINOR version of cxf-spring-boot-starter-jaxrs:${cxf.version}'s spring-boot-starter dependency. -->
         <spring-boot.version>3.0.10</spring-boot.version>
         <!-- Spring Core version. Must match the MAJOR.MINOR version of spring-core used by spring-boot-starter:${spring-boot.version}. -->
-        <spring.version>6.0.11</spring.version>
+        <spring.version>6.1.3</spring.version>
         <!-- logback-* version, must match the MAJOR.MINOR version of logback-classic used by spring-boot-starter-logging:${spring-boot.version} . -->
-        <logback.version>1.4.11</logback.version>
+        <logback.version>1.4.14</logback.version>
         <!-- This version must match the MAJOR.MINOR parts of the slf4j version used by logback-classic:${logback.version} -->
         <slf4j.version>2.0.7</slf4j.version>
         <spotbugs.version>4.7.3</spotbugs.version>
@@ -118,19 +118,10 @@
                 <!-- This version must use the same version of slfj-api used by 'logback-classic' below. -->
                 <version>${slf4j.version}</version>
             </dependency>
-            <dependency>
-                <!-- https://github.com/qos-ch/logback-extensions/wiki/Spring. Used by authzforce webapp for configuring logback with Spring. Declared here to make sure version matches with other logback/spring
-                   dependencies used by other AuthzForce projects. -->
-                <groupId>org.logback-extensions</groupId>
-                <artifactId>logback-ext-spring</artifactId>
-                <!-- TODO: upgrade so that logback-classic dependency version matches below -->
-                <version>0.1.5</version>
-            </dependency>
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
                 <!-- This version must match the version used by the one of 'logback-ext-spring' above. -->
-                <!-- Versions before 1.2.0 (excluded) affected by CVE-2017-5929 -->
                 <version>${logback.version}</version>
             </dependency>
             <dependency>
@@ -315,7 +306,7 @@
                 <plugin>
                     <groupId>org.owasp</groupId>
                     <artifactId>dependency-check-maven</artifactId>
-                    <version>8.4.2</version>
+                    <version>9.0.9</version>
                 </plugin>
                 <plugin>
                     <groupId>org.jvnet.jaxb</groupId>

xacml-model/src/main/java/org/ow2/authzforce/xacml/Xacml3JaxbHelper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 THALES.
+ * Copyright 2012-2024 THALES.
  *
  * This file is part of AuthzForce CE.
  *
@@ -22,17 +22,13 @@
 import jakarta.xml.bind.Marshaller;
 import jakarta.xml.bind.Unmarshaller;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.ObjectFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
 
 import javax.xml.XMLConstants;
 import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
-import java.io.Serializable;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;

xacml-model/src/main/java/org/ow2/authzforce/xacml/identifiers/XPathVersion.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 THALES.
+ * Copyright 2012-2024 THALES.
  *
  * This file is part of AuthzForce CE.
  *

xacml-model/src/main/java/org/ow2/authzforce/xacml/identifiers/XacmlAttributeCategory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 THALES.
+ * Copyright 2012-2024 THALES.
  *
  * This file is part of AuthzForce CE.
  *

xacml-model/src/main/java/org/ow2/authzforce/xacml/identifiers/XacmlAttributeId.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 THALES.
+ * Copyright 2012-2024 THALES.
  *
  * This file is part of AuthzForce CE.
  *

xacml-model/src/main/java/org/ow2/authzforce/xacml/identifiers/XacmlDatatypeId.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 THALES.
+ * Copyright 2012-2024 THALES.
  *
  * This file is part of AuthzForce CE.
  *

xacml-model/src/main/java/org/ow2/authzforce/xacml/identifiers/XacmlNodeName.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 THALES.
+ * Copyright 2012-2024 THALES.
  *
  * This file is part of AuthzForce CE.
  *

xacml-model/src/main/java/org/ow2/authzforce/xacml/identifiers/XacmlResourceScope.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 THALES.
+ * Copyright 2012-2024 THALES.
  *
  * This file is part of AuthzForce CE.
  *

xacml-model/src/main/java/org/ow2/authzforce/xacml/identifiers/XacmlStatusCode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 THALES.
+ * Copyright 2012-2024 THALES.
  *
  * This file is part of AuthzForce CE.
  *

xacml-model/src/main/java/org/ow2/authzforce/xacml/identifiers/XacmlVersion.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 THALES.
+ * Copyright 2012-2024 THALES.
  *
  * This file is part of AuthzForce CE.
  *

xacml-model/src/test/java/org/ow2/authzforce/xacml/test/MainTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 THALES.
+ * Copyright 2012-2024 THALES.
  *
  * This file is part of AuthzForce CE.
  *