Merge branch 'release/4.0.1'

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project are documented in this file following the [K
 Issues reported on [GitHub](https://github.com/authzforce/core/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.
 
 
+## 4.0.1
+### Fixed
+- Dockerfile
+- Upgraded spring-boot-maven-plugin: 2.3.5.RELEASE
+
+
 ## 4.0.0
 ### Changed
 - Upgraded supported JRE to **Java 11** (LTS). Java 8 no longer supported.

CONTRIBUTING.md

@@ -19,5 +19,10 @@
 1. Connect and log in to the OSS Nexus Repository Manager: https://oss.sonatype.org/
 1. Go to Staging Profiles and select the pending repository authzforce-*... you just uploaded with `jgitflow:release-finish`
 1. Click the Release button to release to Maven Central.
+1. Build the Docker image
+   ```shell
+   $ docker build -t authzforce/restful-pdp:${project.version} .
+   $ docker push
+   ```
 
 More info on jgitflow: http://jgitflow.bitbucket.org/

cxf-spring-boot-server/Dockerfile

@@ -0,0 +1,23 @@
+FROM openjdk:11-jre-slim
+LABEL maintainer="AuthzForce Team"
+LABEL org.label-schema.schema-version="1.0"
+LABEL org.label-schema.vendor="THALES"
+LABEL org.label-schema.name="AuthzForce RESTful PDP"
+# LABEL org.label-schema.description=""
+
+# Guidelines: https://spring.io/guides/gs/spring-boot-docker/
+
+VOLUME /tmp
+
+RUN addgroup --system spring && adduser --system --home /home/spring --ingroup spring --disabled-password spring
+USER spring:spring
+WORKDIR /home/spring
+ARG JAR_FILE=target/*-4.0.1.jar
+COPY ${JAR_FILE} /app.jar
+# COPY extensions /extensions
+
+EXPOSE 8080
+EXPOSE 8443
+
+ENV JAVA_OPTS="-Dloader.path=/extensions -Djava.security.egd=file:/dev/./urandom -Djava.awt.headless=true -Djavax.xml.accessExternalSchema=all -Xms1024m -Xmx2048m -server"
+CMD java ${JAVA_OPTS} -jar /app.jar --spring.config.location=classpath:/,file:/conf/application.yml

cxf-spring-boot-server/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.ow2.authzforce</groupId>
 		<artifactId>authzforce-ce-restful-pdp</artifactId>
-		<version>4.0.0</version>
+		<version>4.0.1</version>
 	</parent>
 	<artifactId>authzforce-ce-restful-pdp-cxf-spring-boot-server</artifactId>
 	<name>${project.groupId}:${project.artifactId}</name>
@@ -24,7 +24,7 @@
 		<dependency>
 			<groupId>org.ow2.authzforce</groupId>
 			<artifactId>authzforce-ce-restful-pdp-jaxrs</artifactId>
-			<version>4.0.0</version>
+			<version>4.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
@@ -195,10 +195,11 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<!-- <version>2.0.0.M6</version> -->
-				<version>1.3.6.RELEASE</version>
+				<version>${spring-boot-starter.version}</version>
 				<configuration>
 					<executable>true</executable>
 					<layout>ZIP</layout>
+					<mainClass>org.ow2.authzforce.rest.pdp.cxf.springboot.CxfJaxrsPdpSpringBootApp</mainClass>
 					<!-- <embeddedLaunchScriptProperties> -->
 					<!-- <inlinedConfScript>src/setenv.sh</inlinedConfScript> -->
 					<!-- </embeddedLaunchScriptProperties> -->

docker/docker-compose.yml

@@ -6,22 +6,15 @@ services:
   pdp:
     # depends_on:
     #  - iam
-
-    # Build section for dev/test only. Remove it in production as in that case you should use a released Docker image from a Docker registry (e.g. in Docker Hub).
-    build: 
-      context: ./pdp
-      args:
-        JAR_VERSION: "3.1.0"
-
-    image: authzforce/restful-pdp:3.1.0
+    image: authzforce/restful-pdp:4.0.1
 
     ports:
      - "8080:8080"
      # - "8443:8443"
 
     environment:
       # Variable to customize JVM options
-      JAVA_OPTS: "-Dloader.path=/extensions -Djava.security.egd=file:/dev/./urandom -Djava.awt.headless=true -Djavax.xml.accessExternalSchema=all -Xms1024m -Xmx1024m -XX:+UseConcMarkSweepGC -server"
+      JAVA_OPTS: "-Dloader.path=/extensions -Djava.security.egd=file:/dev/./urandom -Djava.awt.headless=true -Djavax.xml.accessExternalSchema=all -Xms512m -Xmx1024m -server"
 
     volumes:
      # The source path is given as example here. If you want to use AuthzForce PDP extensions, replace it with the path to the folder where you have the extension(s) JAR(s) with all dependencies that are not already part of the Docker image (i.e. that are not already dependencies of Maven artifact 'authzforce-ce-restful-pdp-cxf-spring-boot-server').

jaxrs/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.ow2.authzforce</groupId>
 		<artifactId>authzforce-ce-restful-pdp</artifactId>
-		<version>4.0.0</version>
+		<version>4.0.1</version>
 	</parent>
 	<artifactId>authzforce-ce-restful-pdp-jaxrs</artifactId>
 	<name>${project.groupId}:${project.artifactId}</name>

pom.xml

@@ -6,7 +6,7 @@
       <version>8.0.0</version>
    </parent>
    <artifactId>authzforce-ce-restful-pdp</artifactId>
-   <version>4.0.0</version>
+   <version>4.0.1</version>
    <packaging>pom</packaging>
    <name>${project.groupId}:${project.artifactId}</name>
    <description>AuthzForce - Parent Project of RESTful PDP API implementation according to REST Profile of XACML 3.0</description>