Skip to content

Commit 354257f

Browse files
committed
Update the Thrift definition to 4.0.1
1 parent da32551 commit 354257f

File tree

3 files changed

+1259
-171
lines changed

3 files changed

+1259
-171
lines changed

bin/generate-sources.sh

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,43 @@ set -eu
55
cd "${BASH_SOURCE%/*}/.."
66

77
TARGET=/build/target/generated-sources/thrift
8+
GRADLE_VERSION=8.4
9+
THRIFT_VERSION=$(mvn -q help:evaluate -Dexpression=libthrift.version -DforceStdout)
810

9-
# use unstable for Thrift 0.19.0
10-
docker run -v "${PWD}:/build" --rm debian:unstable /bin/sh -c "\
11+
docker run -v "${PWD}:/build" --rm debian:bookworm /bin/sh -c "\
1112
set -eux
1213
apt-get update -q
13-
apt-get install -q -y thrift-compiler
14+
apt-get install -q -y \
15+
ant \
16+
automake\
17+
bison \
18+
flex \
19+
g++ \
20+
git \
21+
libboost-all-dev \
22+
libevent-dev \
23+
libssl-dev \
24+
libtool \
25+
make \
26+
openjdk-17-jdk-headless \
27+
pkg-config \
28+
unzip \
29+
wget
30+
31+
wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q \
32+
-O /tmp/gradle-$GRADLE_VERSION-bin.zip
33+
unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip
34+
mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle
35+
ln -s /usr/local/gradle/bin/gradle /usr/local/bin
36+
37+
wget 'https://dlcdn.apache.org/thrift/$THRIFT_VERSION/thrift-$THRIFT_VERSION.tar.gz'
38+
tar zxf thrift-$THRIFT_VERSION.tar.gz
39+
cd thrift-$THRIFT_VERSION
40+
./bootstrap.sh
41+
./configure --without-cpp --without-kotlin --without-python --without-py3
42+
make
43+
make install
44+
1445
rm -rf $TARGET
1546
mkdir -p $TARGET
1647
thrift -o $TARGET \

pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,14 @@
2828
<air.check.skip-extended>true</air.check.skip-extended>
2929
<air.javadoc.lint>all,-missing</air.javadoc.lint>
3030
<project.build.targetJdk>17</project.build.targetJdk>
31+
<libthrift.version>0.21.0</libthrift.version>
3132
</properties>
3233

3334
<dependencies>
3435
<dependency>
3536
<groupId>org.apache.thrift</groupId>
3637
<artifactId>libthrift</artifactId>
37-
<version>0.19.0</version>
38+
<version>${libthrift.version}</version>
3839
</dependency>
3940

4041
<dependency>

0 commit comments

Comments
 (0)