firethorn

changeset 4225:1e7585468a10

Merged upstream changes
author Dave Morris <dmr@roe.ac.uk>
date Fri May 10 10:31:38 2019 +0100 (2019-05-10)
parents 02a6b0a80e23 68d995c1fec3
children 905113a1b414
files
line diff
     1.1 --- a/.hgtags	Fri May 10 10:31:08 2019 +0100
     1.2 +++ b/.hgtags	Fri May 10 10:31:38 2019 +0100
     1.3 @@ -42,3 +42,4 @@
     1.4  38c9c21c1e8570e7482d9d0c5ca2240711fc01e4 version-
     1.5  8046b22b74784528664246f731ba84102fa5015f version-2.1.28
     1.6  40233dc8a520ce2b24812b862786b12fccf303b7 version-2.1.29
     1.7 +e85c79f225d2307b217ab304ed9e20f8c9a1e85b version-2.1.30
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/doc/notes/stv/20190509-hg-merge.txt	Fri May 10 10:31:38 2019 +0100
     2.3 @@ -0,0 +1,336 @@
     2.4 +#
     2.5 +# <meta:header>
     2.6 +#   <meta:licence>
     2.7 +#     Copyright (c) 2018, ROE (http://www.roe.ac.uk/)
     2.8 +#
     2.9 +#     This information is free software: you can redistribute it and/or modify
    2.10 +#     it under the terms of the GNU General Public License as published by
    2.11 +#     the Free Software Foundation, either version 3 of the License, or
    2.12 +#     (at your option) any later version.
    2.13 +#
    2.14 +#     This information is distributed in the hope that it will be useful,
    2.15 +#     but WITHOUT ANY WARRANTY; without even the implied warranty of
    2.16 +#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    2.17 +#     GNU General Public License for more details.
    2.18 +#
    2.19 +#     You should have received a copy of the GNU General Public License
    2.20 +#     along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2.21 +#   </meta:licence>
    2.22 +# </meta:header>
    2.23 +#
    2.24 +#
    2.25 +
    2.26 +
    2.27 +## Notes are copied over from /zrq/
    2.28 +## Just Added comments where I had issues
    2.29 +
    2.30 +
    2.31 +# -----------------------------------------------------
    2.32 +# Create a new VM.
    2.33 +# Astoalith
    2.34 +
    2.35 +
    2.36 +# -----------------------------------------------------
    2.37 +# Login as Stevedore
    2.38 +#[user@trop]
    2.39 +
    2.40 +    ssh "${vmname:?}"
    2.41 +
    2.42 +# -----------------------------------------------------
    2.43 +# Install our secret function.
    2.44 +#[user@virtual]
    2.45 +
    2.46 +    mkdir "${HOME:?}/bin"
    2.47 +    vi "${HOME:?}/bin/secret"
    2.48 +
    2.49 +        ....
    2.50 +        ....
    2.51 +        ....
    2.52 +
    2.53 +    chmod u+x "${HOME:?}/bin/secret"
    2.54 +    secret 'frog'
    2.55 +
    2.56 +# -----------------------------------------------------
    2.57 +# Download our builder compose file
    2.58 +#[user@virtual]
    2.59 +
    2.60 +    wget -O builder.yml \
    2.61 +        http://wfau.metagrid.co.uk/code/firethorn/raw-file/tip/docker/compose/builder.yml
    2.62 +
    2.63 +# -----------------------------------------------------
    2.64 +# Set the target branch
    2.65 +#[user@virtual]
    2.66 +
    2.67 +    branch=2.1.23-zrq-update-depends
    2.68 +    branch=2.1.24-zrq-userdata-drop
    2.69 +    branch=2.1.25-zrq-tap-controller
    2.70 +
    2.71 +# -----------------------------------------------------
    2.72 +# Run our builder.
    2.73 +#[user@virtual]
    2.74 +
    2.75 +    export branch
    2.76 +    export secretsh=$(which secret)
    2.77 +
    2.78 +    docker-compose \
    2.79 +        --file "builder.yml" \
    2.80 +        run \
    2.81 +            builder
    2.82 +
    2.83 +    # -----------------------------------------------------
    2.84 +    # Test our secret function.
    2.85 +    #[root@builder]
    2.86 +
    2.87 +
    2.88 +[root@builder /]#         secret 'frog'
    2.89 +sed: can't read /root/secret.store: No such file or directory
    2.90 +
    2.91 +## Create /root/secret.store manually
    2.92 +
    2.93 +
    2.94 +    # -----------------------------------------------------
    2.95 +    # Initialise our paths.
    2.96 +    #[root@builder]
    2.97 +
    2.98 +        PATH=${PATH}:/builder/bin
    2.99 +
   2.100 +        : ${FIRETHORN_HOME:=/etc/firethorn}
   2.101 +        : ${FIRETHORN_CODE:=/var/local/build/firethorn}
   2.102 +
   2.103 +        export FIRETHORN_HOME
   2.104 +        export FIRETHORN_CODE
   2.105 +
   2.106 +    # -----------------------------------------------------
   2.107 +    # Checkout a copy of our source code.
   2.108 +    #[root@builder]
   2.109 +
   2.110 +        02.01-checkout.sh
   2.111 +
   2.112 +
   2.113 +## Needed to fix ssh keys
   2.114 +## Add id_dsa
   2.115 +## Create config with entries for data, wfau (metagrid.co.uk)
   2.116 +## with PubkeyAcceptedKeyTypes=+ssh-dss
   2.117 +
   2.118 +
   2.119 +    # -----------------------------------------------------
   2.120 +    # Merge our branch into main.
   2.121 +    #[root@builder]
   2.122 +
   2.123 +        07.01-merge-start.sh
   2.124 +
   2.125 +    # -----------------------------------------------------
   2.126 +    # Update our version number.
   2.127 +    #[root@builder]
   2.128 +
   2.129 +        07.02-version-step.sh
   2.130 +
   2.131 +    # -----------------------------------------------------
   2.132 +    # Build our base images.
   2.133 +    #[root@builder]
   2.134 +
   2.135 +        04.01-buildbase.sh
   2.136 +
   2.137 +    # -----------------------------------------------------
   2.138 +    # Tag this version of builder as latest.
   2.139 +    #[root@builder]
   2.140 +
   2.141 +        source "${FIRETHORN_HOME}/merge.settings"
   2.142 +
   2.143 +        docker tag \
   2.144 +            "firethorn/builder:${newversion}" "firethorn/builder:latest"
   2.145 +
   2.146 +    # -----------------------------------------------------
   2.147 +    # Exit this version of builder.
   2.148 +    #[root@builder]
   2.149 +
   2.150 +        exit
   2.151 +
   2.152 +# -----------------------------------------------------
   2.153 +# Run a new copy of builder.
   2.154 +#[user@virtual]
   2.155 +
   2.156 +    export branch
   2.157 +    export secretsh=$(which secret)
   2.158 +
   2.159 +    docker-compose \
   2.160 +        --file "builder.yml" \
   2.161 +        run \
   2.162 +            builder
   2.163 +
   2.164 +    # -----------------------------------------------------
   2.165 +    # Test our secret function.
   2.166 +    #[root@builder]
   2.167 +
   2.168 +        secret 'frog'
   2.169 +
   2.170 +
   2.171 +[root@builder /]#         secret 'frog'
   2.172 +sed: can't read /root/secret.store: No such file or directory
   2.173 +
   2.174 +## Create /root/secret.store manually
   2.175 +
   2.176 +    # -----------------------------------------------------
   2.177 +    # Initialise our paths.
   2.178 +    #[root@builder]
   2.179 +
   2.180 +        PATH=${PATH}:/builder/bin
   2.181 +
   2.182 +        : ${FIRETHORN_HOME:=/etc/firethorn}
   2.183 +        : ${FIRETHORN_CODE:=/var/local/build/firethorn}
   2.184 +
   2.185 +        export FIRETHORN_HOME
   2.186 +        export FIRETHORN_CODE
   2.187 +
   2.188 +    # -----------------------------------------------------
   2.189 +    # Build our base images.
   2.190 +    #[root@builder]
   2.191 +
   2.192 +        04.01-buildbase.sh
   2.193 +
   2.194 +    # -----------------------------------------------------
   2.195 +    # Compile our Java code.
   2.196 +    #[root@builder]
   2.197 +
   2.198 +        05.01-javamaven.sh
   2.199 +
   2.200 +    # -----------------------------------------------------
   2.201 +    # Build our Java containers.
   2.202 +    #[root@builder]
   2.203 +
   2.204 +        05.02-javadocker.sh
   2.205 +
   2.206 +    # -----------------------------------------------------
   2.207 +    # Fetch our Python code.
   2.208 +    #[root@builder]
   2.209 +
   2.210 +        echo "Fetching client source"
   2.211 +
   2.212 +        ftpysrc='/var/local/build/client'
   2.213 +       #ftpygit='https://github.com/Zarquan/firethorn.py.git'
   2.214 +        ftpygit='https://github.com/stvoutsin/firethorn.py.git'
   2.215 +
   2.216 +        if [  -e "${ftpysrc:?}" ]
   2.217 +        then
   2.218 +            pushd "${ftpysrc:?}"
   2.219 +
   2.220 +                echo "Updating Python code"
   2.221 +                git pull
   2.222 +
   2.223 +            popd
   2.224 +        else
   2.225 +            pushd "$(dirname ${ftpysrc:?})"
   2.226 +
   2.227 +                echo "Cloning Python code from [${ftpygit:?}]"
   2.228 +                git clone "${ftpygit:?}" "$(basename ${ftpysrc:?})"
   2.229 +
   2.230 +            popd
   2.231 +        fi
   2.232 +
   2.233 +    # -----------------------------------------------------
   2.234 +    # Delete the embedded metadata.
   2.235 +    #[root@builder]
   2.236 +
   2.237 +        pushd "${ftpysrc:?}"
   2.238 +
   2.239 +            du -h  firethorn/meta
   2.240 +            rm -rf firethorn/meta
   2.241 +
   2.242 +        popd
   2.243 +
   2.244 +## du: cannot access 'firethorn/meta': No such file or directory
   2.245 +
   2.246 +
   2.247 +    # -----------------------------------------------------
   2.248 +    # Build our Python container.
   2.249 +    #[root@builder]
   2.250 +
   2.251 +        echo "Building client image"
   2.252 +
   2.253 +        pushd "${FIRETHORN_CODE:?}"
   2.254 +
   2.255 +            source 'bin/util.sh'
   2.256 +            export buildtag=$(getbuildtag)
   2.257 +            export buildsrc=$(pwd)
   2.258 +            export ftpysrc
   2.259 +
   2.260 +            docker-compose \
   2.261 +                --file docker/compose/client/firethorn-py.yml \
   2.262 +                build
   2.263 +
   2.264 +        popd
   2.265 +
   2.266 +# -----------------------------------------------------
   2.267 +# Run our Python tests, 20180712-03-merge-tests.txt
   2.268 +# -----------------------------------------------------
   2.269 +
   2.270 +    # -----------------------------------------------------
   2.271 +    # Update our Mercurial config.
   2.272 +    #[root@builder]
   2.273 +
   2.274 +        07.02-mercurial-user.sh
   2.275 +
   2.276 +## /builder/bin/07.02-mercurial-user.sh: line 31: gitrepo: parameter null or not set
   2.277 +
   2.278 +## Add values to secret.store
   2.279 +
   2.280 +
   2.281 +
   2.282 +
   2.283 +    # -----------------------------------------------------
   2.284 +    # Commit our merged code.
   2.285 +    #[root@builder]
   2.286 +
   2.287 +        07.03-merge-commit.sh
   2.288 +
   2.289 +    # -----------------------------------------------------
   2.290 +    # Push changes to Mercurial
   2.291 +    #[root@builder]
   2.292 +
   2.293 +        08.03-mercurial-push.sh
   2.294 +
   2.295 +## ssh missing
   2.296 +## remote: root@wfau.metagrid.co.uk: Permission denied (publickey,gssapi-keyex,gssapi-with-mic).
   2.297 +
   2.298 +## Had to manually copy paste code from this two scripts to get this working..
   2.299 +## Something missing, but no time to check that now
   2.300 +
   2.301 +
   2.302 +    # -----------------------------------------------------
   2.303 +    # Tag our new images
   2.304 +    #[root@builder]
   2.305 +
   2.306 +        08.01-docker-latest.sh
   2.307 +
   2.308 +    # -----------------------------------------------------
   2.309 +    # Push images to Docker.
   2.310 +    #[root@builder]
   2.311 +
   2.312 +        08.02-docker-push.sh
   2.313 +
   2.314 +    # -----------------------------------------------------
   2.315 +    # Push binaries to Maven repo.
   2.316 +    #[root@builder]
   2.317 +
   2.318 +        08.04-maven-push.sh
   2.319 +
   2.320 +..
   2.321 +
   2.322 +rsync: mkstemp "/var/local/websites/data/wfau/maven/firethorn/uk/ac/roe/wfau/firethorn-testing/.maven-metadata-local.xml.sha1.3FZcDy" failed: Permission denied (13)
   2.323 +rsync: mkstemp "/var/local/websites/data/wfau/maven/firethorn/uk/ac/roe/wfau/firethorn-webapp/.maven-metadata-local.xml.KYw94D" failed: Permission denied (13)
   2.324 +rsync: mkstemp "/var/local/websites/data/wfau/maven/firethorn/uk/ac/roe/wfau/firethorn-webapp/.maven-metadata-local.xml.md5.dNaexJ" failed: Permission denied (13)
   2.325 +rsync: mkstemp "/var/local/websites/data/wfau/maven/firethorn/uk/ac/roe/wfau/firethorn-webapp/.maven-metadata-local.xml.sha1.I5ViZO" failed: Permission denied (13)
   2.326 +rsync: mkstemp "/var/local/websites/data/wfau/maven/firethorn/uk/ac/roe/wfau/firethorn/.maven-metadata-local.xml.CyZ4rU" failed: Permission denied (13)
   2.327 +rsync: mkstemp "/var/local/websites/data/wfau/maven/firethorn/uk/ac/roe/wfau/firethorn/.maven-metadata-local.xml.md5.EgHRUZ" failed: Permission denied (13)
   2.328 +rsync: mkstemp "/var/local/websites/data/wfau/maven/firethorn/uk/ac/roe/wfau/firethorn/.maven-metadata-local.xml.sha1.6oxEn5" failed: Permission denied (13)
   2.329 +
   2.330 +..
   2.331 +
   2.332 +## rsync error: some files/attrs were not transferred (see previous errors) (code 23) at main.c(1189) [sender=3.1.3]
   2.333 +
   2.334 +
   2.335 +
   2.336 +
   2.337 +
   2.338 +
   2.339 +
     3.1 --- a/docker/apache/Dockerfile	Fri May 10 10:31:08 2019 +0100
     3.2 +++ b/docker/apache/Dockerfile	Fri May 10 10:31:38 2019 +0100
     3.3 @@ -17,7 +17,7 @@
     3.4  #
     3.5  # Based on example from the official httpd Docker container.
     3.6  # https://github.com/docker-library/httpd/blob/master/2.4/Dockerfile
     3.7 -FROM firethorn/fedora:2.1.29
     3.8 +FROM firethorn/fedora:2.1.30
     3.9  MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
    3.10  
    3.11  #
     4.1 --- a/docker/builder/Dockerfile	Fri May 10 10:31:08 2019 +0100
     4.2 +++ b/docker/builder/Dockerfile	Fri May 10 10:31:38 2019 +0100
     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/java:2.1.29
     4.8 +FROM firethorn/java:2.1.30
     4.9  MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
    4.10  
    4.11  #
     5.1 --- a/docker/compose/client/Dockerfile	Fri May 10 10:31:08 2019 +0100
     5.2 +++ b/docker/compose/client/Dockerfile	Fri May 10 10:31:38 2019 +0100
     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/tester:2.1.29
     5.8 +FROM firethorn/tester:2.1.30
     5.9  LABEL MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
    5.10  
    5.11  ENV pysrc=/home/firethorn-py
     6.1 --- a/docker/compose/tests/distictella/Dockerfile	Fri May 10 10:31:08 2019 +0100
     6.2 +++ b/docker/compose/tests/distictella/Dockerfile	Fri May 10 10:31:38 2019 +0100
     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.29
     6.8 +FROM firethorn/fedora:2.1.30
     6.9  MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
    6.10  
    6.11  RUN dnf -y install \
     7.1 --- a/docker/compose/tests/distictella/firethorn-py/Dockerfile	Fri May 10 10:31:08 2019 +0100
     7.2 +++ b/docker/compose/tests/distictella/firethorn-py/Dockerfile	Fri May 10 10:31:38 2019 +0100
     7.3 @@ -15,7 +15,7 @@
     7.4  # You should have received a copy of the GNU General Public License
     7.5  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     7.6  
     7.7 -FROM firethorn/fedora:2.1.29
     7.8 +FROM firethorn/fedora:2.1.30
     7.9  MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
    7.10  
    7.11  RUN dnf -y install \
     8.1 --- a/docker/java/Dockerfile	Fri May 10 10:31:08 2019 +0100
     8.2 +++ b/docker/java/Dockerfile	Fri May 10 10:31:38 2019 +0100
     8.3 @@ -15,7 +15,7 @@
     8.4  # You should have received a copy of the GNU General Public License
     8.5  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     8.6  
     8.7 -FROM firethorn/fedora:2.1.29
     8.8 +FROM firethorn/fedora:2.1.30
     8.9  MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
    8.10  
    8.11  ENV JAVA_VERSION=12.0.0.33
     9.1 --- a/docker/python/3.4.2/Dockerfile	Fri May 10 10:31:08 2019 +0100
     9.2 +++ b/docker/python/3.4.2/Dockerfile	Fri May 10 10:31:38 2019 +0100
     9.3 @@ -1,4 +1,4 @@
     9.4 -FROM firethorn/ubuntu:2.1.29
     9.5 +FROM firethorn/ubuntu:2.1.30
     9.6  MAINTAINER Stelios Voutsinas <stv@roe.ac.uk>
     9.7  
     9.8  #
    10.1 --- a/docker/pythonlibs/Dockerfile	Fri May 10 10:31:08 2019 +0100
    10.2 +++ b/docker/pythonlibs/Dockerfile	Fri May 10 10:31:38 2019 +0100
    10.3 @@ -1,4 +1,4 @@
    10.4 -FROM firethorn/python:2.1.29
    10.5 +FROM firethorn/python:2.1.30
    10.6  MAINTAINER Stelios Voutsinas <stv@roe.ac.uk>
    10.7  
    10.8  # Install Python Libs
    11.1 --- a/docker/sql-proxy/Dockerfile	Fri May 10 10:31:08 2019 +0100
    11.2 +++ b/docker/sql-proxy/Dockerfile	Fri May 10 10:31:38 2019 +0100
    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.29
    11.8 +FROM firethorn/fedora:2.1.30
    11.9  MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
   11.10  
   11.11  EXPOSE 1433
    12.1 --- a/docker/sql-tunnel/Dockerfile	Fri May 10 10:31:08 2019 +0100
    12.2 +++ b/docker/sql-tunnel/Dockerfile	Fri May 10 10:31:38 2019 +0100
    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.29
    12.8 +FROM firethorn/fedora:2.1.30
    12.9  MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
   12.10  
   12.11  EXPOSE 1433
    13.1 --- a/docker/ssh-client/Dockerfile	Fri May 10 10:31:08 2019 +0100
    13.2 +++ b/docker/ssh-client/Dockerfile	Fri May 10 10:31:38 2019 +0100
    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/fedora:2.1.29
    13.8 +FROM firethorn/fedora:2.1.30
    13.9  MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
   13.10  
   13.11  RUN dnf -y install openssh-clients
    14.1 --- a/docker/tester/Dockerfile	Fri May 10 10:31:08 2019 +0100
    14.2 +++ b/docker/tester/Dockerfile	Fri May 10 10:31:38 2019 +0100
    14.3 @@ -15,7 +15,7 @@
    14.4  # You should have received a copy of the GNU General Public License
    14.5  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
    14.6  
    14.7 -FROM firethorn/fedora:2.1.29
    14.8 +FROM firethorn/fedora:2.1.30
    14.9  MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
   14.10  
   14.11  RUN dnf install -y jq
    15.1 --- a/docker/tomcat/Dockerfile	Fri May 10 10:31:08 2019 +0100
    15.2 +++ b/docker/tomcat/Dockerfile	Fri May 10 10:31:38 2019 +0100
    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/java:2.1.29
    15.8 +FROM firethorn/java:2.1.30
    15.9  MAINTAINER [Dave Morris <docker-admin@metagrid.co.uk>]
   15.10  
   15.11  # https://tomcat.apache.org/whichversion.html
    16.1 --- a/firethorn-admin/pom.xml	Fri May 10 10:31:08 2019 +0100
    16.2 +++ b/firethorn-admin/pom.xml	Fri May 10 10:31:38 2019 +0100
    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.29</version>
    16.8 +        <version project='firethorn'>2.1.30</version>
    16.9      </parent>
   16.10  
   16.11      <artifactId>firethorn-admin-webapp</artifactId>
    17.1 --- a/firethorn-admin/src/main/docker/firethorn/Dockerfile	Fri May 10 10:31:08 2019 +0100
    17.2 +++ b/firethorn-admin/src/main/docker/firethorn/Dockerfile	Fri May 10 10:31:38 2019 +0100
    17.3 @@ -15,7 +15,7 @@
    17.4  # You should have received a copy of the GNU General Public License
    17.5  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
    17.6  
    17.7 -FROM firethorn/tomcat:2.1.29
    17.8 +FROM firethorn/tomcat:2.1.30
    17.9  MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
   17.10  
   17.11  #
    18.1 --- a/firethorn-annotations/pom.xml	Fri May 10 10:31:08 2019 +0100
    18.2 +++ b/firethorn-annotations/pom.xml	Fri May 10 10:31:38 2019 +0100
    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.29</version>
    18.8 +        <version project='firethorn'>2.1.30</version>
    18.9      </parent>
   18.10  
   18.11      <artifactId>firethorn-annotations</artifactId>
    19.1 --- a/firethorn-cds/adql/pom.xml	Fri May 10 10:31:08 2019 +0100
    19.2 +++ b/firethorn-cds/adql/pom.xml	Fri May 10 10:31:38 2019 +0100
    19.3 @@ -32,7 +32,7 @@
    19.4      <parent>
    19.5          <groupId>uk.ac.roe.wfau</groupId>
    19.6          <artifactId>firethorn-cds</artifactId>
    19.7 -		<version project='firethorn'>2.1.29</version>
    19.8 +		<version project='firethorn'>2.1.30</version>
    19.9  	</parent>
   19.10  
   19.11      <artifactId>firethorn-cds-adql</artifactId>
    20.1 --- a/firethorn-cds/pom.xml	Fri May 10 10:31:08 2019 +0100
    20.2 +++ b/firethorn-cds/pom.xml	Fri May 10 10:31:38 2019 +0100
    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.29</version>
    20.8 +        <version project='firethorn'>2.1.30</version>
    20.9      </parent>
   20.10  
   20.11      <artifactId>firethorn-cds</artifactId>
    21.1 --- a/firethorn-core/pom.xml	Fri May 10 10:31:08 2019 +0100
    21.2 +++ b/firethorn-core/pom.xml	Fri May 10 10:31:38 2019 +0100
    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.29</version>
    21.8 +        <version project='firethorn'>2.1.30</version>
    21.9  	</parent>
   21.10  
   21.11      <artifactId>firethorn-core</artifactId>
    22.1 --- a/firethorn-jdbc/pom.xml	Fri May 10 10:31:08 2019 +0100
    22.2 +++ b/firethorn-jdbc/pom.xml	Fri May 10 10:31:38 2019 +0100
    22.3 @@ -32,7 +32,7 @@
    22.4      <parent>
    22.5          <groupId>uk.ac.roe.wfau</groupId>
    22.6          <artifactId>firethorn</artifactId>
    22.7 -        <version project='firethorn'>2.1.29</version>
    22.8 +        <version project='firethorn'>2.1.30</version>
    22.9      </parent>
   22.10  
   22.11      <artifactId>firethorn-jdbc</artifactId>
    23.1 --- a/firethorn-logging/pom.xml	Fri May 10 10:31:08 2019 +0100
    23.2 +++ b/firethorn-logging/pom.xml	Fri May 10 10:31:38 2019 +0100
    23.3 @@ -32,7 +32,7 @@
    23.4      <parent>
    23.5          <groupId>uk.ac.roe.wfau</groupId>
    23.6          <artifactId>firethorn</artifactId>
    23.7 -        <version project='firethorn'>2.1.29</version>
    23.8 +        <version project='firethorn'>2.1.30</version>
    23.9      </parent>
   23.10  
   23.11      <artifactId>firethorn-logging</artifactId>
    24.1 --- a/firethorn-ogsadai/activity/client/pom.xml	Fri May 10 10:31:08 2019 +0100
    24.2 +++ b/firethorn-ogsadai/activity/client/pom.xml	Fri May 10 10:31:38 2019 +0100
    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.29</version>
    24.8 +        <version project='firethorn'>2.1.30</version>
    24.9  	</parent>
   24.10  
   24.11      <artifactId>firethorn-ogsadai-activity-client</artifactId>
    25.1 --- a/firethorn-ogsadai/activity/common/pom.xml	Fri May 10 10:31:08 2019 +0100
    25.2 +++ b/firethorn-ogsadai/activity/common/pom.xml	Fri May 10 10:31:38 2019 +0100
    25.3 @@ -32,7 +32,7 @@
    25.4      <parent>
    25.5          <groupId>uk.ac.roe.wfau</groupId>
    25.6          <artifactId>firethorn-ogsadai-activity</artifactId>
    25.7 -        <version project='firethorn'>2.1.29</version>
    25.8 +        <version project='firethorn'>2.1.30</version>
    25.9      </parent>
   25.10  
   25.11      <artifactId>firethorn-ogsadai-activity-common</artifactId>
    26.1 --- a/firethorn-ogsadai/activity/context/pom.xml	Fri May 10 10:31:08 2019 +0100
    26.2 +++ b/firethorn-ogsadai/activity/context/pom.xml	Fri May 10 10:31:38 2019 +0100
    26.3 @@ -32,7 +32,7 @@
    26.4      <parent>
    26.5          <groupId>uk.ac.roe.wfau</groupId>
    26.6          <artifactId>firethorn-ogsadai-activity</artifactId>
    26.7 -        <version project='firethorn'>2.1.29</version>
    26.8 +        <version project='firethorn'>2.1.30</version>
    26.9  	</parent>
   26.10  
   26.11      <artifactId>firethorn-ogsadai-activity-context</artifactId>
    27.1 --- a/firethorn-ogsadai/activity/pom.xml	Fri May 10 10:31:08 2019 +0100
    27.2 +++ b/firethorn-ogsadai/activity/pom.xml	Fri May 10 10:31:38 2019 +0100
    27.3 @@ -37,7 +37,7 @@
    27.4      <parent>
    27.5          <groupId>uk.ac.roe.wfau</groupId>
    27.6          <artifactId>firethorn-ogsadai</artifactId>
    27.7 -        <version project='firethorn'>2.1.29</version>
    27.8 +        <version project='firethorn'>2.1.30</version>
    27.9      </parent>
   27.10  
   27.11      <artifactId>firethorn-ogsadai-activity</artifactId>
    28.1 --- a/firethorn-ogsadai/activity/server/pom.xml	Fri May 10 10:31:08 2019 +0100
    28.2 +++ b/firethorn-ogsadai/activity/server/pom.xml	Fri May 10 10:31:38 2019 +0100
    28.3 @@ -32,7 +32,7 @@
    28.4      <parent>
    28.5          <groupId>uk.ac.roe.wfau</groupId>
    28.6          <artifactId>firethorn-ogsadai-activity</artifactId>
    28.7 -        <version project='firethorn'>2.1.29</version>
    28.8 +        <version project='firethorn'>2.1.30</version>
    28.9      </parent>
   28.10  
   28.11      <artifactId>firethorn-ogsadai-activity-server</artifactId>
    29.1 --- a/firethorn-ogsadai/astro/client/pom.xml	Fri May 10 10:31:08 2019 +0100
    29.2 +++ b/firethorn-ogsadai/astro/client/pom.xml	Fri May 10 10:31:38 2019 +0100
    29.3 @@ -32,7 +32,7 @@
    29.4      <parent>
    29.5          <groupId>uk.ac.roe.wfau</groupId>
    29.6          <artifactId>firethorn-ogsadai-astro</artifactId>
    29.7 -        <version project='firethorn'>2.1.29</version>
    29.8 +        <version project='firethorn'>2.1.30</version>
    29.9      </parent>
   29.10  
   29.11      <artifactId>firethorn-ogsadai-astro-client</artifactId>
    30.1 --- a/firethorn-ogsadai/astro/pom.xml	Fri May 10 10:31:08 2019 +0100
    30.2 +++ b/firethorn-ogsadai/astro/pom.xml	Fri May 10 10:31:38 2019 +0100
    30.3 @@ -32,7 +32,7 @@
    30.4      <parent>
    30.5          <groupId>uk.ac.roe.wfau</groupId>
    30.6          <artifactId>firethorn-ogsadai</artifactId>
    30.7 -        <version project='firethorn'>2.1.29</version>
    30.8 +        <version project='firethorn'>2.1.30</version>
    30.9      </parent>
   30.10  
   30.11      <artifactId>firethorn-ogsadai-astro</artifactId>
    31.1 --- a/firethorn-ogsadai/astro/server/pom.xml	Fri May 10 10:31:08 2019 +0100
    31.2 +++ b/firethorn-ogsadai/astro/server/pom.xml	Fri May 10 10:31:38 2019 +0100
    31.3 @@ -32,7 +32,7 @@
    31.4      <parent>
    31.5          <groupId>uk.ac.roe.wfau</groupId>
    31.6          <artifactId>firethorn-ogsadai-astro</artifactId>
    31.7 -        <version project='firethorn'>2.1.29</version>
    31.8 +        <version project='firethorn'>2.1.30</version>
    31.9      </parent>
   31.10  
   31.11      <artifactId>firethorn-ogsadai-astro-server</artifactId>
    32.1 --- a/firethorn-ogsadai/depends/pom.xml	Fri May 10 10:31:08 2019 +0100
    32.2 +++ b/firethorn-ogsadai/depends/pom.xml	Fri May 10 10:31:38 2019 +0100
    32.3 @@ -32,7 +32,7 @@
    32.4      <parent>
    32.5          <groupId>uk.ac.roe.wfau</groupId>
    32.6          <artifactId>firethorn-ogsadai</artifactId>
    32.7 -        <version project='firethorn'>2.1.29</version>
    32.8 +        <version project='firethorn'>2.1.30</version>
    32.9      </parent>
   32.10  
   32.11      <artifactId>firethorn-ogsadai-depends</artifactId>
    33.1 --- a/firethorn-ogsadai/distributed/client/pom.xml	Fri May 10 10:31:08 2019 +0100
    33.2 +++ b/firethorn-ogsadai/distributed/client/pom.xml	Fri May 10 10:31:38 2019 +0100
    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.29</version>
    33.8 +        <version project='firethorn'>2.1.30</version>
    33.9      </parent>
   33.10  
   33.11      <artifactId>firethorn-ogsadai-dqp-client</artifactId>
    34.1 --- a/firethorn-ogsadai/distributed/common/pom.xml	Fri May 10 10:31:08 2019 +0100
    34.2 +++ b/firethorn-ogsadai/distributed/common/pom.xml	Fri May 10 10:31:38 2019 +0100
    34.3 @@ -32,7 +32,7 @@
    34.4      <parent>
    34.5          <groupId>uk.ac.roe.wfau</groupId>
    34.6          <artifactId>firethorn-ogsadai-dqp</artifactId>
    34.7 -        <version project='firethorn'>2.1.29</version>
    34.8 +        <version project='firethorn'>2.1.30</version>
    34.9      </parent>
   34.10  
   34.11      <artifactId>firethorn-ogsadai-dqp-common</artifactId>
    35.1 --- a/firethorn-ogsadai/distributed/pom.xml	Fri May 10 10:31:08 2019 +0100
    35.2 +++ b/firethorn-ogsadai/distributed/pom.xml	Fri May 10 10:31:38 2019 +0100
    35.3 @@ -32,7 +32,7 @@
    35.4      <parent>
    35.5          <groupId>uk.ac.roe.wfau</groupId>
    35.6          <artifactId>firethorn-ogsadai</artifactId>
    35.7 -        <version project='firethorn'>2.1.29</version>
    35.8 +        <version project='firethorn'>2.1.30</version>
    35.9      </parent>
   35.10  
   35.11      <artifactId>firethorn-ogsadai-dqp</artifactId>
    36.1 --- a/firethorn-ogsadai/distributed/server/pom.xml	Fri May 10 10:31:08 2019 +0100
    36.2 +++ b/firethorn-ogsadai/distributed/server/pom.xml	Fri May 10 10:31:38 2019 +0100
    36.3 @@ -32,7 +32,7 @@
    36.4      <parent>
    36.5          <groupId>uk.ac.roe.wfau</groupId>
    36.6          <artifactId>firethorn-ogsadai-dqp</artifactId>
    36.7 -        <version project='firethorn'>2.1.29</version>
    36.8 +        <version project='firethorn'>2.1.30</version>
    36.9      </parent>
   36.10  
   36.11      <artifactId>firethorn-ogsadai-dqp-server</artifactId>
    37.1 --- a/firethorn-ogsadai/firethorn/client/pom.xml	Fri May 10 10:31:08 2019 +0100
    37.2 +++ b/firethorn-ogsadai/firethorn/client/pom.xml	Fri May 10 10:31:38 2019 +0100
    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.29</version>
    37.8 +        <version project='firethorn'>2.1.30</version>
    37.9      </parent>
   37.10  
   37.11      <artifactId>firethorn-ogsadai-firethorn-client</artifactId>
    38.1 --- a/firethorn-ogsadai/firethorn/common/pom.xml	Fri May 10 10:31:08 2019 +0100
    38.2 +++ b/firethorn-ogsadai/firethorn/common/pom.xml	Fri May 10 10:31:38 2019 +0100
    38.3 @@ -32,7 +32,7 @@
    38.4      <parent>
    38.5          <groupId>uk.ac.roe.wfau</groupId>
    38.6          <artifactId>firethorn-ogsadai-firethorn</artifactId>
    38.7 -        <version project='firethorn'>2.1.29</version>
    38.8 +        <version project='firethorn'>2.1.30</version>
    38.9      </parent>
   38.10  
   38.11      <artifactId>firethorn-ogsadai-firethorn-common</artifactId>
    39.1 --- a/firethorn-ogsadai/firethorn/pom.xml	Fri May 10 10:31:08 2019 +0100
    39.2 +++ b/firethorn-ogsadai/firethorn/pom.xml	Fri May 10 10:31:38 2019 +0100
    39.3 @@ -32,7 +32,7 @@
    39.4      <parent>
    39.5          <groupId>uk.ac.roe.wfau</groupId>
    39.6          <artifactId>firethorn-ogsadai</artifactId>
    39.7 -        <version project='firethorn'>2.1.29</version>
    39.8 +        <version project='firethorn'>2.1.30</version>
    39.9      </parent>
   39.10  
   39.11      <artifactId>firethorn-ogsadai-firethorn</artifactId>
    40.1 --- a/firethorn-ogsadai/firethorn/server/pom.xml	Fri May 10 10:31:08 2019 +0100
    40.2 +++ b/firethorn-ogsadai/firethorn/server/pom.xml	Fri May 10 10:31:38 2019 +0100
    40.3 @@ -32,7 +32,7 @@
    40.4      <parent>
    40.5          <groupId>uk.ac.roe.wfau</groupId>
    40.6          <artifactId>firethorn-ogsadai-firethorn</artifactId>
    40.7 -        <version project='firethorn'>2.1.29</version>
    40.8 +        <version project='firethorn'>2.1.30</version>
    40.9      </parent>
   40.10  
   40.11      <artifactId>firethorn-ogsadai-firethorn-server</artifactId>
    41.1 --- a/firethorn-ogsadai/metadata/client/pom.xml	Fri May 10 10:31:08 2019 +0100
    41.2 +++ b/firethorn-ogsadai/metadata/client/pom.xml	Fri May 10 10:31:38 2019 +0100
    41.3 @@ -32,7 +32,7 @@
    41.4      <parent>
    41.5          <groupId>uk.ac.roe.wfau</groupId>
    41.6          <artifactId>firethorn-ogsadai-metadata</artifactId>
    41.7 -        <version project='firethorn'>2.1.29</version>
    41.8 +        <version project='firethorn'>2.1.30</version>
    41.9      </parent>
   41.10  
   41.11      <artifactId>firethorn-ogsadai-metadata-client</artifactId>
    42.1 --- a/firethorn-ogsadai/metadata/pom.xml	Fri May 10 10:31:08 2019 +0100
    42.2 +++ b/firethorn-ogsadai/metadata/pom.xml	Fri May 10 10:31:38 2019 +0100
    42.3 @@ -32,7 +32,7 @@
    42.4      <parent>
    42.5          <groupId>uk.ac.roe.wfau</groupId>
    42.6          <artifactId>firethorn-ogsadai</artifactId>
    42.7 -        <version project='firethorn'>2.1.29</version>
    42.8 +        <version project='firethorn'>2.1.30</version>
    42.9      </parent>
   42.10  
   42.11      <artifactId>firethorn-ogsadai-metadata</artifactId>
    43.1 --- a/firethorn-ogsadai/pom.xml	Fri May 10 10:31:08 2019 +0100
    43.2 +++ b/firethorn-ogsadai/pom.xml	Fri May 10 10:31:38 2019 +0100
    43.3 @@ -37,7 +37,7 @@
    43.4      <parent>
    43.5          <groupId>uk.ac.roe.wfau</groupId>
    43.6          <artifactId>firethorn</artifactId>
    43.7 -        <version project='firethorn'>2.1.29</version>
    43.8 +        <version project='firethorn'>2.1.30</version>
    43.9      </parent>
   43.10  
   43.11      <artifactId>firethorn-ogsadai</artifactId>
    44.1 --- a/firethorn-ogsadai/webapp/pom.xml	Fri May 10 10:31:08 2019 +0100
    44.2 +++ b/firethorn-ogsadai/webapp/pom.xml	Fri May 10 10:31:38 2019 +0100
    44.3 @@ -32,7 +32,7 @@
    44.4      <parent>
    44.5          <groupId>uk.ac.roe.wfau</groupId>
    44.6          <artifactId>firethorn-ogsadai</artifactId>
    44.7 -        <version project='firethorn'>2.1.29</version>
    44.8 +        <version project='firethorn'>2.1.30</version>
    44.9      </parent>
   44.10  
   44.11      <artifactId>firethorn-ogsadai-webapp</artifactId>
    45.1 --- a/firethorn-ogsadai/webapp/src/main/docker/ogsadai/Dockerfile	Fri May 10 10:31:08 2019 +0100
    45.2 +++ b/firethorn-ogsadai/webapp/src/main/docker/ogsadai/Dockerfile	Fri May 10 10:31:38 2019 +0100
    45.3 @@ -15,7 +15,7 @@
    45.4  # You should have received a copy of the GNU General Public License
    45.5  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
    45.6  
    45.7 -FROM firethorn/tomcat:2.1.29
    45.8 +FROM firethorn/tomcat:2.1.30
    45.9  MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
   45.10  
   45.11  #
    46.1 --- a/firethorn-spring/pom.xml	Fri May 10 10:31:08 2019 +0100
    46.2 +++ b/firethorn-spring/pom.xml	Fri May 10 10:31:38 2019 +0100
    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.29</version>
    46.8 +        <version project='firethorn'>2.1.30</version>
    46.9      </parent>
   46.10  
   46.11      <artifactId>firethorn-spring</artifactId>
    47.1 --- a/firethorn-stil/pom.xml	Fri May 10 10:31:08 2019 +0100
    47.2 +++ b/firethorn-stil/pom.xml	Fri May 10 10:31:38 2019 +0100
    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.29</version>
    47.8 +        <version project='firethorn'>2.1.30</version>
    47.9      </parent>
   47.10  
   47.11      <artifactId>firethorn-stil</artifactId>
    48.1 --- a/firethorn-testing/pom.xml	Fri May 10 10:31:08 2019 +0100
    48.2 +++ b/firethorn-testing/pom.xml	Fri May 10 10:31:38 2019 +0100
    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.29</version>
    48.8 +        <version project='firethorn'>2.1.30</version>
    48.9      </parent>
   48.10  
   48.11      <artifactId>firethorn-testing</artifactId>
    49.1 --- a/firethorn-webapp/pom.xml	Fri May 10 10:31:08 2019 +0100
    49.2 +++ b/firethorn-webapp/pom.xml	Fri May 10 10:31:38 2019 +0100
    49.3 @@ -32,7 +32,7 @@
    49.4      <parent>
    49.5          <groupId>uk.ac.roe.wfau</groupId>
    49.6          <artifactId>firethorn</artifactId>
    49.7 -        <version project='firethorn'>2.1.29</version>
    49.8 +        <version project='firethorn'>2.1.30</version>
    49.9      </parent>
   49.10  
   49.11      <artifactId>firethorn-webapp</artifactId>
    50.1 --- a/firethorn-webapp/src/main/docker/firethorn/Dockerfile	Fri May 10 10:31:08 2019 +0100
    50.2 +++ b/firethorn-webapp/src/main/docker/firethorn/Dockerfile	Fri May 10 10:31:38 2019 +0100
    50.3 @@ -15,7 +15,7 @@
    50.4  # You should have received a copy of the GNU General Public License
    50.5  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
    50.6  
    50.7 -FROM firethorn/tomcat:2.1.29
    50.8 +FROM firethorn/tomcat:2.1.30
    50.9  MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
   50.10  
   50.11  #
    51.1 --- a/firethorn-webapp/src/main/java/uk/ac/roe/wfau/firethorn/webapp/votable/BaseTableVOTableController.java	Fri May 10 10:31:08 2019 +0100
    51.2 +++ b/firethorn-webapp/src/main/java/uk/ac/roe/wfau/firethorn/webapp/votable/BaseTableVOTableController.java	Fri May 10 10:31:38 2019 +0100
    51.3 @@ -176,6 +176,33 @@
    51.4              }
    51.5          }
    51.6      
    51.7 +    
    51.8 +    public static class BitFormatter
    51.9 +    extends AbstractFormatter
   51.10 +        {
   51.11 +        public BitFormatter(final BaseColumn<?> column)
   51.12 +            {
   51.13 +            super(
   51.14 +                column
   51.15 +                );
   51.16 +            }
   51.17 +
   51.18 +        @Override
   51.19 +        public String format(final ResultSet results)
   51.20 +        throws SQLException
   51.21 +            {
   51.22 +        		System.out.println(results.getString(index()));
   51.23 +        		System.out.println(String.valueOf(results.getInt(index())));
   51.24 +
   51.25 +	    		if (results.getObject(index())!=null){
   51.26 +	    			return  results.getString(index());
   51.27 +	    		} else {
   51.28 +	    			return "";
   51.29 +	    		}
   51.30 +	        	
   51.31 +            }
   51.32 +        }
   51.33 +    
   51.34      @Override
   51.35      public void head(final PrintWriter writer, final BaseTable<?,?> table)
   51.36      throws ProtectionException
   51.37 @@ -438,6 +465,10 @@
   51.38                  return new ByteFormatter(
   51.39                      column
   51.40                      );
   51.41 +            case BIT:
   51.42 +                return new BitFormatter(
   51.43 +                    column
   51.44 +                    );
   51.45              case DATE :
   51.46              case TIME:
   51.47              case DATETIME :
    52.1 --- a/integration/005/pom.xml	Fri May 10 10:31:08 2019 +0100
    52.2 +++ b/integration/005/pom.xml	Fri May 10 10:31:38 2019 +0100
    52.3 @@ -32,7 +32,7 @@
    52.4      <parent>
    52.5          <groupId>uk.ac.roe.wfau</groupId>
    52.6          <artifactId>firethorn</artifactId>
    52.7 -        <version project='firethorn'>2.1.29</version>
    52.8 +        <version project='firethorn'>2.1.30</version>
    52.9      </parent>
   52.10  
   52.11      <artifactId>firethorn-integration-tests</artifactId>
    53.1 --- a/integration/tester/Dockerfile	Fri May 10 10:31:08 2019 +0100
    53.2 +++ b/integration/tester/Dockerfile	Fri May 10 10:31:38 2019 +0100
    53.3 @@ -15,7 +15,7 @@
    53.4  # You should have received a copy of the GNU General Public License
    53.5  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
    53.6  
    53.7 -FROM firethorn/fedora:2.1.29
    53.8 +FROM firethorn/fedora:2.1.30
    53.9  MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
   53.10  
   53.11  RUN dnf -y install perl
    54.1 --- a/pom.xml	Fri May 10 10:31:08 2019 +0100
    54.2 +++ b/pom.xml	Fri May 10 10:31:38 2019 +0100
    54.3 @@ -39,7 +39,7 @@
    54.4          | Maven project versions
    54.5          | http://www.sonatype.com/books/mvnref-book/reference/pom-relationships-sect-pom-syntax.html
    54.6          +-->
    54.7 -    <version project='firethorn'>2.1.29</version>
    54.8 +    <version project='firethorn'>2.1.30</version>
    54.9  
   54.10      <prerequisites>
   54.11          <maven>3.3.1</maven>