Merge branch 'release/2.3.0'

CHANGELOG.md

@@ -1,6 +1,15 @@
 # Change log
 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).
 
+
+## 2.3.0
+### Changed
+- Upgraded parent project version: 7.6.0
+  - Upgraded dependencies:
+  	- spring-core: 5.1.14
+  	- org.everit.json.schema: 1.12.1
+
+
 ## 2.2.0
 ### Added
 - JSON schema for XACML Policy(Set)

pom.xml

@@ -3,11 +3,11 @@
 	<parent>
 		<groupId>org.ow2.authzforce</groupId>
 		<artifactId>authzforce-ce-parent</artifactId>
-		<version>7.5.1</version>
+		<version>7.6.0</version>
 	</parent>
 	<artifactId>authzforce-ce-xacml-json-model</artifactId>
 	<packaging>jar</packaging>
-	<version>2.2.0</version>
+	<version>2.3.0</version>
 	<name>${project.groupId}:${project.artifactId}</name>
 	<description>AuthzForce - Data model for JSON Profile of XACML 3.0</description>
 	<url>${project.url}</url>
@@ -109,7 +109,6 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<!-- Override license-maven-plugin configuration to exclude SunXACML files from adding GPL license headers (different license) -->
 				<groupId>com.mycila</groupId>
 				<artifactId>license-maven-plugin</artifactId>
 				<configuration>

src/main/java/org/ow2/authzforce/xacml/json/model/XacmlJsonUtils.java

@@ -19,6 +19,8 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.everit.json.schema.Schema;
 import org.everit.json.schema.loader.SchemaClient;
@@ -27,8 +29,6 @@
 import org.json.JSONObject;
 import org.json.JSONTokener;
 
-import com.google.common.collect.ImmutableMap;
-
 /**
  * Instances of JSON schema as defined by JSON Profile of XACML 3.0
  *
@@ -57,9 +57,10 @@ private XacmlJsonUtils()
 
 	static
 	{
-		final SchemaClient schemaClient = new SpringBasedJsonSchemaClient(
-		        ImmutableMap.of("http://authzforce.github.io/xacml-json-profile-model/schemas/1/common-std.schema.json", "classpath:org/ow2/authzforce/xacml/json/model/common-std.schema.json",
-		                "http://authzforce.github.io/xacml-json-profile-model/schemas/1/common-ng.schema.json", "classpath:org/ow2/authzforce/xacml/json/model/common-ng.schema.json"));
+		final Map<String, String> mutableCatalogMap = new HashMap<>();
+		mutableCatalogMap.put("http://authzforce.github.io/xacml-json-profile-model/schemas/1/common-std.schema.json", "classpath:org/ow2/authzforce/xacml/json/model/common-std.schema.json");
+		mutableCatalogMap.put("http://authzforce.github.io/xacml-json-profile-model/schemas/1/common-ng.schema.json", "classpath:org/ow2/authzforce/xacml/json/model/common-ng.schema.json");
+		final SchemaClient schemaClient = new SpringBasedJsonSchemaClient(mutableCatalogMap);
 		try (InputStream inputStream = SpringBasedJsonSchemaClient.class.getResourceAsStream("Request.schema.json"))
 		{
 			final JSONObject rawSchema = new JSONObject(new JSONTokener(inputStream));