From 73b13d3cc3ded2317fdd0dc717f3455d8f1ca558 Mon Sep 17 00:00:00 2001 From: cdanger Date: Tue, 21 Jul 2020 00:21:24 +0200 Subject: [PATCH 1/9] updating poms for 9.0.1-SNAPSHOT development --- dist/pom.xml | 2 +- pom.xml | 2 +- rest-service/pom.xml | 2 +- upgrader/pom.xml | 2 +- webapp/pom.xml | 5 ++--- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dist/pom.xml b/dist/pom.xml index 449529f..a2b122f 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 8.1.1-SNAPSHOT + 9.0.1-SNAPSHOT .. authzforce-ce-server-dist diff --git a/pom.xml b/pom.xml index ba4e6ac..5c392dc 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ authzforce-ce-server - 8.1.1-SNAPSHOT + 9.0.1-SNAPSHOT pom ${project.groupId}:${project.artifactId} AuthzForce CE Server diff --git a/rest-service/pom.xml b/rest-service/pom.xml index ec9bf64..a4f4c52 100644 --- a/rest-service/pom.xml +++ b/rest-service/pom.xml @@ -4,7 +4,7 @@ org.ow2.authzforce authzforce-ce-server - 8.1.1-SNAPSHOT + 9.0.1-SNAPSHOT .. authzforce-ce-server-rest-service diff --git a/upgrader/pom.xml b/upgrader/pom.xml index 5c99bf1..35e25d7 100644 --- a/upgrader/pom.xml +++ b/upgrader/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 8.1.1-SNAPSHOT + 9.0.1-SNAPSHOT .. authzforce-ce-server-upgrader diff --git a/webapp/pom.xml b/webapp/pom.xml index 3e0da6e..b6f0739 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -1,10 +1,9 @@ - + 4.0.0 org.ow2.authzforce authzforce-ce-server - 8.1.1-SNAPSHOT + 9.0.1-SNAPSHOT .. authzforce-ce-server-webapp From e2496cd1f7ff4043e6447496773868d65dd7fb92 Mon Sep 17 00:00:00 2001 From: cdanger Date: Tue, 21 Jul 2020 01:39:39 +0200 Subject: [PATCH 2/9] updating develop poms to master versions to avoid merge conflicts --- dist/pom.xml | 2 +- pom.xml | 2 +- rest-service/pom.xml | 2 +- upgrader/pom.xml | 2 +- webapp/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dist/pom.xml b/dist/pom.xml index a2b122f..4589d10 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 9.0.1-SNAPSHOT + 9.0.0 .. authzforce-ce-server-dist diff --git a/pom.xml b/pom.xml index 5c392dc..d318edd 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ authzforce-ce-server - 9.0.1-SNAPSHOT + 9.0.0 pom ${project.groupId}:${project.artifactId} AuthzForce CE Server diff --git a/rest-service/pom.xml b/rest-service/pom.xml index a4f4c52..faf95f8 100644 --- a/rest-service/pom.xml +++ b/rest-service/pom.xml @@ -4,7 +4,7 @@ org.ow2.authzforce authzforce-ce-server - 9.0.1-SNAPSHOT + 9.0.0 .. authzforce-ce-server-rest-service diff --git a/upgrader/pom.xml b/upgrader/pom.xml index 35e25d7..1c15103 100644 --- a/upgrader/pom.xml +++ b/upgrader/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 9.0.1-SNAPSHOT + 9.0.0 .. authzforce-ce-server-upgrader diff --git a/webapp/pom.xml b/webapp/pom.xml index b6f0739..7fdece1 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 9.0.1-SNAPSHOT + 9.0.0 .. authzforce-ce-server-webapp From 382a42b74fd1a49dc194fd47d0ba5c146c37cdda Mon Sep 17 00:00:00 2001 From: cdanger Date: Tue, 21 Jul 2020 01:39:39 +0200 Subject: [PATCH 3/9] Updating develop poms back to pre merge state --- dist/pom.xml | 2 +- pom.xml | 2 +- rest-service/pom.xml | 2 +- upgrader/pom.xml | 2 +- webapp/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dist/pom.xml b/dist/pom.xml index 4589d10..a2b122f 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 9.0.0 + 9.0.1-SNAPSHOT .. authzforce-ce-server-dist diff --git a/pom.xml b/pom.xml index d318edd..5c392dc 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ authzforce-ce-server - 9.0.0 + 9.0.1-SNAPSHOT pom ${project.groupId}:${project.artifactId} AuthzForce CE Server diff --git a/rest-service/pom.xml b/rest-service/pom.xml index faf95f8..a4f4c52 100644 --- a/rest-service/pom.xml +++ b/rest-service/pom.xml @@ -4,7 +4,7 @@ org.ow2.authzforce authzforce-ce-server - 9.0.0 + 9.0.1-SNAPSHOT .. authzforce-ce-server-rest-service diff --git a/upgrader/pom.xml b/upgrader/pom.xml index 1c15103..35e25d7 100644 --- a/upgrader/pom.xml +++ b/upgrader/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 9.0.0 + 9.0.1-SNAPSHOT .. authzforce-ce-server-upgrader diff --git a/webapp/pom.xml b/webapp/pom.xml index d154e6e..f2b6388 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 9.0.0 + 9.0.1-SNAPSHOT .. authzforce-ce-server-webapp From 672f5e03c02093501abd6e6171682f3c86bab9bc Mon Sep 17 00:00:00 2001 From: cdanger Date: Tue, 21 Jul 2020 23:42:24 +0200 Subject: [PATCH 4/9] Fix Tomcat startup after debian package install --- dist/src/debian/control/postinst | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dist/src/debian/control/postinst b/dist/src/debian/control/postinst index f87aabb..11e5200 100644 --- a/dist/src/debian/control/postinst +++ b/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:" From a6c91264e1aa3b5e52b56b4bed373d6af6d4643e Mon Sep 17 00:00:00 2001 From: cdanger Date: Tue, 21 Jul 2020 23:54:36 +0200 Subject: [PATCH 5/9] Fixed .deb download url in dockerfile --- dist/src/docker/Dockerfile.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/src/docker/Dockerfile.tmpl b/dist/src/docker/Dockerfile.tmpl index a94ee3d..44e2b4a 100644 --- a/dist/src/docker/Dockerfile.tmpl +++ b/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 From 6ce2f485637a38f58705816c70ac5e186795f22a Mon Sep 17 00:00:00 2001 From: cdanger Date: Tue, 21 Jul 2020 23:55:16 +0200 Subject: [PATCH 6/9] updating poms for 9.0.2-SNAPSHOT development --- dist/pom.xml | 2 +- pom.xml | 2 +- rest-service/pom.xml | 2 +- upgrader/pom.xml | 2 +- webapp/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dist/pom.xml b/dist/pom.xml index a2b122f..884d8d4 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 9.0.1-SNAPSHOT + 9.0.2-SNAPSHOT .. authzforce-ce-server-dist diff --git a/pom.xml b/pom.xml index 5c392dc..39dc432 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ authzforce-ce-server - 9.0.1-SNAPSHOT + 9.0.2-SNAPSHOT pom ${project.groupId}:${project.artifactId} AuthzForce CE Server diff --git a/rest-service/pom.xml b/rest-service/pom.xml index a4f4c52..e67631e 100644 --- a/rest-service/pom.xml +++ b/rest-service/pom.xml @@ -4,7 +4,7 @@ org.ow2.authzforce authzforce-ce-server - 9.0.1-SNAPSHOT + 9.0.2-SNAPSHOT .. authzforce-ce-server-rest-service diff --git a/upgrader/pom.xml b/upgrader/pom.xml index 35e25d7..740aa34 100644 --- a/upgrader/pom.xml +++ b/upgrader/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 9.0.1-SNAPSHOT + 9.0.2-SNAPSHOT .. authzforce-ce-server-upgrader diff --git a/webapp/pom.xml b/webapp/pom.xml index f2b6388..de483a4 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 9.0.1-SNAPSHOT + 9.0.2-SNAPSHOT .. authzforce-ce-server-webapp From 0ab46261664eda434f93e27ffc0254632fae0b30 Mon Sep 17 00:00:00 2001 From: cdanger Date: Tue, 21 Jul 2020 23:56:24 +0200 Subject: [PATCH 7/9] updating poms for 9.0.1 branch with snapshot versions --- dist/pom.xml | 2 +- pom.xml | 2 +- rest-service/pom.xml | 2 +- upgrader/pom.xml | 2 +- webapp/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dist/pom.xml b/dist/pom.xml index 884d8d4..a2b122f 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 9.0.2-SNAPSHOT + 9.0.1-SNAPSHOT .. authzforce-ce-server-dist diff --git a/pom.xml b/pom.xml index 39dc432..5c392dc 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ authzforce-ce-server - 9.0.2-SNAPSHOT + 9.0.1-SNAPSHOT pom ${project.groupId}:${project.artifactId} AuthzForce CE Server diff --git a/rest-service/pom.xml b/rest-service/pom.xml index e67631e..a4f4c52 100644 --- a/rest-service/pom.xml +++ b/rest-service/pom.xml @@ -4,7 +4,7 @@ org.ow2.authzforce authzforce-ce-server - 9.0.2-SNAPSHOT + 9.0.1-SNAPSHOT .. authzforce-ce-server-rest-service diff --git a/upgrader/pom.xml b/upgrader/pom.xml index 740aa34..35e25d7 100644 --- a/upgrader/pom.xml +++ b/upgrader/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 9.0.2-SNAPSHOT + 9.0.1-SNAPSHOT .. authzforce-ce-server-upgrader diff --git a/webapp/pom.xml b/webapp/pom.xml index de483a4..f2b6388 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 9.0.2-SNAPSHOT + 9.0.1-SNAPSHOT .. authzforce-ce-server-webapp From 528a2fda43d17939789ed2820d43427d8ad99b8f Mon Sep 17 00:00:00 2001 From: cdanger Date: Tue, 21 Jul 2020 23:58:58 +0200 Subject: [PATCH 8/9] updated changelog for next release --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 927eabc..a3d52c6 100644 --- a/CHANGELOG.md +++ b/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.* From 8356fc19d88123d9cf4995d6547e1648a431345b Mon Sep 17 00:00:00 2001 From: cdanger Date: Tue, 21 Jul 2020 23:59:12 +0200 Subject: [PATCH 9/9] updating poms for branch'release/9.0.1' with non-snapshot versions --- dist/pom.xml | 2 +- pom.xml | 2 +- rest-service/pom.xml | 2 +- upgrader/pom.xml | 2 +- webapp/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dist/pom.xml b/dist/pom.xml index a2b122f..85642e2 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 9.0.1-SNAPSHOT + 9.0.1 .. authzforce-ce-server-dist diff --git a/pom.xml b/pom.xml index 5c392dc..64082a1 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ authzforce-ce-server - 9.0.1-SNAPSHOT + 9.0.1 pom ${project.groupId}:${project.artifactId} AuthzForce CE Server diff --git a/rest-service/pom.xml b/rest-service/pom.xml index a4f4c52..f24ab25 100644 --- a/rest-service/pom.xml +++ b/rest-service/pom.xml @@ -4,7 +4,7 @@ org.ow2.authzforce authzforce-ce-server - 9.0.1-SNAPSHOT + 9.0.1 .. authzforce-ce-server-rest-service diff --git a/upgrader/pom.xml b/upgrader/pom.xml index 35e25d7..3eda424 100644 --- a/upgrader/pom.xml +++ b/upgrader/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 9.0.1-SNAPSHOT + 9.0.1 .. authzforce-ce-server-upgrader diff --git a/webapp/pom.xml b/webapp/pom.xml index f2b6388..792a8ba 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 9.0.1-SNAPSHOT + 9.0.1 .. authzforce-ce-server-webapp