You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2019/10/17 08:28:23 UTC

[plc4x] 01/01: Up to now we couldn't build Thrift with Boost support as Thrift had Boost-Incompatibility issues, these were fixed in 0.13.0: - Bumped the Boost version to the latest 1.71.0 - Bumped the Thrift version to the latest 0.13.0 - Removed the disabling of Boost support in the Thrift build

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch feature/updates-boost-and-thrift-versions
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit 23b61ae9f42003d626f21b43c80e6a50bf185393
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Oct 17 10:28:06 2019 +0200

    Up to now we couldn't build Thrift with Boost support as Thrift had Boost-Incompatibility issues, these were fixed in 0.13.0:
    - Bumped the Boost version to the latest 1.71.0
    - Bumped the Thrift version to the latest 0.13.0
    - Removed the disabling of Boost support in the Thrift build
---
 pom.xml              | 6 +++---
 tools/thrift/pom.xml | 6 ------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3812323..be77d63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,8 +108,8 @@
     <asm.version>5.0.4</asm.version>
     <assertj.version>3.11.1</assertj.version>
     <bouncycastle.version>1.60</bouncycastle.version>
-    <boost.version>1.70.0</boost.version>
-    <boost.version.underline-short>1_70</boost.version.underline-short>
+    <boost.version>1.71.0</boost.version>
+    <boost.version.underline-short>1_71</boost.version.underline-short>
     <boost.version.underline>${boost.version.underline-short}_0</boost.version.underline>
     <byte-buddy.version>1.9.10</byte-buddy.version>
     <cmake-version>3.14.5</cmake-version>
@@ -157,7 +157,7 @@
     <spock-reports.version>1.6.1</spock-reports.version>
     <spock.version>1.2-groovy-2.5</spock.version>
     <t-digest.version>3.2</t-digest.version>
-    <thrift.version>0.12.0</thrift.version>
+    <thrift.version>0.13.0</thrift.version>
     <xmlunit.version>2.6.3</xmlunit.version>
 
     <!-- Site properties -->
diff --git a/tools/thrift/pom.xml b/tools/thrift/pom.xml
index 8ef4f65..cb7c4a7 100644
--- a/tools/thrift/pom.xml
+++ b/tools/thrift/pom.xml
@@ -248,12 +248,6 @@
                 <option>-DBUILD_JAVA=OFF</option>
                 <option>-DBUILD_PYTHON=${thrift.with.python}</option>
                 <option>-DBUILD_HASKELL=OFF</option>
-                <!--
-                  Forcefully disable Boost detection as we don't need it and
-                  having Boost 1.70 available breaks the Thrift build.
-                  Boost would be needed, if we were planning on running tests.
-                -->
-                <option>-DBoost_NO_BOOST_CMAKE=ON</option>
               </options>
             </configuration>
           </execution>