This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch ty/TableModelGrammar in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 03daa3472f29bdf38c034d95aaefe4c81eba0edd Author: Brian Demers <[email protected]> AuthorDate: Mon Jul 22 22:41:42 2024 -0400 Replaces the internal maven property with an officially supported alternative (#12982) The property `maven.multiModuleProjectDirectory` is not officially support and can be removed at any time, it has been removed when using mvnd. The current alternative with Maven 3 is using path traversal from the current module's directory Fixes: #12981 (cherry picked from commit cbabf8762467cb4efb6cbf303d7d0ac5c18f89ba) --- distribution/src/assembly/all.xml | 26 +++++++++++------------ distribution/src/assembly/cli.xml | 6 +++--- distribution/src/assembly/client-cpp.xml | 2 +- distribution/src/assembly/common-files.xml | 12 +++++------ distribution/src/assembly/confignode.xml | 10 ++++----- distribution/src/assembly/datanode.xml | 16 +++++++------- distribution/src/assembly/library-udf.xml | 8 +++---- integration-test/src/assembly/mpp-test.xml | 20 ++++++++--------- iotdb-core/confignode/src/assembly/confignode.xml | 4 ++-- iotdb-core/datanode/src/assembly/server.xml | 10 ++++----- 10 files changed, 57 insertions(+), 57 deletions(-) diff --git a/distribution/src/assembly/all.xml b/distribution/src/assembly/all.xml index 028af358eac..c6da9392929 100644 --- a/distribution/src/assembly/all.xml +++ b/distribution/src/assembly/all.xml @@ -48,65 +48,65 @@ <fileSets> <fileSet> <outputDirectory>conf</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/iotdb-core/datanode/src/assembly/resources/conf</directory> + <directory>${project.basedir}/../iotdb-core/datanode/src/assembly/resources/conf</directory> </fileSet> <fileSet> <outputDirectory>conf</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/iotdb-core/confignode/src/assembly/resources/conf</directory> + <directory>${project.basedir}/../iotdb-core/confignode/src/assembly/resources/conf</directory> </fileSet> <fileSet> <outputDirectory>conf</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/conf</directory> + <directory>${project.basedir}/../iotdb-core/node-commons/src/assembly/resources/conf</directory> </fileSet> <fileSet> <outputDirectory>sbin</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/iotdb-core/datanode/src/assembly/resources/sbin</directory> + <directory>${project.basedir}/../iotdb-core/datanode/src/assembly/resources/sbin</directory> <fileMode>0755</fileMode> </fileSet> <fileSet> <outputDirectory>sbin</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/iotdb-core/confignode/src/assembly/resources/sbin</directory> + <directory>${project.basedir}/../iotdb-core/confignode/src/assembly/resources/sbin</directory> <fileMode>0755</fileMode> </fileSet> <fileSet> <outputDirectory>sbin</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/sbin</directory> + <directory>${project.basedir}/../iotdb-core/node-commons/src/assembly/resources/sbin</directory> <fileMode>0755</fileMode> </fileSet> <fileSet> <outputDirectory>tools</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/iotdb-core/datanode/src/assembly/resources/tools</directory> + <directory>${project.basedir}/../iotdb-core/datanode/src/assembly/resources/tools</directory> <fileMode>0755</fileMode> </fileSet> <fileSet> <outputDirectory>sbin</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/sbin</directory> + <directory>${project.basedir}/../iotdb-client/cli/src/assembly/resources/sbin</directory> <fileMode>0755</fileMode> </fileSet> <fileSet> <outputDirectory>tools</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/tools</directory> + <directory>${project.basedir}/../iotdb-client/cli/src/assembly/resources/tools</directory> <fileMode>0755</fileMode> </fileSet> <!-- <fileSet>--> <!-- <outputDirectory>datanode</outputDirectory>--> - <!-- <directory>${maven.multiModuleProjectDirectory}/distribution/target/apache-iotdb-${project.version}-all-bin/apache-iotdb-${project.version}-all-bin/datanode</directory>--> + <!-- <directory>${project.basedir}/../distribution/target/apache-iotdb-${project.version}-all-bin/apache-iotdb-${project.version}-all-bin/datanode</directory>--> <!-- </fileSet>--> <!-- <fileSet>--> <!-- <outputDirectory>confignode</outputDirectory>--> - <!-- <directory>${maven.multiModuleProjectDirectory}/distribution/target/apache-iotdb-${project.version}-all-bin/apache-iotdb-${project.version}-all-bin/confignode</directory>--> + <!-- <directory>${project.basedir}/../distribution/target/apache-iotdb-${project.version}-all-bin/apache-iotdb-${project.version}-all-bin/confignode</directory>--> <!-- </fileSet>--> </fileSets> <files> <file> - <source>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/conf/logback-backup.xml</source> + <source>${project.basedir}/../iotdb-client/cli/src/assembly/resources/conf/logback-backup.xml</source> <outputDirectory>conf</outputDirectory> <fileMode>0755</fileMode> </file> </files> <!-- <files>--> <!-- <file>--> - <!-- <source>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/conf/datanode-env.sh</source>--> + <!-- <source>${project.basedir}/../server/src/assembly/resources/conf/datanode-env.sh</source>--> <!-- <destName>datanode/conf/datanode-env.sh</destName>--> <!-- <fileMode>0755</fileMode>--> <!-- </file>--> diff --git a/distribution/src/assembly/cli.xml b/distribution/src/assembly/cli.xml index 3566b472148..1c62df4735f 100644 --- a/distribution/src/assembly/cli.xml +++ b/distribution/src/assembly/cli.xml @@ -39,18 +39,18 @@ <fileSets> <fileSet> <outputDirectory>sbin</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/sbin</directory> + <directory>${project.basedir}/../iotdb-client/cli/src/assembly/resources/sbin</directory> <fileMode>0755</fileMode> </fileSet> <fileSet> <outputDirectory>tools</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/tools</directory> + <directory>${project.basedir}/../iotdb-client/cli/src/assembly/resources/tools</directory> <fileMode>0755</fileMode> </fileSet> </fileSets> <files> <file> - <source>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/conf/logback-backup.xml</source> + <source>${project.basedir}/../iotdb-client/cli/src/assembly/resources/conf/logback-backup.xml</source> <outputDirectory>conf</outputDirectory> <fileMode>0755</fileMode> </file> diff --git a/distribution/src/assembly/client-cpp.xml b/distribution/src/assembly/client-cpp.xml index a7e6316c94b..0a4dfffbc06 100644 --- a/distribution/src/assembly/client-cpp.xml +++ b/distribution/src/assembly/client-cpp.xml @@ -28,7 +28,7 @@ <baseDirectory>apache-iotdb-${project.version}-client-cpp-${os.classifier}-bin</baseDirectory> <fileSets> <fileSet> - <directory>${maven.multiModuleProjectDirectory}/iotdb-client/client-cpp/target/client-cpp-${project.version}-cpp-${os.classifier}</directory> + <directory>${project.basedir}/../iotdb-client/client-cpp/target/client-cpp-${project.version}-cpp-${os.classifier}</directory> <outputDirectory>${file.separator}</outputDirectory> </fileSet> </fileSets> diff --git a/distribution/src/assembly/common-files.xml b/distribution/src/assembly/common-files.xml index 4befd2a8d9b..e0c0aa3249a 100644 --- a/distribution/src/assembly/common-files.xml +++ b/distribution/src/assembly/common-files.xml @@ -22,27 +22,27 @@ <component xmlns="http://maven.apache.org/ASSEMBLY-COMPONENT/2.1.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/ASSEMBLY-COMPONENT/2.1.0 http://maven.apache.org/xsd/assembly-component-2.1.0.xsd";> <fileSets> <fileSet> - <directory>${maven.multiModuleProjectDirectory}/licenses</directory> + <directory>${project.basedir}/../licenses</directory> <outputDirectory>licenses</outputDirectory> </fileSet> </fileSets> <files> <file> - <source>${maven.multiModuleProjectDirectory}/README.md</source> + <source>${project.basedir}/../README.md</source> </file> <file> - <source>${maven.multiModuleProjectDirectory}/README_ZH.md</source> + <source>${project.basedir}/../README_ZH.md</source> </file> <file> - <source>${maven.multiModuleProjectDirectory}/LICENSE-binary</source> + <source>${project.basedir}/../LICENSE-binary</source> <destName>LICENSE</destName> </file> <file> - <source>${maven.multiModuleProjectDirectory}/NOTICE-binary</source> + <source>${project.basedir}/../NOTICE-binary</source> <destName>NOTICE</destName> </file> <file> - <source>${maven.multiModuleProjectDirectory}/RELEASE_NOTES.md</source> + <source>${project.basedir}/../RELEASE_NOTES.md</source> </file> </files> </component> diff --git a/distribution/src/assembly/confignode.xml b/distribution/src/assembly/confignode.xml index 502b90758ca..abe88fce388 100644 --- a/distribution/src/assembly/confignode.xml +++ b/distribution/src/assembly/confignode.xml @@ -38,25 +38,25 @@ </dependencySets> <fileSets> <fileSet> - <directory>${maven.multiModuleProjectDirectory}/iotdb-core/confignode/src/assembly/resources/sbin</directory> + <directory>${project.basedir}/../iotdb-core/confignode/src/assembly/resources/sbin</directory> <outputDirectory>sbin</outputDirectory> <fileMode>0755</fileMode> </fileSet> <fileSet> <outputDirectory>sbin</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/sbin</directory> + <directory>${project.basedir}/../iotdb-core/node-commons/src/assembly/resources/sbin</directory> <fileMode>0755</fileMode> </fileSet> <fileSet> - <directory>${maven.multiModuleProjectDirectory}/iotdb-core/confignode/src/assembly/resources/conf</directory> + <directory>${project.basedir}/../iotdb-core/confignode/src/assembly/resources/conf</directory> <outputDirectory>conf</outputDirectory> </fileSet> <fileSet> <outputDirectory>conf</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/conf</directory> + <directory>${project.basedir}/../iotdb-core/node-commons/src/assembly/resources/conf</directory> </fileSet> <!-- <fileSet>--> - <!-- <directory>${maven.multiModuleProjectDirectory}/confignode/src/assembly/resources/tools</directory>--> + <!-- <directory>${project.basedir}/../confignode/src/assembly/resources/tools</directory>--> <!-- <outputDirectory>tools</outputDirectory>--> <!-- <fileMode>0755</fileMode>--> <!-- </fileSet>--> diff --git a/distribution/src/assembly/datanode.xml b/distribution/src/assembly/datanode.xml index 84697fda6d7..9075bea61e4 100644 --- a/distribution/src/assembly/datanode.xml +++ b/distribution/src/assembly/datanode.xml @@ -40,41 +40,41 @@ <fileSets> <!-- <fileSet>--> <!-- <outputDirectory>conf</outputDirectory>--> - <!-- <directory>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/conf</directory>--> + <!-- <directory>${project.basedir}/../server/src/assembly/resources/conf</directory>--> <!-- </fileSet>--> <fileSet> <outputDirectory>conf</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/conf</directory> + <directory>${project.basedir}/../iotdb-core/node-commons/src/assembly/resources/conf</directory> </fileSet> <fileSet> <outputDirectory>sbin</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/iotdb-core/datanode/src/assembly/resources/sbin</directory> + <directory>${project.basedir}/../iotdb-core/datanode/src/assembly/resources/sbin</directory> <fileMode>0755</fileMode> </fileSet> <fileSet> <outputDirectory>sbin</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/sbin</directory> + <directory>${project.basedir}/../iotdb-core/node-commons/src/assembly/resources/sbin</directory> <fileMode>0755</fileMode> </fileSet> <fileSet> <outputDirectory>tools</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/iotdb-core/datanode/src/assembly/resources/tools</directory> + <directory>${project.basedir}/../iotdb-core/datanode/src/assembly/resources/tools</directory> <fileMode>0755</fileMode> </fileSet> <fileSet> <outputDirectory>sbin</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/sbin</directory> + <directory>${project.basedir}/../iotdb-client/cli/src/assembly/resources/sbin</directory> <fileMode>0755</fileMode> </fileSet> <fileSet> <outputDirectory>tools</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/tools</directory> + <directory>${project.basedir}/../iotdb-client/cli/src/assembly/resources/tools</directory> <fileMode>0755</fileMode> </fileSet> </fileSets> <files> <file> - <source>${maven.multiModuleProjectDirectory}/iotdb-core/datanode/src/assembly/resources/conf/datanode-env.sh</source> + <source>${project.basedir}/../iotdb-core/datanode/src/assembly/resources/conf/datanode-env.sh</source> <destName>conf/datanode-env.sh</destName> <fileMode>0755</fileMode> </file> diff --git a/distribution/src/assembly/library-udf.xml b/distribution/src/assembly/library-udf.xml index 300f710b383..bde1d0330a0 100644 --- a/distribution/src/assembly/library-udf.xml +++ b/distribution/src/assembly/library-udf.xml @@ -38,23 +38,23 @@ </dependencySets> <fileSets> <fileSet> - <directory>${maven.multiModuleProjectDirectory}/library-udf/src/assembly/tools</directory> + <directory>${project.basedir}/../library-udf/src/assembly/tools</directory> <outputDirectory/> <fileMode>0755</fileMode> </fileSet> <fileSet> - <directory>${maven.multiModuleProjectDirectory}/licenses</directory> + <directory>${project.basedir}/../licenses</directory> <outputDirectory>licenses</outputDirectory> </fileSet> </fileSets> <files> <file> - <source>${maven.multiModuleProjectDirectory}/LICENSE-binary</source> + <source>${project.basedir}/../LICENSE-binary</source> <outputDirectory>licenses</outputDirectory> <destName>LICENSE</destName> </file> <file> - <source>${maven.multiModuleProjectDirectory}/NOTICE-binary</source> + <source>${project.basedir}/../NOTICE-binary</source> <outputDirectory>licenses</outputDirectory> <destName>NOTICE</destName> </file> diff --git a/integration-test/src/assembly/mpp-test.xml b/integration-test/src/assembly/mpp-test.xml index 509c38b745b..3dc443c8d03 100644 --- a/integration-test/src/assembly/mpp-test.xml +++ b/integration-test/src/assembly/mpp-test.xml @@ -28,49 +28,49 @@ <fileSets> <fileSet> <outputDirectory>conf</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/iotdb-core/datanode/src/assembly/resources/conf</directory> + <directory>${project.basedir}/../iotdb-core/datanode/src/assembly/resources/conf</directory> </fileSet> <fileSet> <outputDirectory>conf</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/iotdb-core/confignode/src/assembly/resources/conf</directory> + <directory>${project.basedir}/../iotdb-core/confignode/src/assembly/resources/conf</directory> </fileSet> <fileSet> <outputDirectory>conf</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/conf</directory> + <directory>${project.basedir}/../iotdb-core/node-commons/src/assembly/resources/conf</directory> </fileSet> <fileSet> <outputDirectory>conf</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/iotdb-core/metrics/interface/src/main/assembly/resources/conf</directory> + <directory>${project.basedir}/../iotdb-core/metrics/interface/src/main/assembly/resources/conf</directory> </fileSet> <fileSet> <outputDirectory>sbin</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/iotdb-core/datanode/src/assembly/resources/sbin</directory> + <directory>${project.basedir}/../iotdb-core/datanode/src/assembly/resources/sbin</directory> <fileMode>0755</fileMode> </fileSet> <fileSet> <outputDirectory>sbin</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/iotdb-core/confignode/src/assembly/resources/sbin</directory> + <directory>${project.basedir}/../iotdb-core/confignode/src/assembly/resources/sbin</directory> <fileMode>0755</fileMode> </fileSet> <fileSet> <outputDirectory>tools</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/iotdb-core/datanode/src/assembly/resources/tools</directory> + <directory>${project.basedir}/../iotdb-core/datanode/src/assembly/resources/tools</directory> <fileMode>0755</fileMode> </fileSet> <fileSet> <outputDirectory>sbin</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/sbin</directory> + <directory>${project.basedir}/../iotdb-client/cli/src/assembly/resources/sbin</directory> <fileMode>0755</fileMode> </fileSet> <fileSet> <outputDirectory>tools</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/tools</directory> + <directory>${project.basedir}/../iotdb-client/cli/src/assembly/resources/tools</directory> <fileMode>0755</fileMode> </fileSet> </fileSets> <files> <file> - <source>${maven.multiModuleProjectDirectory}/iotdb-core/datanode/src/assembly/resources/conf/datanode-env.sh</source> + <source>${project.basedir}/../iotdb-core/datanode/src/assembly/resources/conf/datanode-env.sh</source> <destName>conf/datanode-env.sh</destName> <fileMode>0755</fileMode> </file> diff --git a/iotdb-core/confignode/src/assembly/confignode.xml b/iotdb-core/confignode/src/assembly/confignode.xml index 242e3fb810d..638e4793475 100644 --- a/iotdb-core/confignode/src/assembly/confignode.xml +++ b/iotdb-core/confignode/src/assembly/confignode.xml @@ -44,11 +44,11 @@ </fileSets> <files> <file> - <source>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-system.properties</source> + <source>${project.basedir}/../node-commons/src/assembly/resources/conf/iotdb-system.properties</source> <destName>conf/iotdb-system.properties</destName> </file> <file> - <source>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/sbin/iotdb-common.sh</source> + <source>${project.basedir}/../node-commons/src/assembly/resources/sbin/iotdb-common.sh</source> <destName>sbin/iotdb-common.sh</destName> </file> </files> diff --git a/iotdb-core/datanode/src/assembly/server.xml b/iotdb-core/datanode/src/assembly/server.xml index 96bfdd92748..fc3b1ccf2a1 100644 --- a/iotdb-core/datanode/src/assembly/server.xml +++ b/iotdb-core/datanode/src/assembly/server.xml @@ -39,24 +39,24 @@ </fileSets> <files> <file> - <source>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-system.properties</source> + <source>${project.basedir}/../node-commons/src/assembly/resources/conf/iotdb-system.properties</source> <destName>conf/iotdb-system.properties</destName> </file> <!-- copy iotdb-common.sh to different script folders--> <file> - <source>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/sbin/iotdb-common.sh</source> + <source>${project.basedir}/../node-commons/src/assembly/resources/sbin/iotdb-common.sh</source> <destName>sbin/iotdb-common.sh</destName> </file> <file> - <source>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/sbin/iotdb-common.sh</source> + <source>${project.basedir}/../node-commons/src/assembly/resources/sbin/iotdb-common.sh</source> <destName>tools/iotdb-common.sh</destName> </file> <file> - <source>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/sbin/iotdb-common.sh</source> + <source>${project.basedir}/../node-commons/src/assembly/resources/sbin/iotdb-common.sh</source> <destName>tools/tsfileToolSet/iotdb-common.sh</destName> </file> <file> - <source>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/sbin/iotdb-common.sh</source> + <source>${project.basedir}/../node-commons/src/assembly/resources/sbin/iotdb-common.sh</source> <destName>tools/schema/iotdb-common.sh</destName> </file> </files>
