Merge branch 'release/9.0.1'

Author: cdanger

CHANGELOG.md

@@ -4,6 +4,11 @@ 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.
 
 
+## 9.0.1
+### Fixed
+- Tomcat startup error after Debian package install
+
+
 ## 9.0.0
 *See the [Upgrader tool](upgrader/src) for upgrading from 8.x versions.*
 

dist/pom.xml

@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.ow2.authzforce</groupId>
       <artifactId>authzforce-ce-server</artifactId>
-      <version>9.0.0</version>
+      <version>9.0.1</version>
       <relativePath>..</relativePath>
    </parent>
    <artifactId>authzforce-ce-server-dist</artifactId>

dist/src/debian/control/postinst

@@ -12,11 +12,16 @@ if [ "$RET" = false ]; then
 	rm -rf /opt/[[productId]]/data/domains/*
 fi
 
+# We have changed Tomcat systemd config file during the install, so systemctl daemon-reload must be called
+systemctl daemon-reload
+
 db_get [[productId]]/restartTomcat
 if [ "$RET" = true ]; then
         export JAVA_OPTS='"-Djava.awt.headless=true -Djavax.xml.accessExternalSchema=all -Xms1024m -Xmx1024m -XX:+UseConcMarkSweepGC -server"'
         sed -i 's|^\(JAVA_OPTS\s*=\s*\).*$|\1'"$JAVA_OPTS"'|' /etc/default/tomcat9
-        systemctl restart tomcat9
+        systemctl stop tomcat9
+        rm -rf /var/log/tomcat9/*
+        systemctl start tomcat9
 fi
 
 echo "If you answered 'No' to the second question, you need to set the JAVA_OPTS in '/etc/default/tomcat9' by yourself before restarting Tomcat:" 

dist/src/docker/Dockerfile.tmpl

@@ -24,7 +24,7 @@
 # The alternative is to use FROM ubuntu:* then install tomcat ubuntu package and use upstart/sysctl init script but this is not the way to go:
 # https://github.com/docker/docker/issues/6800
 FROM tomcat:9-jre8
-MAINTAINER AuthzForce Team (contact mailing list: http://scr.im/azteam)
+MAINTAINER AuthzForce Team
 
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -40,7 +40,7 @@ ENV DEBIAN_FRONTEND noninteractive
 ENV JAVA_OPTS="-Djava.security.egd=file:/dev/./urandom -Djava.awt.headless=true -Djavax.xml.accessExternalSchema=all -Xms1024m -Xmx1024m -XX:+UseConcMarkSweepGC -server"
 
 ENV AUTHZFORCE_SERVER_VERSION="${project.version}"
-ENV AUTHZFORCE_SERVER_DOWNLOAD_URL="http://repo1.maven.org/maven2/org/ow2/authzforce/authzforce-ce-server-dist/$AUTHZFORCE_SERVER_VERSION/authzforce-ce-server-dist-$AUTHZFORCE_SERVER_VERSION.deb"
+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)
 # Where there is a command with a pipe, we need to put in between quotes and make it an argument to bash -c command

pom.xml

@@ -8,7 +8,7 @@
    </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>9.0.0</version>
+   <version>9.0.1</version>
    <packaging>pom</packaging>
    <name>${project.groupId}:${project.artifactId}</name>
    <description>AuthzForce CE Server</description>

rest-service/pom.xml

@@ -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>9.0.0</version>
+      <version>9.0.1</version>
       <relativePath>..</relativePath>
    </parent>
    <artifactId>authzforce-ce-server-rest-service</artifactId>

upgrader/pom.xml

@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.ow2.authzforce</groupId>
       <artifactId>authzforce-ce-server</artifactId>
-      <version>9.0.0</version>
+      <version>9.0.1</version>
       <relativePath>..</relativePath>
    </parent>
    <artifactId>authzforce-ce-server-upgrader</artifactId>

webapp/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.ow2.authzforce</groupId>
 		<artifactId>authzforce-ce-server</artifactId>
-		<version>9.0.0</version>
+		<version>9.0.1</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>authzforce-ce-server-webapp</artifactId>