- Spring upgraded to 5.2.19

- added standard attribute 'urn:oasis:names:tc:xacml:2.0:resource:target-namespace' to XacmlAttributeId enum

pom.xml

@@ -24,7 +24,7 @@
       <!-- This version must match the spring-boot-starter's MAJOR.MINOR parts of the version used by cxf-spring-boot-starter-jaxrs:${cxf.version}. (All 4.3.x versions up to 4.3.16 are affected by CVEs.) -->
       <spring-boot-starter.version>2.3.5.RELEASE</spring-boot-starter.version>
       <!-- Spring core version. Must match the MAJOR.MINOR parts of ${spring-boot-starter.version}'s spring-core dependency version -->
-      <spring.version>5.2.18.RELEASE</spring.version>
+      <spring.version>5.2.19.RELEASE</spring.version>
    </properties>
    <url>${project.url}</url>
    <inceptionYear>2012</inceptionYear>
@@ -117,7 +117,7 @@
             <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>1.2.3</version>
+            <version>1.2.10</version>
          </dependency>
          <dependency>
             <groupId>org.springframework</groupId>
@@ -261,7 +261,8 @@
                    <threshold>Low</threshold>
                    <failOnError>true</failOnError>
                    <!-- <includeFilterFile>${session.executionRootDirectory}/spotbugs-security-include.xml</includeFilterFile> -->
-                   <excludeFilterFile>${session.executionRootDirectory}/spotbugs-security-exclude.xml</excludeFilterFile>
+                   <!--suppress UnresolvedMavenProperty -->
+                  <excludeFilterFile>${session.executionRootDirectory}/spotbugs-security-exclude.xml</excludeFilterFile>
                    <plugins>
                        <plugin>
                            <groupId>com.h3xstream.findsecbugs</groupId>

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

 /**
- * Copyright 2012-2021 THALES.
+ * Copyright 2012-2022 THALES.
  *
  * This file is part of AuthzForce CE.
  *

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

 /**
- * Copyright 2012-2021 THALES.
+ * Copyright 2012-2022 THALES.
  *
  * This file is part of AuthzForce CE.
  *

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

 /**
- * Copyright 2012-2021 THALES.
+ * Copyright 2012-2022 THALES.
  *
  * This file is part of AuthzForce CE.
  *

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

 /**
- * Copyright 2012-2021 THALES.
+ * Copyright 2012-2022 THALES.
  *
  * This file is part of AuthzForce CE.
  *
@@ -82,16 +82,20 @@ public enum XacmlAttributeId
 	 */
 	XACML_1_0_RESOURCE_LOCATION("urn:oasis:names:tc:xacml:1.0:resource:resource-location"),
 	/**
-	 * The standard URI for the resource's scope in XACML v3.0 (resp. v2.0) multiple decision (resp. resource) profile.
 	 * 
-	 * @see XACMLResourceScope possible scopes
 	 */
-	XACML_2_0_RESOURCE_SCOPE("urn:oasis:names:tc:xacml:2.0:resource:scope"),
+	XACML_1_0_RESOURCE_SIMPLE_FILE_NAME("urn:oasis:names:tc:xacml:1.0:resource:simple-file-name"),
 	/**
-	 * 
+	 *
 	 */
-	XACML_1_0_RESOURCE_SIMPLE_FILE_NAME("urn:oasis:names:tc:xacml:1.0:resource:simple-file-name"),
+	XACML_2_0_RESOURCE_TARGET_NAMESPACE("urn:oasis:names:tc:xacml:2.0:resource:target-namespace"),
 
+	/**
+	 * The standard URI for the resource's scope in XACML v3.0 (resp. v2.0) multiple decision (resp. resource) profile.
+	 *
+	 * @see XACMLResourceScope possible scopes
+	 */
+	XACML_2_0_RESOURCE_SCOPE("urn:oasis:names:tc:xacml:2.0:resource:scope"),
 	/**
 	 * XACML v3.0 Multiple Decision Profile Version 1.0
 	 */
@@ -107,6 +111,11 @@ public enum XacmlAttributeId
 	 */
 	XACML_1_0_ACTION_ID("urn:oasis:names:tc:xacml:1.0:action:action-id"),
 
+	/**
+	 *
+	 */
+	XACML_1_0_ACTION_NAMESPACE("urn:oasis:names:tc:xacml:1.0:action:action-namespace"),
+
 	/**
 	 * 
 	 */

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

 /**
- * Copyright 2012-2021 THALES.
+ * Copyright 2012-2022 THALES.
  *
  * This file is part of AuthzForce CE.
  *

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

 /**
- * Copyright 2012-2021 THALES.
+ * Copyright 2012-2022 THALES.
  *
  * This file is part of AuthzForce CE.
  *

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

 /**
- * Copyright 2012-2021 THALES.
+ * Copyright 2012-2022 THALES.
  *
  * This file is part of AuthzForce CE.
  *

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

 /**
- * Copyright 2012-2021 THALES.
+ * Copyright 2012-2022 THALES.
  *
  * This file is part of AuthzForce CE.
  *

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

 /**
- * Copyright 2012-2021 THALES.
+ * Copyright 2012-2022 THALES.
  *
  * This file is part of AuthzForce CE.
  *

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

 /**
- * Copyright 2012-2021 THALES.
+ * Copyright 2012-2022 THALES.
  *
  * This file is part of AuthzForce CE.
  *