diff --git a/dataSource/filestore/pom.xml b/dataSource/filestore/pom.xml
index 90863c2bbf..d10455f818 100644
--- a/dataSource/filestore/pom.xml
+++ b/dataSource/filestore/pom.xml
@@ -208,7 +208,6 @@
org.apache.thrift
thrift-maven-plugin
- 0.10.0
${thrift.exec.absolute.path}
diff --git a/pom.xml b/pom.xml
index 7decd7ef8f..49f7dcfc89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -337,6 +337,11 @@
maven-assembly-plugin
3.7.1
+
+ org.apache.thrift
+ thrift-maven-plugin
+ 0.10.0
+
com.mycila
license-maven-plugin
diff --git a/thrift/pom.xml b/thrift/pom.xml
index ae890fca49..62c7b1f545 100644
--- a/thrift/pom.xml
+++ b/thrift/pom.xml
@@ -52,109 +52,50 @@
slf4j-api
-
+
- org.eclipse.m2e
- lifecycle-mapping
- 1.0.0
-
-
-
-
-
- org.apache.thrift.tools
- maven-thrift-plugin
- [0.1.10,)
-
- compile
-
-
-
-
- false
-
-
-
-
-
-
+ org.apache.thrift
+ thrift-maven-plugin
+
+
+ generate-thrift-sources-java
+
+ compile
+
+ generate-sources
+
+ java
+
+
+
+ generate-thrift-sources-python
+
+ compile
+
+ generate-sources
+
+ py
+ ${project.build.directory}/py
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.8.1
-
- 8
- 8
-
-
-
- org.apache.thrift.tools
- maven-thrift-plugin
- 0.1.11
-
-
- generate-thrift-sources-java
-
- compile
-
- generate-sources
-
- java
- ${project.build.directory}/generated-sources/thrift
-
-
-
- generate-thrift-sources-python
-
- compile
-
- generate-sources
-
- py
- ${project.build.directory}/generated-sources/py
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 3.2.0
-
-
- add-source
-
- add-source
-
- generate-sources
-
-
- ${project.build.directory}/generated-sources/thrift
- ${project.build.directory}/generated-sources/py
-
-
-
-
-
-
@@ -171,7 +112,7 @@
thrift-generation
- src/main/proto
+ src/main/thrift
@@ -231,34 +172,30 @@
- org.apache.thrift.tools
- maven-thrift-plugin
- 0.1.11
+ org.apache.thrift
+ thrift-maven-plugin
+
+ ${thrift.exec.absolute.path}
+
+
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
- generate-thrift-sources-java
+ copy-py-thrift
- compile
+ run
- generate-sources
-
- java
-
-
- ${thrift.exec.absolute.path}
- src/main/proto
-
-
-
- generate-thrift-sources-python
-
- compile
-
- generate-sources
+ package
- py
- ${thrift.exec.absolute.path}
- src/main/proto
+
+
+
+
+
+
+
diff --git a/thrift/src/main/proto/rpc.thrift b/thrift/src/main/thrift/rpc.thrift
similarity index 100%
rename from thrift/src/main/proto/rpc.thrift
rename to thrift/src/main/thrift/rpc.thrift