This is an automated email from the ASF dual-hosted git repository. yihua pushed a commit to branch release-0.13.0 in repository https://gitbox.apache.org/repos/asf/hudi.git
commit be1aa615a3d816b0e00f7ec4cae2c8d13c19d2ea Author: Shiyan Xu <[email protected]> AuthorDate: Sun Jan 29 00:33:35 2023 -0600 [HUDI-5638] Fix metaserver test setup (#7785) Fix tests and artifact deployment for metaserver. --- azure-pipelines.yml | 2 +- .../hudi-metaserver/hudi-metaserver-client/pom.xml | 15 +------ .../hudi-metaserver/hudi-metaserver-server/pom.xml | 2 +- hudi-platform-service/hudi-metaserver/pom.xml | 51 +++++++++++++++++++++- pom.xml | 20 ++++++--- 5 files changed, 66 insertions(+), 24 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 73d7bdecd7c..bc675f573af 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -85,7 +85,7 @@ parameters: variables: BUILD_PROFILES: '-Dscala-2.11 -Dspark2.4 -Dflink1.16' PLUGIN_OPTS: '-Dcheckstyle.skip=true -Drat.skip=true -Djacoco.skip=true -ntp -B -V -Pwarn-log -Dorg.slf4j.simpleLogger.log.org.apache.maven.plugins.shade=warn -Dorg.slf4j.simpleLogger.log.org.apache.maven.plugins.dependency=warn' - MVN_OPTS_INSTALL: '-DskipTests $(BUILD_PROFILES) $(PLUGIN_OPTS)' + MVN_OPTS_INSTALL: '-Phudi-platform-service -DskipTests $(BUILD_PROFILES) $(PLUGIN_OPTS)' MVN_OPTS_TEST: '-fae -Pwarn-log $(BUILD_PROFILES) $(PLUGIN_OPTS)' SPARK_VERSION: '2.4.4' HADOOP_VERSION: '2.7' diff --git a/hudi-platform-service/hudi-metaserver/hudi-metaserver-client/pom.xml b/hudi-platform-service/hudi-metaserver/hudi-metaserver-client/pom.xml index 0c5164d531e..3c7ef17ec8a 100644 --- a/hudi-platform-service/hudi-metaserver/hudi-metaserver-client/pom.xml +++ b/hudi-platform-service/hudi-metaserver/hudi-metaserver-client/pom.xml @@ -32,11 +32,6 @@ </properties> <dependencies> - <dependency> - <groupId>org.apache.hudi</groupId> - <artifactId>hudi-common</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.hudi</groupId> <artifactId>hudi-client-common</artifactId> @@ -44,14 +39,6 @@ </dependency> <!-- Test --> - <dependency> - <groupId>org.apache.hudi</groupId> - <artifactId>hudi-common</artifactId> - <version>${project.version}</version> - <classifier>tests</classifier> - <type>test-jar</type> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.hudi</groupId> <artifactId>hudi-client-common</artifactId> @@ -88,4 +75,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/hudi-platform-service/hudi-metaserver/hudi-metaserver-server/pom.xml b/hudi-platform-service/hudi-metaserver/hudi-metaserver-server/pom.xml index 27d67f5673f..5328c572e56 100644 --- a/hudi-platform-service/hudi-metaserver/hudi-metaserver-server/pom.xml +++ b/hudi-platform-service/hudi-metaserver/hudi-metaserver-server/pom.xml @@ -147,4 +147,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/hudi-platform-service/hudi-metaserver/pom.xml b/hudi-platform-service/hudi-metaserver/pom.xml index a3e91d0738a..47f81804a72 100644 --- a/hudi-platform-service/hudi-metaserver/pom.xml +++ b/hudi-platform-service/hudi-metaserver/pom.xml @@ -100,13 +100,62 @@ <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <version>${h2.version}</version> - <scope>compile</scope> + <scope>test-compile</scope> + </dependency> + <dependency> + <groupId>org.apache.hudi</groupId> + <artifactId>hudi-tests-common</artifactId> + <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-api</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-params</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-junit-jupiter</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.platform</groupId> + <artifactId>junit-platform-runner</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.platform</groupId> + <artifactId>junit-platform-suite-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.platform</groupId> + <artifactId>junit-platform-commons</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hudi</groupId> + <artifactId>hudi-common</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + <type>test-jar</type> + <scope>test</scope> + </dependency> </dependencies> <build> diff --git a/pom.xml b/pom.xml index 92905f85b95..ff612d32e84 100644 --- a/pom.xml +++ b/pom.xml @@ -1871,6 +1871,19 @@ </plugins> </build> </profile> + <profile> + <id>hudi-platform-service</id> + <activation> + <property> + <name>deployArtifacts</name> + <value>true</value> + </property> + </activation> + <modules> + <module>hudi-platform-service</module> + <module>packaging/hudi-metaserver-server-bundle</module> + </modules> + </profile> <profile> <id>integration-tests</id> <activation> @@ -2417,13 +2430,6 @@ </activation> </profile> - <profile> - <id>hudi-platform-service</id> - <modules> - <module>hudi-platform-service</module> - <module>packaging/hudi-metaserver-server-bundle</module> - </modules> - </profile> </profiles> </project>
