Skip to content

GitLab

Commit b079f1c1 authored by cdanger's avatar cdanger
Browse files

Merge branch 'release/10.1.0'

parents aac8e4cc 7f85fbc8
Hide whitespace changes
Inline Side-by-side
.github/workflows/ci.yml
View file @ b079f1c1
......@@ -13,14 +13,14 @@ jobs:
steps:
- name: Git checkout
uses: actions/checkout@v2
- name: Use Java 8
- name: Use Java 11
uses: actions/setup-java@v1
with:
java-version: 8
- name: 'Unit Tests with Java 8'
java-version: 11
- name: 'Unit Tests with Java 11'
run: |
mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
mvn test -B
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
\ No newline at end of file
COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
CHANGELOG.md
View file @ b079f1c1
......@@ -4,6 +4,24 @@ All notable changes to this project are documented in this file following the [K
Issues reported on [GitHub](https://github.com/authzforce/server/issues) are referenced in the form of `[GH-N]`, where N is the issue number. Issues reported on [OW2](https://jira.ow2.org/browse/AUTHZFORCE/) are mentioned in the form of `[OW2-N]`, where N is the issue number.
## 10.1.0
### Changed
- FastInfoset version: 2.0.0
### Fixed
- GH-64: XACML/JSON schema loading fails when offline (no Internet connection), preventing AuthzForce Server to start (linked to everit-org/json-schema#88 )
- Fixed in dependency authzforce-ce-xacml-json-model: 3.0.3
- authzforce-ce-parent upgraded to v8.0.2 to fix CVE-2021-22118:
- Upgraded Spring: 5.2.15
- Dependency fixes:
- authzforce-ce-pap-dao-flat-file: 13.0.1
- authzforce-ce-core-pap-api: 11.0.1
- authzforce-ce-core-pdp-engine: 17.1.1
- authzforce-ce-core-pdp-api to 18.0.2
- javax.mail to 1.6.2
- authzforce-ce-jaxrs-utils: 2.0.2
## 10.0.0
### Changed
- Upgraded AuthzForce Parent: 8.0.0:
......@@ -27,7 +45,6 @@ Issues reported on [GitHub](https://github.com/authzforce/server/issues) are ref
- org.everit.json.schema: 1.12.1
- SLF4J API: 1.7.30
### Added
- GH-61: JSON Object support in XACML/JSON Requests/Responses (as defined by JSON Profile of XACML), allowing custom XACML datatypes with JSON object structures.
- Support for validation of XACML/JSON requests (JSON Profile) with custom JSON schema stored in configuration directory, using new webapp environment property (e.g. specified in Tomcat webapp context) `org.ow2.authzforce.domains.xacmlJsonSchemaRelativePath` to be specified in `/etc/tomcat9/<Engine>/<Host>/authzforce-ce.xml` (more info in [webapp-context.xml](dist/src/webapp-context.xml) )
......
dist/pom.xml
View file @ b079f1c1
......@@ -3,7 +3,7 @@
<parent>
<groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-server</artifactId>
<version>10.0.0</version>
<version>10.1.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>authzforce-ce-server-dist</artifactId>
......
dist/src/docker/Dockerfile.tmpl → dist/src/docker/Dockerfile
View file @ b079f1c1
......@@ -39,7 +39,7 @@ ENV DEBIAN_FRONTEND noninteractive
ENV JAVA_OPTS="-Djava.security.egd=file:/dev/./urandom -Djava.awt.headless=true -Djavax.xml.accessExternalSchema=all -Xms1024m -Xmx1024m -server"
ENV AUTHZFORCE_SERVER_VERSION="${project.version}"
ENV AUTHZFORCE_SERVER_VERSION=10.1.0
ENV AUTHZFORCE_SERVER_DOWNLOAD_URL="https://repo1.maven.org/maven2/org/ow2/authzforce/authzforce-ce-server-dist/$AUTHZFORCE_SERVER_VERSION/authzforce-ce-server-dist-$AUTHZFORCE_SERVER_VERSION.deb"
# Download and install Authzforce Server (service starts automatically)
......@@ -68,6 +68,10 @@ RUN curl --silent --output authzforce-ce-server.deb --location $AUTHZFORCE_SERVE
rm -rf /opt/authzforce-ce-server/data/domains/* && \
rm -rf /root/authzforce && \
rm -f authzforce-ce-server.deb
VOLUME /opt/authzforce-ce-server/data
VOLUME /usr/local/tomcat/conf
CMD ["catalina.sh", "run"]
### Exposed ports
......
dist/src/docker/README.md
View file @ b079f1c1
......@@ -3,7 +3,7 @@
This image of a minimal AuthzForce Server runtime is intended to work together with [Identity Manager - Keyrock](http://catalogue.fiware.org/enablers/identity-management-keyrock) and [PEP Proxy Wilma](http://catalogue.fiware.org/enablers/pep-proxy-wilma) generic enabler.
## Image contents
- OpenJDK JRE 8;
- OpenJDK JRE 11;
- Tomcat 9 (since AuthzForce Server v9.0.1, else Tomcat 8 for older versions);
- AuthzForce Server CE (version matching the Docker image tag).
......@@ -14,7 +14,7 @@ This image gives you a minimal installation for testing purposes. The AuthzForce
Create a container using `authzforce/server` image by doing (replace the first *8080* after *-p* with whatever network port you want to use on the host to access the AuthzForce Server, e.g. 80; and *release-9.0.1* with the current Docker image tag that you are using):
```
docker run -d -p 8080:8080 --name <container-name> authzforce/server:release-9.0.1
docker run -d -p 8080:8080 --name <container-name> authzforce/server
```
As stands in the AuthzForce Installation and administration guide on [readthedocs.org](https://readthedocs.org/projects/authzforce-ce-fiware/versions/) (select the version matching the Docker image tag, then **AuthzForce - Installation and Administration Guide**) you can:
......
dist/src/tar/README.md
View file @ b079f1c1
......@@ -10,9 +10,9 @@ This guide provides the procedure to install the AuthzForce server from the tarb
* RAM: 4GB min
* Disk space: 10 GB min
* File system: ext4
* Operating System: Ubuntu 18.04 LTS
* Operating System: Ubuntu 20.04 LTS
* Java environment:
* JRE 8 either from OpenJDK or Oracle;
* JRE 11 either from OpenJDK or Oracle;
* Tomcat 9.x.
## Installation
......
pom.xml
View file @ b079f1c1
......@@ -4,21 +4,21 @@
<parent>
<groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-parent</artifactId>
<version>8.0.0</version>
<version>8.0.2</version>
</parent>
<artifactId>authzforce-ce-server</artifactId>
<!-- FIWARE Versioning + Version must be equal or higher than 'authzforce-ce-rest-api-model' dependency in 'rest-service' module -->
<version>10.0.0</version>
<version>10.1.0</version>
<packaging>pom</packaging>
<name>${project.groupId}:${project.artifactId}</name>
<description>AuthzForce CE Server</description>
<url>${project.url}</url>
<properties>
<git.url.base>https://github.com/authzforce/server</git.url.base>
<authzforce-ce-core.version>17.1.0</authzforce-ce-core.version>
<authzforce-ce-core-pap-api.version>11.0.0</authzforce-ce-core-pap-api.version>
<authzforce-ce-core.version>17.1.1</authzforce-ce-core.version>
<authzforce-ce-core-pap-api.version>11.0.1</authzforce-ce-core-pap-api.version>
<!-- Version must be compatible with authzforce-ce-core and authzforce-ce-core-pap-api versions above. -->
<authzforce-ce-pap-dao-flat-file.version>13.0.0</authzforce-ce-pap-dao-flat-file.version>
<authzforce-ce-pap-dao-flat-file.version>13.0.1</authzforce-ce-pap-dao-flat-file.version>
<productId>authzforce-ce-server</productId>
<productName>AuthzForce CE Server</productName>
<productMaintainer>THALES</productMaintainer>
......
rest-service/pom.xml
View file @ b079f1c1
......@@ -4,7 +4,7 @@
<groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-server</artifactId>
<!-- Version must be equal or higher than authzforce-ce-rest-api-model dependency -->
<version>10.0.0</version>
<version>10.1.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>authzforce-ce-server-rest-service</artifactId>
......@@ -39,7 +39,7 @@
<dependency>
<groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-jaxrs-utils</artifactId>
<version>2.0.1</version>
<version>2.0.2</version>
</dependency>
</dependencies>
<build>
......
upgrader/pom.xml
View file @ b079f1c1
......@@ -3,7 +3,7 @@
<parent>
<groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-server</artifactId>
<version>10.0.0</version>
<version>10.1.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>authzforce-ce-server-upgrader</artifactId>
......
webapp/pom.xml
View file @ b079f1c1
......@@ -3,7 +3,7 @@
<parent>
<groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-server</artifactId>
<version>10.0.0</version>
<version>10.1.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>authzforce-ce-server-webapp</artifactId>
......@@ -12,8 +12,7 @@
<description>Web application packaging for AuthzForce (PAP/PDP) REST service</description>
<url>https://github.com/authzforce/server/webapp</url>
<properties>
<!-- Tomcat version on Ubuntu 18.04 LTS (official target OS) -->
<tomcat.version>9.0.35</tomcat.version>
<tomcat.version>9.0.43</tomcat.version>
</properties>
<scm>
<connection>scm:git:${git.url.base}.git</connection>
......@@ -77,7 +76,7 @@
<dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>
<version>1.2.18</version>
<version>2.0.0</version>
</dependency>
<!-- http://cxf.apache.org/docs/jax-rs.html#JAX-RS-FromCXF2.7.xtoCXF3.0.0 , item 4: WADL Auto Generator code has been moved to a new cxf-rt-rs-service-description -->
<dependency>
......@@ -159,7 +158,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
......
Markdown is supported
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