You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by jf...@apache.org on 2019/10/21 14:00:09 UTC
[plc4x] branch develop updated: Revert "Merge pull request #92 from
apache/feature/updates-boost-and-thrift-versions"
This is an automated email from the ASF dual-hosted git repository.
jfeinauer pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new d4a8ebf Revert "Merge pull request #92 from apache/feature/updates-boost-and-thrift-versions"
d4a8ebf is described below
commit d4a8ebf682efdd9e57db73bfa0c8faea0d1fe5e6
Author: Julian Feinauer <j....@pragmaticminds.de>
AuthorDate: Mon Oct 21 15:58:38 2019 +0200
Revert "Merge pull request #92 from apache/feature/updates-boost-and-thrift-versions"
This reverts commit a7a4e0cf9e630b648980d2778e760d5ad50a2da6, reversing
changes made to aefcd26aaafc2dcdd832bca770ababe2382d9c3f.
---
pom.xml | 6 +++---
tools/thrift/pom.xml | 6 ++++++
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index c404fb3..6eacdde 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.71.0</boost.version>
- <boost.version.underline-short>1_71</boost.version.underline-short>
+ <boost.version>1.70.0</boost.version>
+ <boost.version.underline-short>1_70</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.13.0</thrift.version>
+ <thrift.version>0.12.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 cb7c4a7..8ef4f65 100644
--- a/tools/thrift/pom.xml
+++ b/tools/thrift/pom.xml
@@ -248,6 +248,12 @@
<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>