Skip to content
Snippets Groups Projects
Commit 82ef087b authored by Cyril Dangerville's avatar Cyril Dangerville
Browse files

Merge branch 'release/9.1.0'

parents be4f8fa3 9ef18a64
Branches master
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 29 additions and 35 deletions
CHANGELOG.md
+ 7
− 0
View file @ 82ef087b
# Change log
All notable changes to this project are documented in this file following the [Keep a CHANGELOG](http://keepachangelog.com) conventions.
## 9.1.0
### Changed
- Upgraded managed dependencies:
- Spring Core: 6.1.3
- Logback: 1.4.14
- Removed from managed dependencies: logback-ext-spring
## 9.0.0
### Changed
......
atom-model/pom.xml
+ 1
− 1
View file @ 82ef087b
......@@ -3,7 +3,7 @@
<parent>
<groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-parent</artifactId>
<version>9.0.0</version>
<version>9.1.0</version>
</parent>
<artifactId>authzforce-ce-atom-model</artifactId>
<packaging>jar</packaging>
......
pdp-ext-model/pom.xml
+ 1
− 1
View file @ 82ef087b
......@@ -3,7 +3,7 @@
<parent>
<groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-parent</artifactId>
<version>9.0.0</version>
<version>9.1.0</version>
</parent>
<artifactId>authzforce-ce-pdp-ext-model</artifactId>
<name>${project.groupId}:${project.artifactId}</name>
......
pom.xml
+ 8
− 17
View file @ 82ef087b
......@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-parent</artifactId>
<version>9.0.0</version>
<version>9.1.0</version>
<packaging>pom</packaging>
<name>${project.groupId}:${project.artifactId}</name>
<description>AuthzForce - Parent of all AuthzForce components</description>
......@@ -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>
......@@ -229,25 +220,25 @@
<groupId>${project.groupId}</groupId>
<artifactId>${artifactId.prefix}-xmlns-model</artifactId>
<!-- Version updated automatically by maven jgitflow:release-start -->
<version>9.0.0</version>
<version>9.1.0</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>${artifactId.prefix}-atom-model</artifactId>
<!-- Version updated automatically by maven jgitflow:release-start -->
<version>9.0.0</version>
<version>9.1.0</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>${artifactId.prefix}-xacml-model</artifactId>
<!-- Version updated automatically by maven jgitflow:release-start -->
<version>9.0.0</version>
<version>9.1.0</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>${artifactId.prefix}-pdp-ext-model</artifactId>
<!-- Version updated automatically by maven jgitflow:release-start -->
<version>9.0.0</version>
<version>9.1.0</version>
</dependency>
<!-- /Common AuthzForce CE dependencies -->
</dependencies>
......@@ -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/pom.xml
+ 1
− 1
View file @ 82ef087b
......@@ -3,7 +3,7 @@
<parent>
<groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-parent</artifactId>
<version>9.0.0</version>
<version>9.1.0</version>
</parent>
<artifactId>authzforce-ce-xacml-model</artifactId>
<name>${project.groupId}:${project.artifactId}</name>
......
xacml-model/src/main/java/org/ow2/authzforce/xacml/Xacml3JaxbHelper.java
+ 1
− 5
View file @ 82ef087b
/*
* Copyright 2012-2023 THALES.
* Copyright 2012-2024 THALES.
*
* This file is part of AuthzForce CE.
*
......@@ -22,17 +22,13 @@ import jakarta.xml.bind.JAXBException;
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
− 1
View file @ 82ef087b
/*
* 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
− 1
View file @ 82ef087b
/*
* 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
− 1
View file @ 82ef087b
/*
* 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
− 1
View file @ 82ef087b
/*
* 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
− 1
View file @ 82ef087b
/*
* 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
− 1
View file @ 82ef087b
/*
* 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
− 1
View file @ 82ef087b
/*
* 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
− 1
View file @ 82ef087b
/*
* 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
− 1
View file @ 82ef087b
/*
* Copyright 2012-2023 THALES.
* Copyright 2012-2024 THALES.
*
* This file is part of AuthzForce CE.
*
......
xmlns-model/pom.xml
+ 1
− 1
View file @ 82ef087b
......@@ -3,7 +3,7 @@
<parent>
<groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-parent</artifactId>
<version>9.0.0</version>
<version>9.1.0</version>
</parent>
<artifactId>authzforce-ce-xmlns-model</artifactId>
<name>${project.groupId}:${project.artifactId}</name>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment