fixes #1016 Build w/ any Accumulo w/o setting thrift ver (#1017)
diff --git a/.travis.yml b/.travis.yml
index 7f0dcf0..4548da8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@
language: java
jdk:
- openjdk8
-script: mvn clean verify javadoc:jar -Daccumulo.version=1.8.1 -Dthrift.version=0.9.3
+script: mvn clean verify javadoc:jar -Daccumulo.version=1.8.1
notifications:
irc:
channels:
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index fdd1f69..ba774f7 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -76,6 +76,7 @@
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
+ <version>0.9.1</version>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index e08daa2..d9a1eb6 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -81,11 +81,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<scope>test</scope>
diff --git a/modules/integration/src/test/java/org/apache/fluo/integration/impl/OracleIT.java b/modules/integration/src/test/java/org/apache/fluo/integration/impl/OracleIT.java
index 9bcfb17..ccd9e73 100644
--- a/modules/integration/src/test/java/org/apache/fluo/integration/impl/OracleIT.java
+++ b/modules/integration/src/test/java/org/apache/fluo/integration/impl/OracleIT.java
@@ -35,7 +35,8 @@
import org.apache.fluo.integration.ITBaseImpl;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.thrift.server.THsHaServer;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.Timeout;
@@ -46,9 +47,14 @@
public class OracleIT extends ITBaseImpl {
+ private static final String THRIFT_SERVER_LOGGER_NAME =
+ "org.apache.fluo.core.shaded.thrift.server";
+
@Rule
public Timeout globalTimeout = Timeout.seconds(getTestTimeout());
+ private Level curLevel;
+
@Test
public void testRestart() throws Exception {
OracleClient client = env.getSharedResources().getOracleClient();
@@ -96,6 +102,17 @@
}
}
+ @Before
+ public void disableLogger() {
+ curLevel = Logger.getLogger(THRIFT_SERVER_LOGGER_NAME).getLevel();
+ Logger.getLogger(THRIFT_SERVER_LOGGER_NAME).setLevel(Level.FATAL);
+ }
+
+ @After
+ public void enableLogger() {
+ Logger.getLogger(THRIFT_SERVER_LOGGER_NAME).setLevel(curLevel);
+ }
+
/**
* Test that bogus input into the oracle server doesn't cause an OOM exception. This essentially
* tests for THRIFT-602
@@ -103,10 +120,6 @@
@Test
public void bogusDataTest() throws Exception {
- // we are expecting an error at this point
- Level curLevel = Logger.getLogger(THsHaServer.class).getLevel();
- Logger.getLogger(THsHaServer.class).setLevel(Level.FATAL);
-
Socket socket = new Socket();
socket.connect(new InetSocketAddress(HostUtil.getHostName(), oserver.getPort()));
OutputStream outstream = socket.getOutputStream();
@@ -120,8 +133,6 @@
OracleClient client = env.getSharedResources().getOracleClient();
assertEquals(2, client.getStamp().getTxTimestamp());
-
- Logger.getLogger(THsHaServer.class).setLevel(curLevel);
}
@Test
diff --git a/pom.xml b/pom.xml
index ccd069e..ed5bd1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,6 @@
<logback.version>1.1.3</logback.version>
<releaseProfiles>fluo-release</releaseProfiles>
<slf4j.version>1.7.12</slf4j.version>
- <thrift.version>0.9.1</thrift.version>
<twill.version>0.6.0-incubating</twill.version>
<zookeeper.version>3.4.8</zookeeper.version>
</properties>
@@ -211,11 +210,6 @@
<version>${hadoop.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>${thrift.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.twill</groupId>
<artifactId>twill-api</artifactId>
<version>${twill.version}</version>
