You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2023/02/03 11:11:36 UTC
[shardingsphere] branch master updated: Restore antlr output directory for generated codes (#23975)
This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new d972f3024ae Restore antlr output directory for generated codes (#23975)
d972f3024ae is described below
commit d972f3024aeb870c5bc8e61fa7aa2e6cadc390f1
Author: 吴伟杰 <wu...@apache.org>
AuthorDate: Fri Feb 3 19:11:29 2023 +0800
Restore antlr output directory for generated codes (#23975)
---
.gitignore | 2 --
distsql/parser/pom.xml | 3 +--
features/db-discovery/distsql/parser/pom.xml | 3 +--
features/encrypt/distsql/parser/pom.xml | 3 +--
features/mask/distsql/parser/pom.xml | 3 +--
features/readwrite-splitting/distsql/parser/pom.xml | 3 +--
features/shadow/distsql/parser/pom.xml | 3 +--
features/sharding/distsql/parser/pom.xml | 3 +--
kernel/authority/distsql/parser/pom.xml | 3 +--
kernel/data-pipeline/distsql/parser/pom.xml | 3 +--
kernel/parser/distsql/parser/pom.xml | 3 +--
kernel/sql-federation/optimizer/pom.xml | 3 +--
kernel/sql-translator/distsql/parser/pom.xml | 3 +--
kernel/traffic/distsql/parser/pom.xml | 3 +--
kernel/transaction/distsql/parser/pom.xml | 3 +--
pom.xml | 2 --
sql-parser/dialect/pom.xml | 3 +--
17 files changed, 15 insertions(+), 34 deletions(-)
diff --git a/.gitignore b/.gitignore
index fbb3666326e..b94ead05452 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,5 +49,3 @@ Thumbs.db
# antlr ignore
gen/
*.tokens
-**/generated/antlr**
-
diff --git a/distsql/parser/pom.xml b/distsql/parser/pom.xml
index 94af5a20580..8bf7b2e68e2 100644
--- a/distsql/parser/pom.xml
+++ b/distsql/parser/pom.xml
@@ -28,7 +28,7 @@
<name>${project.artifactId}</name>
<properties>
- <antlr.output.directory>${basedir}/src/generated/antlr4</antlr.output.directory>
+ <antlr.output.directory>${basedir}/target/generated-sources/antlr4</antlr.output.directory>
</properties>
<dependencies>
@@ -97,7 +97,6 @@
</goals>
<configuration>
<libDirectory>src/main/antlr4/imports/</libDirectory>
- <outputDirectory>${antlr.output.directory}</outputDirectory>
<listener>false</listener>
<visitor>true</visitor>
</configuration>
diff --git a/features/db-discovery/distsql/parser/pom.xml b/features/db-discovery/distsql/parser/pom.xml
index f62688341a5..7c7dae8b791 100644
--- a/features/db-discovery/distsql/parser/pom.xml
+++ b/features/db-discovery/distsql/parser/pom.xml
@@ -28,7 +28,7 @@
<name>${project.artifactId}</name>
<properties>
- <antlr.output.directory>${basedir}/src/generated/antlr4</antlr.output.directory>
+ <antlr.output.directory>${basedir}/target/generated-sources/antlr4</antlr.output.directory>
</properties>
<dependencies>
@@ -97,7 +97,6 @@
</goals>
<configuration>
<libDirectory>src/main/antlr4/imports/db-discovery/</libDirectory>
- <outputDirectory>${antlr.output.directory}</outputDirectory>
<listener>false</listener>
<visitor>true</visitor>
</configuration>
diff --git a/features/encrypt/distsql/parser/pom.xml b/features/encrypt/distsql/parser/pom.xml
index 8b0ac57d8c0..34092631051 100644
--- a/features/encrypt/distsql/parser/pom.xml
+++ b/features/encrypt/distsql/parser/pom.xml
@@ -28,7 +28,7 @@
<name>${project.artifactId}</name>
<properties>
- <antlr.output.directory>${basedir}/src/generated/antlr4</antlr.output.directory>
+ <antlr.output.directory>${basedir}/target/generated-sources/antlr4</antlr.output.directory>
</properties>
<dependencies>
@@ -104,7 +104,6 @@
</goals>
<configuration>
<libDirectory>src/main/antlr4/imports/encrypt</libDirectory>
- <outputDirectory>${antlr.output.directory}</outputDirectory>
<listener>false</listener>
<visitor>true</visitor>
</configuration>
diff --git a/features/mask/distsql/parser/pom.xml b/features/mask/distsql/parser/pom.xml
index f9cd39cdf81..c962f56b43d 100644
--- a/features/mask/distsql/parser/pom.xml
+++ b/features/mask/distsql/parser/pom.xml
@@ -28,7 +28,7 @@
<name>${project.artifactId}</name>
<properties>
- <antlr.output.directory>${basedir}/src/generated/antlr4</antlr.output.directory>
+ <antlr.output.directory>${basedir}/target/generated-sources/antlr4</antlr.output.directory>
</properties>
<dependencies>
@@ -97,7 +97,6 @@
</goals>
<configuration>
<libDirectory>src/main/antlr4/imports/mask/</libDirectory>
- <outputDirectory>${antlr.output.directory}</outputDirectory>
<listener>false</listener>
<visitor>true</visitor>
</configuration>
diff --git a/features/readwrite-splitting/distsql/parser/pom.xml b/features/readwrite-splitting/distsql/parser/pom.xml
index 79e0ae29558..04bcddc3203 100644
--- a/features/readwrite-splitting/distsql/parser/pom.xml
+++ b/features/readwrite-splitting/distsql/parser/pom.xml
@@ -28,7 +28,7 @@
<name>${project.artifactId}</name>
<properties>
- <antlr.output.directory>${basedir}/src/generated/antlr4</antlr.output.directory>
+ <antlr.output.directory>${basedir}/target/generated-sources/antlr4</antlr.output.directory>
</properties>
<dependencies>
@@ -97,7 +97,6 @@
</goals>
<configuration>
<libDirectory>src/main/antlr4/imports/readwrite-splitting/</libDirectory>
- <outputDirectory>${antlr.output.directory}</outputDirectory>
<listener>false</listener>
<visitor>true</visitor>
</configuration>
diff --git a/features/shadow/distsql/parser/pom.xml b/features/shadow/distsql/parser/pom.xml
index fee82851ae6..b53812973c2 100644
--- a/features/shadow/distsql/parser/pom.xml
+++ b/features/shadow/distsql/parser/pom.xml
@@ -28,7 +28,7 @@
<name>${project.artifactId}</name>
<properties>
- <antlr.output.directory>${basedir}/src/generated/antlr4</antlr.output.directory>
+ <antlr.output.directory>${basedir}/target/generated-sources/antlr4</antlr.output.directory>
</properties>
<dependencies>
@@ -97,7 +97,6 @@
</goals>
<configuration>
<libDirectory>src/main/antlr4/imports/shadow/</libDirectory>
- <outputDirectory>${antlr.output.directory}</outputDirectory>
<listener>false</listener>
<visitor>true</visitor>
</configuration>
diff --git a/features/sharding/distsql/parser/pom.xml b/features/sharding/distsql/parser/pom.xml
index b010ad1b63d..67fc14ef794 100644
--- a/features/sharding/distsql/parser/pom.xml
+++ b/features/sharding/distsql/parser/pom.xml
@@ -28,7 +28,7 @@
<name>${project.artifactId}</name>
<properties>
- <antlr.output.directory>${basedir}/src/generated/antlr4</antlr.output.directory>
+ <antlr.output.directory>${basedir}/target/generated-sources/antlr4</antlr.output.directory>
</properties>
<dependencies>
@@ -98,7 +98,6 @@
<configuration>
<sourceDirectory>src/main/antlr4/sharding/</sourceDirectory>
<libDirectory>src/main/antlr4/imports/sharding/</libDirectory>
- <outputDirectory>${antlr.output.directory}</outputDirectory>
<listener>false</listener>
<visitor>true</visitor>
</configuration>
diff --git a/kernel/authority/distsql/parser/pom.xml b/kernel/authority/distsql/parser/pom.xml
index 632ee2d976e..18e37c75201 100644
--- a/kernel/authority/distsql/parser/pom.xml
+++ b/kernel/authority/distsql/parser/pom.xml
@@ -28,7 +28,7 @@
<name>${project.artifactId}</name>
<properties>
- <antlr.output.directory>${basedir}/src/generated/antlr4</antlr.output.directory>
+ <antlr.output.directory>${basedir}/target/generated-sources/antlr4</antlr.output.directory>
</properties>
<dependencies>
@@ -97,7 +97,6 @@
</goals>
<configuration>
<libDirectory>src/main/antlr4/imports/authority/</libDirectory>
- <outputDirectory>${antlr.output.directory}</outputDirectory>
<listener>false</listener>
<visitor>true</visitor>
</configuration>
diff --git a/kernel/data-pipeline/distsql/parser/pom.xml b/kernel/data-pipeline/distsql/parser/pom.xml
index 38dd063b84d..76ffaad1088 100644
--- a/kernel/data-pipeline/distsql/parser/pom.xml
+++ b/kernel/data-pipeline/distsql/parser/pom.xml
@@ -28,7 +28,7 @@
<name>${project.artifactId}</name>
<properties>
- <antlr.output.directory>${basedir}/src/generated/antlr4</antlr.output.directory>
+ <antlr.output.directory>${basedir}/target/generated-sources/antlr4</antlr.output.directory>
</properties>
<dependencies>
@@ -98,7 +98,6 @@
<configuration>
<sourceDirectory>src/main/antlr4/migration/</sourceDirectory>
<libDirectory>src/main/antlr4/imports/migration/</libDirectory>
- <outputDirectory>${antlr.output.directory}</outputDirectory>
<listener>false</listener>
<visitor>true</visitor>
</configuration>
diff --git a/kernel/parser/distsql/parser/pom.xml b/kernel/parser/distsql/parser/pom.xml
index 629aaecaf5b..9523b85f96e 100644
--- a/kernel/parser/distsql/parser/pom.xml
+++ b/kernel/parser/distsql/parser/pom.xml
@@ -28,7 +28,7 @@
<name>${project.artifactId}</name>
<properties>
- <antlr.output.directory>${basedir}/src/generated/antlr4</antlr.output.directory>
+ <antlr.output.directory>${basedir}/target/generated-sources/antlr4</antlr.output.directory>
</properties>
<dependencies>
@@ -97,7 +97,6 @@
</goals>
<configuration>
<libDirectory>src/main/antlr4/imports/parser/</libDirectory>
- <outputDirectory>${antlr.output.directory}</outputDirectory>
<listener>false</listener>
<visitor>true</visitor>
</configuration>
diff --git a/kernel/sql-federation/optimizer/pom.xml b/kernel/sql-federation/optimizer/pom.xml
index 275750af60c..6fccbdfe456 100644
--- a/kernel/sql-federation/optimizer/pom.xml
+++ b/kernel/sql-federation/optimizer/pom.xml
@@ -28,7 +28,7 @@
<name>${project.artifactId}</name>
<properties>
- <antlr.output.directory>${basedir}/src/generated/antlr4</antlr.output.directory>
+ <antlr.output.directory>${basedir}/target/generated-sources/antlr4</antlr.output.directory>
</properties>
<dependencies>
@@ -181,7 +181,6 @@
</goals>
<configuration>
<libDirectory>src/main/antlr4/org/apache/shardingsphere/sqlfederation/optimizer/parser/rexnode</libDirectory>
- <outputDirectory>${antlr.output.directory}</outputDirectory>
<listener>false</listener>
<visitor>true</visitor>
</configuration>
diff --git a/kernel/sql-translator/distsql/parser/pom.xml b/kernel/sql-translator/distsql/parser/pom.xml
index 5f501758f07..024289df48b 100644
--- a/kernel/sql-translator/distsql/parser/pom.xml
+++ b/kernel/sql-translator/distsql/parser/pom.xml
@@ -28,7 +28,7 @@
<name>${project.artifactId}</name>
<properties>
- <antlr.output.directory>${basedir}/src/generated/antlr4</antlr.output.directory>
+ <antlr.output.directory>${basedir}/target/generated-sources/antlr4</antlr.output.directory>
</properties>
<dependencies>
@@ -97,7 +97,6 @@
</goals>
<configuration>
<libDirectory>src/main/antlr4/imports/sqltranslator/</libDirectory>
- <outputDirectory>${antlr.output.directory}</outputDirectory>
<listener>false</listener>
<visitor>true</visitor>
</configuration>
diff --git a/kernel/traffic/distsql/parser/pom.xml b/kernel/traffic/distsql/parser/pom.xml
index d63fd888b57..9e447e93b54 100644
--- a/kernel/traffic/distsql/parser/pom.xml
+++ b/kernel/traffic/distsql/parser/pom.xml
@@ -28,7 +28,7 @@
<name>${project.artifactId}</name>
<properties>
- <antlr.output.directory>${basedir}/src/generated/antlr4</antlr.output.directory>
+ <antlr.output.directory>${basedir}/target/generated-sources/antlr4</antlr.output.directory>
</properties>
<dependencies>
@@ -97,7 +97,6 @@
</goals>
<configuration>
<libDirectory>src/main/antlr4/imports/traffic/</libDirectory>
- <outputDirectory>${antlr.output.directory}</outputDirectory>
<listener>false</listener>
<visitor>true</visitor>
</configuration>
diff --git a/kernel/transaction/distsql/parser/pom.xml b/kernel/transaction/distsql/parser/pom.xml
index 9b00d7ead90..a5a155d2afd 100644
--- a/kernel/transaction/distsql/parser/pom.xml
+++ b/kernel/transaction/distsql/parser/pom.xml
@@ -28,7 +28,7 @@
<name>${project.artifactId}</name>
<properties>
- <antlr.output.directory>${basedir}/src/generated/antlr4</antlr.output.directory>
+ <antlr.output.directory>${basedir}/target/generated-sources/antlr4</antlr.output.directory>
</properties>
<dependencies>
@@ -97,7 +97,6 @@
</goals>
<configuration>
<libDirectory>src/main/antlr4/imports/transaction/</libDirectory>
- <outputDirectory>${antlr.output.directory}</outputDirectory>
<listener>false</listener>
<visitor>true</visitor>
</configuration>
diff --git a/pom.xml b/pom.xml
index 4517cbf59e1..d3b8aebec2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -918,8 +918,6 @@
<!-- Helm files -->
<exclude>**/.helmignore</exclude>
<exclude>**/_helpers.tpl</exclude>
- <!-- Antlr generated files -->
- <exclude>**/generated/antlr4/**</exclude>
</excludes>
</configuration>
<executions>
diff --git a/sql-parser/dialect/pom.xml b/sql-parser/dialect/pom.xml
index 16c42857d57..db07443259e 100644
--- a/sql-parser/dialect/pom.xml
+++ b/sql-parser/dialect/pom.xml
@@ -37,7 +37,7 @@
</modules>
<properties>
- <antlr.output.directory>${basedir}/src/generated/antlr4</antlr.output.directory>
+ <antlr.output.directory>${basedir}/target/generated-sources/antlr4</antlr.output.directory>
</properties>
<dependencies>
@@ -120,7 +120,6 @@
</goals>
<configuration>
<libDirectory>src/main/antlr4/imports/${dialect.parser}/</libDirectory>
- <outputDirectory>${antlr.output.directory}</outputDirectory>
<listener>false</listener>
<visitor>true</visitor>
</configuration>