Skip to content

Build: Replace Thrift and Drill FMPP Maven plugins #18612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
HTHou wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Build: Replace Thrift and Drill FMPP Maven plugins #18612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5e28a72
Build: Replace obsolete Thrift Maven plugin
HTHou Sep 9, 2026
773fd44
Use exec-maven-plugin for Thrift code generation
HTHou Sep 9, 2026
3e2487a
Build: Replace Drill FMPP plugin with Groovy generation
HTHou Sep 9, 2026
de9fb2f
Build: Preserve FMPP generation during SBOM checks
HTHou Sep 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions iotdb-core/calc-commons/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,25 +181,6 @@
</execution>
</executions>
</plugin>
<plugin>
<!-- generate sources from fmpp -->
<groupId>org.apache.drill.tools</groupId>
<artifactId>drill-fmpp-maven-plugin</artifactId>
<executions>
<execution>
<id>generate-fmpp</id>
<goals>
<goal>generate</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<config>${project.build.directory}/codegen/config.fmpp</config>
<output>${project.build.directory}/generated-sources/freemarker</output>
<templates>${project.build.directory}/codegen/templates</templates>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
Expand Down
20 changes: 0 additions & 20 deletions iotdb-core/datanode/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,25 +419,6 @@
</execution>
</executions>
</plugin>
<plugin>
<!-- generate sources from fmpp -->
<groupId>org.apache.drill.tools</groupId>
<artifactId>drill-fmpp-maven-plugin</artifactId>
<executions>
<execution>
<id>generate-fmpp</id>
<goals>
<goal>generate</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<config>${project.build.directory}/codegen/config.fmpp</config>
<output>${project.build.directory}/generated-sources/freemarker</output>
<templates>${project.build.directory}/codegen/templates</templates>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
Expand All @@ -450,7 +431,6 @@
<phase>generate-sources</phase>
<configuration>
<sources>
<source>${project.build.directory}/generated-sources/freemarker</source>
<source>${project.basedir}/src/main/i18n/${i18n.locale}</source>
</sources>
</configuration>
Expand Down
25 changes: 3 additions & 22 deletions iotdb-protocol/thrift-ainode/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
<artifactId>iotdb-thrift-ainode</artifactId>
<name>IoTDB: Protocol: Thrift AI Node</name>
<description>RPC (Thrift) framework among AINodes.</description>
<properties>
<thrift.source>ainode.thrift</thrift.source>
</properties>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -44,26 +47,4 @@
<version>2.0.11-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-source</id>
<goals>
<goal>add-source</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<sources>
<source>${project.build.directory}/generated-sources/thrift</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
26 changes: 4 additions & 22 deletions iotdb-protocol/thrift-commons/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,32 +29,14 @@
<artifactId>iotdb-thrift-commons</artifactId>
<name>IoTDB: Protocol: Thrift Commons</name>
<description>RPC (Thrift) common framework.</description>
<properties>
<thrift.source>common.thrift</thrift.source>
<thrift.skip.client>false</thrift.skip.client>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-source</id>
<goals>
<goal>add-source</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<sources>
<source>${project.build.directory}/generated-sources/thrift</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
25 changes: 3 additions & 22 deletions iotdb-protocol/thrift-confignode/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
<artifactId>iotdb-thrift-confignode</artifactId>
<name>IoTDB: Protocol: Thrift Config Node</name>
<description>RPC (Thrift) framework among ConfigNodes.</description>
<properties>
<thrift.source>confignode.thrift</thrift.source>
</properties>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -44,26 +47,4 @@
<version>2.0.11-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-source</id>
<goals>
<goal>add-source</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<sources>
<source>${project.build.directory}/generated-sources/thrift</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
20 changes: 13 additions & 7 deletions iotdb-protocol/thrift-consensus/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
<artifactId>iotdb-thrift-consensus</artifactId>
<name>IoTDB: Protocol: Thrift Consensus</name>
<description>RPC modules for consensus</description>
<properties>
<thrift.source>iotconsensus.thrift</thrift.source>
<thrift.skip.python>true</thrift.skip.python>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.iotdb</groupId>
Expand All @@ -48,18 +52,20 @@
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<id>add-source</id>
<id>generate-iotconsensusv2-java</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
<goal>exec</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<sources>
<source>${project.build.directory}/generated-sources/thrift</source>
</sources>
<arguments combine.children="append">
<argument>--gen</argument>
<argument>java:generated_annotations=suppress</argument>
<argument>${project.basedir}/src/main/thrift/iotconsensusv2.thrift</argument>
</arguments>
</configuration>
</execution>
</executions>
Expand Down
33 changes: 27 additions & 6 deletions iotdb-protocol/thrift-datanode/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
<artifactId>iotdb-thrift</artifactId>
<name>IoTDB: Protocol: Thrift Data Node</name>
<description>RPC (Thrift) framework for client and DataNodes.</description>
<properties>
<thrift.source>client.thrift</thrift.source>
<thrift.skip.client>false</thrift.skip.client>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.iotdb</groupId>
Expand Down Expand Up @@ -84,18 +88,35 @@
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<id>add-source</id>
<id>generate-datanode-java</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
<goal>exec</goal>
</goals>
<configuration>
<arguments combine.children="append">
<argument>--gen</argument>
<argument>java:generated_annotations=suppress</argument>
<argument>${project.basedir}/src/main/thrift/datanode.thrift</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>generate-datanode-python</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<sources>
<source>${project.build.directory}/generated-sources/thrift</source>
</sources>
<workingDirectory>${project.build.directory}/generated-sources-python</workingDirectory>
<arguments combine.children="append">
<argument>--gen</argument>
<argument>py</argument>
<argument>${project.basedir}/src/main/thrift/datanode.thrift</argument>
</arguments>
</configuration>
</execution>
</executions>
Expand Down
Loading
Loading