Skip to content

Commit

Permalink
Use an old testng for all but presto-product-tests
Browse files Browse the repository at this point in the history 
Somewhere between 6.8.21 and 6.9.6, an issue is introduced where the
@BeforeClass methods in children of AbstractTestHiveClient don't always get
called.

Originally, presto-hive-* use the older version, while others use the newer
version. However, this causes dependency conflicts in upcoming changes. To
resolve the conflict, presto-tests must use the old version. And every
connector depends on presto-tests. As a result, most of Presto must use the old
version.

This commit changes the version of testng in all Presto artifacts expect
presto-product-tests to the old version.
  • Loading branch information
@haozhun
haozhun committed Mar 21, 2016
1 parent cc77b0e commit fada6cb
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 112 deletions.
7 changes: 7 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,13 @@
<dep.slice.version>0.19</dep.slice.version>
<dep.aws-sdk.version>1.9.40</dep.aws-sdk.version>

<!--
Versions newer than 6.9 appear to have an issue where the @BeforeClass method in
children of AbstractTestHiveClient doesn't always get called.
TODO: remove once we can upgrade to a version that fixes it
-->
<dep.testng.version>6.8.21</dep.testng.version>

<cli.skip-execute>true</cli.skip-execute>
<cli.main-class>None</cli.main-class>

Expand Down
12 changes: 0 additions & 12 deletions presto-cassandra/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</exclusion>
<exclusion>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
Expand Down Expand Up @@ -87,10 +83,6 @@
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</exclusion>
<exclusion>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand Down Expand Up @@ -250,10 +242,6 @@
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
<exclusion>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
<exclusion>
<groupId>com.datastax.cassandra</groupId>
<artifactId>cassandra-driver-core</artifactId>
Expand Down
25 changes: 0 additions & 25 deletions presto-hive-cdh4/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,6 @@
<air.main.basedir>${project.parent.basedir}</air.main.basedir>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<!--
Versions newer than 6.9 appear to have an issue where the @BeforeClass method in
children of AbstractTestHiveClient doesn't always get called.
TODO: remove once we can upgrade to a version that fixes it
-->
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.8.21</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>com.facebook.presto</groupId>
Expand Down
25 changes: 0 additions & 25 deletions presto-hive-cdh5/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,6 @@
<air.main.basedir>${project.parent.basedir}</air.main.basedir>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<!--
Versions newer than 6.9 appear to have an issue where the @BeforeClass method in
children of AbstractTestHiveClient doesn't always get called.
TODO: remove once we can upgrade to a version that fixes it
-->
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.8.21</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>com.facebook.presto</groupId>
Expand Down
25 changes: 0 additions & 25 deletions presto-hive-hadoop1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,6 @@
<air.main.basedir>${project.parent.basedir}</air.main.basedir>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<!--
Versions newer than 6.9 appear to have an issue where the @BeforeClass method in
children of AbstractTestHiveClient doesn't always get called.
TODO: remove once we can upgrade to a version that fixes it
-->
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.8.21</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>com.facebook.presto</groupId>
Expand Down
25 changes: 0 additions & 25 deletions presto-hive-hadoop2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,6 @@
<air.main.basedir>${project.parent.basedir}</air.main.basedir>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<!--
Versions newer than 6.9 appear to have an issue where the @BeforeClass method in
children of AbstractTestHiveClient doesn't always get called.
TODO: remove once we can upgrade to a version that fixes it
-->
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.8.21</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>com.facebook.presto</groupId>
Expand Down
9 changes: 9 additions & 0 deletions presto-product-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@
<properties>
<air.main.basedir>${project.parent.basedir}</air.main.basedir>
<main-class>com.facebook.presto.tests.TemptoProductTestRunner</main-class>

<!--
Versions newer than 6.9 appear to have an issue where the @BeforeClass method in
children of AbstractTestHiveClient doesn't always get called. Therefore, an older
version is used for other artifacts in Presto. This artifact overrides it with a
newer version because it is required for Tempto
TODO: remove once we can upgrade to a version that fixes it
-->
<dep.testng.version>6.9.6</dep.testng.version>
</properties>

<dependencies>
Expand Down

0 comments on commit fada6cb

Please sign in to comment.