This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git
commit 17f408ce6cac4a66677c6d1502a45fa06821016a Author: Istvan Toth <st...@apache.org> AuthorDate: Tue Nov 21 14:53:42 2023 +0100 PHOENIX-6923 Always run Scala tests for Phoenix-Spark connector --- phoenix5-spark/pom.xml | 16 +--------------- phoenix5-spark3-it/pom.xml | 15 +-------------- pom.xml | 13 +++---------- 3 files changed, 5 insertions(+), 39 deletions(-) diff --git a/phoenix5-spark/pom.xml b/phoenix5-spark/pom.xml index 78eedfa..e6be35c 100644 --- a/phoenix5-spark/pom.xml +++ b/phoenix5-spark/pom.xml @@ -35,7 +35,6 @@ <properties> <top.dir>${project.basedir}/..</top.dir> - <skip-scala-tests>true</skip-scala-tests> <scala.version>${scala.version.for.spark2}</scala.version> <scala.binary.version>${scala.binary.version.for.spark2}</scala.binary.version> </properties> @@ -551,7 +550,7 @@ <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory> <junitxml>.</junitxml> <filereports>WDF TestSuite.txt</filereports> - <skipTests>${skip-scala-tests}</skipTests> + <skipTests>${skip.scalatest}</skipTests> </configuration> <executions> <execution> @@ -610,17 +609,4 @@ this should be kept in sync with Phoenix as much as possible --> </plugins> </build> - <profiles> - <profile> - <id>scala-tests-enabled</id> - <activation> - <property> - <name>scala-tests-enabled</name> - </property> - </activation> - <properties> - <skip-scala-tests>false</skip-scala-tests> - </properties> - </profile> - </profiles> </project> diff --git a/phoenix5-spark3-it/pom.xml b/phoenix5-spark3-it/pom.xml index 5ce08df..5a8aaf1 100644 --- a/phoenix5-spark3-it/pom.xml +++ b/phoenix5-spark3-it/pom.xml @@ -219,7 +219,7 @@ <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory> <junitxml>.</junitxml> <filereports>WDF TestSuite.txt</filereports> - <skipTests>${skip-scala-tests}</skipTests> + <skipTests>${skip.scalatest}</skipTests> </configuration> <executions> <execution> @@ -257,17 +257,4 @@ </plugin> </plugins> </build> - <profiles> - <profile> - <id>scala-tests-enabled</id> - <activation> - <property> - <name>scala-tests-enabled</name> - </property> - </activation> - <properties> - <skip-scala-tests>false</skip-scala-tests> - </properties> - </profile> - </profiles> </project> \ No newline at end of file diff --git a/pom.xml b/pom.xml index 5f796e4..5dbfdec 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ <hbase.shaded.package>org.apache.hadoop.hbase.shaded</hbase.shaded.package> <phoenix.main.version>5</phoenix.main.version> - <skip-scala-tests>true</skip-scala-tests> + <skip.scalatest>false</skip.scalatest> <skip.spark.javadoc>false</skip.spark.javadoc> </properties> @@ -858,10 +858,7 @@ <jdk>[11,17)</jdk> </activation> <properties> - <argLine>${phoenix-surefire.jdk11.flags} - ${phoenix-surefire.jdk11.tuning.flags} - ${phoenix-surefire.argLine} - @{jacocoArgLine}</argLine> + <argLine>${phoenix-surefire.jdk11.flags} ${phoenix-surefire.jdk11.tuning.flags} ${phoenix-surefire.argLine}</argLine> </properties> </profile> <profile> @@ -870,11 +867,7 @@ <jdk>[17,)</jdk> </activation> <properties> - <argLine>${phoenix-surefire.jdk11.flags} - ${phoenix-surefire.jdk17.flags} - ${phoenix-surefire.jdk17.tuning.flags} - ${phoenix-surefire.argLine} - @{jacocoArgLine}</argLine> + <argLine>${phoenix-surefire.jdk11.flags} ${phoenix-surefire.jdk17.flags} ${phoenix-surefire.jdk17.tuning.flags} ${phoenix-surefire.argLine}</argLine> </properties> </profile> <!-- disable doclint with 1.8+ JDKs-->