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/04/03 16:41:14 UTC

[shardingsphere] branch master updated: Refactor build-helper-maven-plugin to plugin management tag (#24991)

This is an automated email from the ASF dual-hosted git repository.

zhaojinchao 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 58a60509517 Refactor build-helper-maven-plugin to plugin management tag (#24991)
58a60509517 is described below

commit 58a605095172a8d5309bb7f2f0edcd36f0a43abb
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Tue Apr 4 00:41:00 2023 +0800

    Refactor build-helper-maven-plugin to plugin management tag (#24991)
---
 distsql/parser/pom.xml                              | 15 ---------------
 features/encrypt/distsql/parser/pom.xml             | 15 ---------------
 features/mask/distsql/parser/pom.xml                | 15 ---------------
 features/readwrite-splitting/distsql/parser/pom.xml | 15 ---------------
 features/shadow/distsql/parser/pom.xml              | 15 ---------------
 features/sharding/distsql/parser/pom.xml            | 15 ---------------
 kernel/authority/distsql/parser/pom.xml             | 15 ---------------
 kernel/data-pipeline/distsql/parser/pom.xml         | 15 ---------------
 kernel/parser/distsql/parser/pom.xml                | 15 ---------------
 kernel/sql-federation/optimizer/pom.xml             | 15 ---------------
 kernel/sql-translator/distsql/parser/pom.xml        | 15 ---------------
 kernel/traffic/distsql/parser/pom.xml               | 15 ---------------
 kernel/transaction/distsql/parser/pom.xml           | 15 ---------------
 pom.xml                                             | 20 ++++++++++++++++++++
 sql-parser/dialect/pom.xml                          | 15 ---------------
 15 files changed, 20 insertions(+), 210 deletions(-)

diff --git a/distsql/parser/pom.xml b/distsql/parser/pom.xml
index 0eb87e15b07..c763e605e3d 100644
--- a/distsql/parser/pom.xml
+++ b/distsql/parser/pom.xml
@@ -60,21 +60,6 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>${build-helper-maven-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <sources>
-                                        <source>${antlr.output.directory}</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
                     </plugin>
                 </plugins>
             </build>
diff --git a/features/encrypt/distsql/parser/pom.xml b/features/encrypt/distsql/parser/pom.xml
index 08cb2efaba9..24e8501204b 100644
--- a/features/encrypt/distsql/parser/pom.xml
+++ b/features/encrypt/distsql/parser/pom.xml
@@ -67,21 +67,6 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>${build-helper-maven-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <sources>
-                                        <source>${antlr.output.directory}</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
                     </plugin>
                 </plugins>
             </build>
diff --git a/features/mask/distsql/parser/pom.xml b/features/mask/distsql/parser/pom.xml
index a22f0c9026a..f20c7bb6c3c 100644
--- a/features/mask/distsql/parser/pom.xml
+++ b/features/mask/distsql/parser/pom.xml
@@ -60,21 +60,6 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>${build-helper-maven-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <sources>
-                                        <source>${antlr.output.directory}</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
                     </plugin>
                 </plugins>
             </build>
diff --git a/features/readwrite-splitting/distsql/parser/pom.xml b/features/readwrite-splitting/distsql/parser/pom.xml
index 01667a82c7a..6aafa15a4fc 100644
--- a/features/readwrite-splitting/distsql/parser/pom.xml
+++ b/features/readwrite-splitting/distsql/parser/pom.xml
@@ -60,21 +60,6 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>${build-helper-maven-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <sources>
-                                        <source>${antlr.output.directory}</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
                     </plugin>
                 </plugins>
             </build>
diff --git a/features/shadow/distsql/parser/pom.xml b/features/shadow/distsql/parser/pom.xml
index 0acc47938d0..3d888e37b00 100644
--- a/features/shadow/distsql/parser/pom.xml
+++ b/features/shadow/distsql/parser/pom.xml
@@ -60,21 +60,6 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>${build-helper-maven-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <sources>
-                                        <source>${antlr.output.directory}</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
                     </plugin>
                 </plugins>
             </build>
diff --git a/features/sharding/distsql/parser/pom.xml b/features/sharding/distsql/parser/pom.xml
index 5b35da6ba5d..56012c2dd27 100644
--- a/features/sharding/distsql/parser/pom.xml
+++ b/features/sharding/distsql/parser/pom.xml
@@ -60,21 +60,6 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>${build-helper-maven-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <sources>
-                                        <source>${antlr.output.directory}</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
                     </plugin>
                 </plugins>
             </build>
diff --git a/kernel/authority/distsql/parser/pom.xml b/kernel/authority/distsql/parser/pom.xml
index 9a9759f9b96..99e66390b0a 100644
--- a/kernel/authority/distsql/parser/pom.xml
+++ b/kernel/authority/distsql/parser/pom.xml
@@ -60,21 +60,6 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>${build-helper-maven-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <sources>
-                                        <source>${antlr.output.directory}</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
                     </plugin>
                 </plugins>
             </build>
diff --git a/kernel/data-pipeline/distsql/parser/pom.xml b/kernel/data-pipeline/distsql/parser/pom.xml
index 0ebf48b2731..4b1c323d1be 100644
--- a/kernel/data-pipeline/distsql/parser/pom.xml
+++ b/kernel/data-pipeline/distsql/parser/pom.xml
@@ -60,21 +60,6 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>${build-helper-maven-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <sources>
-                                        <source>${antlr.output.directory}</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
                     </plugin>
                 </plugins>
             </build>
diff --git a/kernel/parser/distsql/parser/pom.xml b/kernel/parser/distsql/parser/pom.xml
index 18cd401a953..6dcc586a971 100644
--- a/kernel/parser/distsql/parser/pom.xml
+++ b/kernel/parser/distsql/parser/pom.xml
@@ -60,21 +60,6 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>${build-helper-maven-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <sources>
-                                        <source>${antlr.output.directory}</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
                     </plugin>
                 </plugins>
             </build>
diff --git a/kernel/sql-federation/optimizer/pom.xml b/kernel/sql-federation/optimizer/pom.xml
index 620bb58d3d1..2f01112d024 100644
--- a/kernel/sql-federation/optimizer/pom.xml
+++ b/kernel/sql-federation/optimizer/pom.xml
@@ -144,21 +144,6 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>${build-helper-maven-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <sources>
-                                        <source>${antlr.output.directory}</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
                     </plugin>
                 </plugins>
             </build>
diff --git a/kernel/sql-translator/distsql/parser/pom.xml b/kernel/sql-translator/distsql/parser/pom.xml
index 9a54097a9fe..7f4c9e53b49 100644
--- a/kernel/sql-translator/distsql/parser/pom.xml
+++ b/kernel/sql-translator/distsql/parser/pom.xml
@@ -60,21 +60,6 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>${build-helper-maven-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <sources>
-                                        <source>${antlr.output.directory}</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
                     </plugin>
                 </plugins>
             </build>
diff --git a/kernel/traffic/distsql/parser/pom.xml b/kernel/traffic/distsql/parser/pom.xml
index de1db7e592f..0bc74957511 100644
--- a/kernel/traffic/distsql/parser/pom.xml
+++ b/kernel/traffic/distsql/parser/pom.xml
@@ -60,21 +60,6 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>${build-helper-maven-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <sources>
-                                        <source>${antlr.output.directory}</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
                     </plugin>
                 </plugins>
             </build>
diff --git a/kernel/transaction/distsql/parser/pom.xml b/kernel/transaction/distsql/parser/pom.xml
index 5a0faa2dbd1..4f44844daf1 100644
--- a/kernel/transaction/distsql/parser/pom.xml
+++ b/kernel/transaction/distsql/parser/pom.xml
@@ -60,21 +60,6 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>${build-helper-maven-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <sources>
-                                        <source>${antlr.output.directory}</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
                     </plugin>
                 </plugins>
             </build>
diff --git a/pom.xml b/pom.xml
index 025db9e8c78..24e4abb424a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.deploy.skip>false</maven.deploy.skip>
         <shade.package>org.apache.shardingsphere.shade</shade.package>
+        <antlr.output.directory>${basedir}/target/generated-sources/antlr4</antlr.output.directory>
         
         <!-- 3rd party library versions -->
         <guava.version>30.0-jre</guava.version>
@@ -808,6 +809,25 @@
                     <artifactId>jandex-maven-plugin</artifactId>
                     <version>${jandex-maven-plugin.version}</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <version>${build-helper-maven-plugin.version}</version>
+                    <executions>
+                        <execution>
+                            <id>add-source</id>
+                            <goals>
+                                <goal>add-source</goal>
+                            </goals>
+                            <phase>generate-sources</phase>
+                            <configuration>
+                                <sources>
+                                    <source>${antlr.output.directory}</source>
+                                </sources>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
                 
                 <!-- Check plugins -->
                 <plugin>
diff --git a/sql-parser/dialect/pom.xml b/sql-parser/dialect/pom.xml
index b32e8b74ea4..4cdc2be7b21 100644
--- a/sql-parser/dialect/pom.xml
+++ b/sql-parser/dialect/pom.xml
@@ -83,21 +83,6 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>${build-helper-maven-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <sources>
-                                        <source>${antlr.output.directory}</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
                     </plugin>
                 </plugins>
             </build>