firethorn

changeset 4246:9ab93a7d0fe3 2.1.32-zrq-thread-pools

Updated Maven dependencies
author Dave Morris <dmr@roe.ac.uk>
date Tue Jun 04 01:36:10 2019 +0100 (2019-06-04)
parents 1789c8114edc
children eb14fea170cb
files doc/notes/zrq/20190603-02-updates.txt firethorn-webapp/pom.xml pom.xml
line diff
     1.1 --- a/doc/notes/zrq/20190603-02-updates.txt	Tue Jun 04 01:28:21 2019 +0100
     1.2 +++ b/doc/notes/zrq/20190603-02-updates.txt	Tue Jun 04 01:36:10 2019 +0100
     1.3 @@ -36,4 +36,146 @@
     1.4      gedit  "${FIRETHORN_CODE:?}/doc/notes/zrq/20180302-02-hg-branch.txt" &
     1.5  
     1.6  
     1.7 +#---------------------------------------------------------------------
     1.8 +# Update our base container.
     1.9 +#[user@desktop]
    1.10  
    1.11 +    source "${HOME:?}/firethorn.settings"
    1.12 +    pushd "${FIRETHORN_CODE:?}"
    1.13 +
    1.14 +        vi docker/fedora/Dockerfile
    1.15 +
    1.16 +        -   # FROM fedora:28
    1.17 +        -   # https://github.com/docker-library/repo-info/blob/master/repos/fedora/tag-details.md#fedora28
    1.18 +        -   FROM fedora@sha256:7ae08e5637170eb47c01e315b6e64e0d48c6200d2942c695d0bee61b38c65b39
    1.19 +
    1.20 +        +   # FROM latest (fedora:29)
    1.21 +        +   # https://github.com/docker-library/repo-info/blob/master/repos/fedora/tag-details.md#fedoralatest
    1.22 +        +   FROM fedora@sha256:2a60898a6dd7da9964b0c59fedcf652e24bfff04142e5488f793c9e8156afd33
    1.23 +
    1.24 +
    1.25 +        vi docker/java/Dockerfile
    1.26 +
    1.27 +        ~   ENV JAVA_VERSION=12.0.0.33
    1.28 +
    1.29 +
    1.30 +        vi docker/tomcat/Dockerfile
    1.31 +
    1.32 +        -   ENV TOMCAT_VERSION 9.0.10
    1.33 +        +   ENV TOMCAT_VERSION 9.0.20
    1.34 +
    1.35 +
    1.36 +        vi docker/tomcat/Dockerfile
    1.37 +
    1.38 +        -   FROM postgres:10
    1.39 +        +   FROM postgres:11
    1.40 +
    1.41 +
    1.42 +    popd
    1.43 +
    1.44 +
    1.45 +# -----------------------------------------------------
    1.46 +# Build our Docker images.
    1.47 +#[user@desktop]
    1.48 +
    1.49 +    source "${HOME:?}/firethorn.settings"
    1.50 +    pushd "${FIRETHORN_CODE:?}"
    1.51 +
    1.52 +        export buildtag=$(hg branch)
    1.53 +
    1.54 +        docker-compose \
    1.55 +            --file docker/compose/images.yml \
    1.56 +            build
    1.57 +
    1.58 +    popd
    1.59 +
    1.60 +
    1.61 +#---------------------------------------------------------------------
    1.62 +# Update our Java dependencies.
    1.63 +#[user@desktop]
    1.64 +
    1.65 +    source "${HOME:?}/firethorn.settings"
    1.66 +    pushd "${FIRETHORN_CODE:?}"
    1.67 +
    1.68 +        mvn versions:display-dependency-updates
    1.69 +
    1.70 +    popd
    1.71 +
    1.72 +
    1.73 +
    1.74 +#---------------------------------------------------------------------
    1.75 +# Update our Maven dependencies.
    1.76 +#[user@desktop]
    1.77 +
    1.78 +    source "${HOME:?}/firethorn.settings"
    1.79 +    pushd "${FIRETHORN_CODE:?}"
    1.80 +
    1.81 +        mvn versions:display-plugin-updates
    1.82 +
    1.83 +    popd
    1.84 +
    1.85 +
    1.86 +
    1.87 +
    1.88 +
    1.89 +
    1.90 +
    1.91 +
    1.92 +#---------------------------------------------------------------------
    1.93 +# Compile our Java code.
    1.94 +#[user@desktop]
    1.95 +
    1.96 +    source "${HOME:?}/firethorn.settings"
    1.97 +    pushd "${FIRETHORN_CODE:?}"
    1.98 +
    1.99 +        mvn clean install eclipse:eclipse
   1.100 +
   1.101 +    popd
   1.102 +
   1.103 +# -----------------------------------------------------
   1.104 +# Build our Java containers.
   1.105 +#[user@desktop]
   1.106 +
   1.107 +    source "${HOME:?}/firethorn.settings"
   1.108 +    pushd "${FIRETHORN_CODE:?}"
   1.109 +
   1.110 +        export buildtag=$(hg branch)
   1.111 +        pushd firethorn-ogsadai/webapp
   1.112 +            mvn docker:package
   1.113 +        popd
   1.114 +
   1.115 +        export buildtag=$(hg branch)
   1.116 +        pushd firethorn-webapp
   1.117 +            mvn docker:package
   1.118 +        popd
   1.119 +
   1.120 +    popd
   1.121 +
   1.122 +# -----------------------------------------------------
   1.123 +# Build our Python client container.
   1.124 +#[user@desktop]
   1.125 +
   1.126 +    source "${HOME:?}/projects.settings"
   1.127 +    export ftpysrc=${EDINBURGH_PROJECTS}/ftpy/github.stv
   1.128 +
   1.129 +    pushd "${ftpysrc:?}"
   1.130 +        git pull
   1.131 +    popd
   1.132 +
   1.133 +    source "${HOME:?}/firethorn.settings"
   1.134 +    pushd "${FIRETHORN_CODE:?}"
   1.135 +
   1.136 +        export buildtag=$(hg branch)
   1.137 +        export buildsrc=$(pwd)
   1.138 +
   1.139 +        docker-compose \
   1.140 +            --file "docker/compose/client/firethorn-py.yml" \
   1.141 +            build \
   1.142 +                firethorn-py
   1.143 +
   1.144 +    popd
   1.145 +
   1.146 +
   1.147 +
   1.148 +
   1.149 +
     2.1 --- a/firethorn-webapp/pom.xml	Tue Jun 04 01:28:21 2019 +0100
     2.2 +++ b/firethorn-webapp/pom.xml	Tue Jun 04 01:36:10 2019 +0100
     2.3 @@ -200,7 +200,7 @@
     2.4              <plugin>
     2.5                  <groupId>org.apache.maven.plugins</groupId>
     2.6                  <artifactId>maven-project-info-reports-plugin</artifactId>
     2.7 -                <version>2.9</version>
     2.8 +                <version>3.0.0</version>
     2.9                  <reportSets>
    2.10                      <reportSet>
    2.11                          <reports>
     3.1 --- a/pom.xml	Tue Jun 04 01:28:21 2019 +0100
     3.2 +++ b/pom.xml	Tue Jun 04 01:36:10 2019 +0100
     3.3 @@ -524,7 +524,7 @@
     3.4  
     3.5                  <plugin>
     3.6                      <artifactId>maven-compiler-plugin</artifactId>
     3.7 -                    <version>3.7.0</version>
     3.8 +                    <version>3.8.1</version>
     3.9                      <configuration>
    3.10                          <source>${project.javaversion}</source>
    3.11                          <target>${project.javaversion}</target>
    3.12 @@ -573,17 +573,17 @@
    3.13                  <plugin>
    3.14                      <groupId>org.apache.maven.plugins</groupId>
    3.15                      <artifactId>maven-jar-plugin</artifactId>
    3.16 -                    <version>3.1.0</version>
    3.17 +                    <version>3.1.2</version>
    3.18                  </plugin>
    3.19                  <plugin>
    3.20                      <groupId>org.apache.maven.plugins</groupId>
    3.21                      <artifactId>maven-war-plugin</artifactId>
    3.22 -                    <version>3.2.2</version>
    3.23 +                    <version>3.2.3</version>
    3.24                  </plugin>
    3.25                  <plugin>
    3.26                      <groupId>org.apache.maven.plugins</groupId>
    3.27                      <artifactId>maven-source-plugin</artifactId>
    3.28 -                    <version>3.0.1</version>
    3.29 +                    <version>3.1.0</version>
    3.30                  </plugin>
    3.31                  <plugin>
    3.32                      <groupId>org.codehaus.mojo</groupId>
    3.33 @@ -599,7 +599,7 @@
    3.34                  <plugin>
    3.35                      <groupId>org.apache.maven.plugins</groupId>
    3.36                      <artifactId>maven-surefire-plugin</artifactId>
    3.37 -                    <version>2.22.0</version>
    3.38 +                    <version>2.22.2</version>
    3.39                  </plugin>
    3.40  
    3.41                  <plugin>
    3.42 @@ -902,7 +902,7 @@
    3.43              <plugin>
    3.44                  <groupId>org.apache.maven.plugins</groupId>
    3.45                  <artifactId>maven-javadoc-plugin</artifactId>
    3.46 -                <version>3.0.1</version>
    3.47 +                <version>3.1.0</version>
    3.48  
    3.49                  <configuration>
    3.50                      <detectJavaApiLink>true</detectJavaApiLink>
    3.51 @@ -962,7 +962,7 @@
    3.52              <plugin>
    3.53                  <groupId>org.apache.maven.plugins</groupId>
    3.54                  <artifactId>maven-surefire-report-plugin</artifactId>
    3.55 -                <version>2.22.0</version>
    3.56 +                <version>2.22.2</version>
    3.57              </plugin>
    3.58  
    3.59              <!--+
    3.60 @@ -989,7 +989,7 @@
    3.61              <plugin>
    3.62                  <groupId>org.apache.maven.plugins</groupId>
    3.63                  <artifactId>maven-jxr-plugin</artifactId>
    3.64 -                <version>2.5</version>
    3.65 +                <version>3.0.0</version>
    3.66                  <configuration>
    3.67                      <linkJavadoc>true</linkJavadoc>
    3.68                  </configuration>