firethorn

changeset 4247:eb14fea170cb 2.1.32-zrq-thread-pools

Update Java dependencies
author Dave Morris <dmr@roe.ac.uk>
date Tue Jun 04 01:55:54 2019 +0100 (2019-06-04)
parents 9ab93a7d0fe3
children fd4ca3093920
files doc/notes/zrq/20190603-02-updates.txt pom.xml
line diff
     1.1 --- a/doc/notes/zrq/20190603-02-updates.txt	Tue Jun 04 01:36:10 2019 +0100
     1.2 +++ b/doc/notes/zrq/20190603-02-updates.txt	Tue Jun 04 01:55:54 2019 +0100
     1.3 @@ -102,7 +102,6 @@
     1.4      popd
     1.5  
     1.6  
     1.7 -
     1.8  #---------------------------------------------------------------------
     1.9  # Update our Maven dependencies.
    1.10  #[user@desktop]
    1.11 @@ -115,12 +114,6 @@
    1.12      popd
    1.13  
    1.14  
    1.15 -
    1.16 -
    1.17 -
    1.18 -
    1.19 -
    1.20 -
    1.21  #---------------------------------------------------------------------
    1.22  # Compile our Java code.
    1.23  #[user@desktop]
    1.24 @@ -151,31 +144,4 @@
    1.25  
    1.26      popd
    1.27  
    1.28 -# -----------------------------------------------------
    1.29 -# Build our Python client container.
    1.30 -#[user@desktop]
    1.31  
    1.32 -    source "${HOME:?}/projects.settings"
    1.33 -    export ftpysrc=${EDINBURGH_PROJECTS}/ftpy/github.stv
    1.34 -
    1.35 -    pushd "${ftpysrc:?}"
    1.36 -        git pull
    1.37 -    popd
    1.38 -
    1.39 -    source "${HOME:?}/firethorn.settings"
    1.40 -    pushd "${FIRETHORN_CODE:?}"
    1.41 -
    1.42 -        export buildtag=$(hg branch)
    1.43 -        export buildsrc=$(pwd)
    1.44 -
    1.45 -        docker-compose \
    1.46 -            --file "docker/compose/client/firethorn-py.yml" \
    1.47 -            build \
    1.48 -                firethorn-py
    1.49 -
    1.50 -    popd
    1.51 -
    1.52 -
    1.53 -
    1.54 -
    1.55 -
     2.1 --- a/pom.xml	Tue Jun 04 01:36:10 2019 +0100
     2.2 +++ b/pom.xml	Tue Jun 04 01:55:54 2019 +0100
     2.3 @@ -393,7 +393,7 @@
     2.4              <dependency>
     2.5                  <groupId>joda-time</groupId>
     2.6                  <artifactId>joda-time</artifactId>
     2.7 -                <version>2.12</version>
     2.8 +                <version>2.10.2</version>
     2.9              </dependency>
    2.10              <dependency>
    2.11                  <groupId>joda-time</groupId>