Merge branch 'release/3.0.4'

CHANGELOG.md

@@ -2,9 +2,14 @@
 All notable changes to this project are documented in this file following the [Keep a CHANGELOG](http://keepachangelog.com) conventions. This project adheres to [Semantic Versioning](http://semver.org).
 
 
+## 3.0.4
+### Fixed 
+- CVE-2021-22696 and CVE-2021-3046 fixed by upgrading **authzforce-ce-parent to v8.0.3**
+- Fix for https://github.com/authzforce/server/issues/64 (loading schemas in offline mode fails)
+
+
 ## 3.0.3
 ### Fixed
-- Fix for https://github.com/authzforce/server/issues/64 (loading schemas in offline mode)
 - CVE-2021-22118: updated parent version to 8.0.2 -> Spring to 5.2.15
 
 

pom.xml

@@ -3,11 +3,11 @@
 	<parent>
 		<groupId>org.ow2.authzforce</groupId>
 		<artifactId>authzforce-ce-parent</artifactId>
-		<version>8.0.2</version>
+		<version>8.0.3</version>
 	</parent>
 	<artifactId>authzforce-ce-xacml-json-model</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.3</version>
+	<version>3.0.4</version>
 	<name>${project.groupId}:${project.artifactId}</name>
 	<description>AuthzForce - Data model for JSON Profile of XACML 3.0</description>
 	<url>${project.url}</url>

src/main/resources/org/ow2/authzforce/xacml/json/model/Policy.schema.json

 {
 	"$schema": "http://json-schema.org/draft-06/schema",
-	"$id": "https://raw.githubusercontent.com/authzforce/xacml-json-model/master/src/main/resources/org/ow2/authzforce/xacml/json/model/Policy.schema.json",
+	"$id": "Policy.schema.json",
 	"title": "JSON schema of a policy object equivalent to XACML 3.0 Policy(Set)",
 	"definitions": {
 		"VariableReference": {

src/main/resources/org/ow2/authzforce/xacml/json/model/Request.schema.json

 {
 	"$schema": "http://json-schema.org/draft-06/schema",
-	"$id": "https://raw.githubusercontent.com/authzforce/xacml-json-model/master/src/main/resources/org/ow2/authzforce/xacml/json/model/Request.schema.json",
+	"$id": "Request.schema.json",
 	"title": "JSON schema of Request object defined in JSON profile of XACML 3.0 v1.0",
+	"description": "",
 	"definitions": 
 	{
 		"RequestReferenceType": 

src/main/resources/org/ow2/authzforce/xacml/json/model/Response.schema.json

 {
 	"$schema": "http://json-schema.org/draft-06/schema",
-	"$id": "https://raw.githubusercontent.com/authzforce/xacml-json-model/master/src/main/resources/org/ow2/authzforce/xacml/json/model/Response.schema.json",
+	"$id": "Response.schema.json",
 	"title": "JSON schema of Response object defined in JSON profile of XACML 3.0 v1.0",
+	"description": "",
 	"definitions": 
 	{
 		"DecisionType": 

src/main/resources/org/ow2/authzforce/xacml/json/model/common-ng.schema.json

 {
 	"$schema": "http://json-schema.org/draft-06/schema",
-	"$id": "https://raw.githubusercontent.com/authzforce/xacml-json-model/master/src/main/resources/org/ow2/authzforce/xacml/json/model/common-ng.schema.json",
 	"title": "Common JSON schema to Request and Response objects defined in JSON profile of XACML 3.0 v1.0",
 	"definitions": 
 	{

src/main/resources/org/ow2/authzforce/xacml/json/model/common-std.schema.json

 {
 	"$schema": "http://json-schema.org/draft-06/schema",
-	"$id": "https://raw.githubusercontent.com/authzforce/xacml-json-model/master/src/main/resources/org/ow2/authzforce/xacml/json/model/common-std.schema.json",
 	"title": "Common JSON schema to Request and Response objects defined in JSON profile of XACML 3.0 v1.0",
+	"description": "WARNING: don't specify an $id property, else the resolution of this schema on the classpath using $ref from other schemas and resolutionScope with JSON Schema Validator (https://github.com/everit-org/json-schema) will fail.",
 	"definitions": 
 	{
 		"AttributeValueType":