This is an automated email from the ASF dual-hosted git repository. mhubail pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 0cde5158013b66cace5dd7362db15d2667618d48 Author: Ian Maxon <[email protected]> AuthorDate: Thu Feb 20 14:22:00 2025 -0800 [ASTERIXDB-3569][TEST] Reorganize and clean tests Details: -Move surefire/failsafe into pluginManagement and only bring either into a module build when that module contains tests of that type. -Clean up CI profiles so that the build will only be passed if tests are missing due to a clear and explicit wholesale exclusion of either unit or integration tests, and only for either type respectively. Ext-ref: MB-58891 Change-Id: I9ba2ce7afc54ddd08f5e522627c56e22f51c21d1 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19452 Integration-Tests: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Ian Maxon <[email protected]> Reviewed-by: Michael Blow <[email protected]> --- asterixdb/asterix-active/pom.xml | 11 ++ asterixdb/asterix-algebra/pom.xml | 7 ++ asterixdb/asterix-app/pom.xml | 104 +++++++++++----- asterixdb/asterix-benchmark/pom.xml | 7 ++ asterixdb/asterix-client-helper/pom.xml | 7 ++ asterixdb/asterix-common/pom.xml | 8 ++ asterixdb/asterix-dashboard/pom.xml | 7 ++ asterixdb/asterix-doc/pom.xml | 7 ++ asterixdb/asterix-external-data/pom.xml | 8 ++ asterixdb/asterix-fuzzyjoin/pom.xml | 4 + asterixdb/asterix-geo/pom.xml | 7 ++ asterixdb/asterix-lang-common/pom.xml | 7 ++ asterixdb/asterix-lang-sqlpp/pom.xml | 8 ++ asterixdb/asterix-license/pom.xml | 7 ++ .../asterix-grammar-extension-maven-plugin/pom.xml | 8 ++ .../pom.xml | 12 ++ .../lexer-generator-maven-plugin/pom.xml | 12 ++ .../record-manager-generator-maven-plugin/pom.xml | 12 ++ asterixdb/asterix-metadata/pom.xml | 12 ++ asterixdb/asterix-om/pom.xml | 13 -- asterixdb/asterix-podman/pom.xml | 11 ++ asterixdb/asterix-replication/pom.xml | 15 +++ asterixdb/asterix-runtime/pom.xml | 12 ++ asterixdb/asterix-server/pom.xml | 11 ++ asterixdb/asterix-spidersilk/pom.xml | 12 ++ asterixdb/asterix-test-framework/pom.xml | 7 ++ asterixdb/asterix-tools/pom.xml | 11 ++ asterixdb/asterix-transactions/pom.xml | 8 ++ asterixdb/pom.xml | 133 ++++++++++----------- .../algebricks/algebricks-compiler/pom.xml | 9 ++ .../algebricks/algebricks-tests/pom.xml | 4 + hyracks-fullstack/hyracks/hyracks-api/pom.xml | 4 + hyracks-fullstack/hyracks/hyracks-client/pom.xml | 4 + .../hyracks-control/hyracks-control-cc/pom.xml | 7 +- .../hyracks-control/hyracks-control-common/pom.xml | 9 ++ .../hyracks-control/hyracks-nc-service/pom.xml | 9 ++ .../hyracks/hyracks-data/hyracks-data-std/pom.xml | 10 ++ .../hyracks/hyracks-dataflow-common/pom.xml | 9 ++ .../hyracks/hyracks-dataflow-std/pom.xml | 9 ++ .../hyracks-integration-tests/pom.xml | 4 + hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml | 4 + hyracks-fullstack/hyracks/hyracks-ipc/pom.xml | 9 ++ hyracks-fullstack/hyracks/hyracks-net/pom.xml | 9 ++ .../hyracks/hyracks-storage-am-btree/pom.xml | 9 ++ .../hyracks/hyracks-storage-am-common/pom.xml | 4 + hyracks-fullstack/pom.xml | 56 ++++----- 46 files changed, 508 insertions(+), 149 deletions(-) diff --git a/asterixdb/asterix-active/pom.xml b/asterixdb/asterix-active/pom.xml index 90c96a1eda..bddf6d5b3b 100644 --- a/asterixdb/asterix-active/pom.xml +++ b/asterixdb/asterix-active/pom.xml @@ -27,6 +27,17 @@ <properties> <root.dir>${basedir}/..</root.dir> </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <failIfNoTests>false</failIfNoTests> + </configuration> + </plugin> + </plugins> + </build> <dependencies> <dependency> <groupId>org.apache.asterix</groupId> diff --git a/asterixdb/asterix-algebra/pom.xml b/asterixdb/asterix-algebra/pom.xml index 4cf565ab7e..d1526ec6ba 100644 --- a/asterixdb/asterix-algebra/pom.xml +++ b/asterixdb/asterix-algebra/pom.xml @@ -101,6 +101,13 @@ </lifecycleMappingMetadata> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <failIfNoTests>false</failIfNoTests> + </configuration> + </plugin> </plugins> </pluginManagement> </build> diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml index d9f235f76d..c15e6515af 100644 --- a/asterixdb/asterix-app/pom.xml +++ b/asterixdb/asterix-app/pom.xml @@ -329,6 +329,14 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + </plugin> </plugins> <pluginManagement> <plugins> @@ -393,73 +401,103 @@ <test.excludes>**/SqlppExecutionWithCancellationTest.java,**/DmlTest.java,**/RepeatedTest.java,**/SqlppExecutionTest.java,**/AqlExecutionTest.java,**/*Compression*Test.java,**/*Ssl*Test.java,**/Podman*.java</test.excludes> <itest.excludes>**/*.java</itest.excludes> </properties> + </profile> + <profile> + <id>asterix-gerrit-asterix-app-sql-execution</id> + <properties> + <test.excludes>**/*.java</test.excludes> + <itest.includes>**/SqlppExecution*IT.java,**/ExternalPythonFunctionIT.java</itest.includes> + </properties> <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <id>SqlppExecutionTest</id> - <configuration> - <excludes combine.self="override"/> - <argLine> - -enableassertions -Xmx${test.heap.size}m - -Dfile.encoding=UTF-8 - -Xdebug - -Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=${debug.suspend.flag} - -Xloggc:"${project.build.directory}/surefire-reports/SqlppExecutionTest-%p-gc.log" -XX:+PrintGC - --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED - </argLine> - </configuration> - <goals> - <goal>test</goal> - </goals> - </execution> - </executions> + <configuration> + <failIfNoTests>false</failIfNoTests> + </configuration> </plugin> </plugins> </build> </profile> - <profile> - <id>asterix-gerrit-asterix-app-sql-execution</id> - <properties> - <test.excludes>**/*.java</test.excludes> - <itest.includes>**/SqlppExecution*IT.java,**/ExternalPythonFunctionIT.java</itest.includes> - <failIfNoTests>false</failIfNoTests> - </properties> - </profile> <profile> <id>asterix-gerrit-asterix-app-sql-rqg</id> <properties> <test.excludes>**/*.java</test.excludes> <itest.includes>**/SqlppRQG*IT.java</itest.includes> - <failIfNoTests>false</failIfNoTests> </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <failIfNoTests>false</failIfNoTests> + </configuration> + </plugin> + </plugins> + </build> </profile> <profile> <id>asterix-gerrit-ssl-compression</id> <properties> <test.includes>**/*Compression*Test.java,**/*Ssl*Test.java</test.includes> <itest.excludes>**/*.java</itest.excludes> - <failIfNoTests>false</failIfNoTests> </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <configuration> + <failIfNoTests>false</failIfNoTests> + </configuration> + </plugin> + </plugins> + </build> </profile> <profile> <id>asterix-gerrit-verify-asterix-app</id> <properties> - <test.includes>**/AqlExecutionTest.java</test.includes> - <itest.excludes>**/External*IT.java,**/SqlppExecution*IT.java,**/SqlppRQG*IT.java,**/RebalanceWithCancellationIT.java</itest.excludes> - <failIfNoTests>false</failIfNoTests> + <test.excludes>**/*.java</test.excludes> + <itest.excludes>**/*.java</itest.excludes> </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <failIfNoTests>false</failIfNoTests> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <configuration> + <failIfNoTests>false</failIfNoTests> + </configuration> + </plugin> + </plugins> + </build> </profile> <profile> <id>asterix-gerrit-rebalance-cancellation</id> <properties> <test.excludes>**/*.java</test.excludes> <itest.includes>**/RebalanceWithCancellationIT.java</itest.includes> - <failIfNoTests>false</failIfNoTests> </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <failIfNoTests>false</failIfNoTests> + </configuration> + </plugin> + </plugins> + </build> </profile> </profiles> <dependencies> diff --git a/asterixdb/asterix-benchmark/pom.xml b/asterixdb/asterix-benchmark/pom.xml index e55e4b9cb2..f229e63fe0 100644 --- a/asterixdb/asterix-benchmark/pom.xml +++ b/asterixdb/asterix-benchmark/pom.xml @@ -48,6 +48,13 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <failIfNoTests>false</failIfNoTests> + </configuration> + </plugin> </plugins> </build> diff --git a/asterixdb/asterix-client-helper/pom.xml b/asterixdb/asterix-client-helper/pom.xml index b40b7d92f8..6d89821f4a 100644 --- a/asterixdb/asterix-client-helper/pom.xml +++ b/asterixdb/asterix-client-helper/pom.xml @@ -134,6 +134,13 @@ </usedDependencies> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <failIfNoTests>false</failIfNoTests> + </configuration> + </plugin> </plugins> <pluginManagement> <plugins> diff --git a/asterixdb/asterix-common/pom.xml b/asterixdb/asterix-common/pom.xml index c775db6fa1..27124c0f56 100644 --- a/asterixdb/asterix-common/pom.xml +++ b/asterixdb/asterix-common/pom.xml @@ -68,6 +68,14 @@ </ignoredUnusedDeclaredDependencies> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + </plugin> </plugins> </build> <dependencies> diff --git a/asterixdb/asterix-dashboard/pom.xml b/asterixdb/asterix-dashboard/pom.xml index 17485c4eca..75e10b7638 100644 --- a/asterixdb/asterix-dashboard/pom.xml +++ b/asterixdb/asterix-dashboard/pom.xml @@ -202,6 +202,13 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <failIfNoTests>false</failIfNoTests> + </configuration> + </plugin> </plugins> </build> </project> diff --git a/asterixdb/asterix-doc/pom.xml b/asterixdb/asterix-doc/pom.xml index c714fde81f..6bc02dcab3 100644 --- a/asterixdb/asterix-doc/pom.xml +++ b/asterixdb/asterix-doc/pom.xml @@ -131,6 +131,13 @@ </excludes> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <failIfNoTests>false</failIfNoTests> + </configuration> + </plugin> </plugins> </build> <profiles> diff --git a/asterixdb/asterix-external-data/pom.xml b/asterixdb/asterix-external-data/pom.xml index bcccb482b5..e9ab1ee4f6 100644 --- a/asterixdb/asterix-external-data/pom.xml +++ b/asterixdb/asterix-external-data/pom.xml @@ -156,6 +156,14 @@ </excludes> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + </plugin> </plugins> <pluginManagement> <plugins> diff --git a/asterixdb/asterix-fuzzyjoin/pom.xml b/asterixdb/asterix-fuzzyjoin/pom.xml index d396b3a361..a11e01096b 100644 --- a/asterixdb/asterix-fuzzyjoin/pom.xml +++ b/asterixdb/asterix-fuzzyjoin/pom.xml @@ -69,6 +69,10 @@ </excludes> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> </plugins> </build> diff --git a/asterixdb/asterix-geo/pom.xml b/asterixdb/asterix-geo/pom.xml index 27f359b560..034ddd5813 100644 --- a/asterixdb/asterix-geo/pom.xml +++ b/asterixdb/asterix-geo/pom.xml @@ -69,6 +69,13 @@ </excludes> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <failIfNoTests>false</failIfNoTests> + </configuration> + </plugin> </plugins> </build> diff --git a/asterixdb/asterix-lang-common/pom.xml b/asterixdb/asterix-lang-common/pom.xml index cab6a7be74..752924fa0f 100644 --- a/asterixdb/asterix-lang-common/pom.xml +++ b/asterixdb/asterix-lang-common/pom.xml @@ -59,6 +59,13 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <failIfNoTests>false</failIfNoTests> + </configuration> + </plugin> </plugins> </build> diff --git a/asterixdb/asterix-lang-sqlpp/pom.xml b/asterixdb/asterix-lang-sqlpp/pom.xml index 4ef8c1a2fc..3a95cbc058 100644 --- a/asterixdb/asterix-lang-sqlpp/pom.xml +++ b/asterixdb/asterix-lang-sqlpp/pom.xml @@ -79,6 +79,14 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + </plugin> </plugins> <pluginManagement> <plugins> diff --git a/asterixdb/asterix-license/pom.xml b/asterixdb/asterix-license/pom.xml index 9f5723e95b..f7043a6935 100644 --- a/asterixdb/asterix-license/pom.xml +++ b/asterixdb/asterix-license/pom.xml @@ -93,6 +93,13 @@ </templateProperties> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <failIfNoTests>false</failIfNoTests> + </configuration> + </plugin> </plugins> <pluginManagement> <plugins> diff --git a/asterixdb/asterix-maven-plugins/asterix-grammar-extension-maven-plugin/pom.xml b/asterixdb/asterix-maven-plugins/asterix-grammar-extension-maven-plugin/pom.xml index 3c82fab9d5..816b41d242 100644 --- a/asterixdb/asterix-maven-plugins/asterix-grammar-extension-maven-plugin/pom.xml +++ b/asterixdb/asterix-maven-plugins/asterix-grammar-extension-maven-plugin/pom.xml @@ -114,6 +114,14 @@ </usedDependencies> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + </plugin> </plugins> <pluginManagement> <plugins> diff --git a/asterixdb/asterix-maven-plugins/asterix-test-datagenerator-maven-plugin/pom.xml b/asterixdb/asterix-maven-plugins/asterix-test-datagenerator-maven-plugin/pom.xml index 49771de0b3..0c0b323f92 100644 --- a/asterixdb/asterix-maven-plugins/asterix-test-datagenerator-maven-plugin/pom.xml +++ b/asterixdb/asterix-maven-plugins/asterix-test-datagenerator-maven-plugin/pom.xml @@ -33,6 +33,18 @@ <root.dir>${basedir}/../..</root.dir> </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <failIfNoTests>false</failIfNoTests> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> <dependency> <groupId>org.apache.maven</groupId> diff --git a/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml b/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml index b834ed0615..bc4c9f06d0 100644 --- a/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml +++ b/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml @@ -31,6 +31,18 @@ <properties> <root.dir>${basedir}/../..</root.dir> </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + </plugin> + </plugins> + </build> <dependencies> <dependency> <groupId>junit</groupId> diff --git a/asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml b/asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml index 75938d6751..d8e125ab8e 100644 --- a/asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml +++ b/asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml @@ -28,6 +28,18 @@ <packaging>maven-plugin</packaging> <name>record-manager-generator-maven-plugin</name> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <failIfNoTests>false</failIfNoTests> + </configuration> + </plugin> + </plugins> + </build> + <properties> <root.dir>${basedir}/../..</root.dir> </properties> diff --git a/asterixdb/asterix-metadata/pom.xml b/asterixdb/asterix-metadata/pom.xml index d7a3bda7c3..a1fc139bb3 100644 --- a/asterixdb/asterix-metadata/pom.xml +++ b/asterixdb/asterix-metadata/pom.xml @@ -36,6 +36,18 @@ <comments>A business-friendly OSS license</comments> </license> </licenses> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + </plugin> + </plugins> + </build> <dependencies> <dependency> <groupId>org.apache.asterix</groupId> diff --git a/asterixdb/asterix-om/pom.xml b/asterixdb/asterix-om/pom.xml index abfb797fbc..f11b48b4e1 100644 --- a/asterixdb/asterix-om/pom.xml +++ b/asterixdb/asterix-om/pom.xml @@ -43,19 +43,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <parallel>all</parallel> - <forkCount>4</forkCount> - <reuseForks>false</reuseForks> - <threadCount>1</threadCount> - <argLine> - -enableassertions -Xmx${test.heap.size}m - -Dfile.encoding=UTF-8 - -DrunSlowAQLTests=${runSlowAQLTests} - -Xdebug - ${coverageArgLine} - </argLine> - </configuration> </plugin> </plugins> </build> diff --git a/asterixdb/asterix-podman/pom.xml b/asterixdb/asterix-podman/pom.xml index 1dbdfb124e..ea98c01294 100644 --- a/asterixdb/asterix-podman/pom.xml +++ b/asterixdb/asterix-podman/pom.xml @@ -86,6 +86,17 @@ </excludes> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <failIfNoTests>false</failIfNoTests> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + </plugin> </plugins> </build> <profiles> diff --git a/asterixdb/asterix-replication/pom.xml b/asterixdb/asterix-replication/pom.xml index 0cd6687e44..dd1747f95c 100644 --- a/asterixdb/asterix-replication/pom.xml +++ b/asterixdb/asterix-replication/pom.xml @@ -17,6 +17,21 @@ <properties> <root.dir>${basedir}/..</root.dir> </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <failIfNoTests>false</failIfNoTests> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + </plugin> + </plugins> + </build> <dependencies> <dependency> <groupId>org.apache.asterix</groupId> diff --git a/asterixdb/asterix-runtime/pom.xml b/asterixdb/asterix-runtime/pom.xml index c669f9457e..34ef938444 100644 --- a/asterixdb/asterix-runtime/pom.xml +++ b/asterixdb/asterix-runtime/pom.xml @@ -35,6 +35,18 @@ <comments>A business-friendly OSS license</comments> </license> </licenses> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + </plugin> + </plugins> + </build> <dependencies> <dependency> <groupId>org.apache.asterix</groupId> diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml index 438feab2b7..7bc774d4e2 100644 --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@ -955,6 +955,17 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <failIfNoTests>false</failIfNoTests> + </configuration> + </plugin> </plugins> <pluginManagement> <plugins> diff --git a/asterixdb/asterix-spidersilk/pom.xml b/asterixdb/asterix-spidersilk/pom.xml index 1354f3590e..be215001ab 100644 --- a/asterixdb/asterix-spidersilk/pom.xml +++ b/asterixdb/asterix-spidersilk/pom.xml @@ -27,6 +27,18 @@ <version>0.9.8.3-SNAPSHOT</version> </parent> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <failIfNoTests>false</failIfNoTests> + </configuration> + </plugin> + </plugins> + </build> + <licenses> <license> <name>Apache License, Version 2.0</name> diff --git a/asterixdb/asterix-test-framework/pom.xml b/asterixdb/asterix-test-framework/pom.xml index c299717b5a..c28eb482d3 100644 --- a/asterixdb/asterix-test-framework/pom.xml +++ b/asterixdb/asterix-test-framework/pom.xml @@ -62,6 +62,13 @@ </usedDependencies> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <failIfNoTests>false</failIfNoTests> + </configuration> + </plugin> </plugins> </build> diff --git a/asterixdb/asterix-tools/pom.xml b/asterixdb/asterix-tools/pom.xml index 79794c066a..c04c5a8201 100644 --- a/asterixdb/asterix-tools/pom.xml +++ b/asterixdb/asterix-tools/pom.xml @@ -80,6 +80,17 @@ </licenseFamilies> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <failIfNoTests>false</failIfNoTests> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + </plugin> </plugins> </build> diff --git a/asterixdb/asterix-transactions/pom.xml b/asterixdb/asterix-transactions/pom.xml index 45c0572ac0..dd11eb87ac 100644 --- a/asterixdb/asterix-transactions/pom.xml +++ b/asterixdb/asterix-transactions/pom.xml @@ -91,6 +91,14 @@ </excludes> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + </plugin> </plugins> </build> <dependencies> diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index e4d9a2684f..8639b323a1 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -130,66 +130,6 @@ </archive> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <failIfNoTests>false</failIfNoTests> - <systemPropertyVariables> - <skipFredSlowTests>true</skipFredSlowTests> - <log4j.configurationFile>${testLog4jConfigFile}</log4j.configurationFile> - </systemPropertyVariables> - <forkCount>1</forkCount> - <reuseForks>false</reuseForks> - <argLine> - -enableassertions -Xmx${test.heap.size}m - -Dfile.encoding=UTF-8 - -DrunSlowAQLTests=${runSlowAQLTests} - -Xdebug - -Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=${debug.suspend.flag} - --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED - ${coverageArgLine} - ${extraSurefireArgLine} - </argLine> - <includes> - <include>${test.includes}</include> - </includes> - <excludes> - <exclude>${test.excludes}</exclude> - </excludes> - <skipTests>${skip.surefire.tests}</skipTests> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <configuration> - <runOrder>alphabetical</runOrder> - <forkCount>1</forkCount> - <reuseForks>false</reuseForks> - <argLine> - ${coverageArgLine} - ${extraFailsafeArgLine} - </argLine> - <systemProperties> - <log4j.configurationFile>${testLog4jConfigFile}</log4j.configurationFile> - </systemProperties> - <includes> - <include>${itest.includes}</include> - </includes> - <excludes> - <exclude>${itest.excludes}</exclude> - </excludes> - </configuration> - <executions> - <execution> - <goals> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - </execution> - </executions> - </plugin> <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> @@ -553,16 +493,6 @@ <artifactId>apache-rat-plugin</artifactId> <version>0.12</version> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>3.0.0-M5</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <version>2.21.0</version> - </plugin> <plugin> <groupId>org.apache.hyracks</groupId> <artifactId>license-automation-plugin</artifactId> @@ -674,6 +604,69 @@ <artifactId>maven-enforcer-plugin</artifactId> <version>3.0.0-M3</version> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>3.0.0-M5</version> + <configuration> + <failIfNoTests>true</failIfNoTests> + <systemPropertyVariables> + <skipFredSlowTests>true</skipFredSlowTests> + <log4j.configurationFile>${testLog4jConfigFile}</log4j.configurationFile> + </systemPropertyVariables> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> + <argLine> + -enableassertions -Xmx${test.heap.size}m + -Dfile.encoding=UTF-8 + -DrunSlowAQLTests=${runSlowAQLTests} + -Xdebug + -Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=${debug.suspend.flag} + --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED + ${coverageArgLine} + ${extraSurefireArgLine} + </argLine> + <includes> + <include>${test.includes}</include> + </includes> + <excludes> + <exclude>${test.excludes}</exclude> + </excludes> + <skipTests>${skip.surefire.tests}</skipTests> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <version>2.21.0</version> + <configuration> + <failIfNoTests>true</failIfNoTests> + <runOrder>alphabetical</runOrder> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> + <argLine> + ${coverageArgLine} + ${extraFailsafeArgLine} + </argLine> + <systemProperties> + <log4j.configurationFile>${testLog4jConfigFile}</log4j.configurationFile> + </systemProperties> + <includes> + <include>${itest.includes}</include> + </includes> + <excludes> + <exclude>${itest.excludes}</exclude> + </excludes> + </configuration> + <executions> + <execution> + <goals> + <goal>integration-test</goal> + <goal>verify</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </pluginManagement> </build> diff --git a/hyracks-fullstack/algebricks/algebricks-compiler/pom.xml b/hyracks-fullstack/algebricks/algebricks-compiler/pom.xml index 53dcd27c0d..efd29633a9 100644 --- a/hyracks-fullstack/algebricks/algebricks-compiler/pom.xml +++ b/hyracks-fullstack/algebricks/algebricks-compiler/pom.xml @@ -41,6 +41,15 @@ <root.dir>${basedir}/../..</root.dir> </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + </plugins> + </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks-fullstack/algebricks/algebricks-tests/pom.xml b/hyracks-fullstack/algebricks/algebricks-tests/pom.xml index 76cf5f7bdc..1c6a3bde06 100644 --- a/hyracks-fullstack/algebricks/algebricks-tests/pom.xml +++ b/hyracks-fullstack/algebricks/algebricks-tests/pom.xml @@ -77,6 +77,10 @@ </excludes> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> </plugins> <pluginManagement> <plugins> diff --git a/hyracks-fullstack/hyracks/hyracks-api/pom.xml b/hyracks-fullstack/hyracks/hyracks-api/pom.xml index 7a4eb58cf9..dda943868e 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-api/pom.xml @@ -52,6 +52,10 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> </plugins> </build> <dependencies> diff --git a/hyracks-fullstack/hyracks/hyracks-client/pom.xml b/hyracks-fullstack/hyracks/hyracks-client/pom.xml index 071fc8166d..2a9a15993c 100644 --- a/hyracks-fullstack/hyracks/hyracks-client/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-client/pom.xml @@ -62,6 +62,10 @@ </filesets> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> </plugins> </build> <dependencies> diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml index 775b1be290..6e7ded376e 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml @@ -48,7 +48,12 @@ </goals> </execution> </executions> - </plugin> </plugins> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + </plugins> </build> <dependencies> <dependency> diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/pom.xml b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/pom.xml index 5337846788..7844143b01 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/pom.xml @@ -27,6 +27,15 @@ <version>0.3.8.3-SNAPSHOT</version> </parent> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + </plugins> + </build> + <properties> <root.dir>${basedir}/../../..</root.dir> </properties> diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/pom.xml b/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/pom.xml index 83bc838f7f..5dc4dfda99 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/pom.xml @@ -31,6 +31,15 @@ <root.dir>${basedir}/../../..</root.dir> </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + </plugins> + </build> + <dependencies> <dependency> <groupId>args4j</groupId> diff --git a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/pom.xml b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/pom.xml index 17176b5e19..5cc840e18d 100644 --- a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/pom.xml @@ -27,6 +27,16 @@ <artifactId>hyracks-data</artifactId> <version>0.3.8.3-SNAPSHOT</version> </parent> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + </plugins> + </build> + <properties> <root.dir>${basedir}/../../..</root.dir> </properties> diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml b/hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml index 40c0dcfe19..9d363754bd 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml @@ -40,6 +40,15 @@ <root.dir>${basedir}/../..</root.dir> </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + </plugins> + </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml b/hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml index 3711a77c13..52be6eba12 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml @@ -41,6 +41,15 @@ <root.dir>${basedir}/../..</root.dir> </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + </plugins> + </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml index 39359f9d9d..8b88062c60 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml @@ -46,6 +46,10 @@ </excludes> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> </plugins> </build> <properties> diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml index 265312973d..aa774bc7c7 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml @@ -85,6 +85,10 @@ </excludes> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> </plugins> </build> diff --git a/hyracks-fullstack/hyracks/hyracks-ipc/pom.xml b/hyracks-fullstack/hyracks/hyracks-ipc/pom.xml index 939f48709e..37fcbced97 100644 --- a/hyracks-fullstack/hyracks/hyracks-ipc/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-ipc/pom.xml @@ -36,6 +36,15 @@ </license> </licenses> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + </plugins> + </build> + <properties> <root.dir>${basedir}/../..</root.dir> </properties> diff --git a/hyracks-fullstack/hyracks/hyracks-net/pom.xml b/hyracks-fullstack/hyracks/hyracks-net/pom.xml index 57e1233c87..ed1037fdf1 100644 --- a/hyracks-fullstack/hyracks/hyracks-net/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-net/pom.xml @@ -40,6 +40,15 @@ <root.dir>${basedir}/../..</root.dir> </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + </plugins> + </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml index 834fa7df9b..22d387702a 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml @@ -37,6 +37,15 @@ <properties> <root.dir>${basedir}/../..</root.dir> </properties> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + </plugins> + </build> <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml b/hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml index 817411d8d8..6367ebb08f 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml @@ -50,6 +50,10 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> </plugins> </build> <dependencies> diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index 66b4ebb947..91abbecc5b 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -540,38 +540,6 @@ </excludes> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <failIfNoTests>false</failIfNoTests> - <forkCount>1</forkCount> - <reuseForks>false</reuseForks> - <argLine>-enableassertions -Xmx2048m -Dfile.encoding=UTF-8 -Xdebug - -Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=n ${coverageArgLine} - --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED - </argLine> - <systemPropertyVariables> - <log4j.configurationFile>${testLog4jConfigFile}</log4j.configurationFile> - </systemPropertyVariables> - <includes> - <include>${test.includes}</include> - </includes> - <excludes combine.children="append"> - <exclude>${test.excludes}</exclude> - </excludes> - <skipTests>${skip.surefire.tests}</skipTests> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <configuration> - <systemPropertyVariables> - <log4j.configurationFile>${testLog4jConfigFile}</log4j.configurationFile> - </systemPropertyVariables> - </configuration> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> @@ -862,11 +830,35 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>2.21.0</version> + <configuration> + <failIfNoTests>false</failIfNoTests> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> + <argLine>-enableassertions -Xmx2048m -Dfile.encoding=UTF-8 -Xdebug + -Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=n ${coverageArgLine} + --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED + </argLine> + <systemPropertyVariables> + <log4j.configurationFile>${testLog4jConfigFile}</log4j.configurationFile> + </systemPropertyVariables> + <includes> + <include>${test.includes}</include> + </includes> + <excludes combine.children="append"> + <exclude>${test.excludes}</exclude> + </excludes> + <skipTests>${skip.surefire.tests}</skipTests> + </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> <version>2.21.0</version> + <configuration> + <systemPropertyVariables> + <log4j.configurationFile>${testLog4jConfigFile}</log4j.configurationFile> + </systemPropertyVariables> + </configuration> </plugin> <plugin> <groupId>org.apache.hyracks</groupId>
