firethorn

changeset 4265:9e557d1a5a59 2.1.33-stv-tap-swarm

Creating [branch-2.1.33-stv-tap-swarm]
author Stelios <stv@roe.ac.uk>
date Thu Jul 18 13:57:24 2019 +0300 (2019-07-18)
parents e99f391f91b4
children d05c4df148d9
files docker/apache/Dockerfile docker/builder/Dockerfile docker/compose/client/Dockerfile docker/compose/tests/distictella/Dockerfile docker/compose/tests/distictella/firethorn-py/Dockerfile docker/java/Dockerfile docker/python/3.4.2/Dockerfile docker/pythonlibs/Dockerfile docker/sql-proxy/Dockerfile docker/sql-tunnel/Dockerfile docker/ssh-client/Dockerfile docker/tester/Dockerfile docker/tomcat/Dockerfile firethorn-admin/pom.xml firethorn-admin/src/main/docker/firethorn/Dockerfile firethorn-annotations/pom.xml firethorn-cds/adql/pom.xml firethorn-cds/pom.xml firethorn-core/pom.xml firethorn-jdbc/pom.xml firethorn-logging/pom.xml firethorn-ogsadai/activity/client/pom.xml firethorn-ogsadai/activity/common/pom.xml firethorn-ogsadai/activity/context/pom.xml firethorn-ogsadai/activity/context/src/main/java/uk/ac/roe/wfau/firethorn/ogsadai/context/RequestContextFactory.java firethorn-ogsadai/activity/pom.xml firethorn-ogsadai/activity/server/pom.xml firethorn-ogsadai/astro/client/pom.xml firethorn-ogsadai/astro/pom.xml firethorn-ogsadai/astro/server/pom.xml firethorn-ogsadai/depends/pom.xml firethorn-ogsadai/distributed/client/pom.xml firethorn-ogsadai/distributed/common/pom.xml firethorn-ogsadai/distributed/pom.xml firethorn-ogsadai/distributed/server/pom.xml firethorn-ogsadai/firethorn/client/pom.xml firethorn-ogsadai/firethorn/common/pom.xml firethorn-ogsadai/firethorn/pom.xml firethorn-ogsadai/firethorn/server/pom.xml firethorn-ogsadai/metadata/client/pom.xml firethorn-ogsadai/metadata/pom.xml firethorn-ogsadai/pom.xml firethorn-ogsadai/webapp/pom.xml firethorn-ogsadai/webapp/src/main/docker/ogsadai/Dockerfile firethorn-spring/pom.xml firethorn-stil/pom.xml firethorn-testing/pom.xml firethorn-webapp/pom.xml firethorn-webapp/src/main/docker/firethorn/Dockerfile integration/005/pom.xml integration/tester/Dockerfile pom.xml
line diff
     1.1 --- a/docker/apache/Dockerfile	Tue Jul 02 07:46:37 2019 +0200
     1.2 +++ b/docker/apache/Dockerfile	Thu Jul 18 13:57:24 2019 +0300
     1.3 @@ -17,7 +17,7 @@
     1.4  #
     1.5  # Based on example from the official httpd Docker container.
     1.6  # https://github.com/docker-library/httpd/blob/master/2.4/Dockerfile
     1.7 -FROM firethorn/fedora:2.1.33
     1.8 +FROM firethorn/fedora:2.1.33-stv-tap-swarm
     1.9  MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
    1.10  
    1.11  #
     2.1 --- a/docker/builder/Dockerfile	Tue Jul 02 07:46:37 2019 +0200
     2.2 +++ b/docker/builder/Dockerfile	Thu Jul 18 13:57:24 2019 +0300
     2.3 @@ -15,7 +15,7 @@
     2.4  # You should have received a copy of the GNU General Public License
     2.5  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     2.6  
     2.7 -FROM firethorn/java:2.1.33
     2.8 +FROM firethorn/java:2.1.33-stv-tap-swarm
     2.9  MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
    2.10  
    2.11  #
     3.1 --- a/docker/compose/client/Dockerfile	Tue Jul 02 07:46:37 2019 +0200
     3.2 +++ b/docker/compose/client/Dockerfile	Thu Jul 18 13:57:24 2019 +0300
     3.3 @@ -15,7 +15,7 @@
     3.4  # You should have received a copy of the GNU General Public License
     3.5  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     3.6  
     3.7 -FROM firethorn/tester:2.1.33
     3.8 +FROM firethorn/tester:2.1.33-stv-tap-swarm
     3.9  LABEL MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
    3.10  
    3.11  ENV pysrc=/home/firethorn-py
     4.1 --- a/docker/compose/tests/distictella/Dockerfile	Tue Jul 02 07:46:37 2019 +0200
     4.2 +++ b/docker/compose/tests/distictella/Dockerfile	Thu Jul 18 13:57:24 2019 +0300
     4.3 @@ -15,7 +15,7 @@
     4.4  # You should have received a copy of the GNU General Public License
     4.5  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     4.6  
     4.7 -FROM firethorn/fedora:2.1.33
     4.8 +FROM firethorn/fedora:2.1.33-stv-tap-swarm
     4.9  MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
    4.10  
    4.11  RUN dnf -y install \
     5.1 --- a/docker/compose/tests/distictella/firethorn-py/Dockerfile	Tue Jul 02 07:46:37 2019 +0200
     5.2 +++ b/docker/compose/tests/distictella/firethorn-py/Dockerfile	Thu Jul 18 13:57:24 2019 +0300
     5.3 @@ -15,7 +15,7 @@
     5.4  # You should have received a copy of the GNU General Public License
     5.5  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     5.6  
     5.7 -FROM firethorn/fedora:2.1.33
     5.8 +FROM firethorn/fedora:2.1.33-stv-tap-swarm
     5.9  MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
    5.10  
    5.11  RUN dnf -y install \
     6.1 --- a/docker/java/Dockerfile	Tue Jul 02 07:46:37 2019 +0200
     6.2 +++ b/docker/java/Dockerfile	Thu Jul 18 13:57:24 2019 +0300
     6.3 @@ -15,7 +15,7 @@
     6.4  # You should have received a copy of the GNU General Public License
     6.5  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     6.6  
     6.7 -FROM firethorn/fedora:2.1.33
     6.8 +FROM firethorn/fedora:2.1.33-stv-tap-swarm
     6.9  MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
    6.10  
    6.11  ENV JAVA_VERSION=12.0.0.33
     7.1 --- a/docker/python/3.4.2/Dockerfile	Tue Jul 02 07:46:37 2019 +0200
     7.2 +++ b/docker/python/3.4.2/Dockerfile	Thu Jul 18 13:57:24 2019 +0300
     7.3 @@ -1,4 +1,4 @@
     7.4 -FROM firethorn/ubuntu:2.1.33
     7.5 +FROM firethorn/ubuntu:2.1.33-stv-tap-swarm
     7.6  MAINTAINER Stelios Voutsinas <stv@roe.ac.uk>
     7.7  
     7.8  #
     8.1 --- a/docker/pythonlibs/Dockerfile	Tue Jul 02 07:46:37 2019 +0200
     8.2 +++ b/docker/pythonlibs/Dockerfile	Thu Jul 18 13:57:24 2019 +0300
     8.3 @@ -1,4 +1,4 @@
     8.4 -FROM firethorn/python:2.1.33
     8.5 +FROM firethorn/python:2.1.33-stv-tap-swarm
     8.6  MAINTAINER Stelios Voutsinas <stv@roe.ac.uk>
     8.7  
     8.8  # Install Python Libs
     9.1 --- a/docker/sql-proxy/Dockerfile	Tue Jul 02 07:46:37 2019 +0200
     9.2 +++ b/docker/sql-proxy/Dockerfile	Thu Jul 18 13:57:24 2019 +0300
     9.3 @@ -15,7 +15,7 @@
     9.4  # You should have received a copy of the GNU General Public License
     9.5  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     9.6  
     9.7 -FROM firethorn/fedora:2.1.33
     9.8 +FROM firethorn/fedora:2.1.33-stv-tap-swarm
     9.9  MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
    9.10  
    9.11  EXPOSE 1433
    10.1 --- a/docker/sql-tunnel/Dockerfile	Tue Jul 02 07:46:37 2019 +0200
    10.2 +++ b/docker/sql-tunnel/Dockerfile	Thu Jul 18 13:57:24 2019 +0300
    10.3 @@ -15,7 +15,7 @@
    10.4  # You should have received a copy of the GNU General Public License
    10.5  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
    10.6  
    10.7 -FROM firethorn/fedora:2.1.33
    10.8 +FROM firethorn/fedora:2.1.33-stv-tap-swarm
    10.9  MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
   10.10  
   10.11  EXPOSE 1433
    11.1 --- a/docker/ssh-client/Dockerfile	Tue Jul 02 07:46:37 2019 +0200
    11.2 +++ b/docker/ssh-client/Dockerfile	Thu Jul 18 13:57:24 2019 +0300
    11.3 @@ -15,7 +15,7 @@
    11.4  # You should have received a copy of the GNU General Public License
    11.5  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
    11.6  
    11.7 -FROM firethorn/fedora:2.1.33
    11.8 +FROM firethorn/fedora:2.1.33-stv-tap-swarm
    11.9  MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
   11.10  
   11.11  RUN dnf -y install openssh-clients
    12.1 --- a/docker/tester/Dockerfile	Tue Jul 02 07:46:37 2019 +0200
    12.2 +++ b/docker/tester/Dockerfile	Thu Jul 18 13:57:24 2019 +0300
    12.3 @@ -15,7 +15,7 @@
    12.4  # You should have received a copy of the GNU General Public License
    12.5  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
    12.6  
    12.7 -FROM firethorn/fedora:2.1.33
    12.8 +FROM firethorn/fedora:2.1.33-stv-tap-swarm
    12.9  MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
   12.10  
   12.11  RUN dnf install -y jq
    13.1 --- a/docker/tomcat/Dockerfile	Tue Jul 02 07:46:37 2019 +0200
    13.2 +++ b/docker/tomcat/Dockerfile	Thu Jul 18 13:57:24 2019 +0300
    13.3 @@ -15,7 +15,7 @@
    13.4  # You should have received a copy of the GNU General Public License
    13.5  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
    13.6  
    13.7 -FROM firethorn/java:2.1.33
    13.8 +FROM firethorn/java:2.1.33-stv-tap-swarm
    13.9  MAINTAINER [Dave Morris <docker-admin@metagrid.co.uk>]
   13.10  
   13.11  # https://tomcat.apache.org/whichversion.html
    14.1 --- a/firethorn-admin/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    14.2 +++ b/firethorn-admin/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    14.3 @@ -32,7 +32,7 @@
    14.4      <parent>
    14.5          <groupId>uk.ac.roe.wfau</groupId>
    14.6          <artifactId>firethorn</artifactId>
    14.7 -        <version project='firethorn'>2.1.33</version>
    14.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    14.9      </parent>
   14.10  
   14.11      <artifactId>firethorn-admin-webapp</artifactId>
    15.1 --- a/firethorn-admin/src/main/docker/firethorn/Dockerfile	Tue Jul 02 07:46:37 2019 +0200
    15.2 +++ b/firethorn-admin/src/main/docker/firethorn/Dockerfile	Thu Jul 18 13:57:24 2019 +0300
    15.3 @@ -15,7 +15,7 @@
    15.4  # You should have received a copy of the GNU General Public License
    15.5  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
    15.6  
    15.7 -FROM firethorn/tomcat:2.1.33
    15.8 +FROM firethorn/tomcat:2.1.33-stv-tap-swarm
    15.9  MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
   15.10  
   15.11  #
    16.1 --- a/firethorn-annotations/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    16.2 +++ b/firethorn-annotations/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    16.3 @@ -32,7 +32,7 @@
    16.4      <parent>
    16.5          <groupId>uk.ac.roe.wfau</groupId>
    16.6          <artifactId>firethorn</artifactId>
    16.7 -        <version project='firethorn'>2.1.33</version>
    16.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    16.9      </parent>
   16.10  
   16.11      <artifactId>firethorn-annotations</artifactId>
    17.1 --- a/firethorn-cds/adql/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    17.2 +++ b/firethorn-cds/adql/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    17.3 @@ -32,7 +32,7 @@
    17.4      <parent>
    17.5          <groupId>uk.ac.roe.wfau</groupId>
    17.6          <artifactId>firethorn-cds</artifactId>
    17.7 -		<version project='firethorn'>2.1.33</version>
    17.8 +		<version project='firethorn'>2.1.33-stv-tap-swarm</version>
    17.9  	</parent>
   17.10  
   17.11      <artifactId>firethorn-cds-adql</artifactId>
    18.1 --- a/firethorn-cds/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    18.2 +++ b/firethorn-cds/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    18.3 @@ -32,7 +32,7 @@
    18.4      <parent>
    18.5          <groupId>uk.ac.roe.wfau</groupId>
    18.6          <artifactId>firethorn</artifactId>
    18.7 -        <version project='firethorn'>2.1.33</version>
    18.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    18.9      </parent>
   18.10  
   18.11      <artifactId>firethorn-cds</artifactId>
    19.1 --- a/firethorn-core/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    19.2 +++ b/firethorn-core/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    19.3 @@ -32,7 +32,7 @@
    19.4      <parent>
    19.5          <groupId>uk.ac.roe.wfau</groupId>
    19.6          <artifactId>firethorn</artifactId>
    19.7 -        <version project='firethorn'>2.1.33</version>
    19.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    19.9  	</parent>
   19.10  
   19.11      <artifactId>firethorn-core</artifactId>
    20.1 --- a/firethorn-jdbc/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    20.2 +++ b/firethorn-jdbc/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    20.3 @@ -32,7 +32,7 @@
    20.4      <parent>
    20.5          <groupId>uk.ac.roe.wfau</groupId>
    20.6          <artifactId>firethorn</artifactId>
    20.7 -        <version project='firethorn'>2.1.33</version>
    20.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    20.9      </parent>
   20.10  
   20.11      <artifactId>firethorn-jdbc</artifactId>
    21.1 --- a/firethorn-logging/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    21.2 +++ b/firethorn-logging/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    21.3 @@ -32,7 +32,7 @@
    21.4      <parent>
    21.5          <groupId>uk.ac.roe.wfau</groupId>
    21.6          <artifactId>firethorn</artifactId>
    21.7 -        <version project='firethorn'>2.1.33</version>
    21.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    21.9      </parent>
   21.10  
   21.11      <artifactId>firethorn-logging</artifactId>
    22.1 --- a/firethorn-ogsadai/activity/client/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    22.2 +++ b/firethorn-ogsadai/activity/client/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    22.3 @@ -32,7 +32,7 @@
    22.4      <parent>
    22.5          <groupId>uk.ac.roe.wfau</groupId>
    22.6          <artifactId>firethorn-ogsadai-activity</artifactId>
    22.7 -        <version project='firethorn'>2.1.33</version>
    22.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    22.9  	</parent>
   22.10  
   22.11      <artifactId>firethorn-ogsadai-activity-client</artifactId>
    23.1 --- a/firethorn-ogsadai/activity/common/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    23.2 +++ b/firethorn-ogsadai/activity/common/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    23.3 @@ -32,7 +32,7 @@
    23.4      <parent>
    23.5          <groupId>uk.ac.roe.wfau</groupId>
    23.6          <artifactId>firethorn-ogsadai-activity</artifactId>
    23.7 -        <version project='firethorn'>2.1.33</version>
    23.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    23.9      </parent>
   23.10  
   23.11      <artifactId>firethorn-ogsadai-activity-common</artifactId>
    24.1 --- a/firethorn-ogsadai/activity/context/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    24.2 +++ b/firethorn-ogsadai/activity/context/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    24.3 @@ -32,7 +32,7 @@
    24.4      <parent>
    24.5          <groupId>uk.ac.roe.wfau</groupId>
    24.6          <artifactId>firethorn-ogsadai-activity</artifactId>
    24.7 -        <version project='firethorn'>2.1.33</version>
    24.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    24.9  	</parent>
   24.10  
   24.11      <artifactId>firethorn-ogsadai-activity-context</artifactId>
    25.1 --- a/firethorn-ogsadai/activity/context/src/main/java/uk/ac/roe/wfau/firethorn/ogsadai/context/RequestContextFactory.java	Tue Jul 02 07:46:37 2019 +0200
    25.2 +++ b/firethorn-ogsadai/activity/context/src/main/java/uk/ac/roe/wfau/firethorn/ogsadai/context/RequestContextFactory.java	Thu Jul 18 13:57:24 2019 +0300
    25.3 @@ -11,10 +11,13 @@
    25.4  import uk.ac.roe.wfau.firethorn.ogsadai.activity.common.chaos.MonkeyParam;
    25.5  import uk.ac.roe.wfau.firethorn.ogsadai.activity.common.chaos.MonkeyParamImpl;
    25.6  import uk.org.ogsadai.service.rest.authorisation.SecurityContextFactory;
    25.7 +import org.springframework.beans.factory.annotation.Value;
    25.8 +import org.springframework.stereotype.Component;
    25.9  
   25.10  /**
   25.11   *
   25.12   */
   25.13 +@Component
   25.14  public class RequestContextFactory
   25.15  implements SecurityContextFactory
   25.16  	{
   25.17 @@ -78,8 +81,9 @@
   25.18                      {
   25.19                      this.protocol = protocol;
   25.20                      }
   25.21 -
   25.22 -                private String host = (remote != null) ? remote : DEFAULT_HOST ;
   25.23 +                
   25.24 +                @Value("${firethorn.host:#{localhost2}}")
   25.25 +                private String host;
   25.26                  @Override
   25.27                  public String host()
   25.28                      {
    26.1 --- a/firethorn-ogsadai/activity/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    26.2 +++ b/firethorn-ogsadai/activity/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    26.3 @@ -37,7 +37,7 @@
    26.4      <parent>
    26.5          <groupId>uk.ac.roe.wfau</groupId>
    26.6          <artifactId>firethorn-ogsadai</artifactId>
    26.7 -        <version project='firethorn'>2.1.33</version>
    26.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    26.9      </parent>
   26.10  
   26.11      <artifactId>firethorn-ogsadai-activity</artifactId>
    27.1 --- a/firethorn-ogsadai/activity/server/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    27.2 +++ b/firethorn-ogsadai/activity/server/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    27.3 @@ -32,7 +32,7 @@
    27.4      <parent>
    27.5          <groupId>uk.ac.roe.wfau</groupId>
    27.6          <artifactId>firethorn-ogsadai-activity</artifactId>
    27.7 -        <version project='firethorn'>2.1.33</version>
    27.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    27.9      </parent>
   27.10  
   27.11      <artifactId>firethorn-ogsadai-activity-server</artifactId>
    28.1 --- a/firethorn-ogsadai/astro/client/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    28.2 +++ b/firethorn-ogsadai/astro/client/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    28.3 @@ -32,7 +32,7 @@
    28.4      <parent>
    28.5          <groupId>uk.ac.roe.wfau</groupId>
    28.6          <artifactId>firethorn-ogsadai-astro</artifactId>
    28.7 -        <version project='firethorn'>2.1.33</version>
    28.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    28.9      </parent>
   28.10  
   28.11      <artifactId>firethorn-ogsadai-astro-client</artifactId>
    29.1 --- a/firethorn-ogsadai/astro/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    29.2 +++ b/firethorn-ogsadai/astro/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    29.3 @@ -32,7 +32,7 @@
    29.4      <parent>
    29.5          <groupId>uk.ac.roe.wfau</groupId>
    29.6          <artifactId>firethorn-ogsadai</artifactId>
    29.7 -        <version project='firethorn'>2.1.33</version>
    29.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    29.9      </parent>
   29.10  
   29.11      <artifactId>firethorn-ogsadai-astro</artifactId>
    30.1 --- a/firethorn-ogsadai/astro/server/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    30.2 +++ b/firethorn-ogsadai/astro/server/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    30.3 @@ -32,7 +32,7 @@
    30.4      <parent>
    30.5          <groupId>uk.ac.roe.wfau</groupId>
    30.6          <artifactId>firethorn-ogsadai-astro</artifactId>
    30.7 -        <version project='firethorn'>2.1.33</version>
    30.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    30.9      </parent>
   30.10  
   30.11      <artifactId>firethorn-ogsadai-astro-server</artifactId>
    31.1 --- a/firethorn-ogsadai/depends/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    31.2 +++ b/firethorn-ogsadai/depends/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    31.3 @@ -32,7 +32,7 @@
    31.4      <parent>
    31.5          <groupId>uk.ac.roe.wfau</groupId>
    31.6          <artifactId>firethorn-ogsadai</artifactId>
    31.7 -        <version project='firethorn'>2.1.33</version>
    31.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    31.9      </parent>
   31.10  
   31.11      <artifactId>firethorn-ogsadai-depends</artifactId>
    32.1 --- a/firethorn-ogsadai/distributed/client/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    32.2 +++ b/firethorn-ogsadai/distributed/client/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    32.3 @@ -32,7 +32,7 @@
    32.4      <parent>
    32.5          <groupId>uk.ac.roe.wfau</groupId>
    32.6          <artifactId>firethorn-ogsadai-dqp</artifactId>
    32.7 -        <version project='firethorn'>2.1.33</version>
    32.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    32.9      </parent>
   32.10  
   32.11      <artifactId>firethorn-ogsadai-dqp-client</artifactId>
    33.1 --- a/firethorn-ogsadai/distributed/common/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    33.2 +++ b/firethorn-ogsadai/distributed/common/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    33.3 @@ -32,7 +32,7 @@
    33.4      <parent>
    33.5          <groupId>uk.ac.roe.wfau</groupId>
    33.6          <artifactId>firethorn-ogsadai-dqp</artifactId>
    33.7 -        <version project='firethorn'>2.1.33</version>
    33.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    33.9      </parent>
   33.10  
   33.11      <artifactId>firethorn-ogsadai-dqp-common</artifactId>
    34.1 --- a/firethorn-ogsadai/distributed/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    34.2 +++ b/firethorn-ogsadai/distributed/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    34.3 @@ -32,7 +32,7 @@
    34.4      <parent>
    34.5          <groupId>uk.ac.roe.wfau</groupId>
    34.6          <artifactId>firethorn-ogsadai</artifactId>
    34.7 -        <version project='firethorn'>2.1.33</version>
    34.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    34.9      </parent>
   34.10  
   34.11      <artifactId>firethorn-ogsadai-dqp</artifactId>
    35.1 --- a/firethorn-ogsadai/distributed/server/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    35.2 +++ b/firethorn-ogsadai/distributed/server/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    35.3 @@ -32,7 +32,7 @@
    35.4      <parent>
    35.5          <groupId>uk.ac.roe.wfau</groupId>
    35.6          <artifactId>firethorn-ogsadai-dqp</artifactId>
    35.7 -        <version project='firethorn'>2.1.33</version>
    35.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    35.9      </parent>
   35.10  
   35.11      <artifactId>firethorn-ogsadai-dqp-server</artifactId>
    36.1 --- a/firethorn-ogsadai/firethorn/client/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    36.2 +++ b/firethorn-ogsadai/firethorn/client/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    36.3 @@ -32,7 +32,7 @@
    36.4      <parent>
    36.5          <groupId>uk.ac.roe.wfau</groupId>
    36.6          <artifactId>firethorn-ogsadai-firethorn</artifactId>
    36.7 -        <version project='firethorn'>2.1.33</version>
    36.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    36.9      </parent>
   36.10  
   36.11      <artifactId>firethorn-ogsadai-firethorn-client</artifactId>
    37.1 --- a/firethorn-ogsadai/firethorn/common/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    37.2 +++ b/firethorn-ogsadai/firethorn/common/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    37.3 @@ -32,7 +32,7 @@
    37.4      <parent>
    37.5          <groupId>uk.ac.roe.wfau</groupId>
    37.6          <artifactId>firethorn-ogsadai-firethorn</artifactId>
    37.7 -        <version project='firethorn'>2.1.33</version>
    37.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    37.9      </parent>
   37.10  
   37.11      <artifactId>firethorn-ogsadai-firethorn-common</artifactId>
    38.1 --- a/firethorn-ogsadai/firethorn/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    38.2 +++ b/firethorn-ogsadai/firethorn/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    38.3 @@ -32,7 +32,7 @@
    38.4      <parent>
    38.5          <groupId>uk.ac.roe.wfau</groupId>
    38.6          <artifactId>firethorn-ogsadai</artifactId>
    38.7 -        <version project='firethorn'>2.1.33</version>
    38.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    38.9      </parent>
   38.10  
   38.11      <artifactId>firethorn-ogsadai-firethorn</artifactId>
    39.1 --- a/firethorn-ogsadai/firethorn/server/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    39.2 +++ b/firethorn-ogsadai/firethorn/server/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    39.3 @@ -32,7 +32,7 @@
    39.4      <parent>
    39.5          <groupId>uk.ac.roe.wfau</groupId>
    39.6          <artifactId>firethorn-ogsadai-firethorn</artifactId>
    39.7 -        <version project='firethorn'>2.1.33</version>
    39.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    39.9      </parent>
   39.10  
   39.11      <artifactId>firethorn-ogsadai-firethorn-server</artifactId>
    40.1 --- a/firethorn-ogsadai/metadata/client/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    40.2 +++ b/firethorn-ogsadai/metadata/client/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    40.3 @@ -32,7 +32,7 @@
    40.4      <parent>
    40.5          <groupId>uk.ac.roe.wfau</groupId>
    40.6          <artifactId>firethorn-ogsadai-metadata</artifactId>
    40.7 -        <version project='firethorn'>2.1.33</version>
    40.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    40.9      </parent>
   40.10  
   40.11      <artifactId>firethorn-ogsadai-metadata-client</artifactId>
    41.1 --- a/firethorn-ogsadai/metadata/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    41.2 +++ b/firethorn-ogsadai/metadata/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    41.3 @@ -32,7 +32,7 @@
    41.4      <parent>
    41.5          <groupId>uk.ac.roe.wfau</groupId>
    41.6          <artifactId>firethorn-ogsadai</artifactId>
    41.7 -        <version project='firethorn'>2.1.33</version>
    41.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    41.9      </parent>
   41.10  
   41.11      <artifactId>firethorn-ogsadai-metadata</artifactId>
    42.1 --- a/firethorn-ogsadai/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    42.2 +++ b/firethorn-ogsadai/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    42.3 @@ -37,7 +37,7 @@
    42.4      <parent>
    42.5          <groupId>uk.ac.roe.wfau</groupId>
    42.6          <artifactId>firethorn</artifactId>
    42.7 -        <version project='firethorn'>2.1.33</version>
    42.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    42.9      </parent>
   42.10  
   42.11      <artifactId>firethorn-ogsadai</artifactId>
    43.1 --- a/firethorn-ogsadai/webapp/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    43.2 +++ b/firethorn-ogsadai/webapp/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    43.3 @@ -32,7 +32,7 @@
    43.4      <parent>
    43.5          <groupId>uk.ac.roe.wfau</groupId>
    43.6          <artifactId>firethorn-ogsadai</artifactId>
    43.7 -        <version project='firethorn'>2.1.33</version>
    43.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    43.9      </parent>
   43.10  
   43.11      <artifactId>firethorn-ogsadai-webapp</artifactId>
    44.1 --- a/firethorn-ogsadai/webapp/src/main/docker/ogsadai/Dockerfile	Tue Jul 02 07:46:37 2019 +0200
    44.2 +++ b/firethorn-ogsadai/webapp/src/main/docker/ogsadai/Dockerfile	Thu Jul 18 13:57:24 2019 +0300
    44.3 @@ -15,7 +15,7 @@
    44.4  # You should have received a copy of the GNU General Public License
    44.5  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
    44.6  
    44.7 -FROM firethorn/tomcat:2.1.33
    44.8 +FROM firethorn/tomcat:2.1.33-stv-tap-swarm
    44.9  MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
   44.10  
   44.11  #
    45.1 --- a/firethorn-spring/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    45.2 +++ b/firethorn-spring/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    45.3 @@ -32,7 +32,7 @@
    45.4      <parent>
    45.5          <groupId>uk.ac.roe.wfau</groupId>
    45.6          <artifactId>firethorn</artifactId>
    45.7 -        <version project='firethorn'>2.1.33</version>
    45.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    45.9      </parent>
   45.10  
   45.11      <artifactId>firethorn-spring</artifactId>
    46.1 --- a/firethorn-stil/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    46.2 +++ b/firethorn-stil/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    46.3 @@ -32,7 +32,7 @@
    46.4      <parent>
    46.5          <groupId>uk.ac.roe.wfau</groupId>
    46.6          <artifactId>firethorn</artifactId>
    46.7 -        <version project='firethorn'>2.1.33</version>
    46.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    46.9      </parent>
   46.10  
   46.11      <artifactId>firethorn-stil</artifactId>
    47.1 --- a/firethorn-testing/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    47.2 +++ b/firethorn-testing/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    47.3 @@ -32,7 +32,7 @@
    47.4      <parent>
    47.5          <groupId>uk.ac.roe.wfau</groupId>
    47.6          <artifactId>firethorn</artifactId>
    47.7 -        <version project='firethorn'>2.1.33</version>
    47.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    47.9      </parent>
   47.10  
   47.11      <artifactId>firethorn-testing</artifactId>
    48.1 --- a/firethorn-webapp/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    48.2 +++ b/firethorn-webapp/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    48.3 @@ -32,7 +32,7 @@
    48.4      <parent>
    48.5          <groupId>uk.ac.roe.wfau</groupId>
    48.6          <artifactId>firethorn</artifactId>
    48.7 -        <version project='firethorn'>2.1.33</version>
    48.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    48.9      </parent>
   48.10  
   48.11      <artifactId>firethorn-webapp</artifactId>
    49.1 --- a/firethorn-webapp/src/main/docker/firethorn/Dockerfile	Tue Jul 02 07:46:37 2019 +0200
    49.2 +++ b/firethorn-webapp/src/main/docker/firethorn/Dockerfile	Thu Jul 18 13:57:24 2019 +0300
    49.3 @@ -15,7 +15,7 @@
    49.4  # You should have received a copy of the GNU General Public License
    49.5  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
    49.6  
    49.7 -FROM firethorn/tomcat:2.1.33
    49.8 +FROM firethorn/tomcat:2.1.33-stv-tap-swarm
    49.9  MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
   49.10  
   49.11  #
    50.1 --- a/integration/005/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    50.2 +++ b/integration/005/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    50.3 @@ -32,7 +32,7 @@
    50.4      <parent>
    50.5          <groupId>uk.ac.roe.wfau</groupId>
    50.6          <artifactId>firethorn</artifactId>
    50.7 -        <version project='firethorn'>2.1.33</version>
    50.8 +        <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    50.9      </parent>
   50.10  
   50.11      <artifactId>firethorn-integration-tests</artifactId>
    51.1 --- a/integration/tester/Dockerfile	Tue Jul 02 07:46:37 2019 +0200
    51.2 +++ b/integration/tester/Dockerfile	Thu Jul 18 13:57:24 2019 +0300
    51.3 @@ -15,7 +15,7 @@
    51.4  # You should have received a copy of the GNU General Public License
    51.5  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
    51.6  
    51.7 -FROM firethorn/fedora:2.1.33
    51.8 +FROM firethorn/fedora:2.1.33-stv-tap-swarm
    51.9  MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
   51.10  
   51.11  RUN dnf -y install perl
    52.1 --- a/pom.xml	Tue Jul 02 07:46:37 2019 +0200
    52.2 +++ b/pom.xml	Thu Jul 18 13:57:24 2019 +0300
    52.3 @@ -39,7 +39,7 @@
    52.4          | Maven project versions
    52.5          | http://www.sonatype.com/books/mvnref-book/reference/pom-relationships-sect-pom-syntax.html
    52.6          +-->
    52.7 -    <version project='firethorn'>2.1.33</version>
    52.8 +    <version project='firethorn'>2.1.33-stv-tap-swarm</version>
    52.9  
   52.10      <prerequisites>
   52.11          <maven>3.3.1</maven>