Merge pull request #54 from EnMasseProject/update-1.6.0-rc1

Ulf Lilleengen · web-flow · commit 852c9a3b210b · 2019-03-23T07:06:47.000+01:00
Update to dispatch router 1.6.0
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ script:
 - .travis/build.sh $VERSION $COMMIT
 env:
   global:
-  - VERSION=1.5-DISPATCH-1273
+  - VERSION=1.6.0-rc1
   - COMMIT=${TRAVIS_COMMIT::8}
   - secure: EmUEqnwrvAJ1aQYlb7OKvxzNmJ1L4fX37Kat0/PuPD5heQyOqjjNkfoBS6k4hvoo/wsvv3D6Vux/vwtHJaWMA1TH0sLqH8CPkuGlE8p+K+rklcz8/uXRe1Eow7dt+v4BLvGlFwTPZ7NELibFCrvClIfNflx9KW9FZdRBB5ffjzOsDN/uWh3oA2nOhHEXbz9xxM33s9TNAHqZQ0LRN+9GRZd7cA8t4m/8ds7g0WZG3dqNzn1yUxSHvN5poBAQfZSc6pHDaRJD7a0geKGEx3tMMnIF14kMFGiLmQ4Qto6+eQoDyK1PjX/RRQDErS8oL50P9LyHRljBWU5NbBBROzjOt+P1eye4hgcvEnFoTky7gwF5zAhk7/l/F2CroIhKMlU8crn+TtwSJKCn9RfmYhpSobwHiFIDjv8vLDk40RbUNZAfzs2i0pMIQ+2PDylHez6S00ViJ4UjTvEOEhzVY1M8XpWYAascFAsSP1LhokFkSpzJgnI2aYVzG1EHllR1Pf8Fgkp8hcOyNLg1LfwOV35ox0LuS90Jm0n4I4LugAPTJ90JySuYRGXgUdOO7LnzWhNsbxlQC6YPn2BPAHURDIDWzi10e2G8e23YSf7AhLuT6nVsV6sawzHivn8qN8ldGGu81jlblMOQ73fdjRXjwrPRpH3XmvkjiF9px5xyH9ZBEQI=
   - secure: Eh+eJGIxNrNL7aX8kcjvIjv0auLkFM3n9u1xf+9mgM3Tyu2pDEzL7W8Ml9X4MoaNStLKheWU0yoGWaae9vXw998qg9NcMOweeuJA1tfVT2CKthHfGKVfBezqPvRoo1bW2Bbf4cAnqi4Nrt6eHF/HbTlyRCr1G6+dbXiZeHEwNDBCY74AjBWijvv5vV0KxUTlkHIP0fftFxXVyhKqA2VBIKSyxRbnYCOM65cxDiqOfLkTXn3g6jtkhvvWgSLeQAT+6fWsWLi/zeR0hAVYmHlCTfVbNYEUYopS6bDqMLJnOFKI7m6u2q/QiJSER7QwrtWK/D3VzgBSkLDuUj7f0iVjVL0vFwT5C8Jd5bAy9WP+M++hrbKV8yMi2ENY07iXh+PRnFOtPE9o3q3h2YX33rFxSe4uoV6hEoqamOQkuSjC8RscZh5pUMQ2d6TxikOEJm2PJFBF7u1+de02eP8jSSUEaXwg/JfZ4kCtKBOSH6P3KKnGPsQSTiIbrBQtFFsnPAydFLEgpTs5jiRPDxuOgFUqVAoGGzU0RqaEaGXQQDI0DLf8XoklM0RavcwseIEmiriDJAuBW3LhxHNwY1TZx/ET02xsuYEOFTie1HtMhixYqifqHVFcimQ7vxVVF41adPWP1u49X0D8Cl+kyJO33DI1f/5hx1Kb21MOKOy7t441jzQ=
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:28
+FROM fedora:29
 RUN dnf -y install glibc.i686 cyrus-sasl-lib cyrus-sasl-plain libuuid openssl python gettext hostname iputils libwebsockets-devel && dnf -y update && dnf clean all
 ADD qpid-proton-image.tar.gz qpid-dispatch-image.tar.gz /
 ARG version=latest
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 PROJECT_NAME=qdrouterd
 PWD=$(shell pwd)
-ROUTER_SOURCE_URL=http://archive.apache.org/dist/qpid/dispatch/1.5.0/qpid-dispatch-1.5.0.tar.gz
+ROUTER_SOURCE_URL=https://dist.apache.org/repos/dist/dev/qpid/dispatch/1.6.0-rc1/qpid-dispatch-1.6.0.tar.gz
 PROTON_SOURCE_URL=http://archive.apache.org/dist/qpid/proton/0.26.0/qpid-proton-0.26.0.tar.gz
 
 all: build
diff --git a/builder/Dockerfile b/builder/Dockerfile
@@ -1,3 +1,3 @@
-FROM fedora:28
+FROM fedora:29
 
 RUN dnf install -y gcc gcc-c++ make cmake libuuid-devel openssl-devel python-devel swig libwebsockets-devel wget patch findutils && dnf clean all -y
diff --git a/patches/dispatch/DISPATCH-1273.patch b/patches/dispatch/DISPATCH-1273.patch

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM fedora:28`
	`1`	`+FROM fedora:29`
`2`	`2`	`RUN dnf -y install glibc.i686 cyrus-sasl-lib cyrus-sasl-plain libuuid openssl python gettext hostname iputils libwebsockets-devel && dnf -y update && dnf clean all`
`3`	`3`	`ADD qpid-proton-image.tar.gz qpid-dispatch-image.tar.gz /`
`4`	`4`	`ARG version=latest`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-FROM fedora:28`
	`1`	`+FROM fedora:29`
`2`	`2`
`3`	`3`	`RUN dnf install -y gcc gcc-c++ make cmake libuuid-devel openssl-devel python-devel swig libwebsockets-devel wget patch findutils && dnf clean all -y`