Merge branch 'next' into prnext

.travis.yml

@@ -4,7 +4,7 @@ before_install:
   - sudo hostname "$(hostname | cut -c1-63)"
   - sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname | cut -c1-63)/" /etc/hosts | sudo tee /etc/hosts
   - cat /etc/hosts # optionally check the content *after*
-  - wget https://protobuf.googlecode.com/files/protobuf-2.5.0.tar.gz -O /tmp/protobuf-2.5.0.tar.gz
+  - wget https://github.com/google/protobuf/releases/download/v2.5.0/protobuf-2.5.0.tar.gz -O /tmp/protobuf-2.5.0.tar.gz
   - tar -C /tmp -xvf /tmp/protobuf-2.5.0.tar.gz
   - cd /tmp/protobuf-2.5.0 && ./configure --prefix=/usr && make --quiet && sudo make install
 before_script:
@@ -14,6 +14,7 @@ script: export MAVEN_OPTS="-Xmx1024m" && mvn test --quiet
 jdk:
   - oraclejdk7
   - openjdk6
+  - oraclejdk8
 notifications:
     email: false
 addons:

Makefile

@@ -85,6 +85,7 @@ asynchbase_SOURCES := \
 	src/FirstKeyOnlyFilter.java	\
 	src/FuzzyRowFilter.java \
 	src/GetRequest.java	\
+	src/GetResultOrException.java	\
 	src/HBaseClient.java	\
 	src/HBaseException.java	\
 	src/HBaseRpc.java	\

pom.xml.in

@@ -166,6 +166,45 @@
 
     </plugins>
   </build>
+
+  <profiles>
+    <!-- CGlib in Mockito and PowerMockito has issues mocking the Subject class under javax.security.auth. 
+    It should work better in 2.x so until that comes out, we'll just skip the auth test classes when running 
+    under JDK 8.
+
+    The exception observed is:
+       java.lang.LinkageError: loader constraint violation in interface itable initialization: 
+      when resolving method "$java.security.Principal$$EnhancerByMockitoWithCGLIB$$e775e657
+      .implies(Ljavax/security/auth/Subject;)Z" the class loader (instance of org/powermock/
+      core/classloader/MockClassLoader) of the current class, $java/security/
+      Principal$$EnhancerByMockitoWithCGLIB$$e775e657, and the class loader (instance of <bootloader>) for 
+      interface java/security/Principal have different Class objects for the type javax/security/auth/Subject 
+      used in the signature.
+    -->  
+    <profile>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>2.12.4</version>
+            <configuration>
+              <excludes>
+                <exclude>**/TestKerberosClientAuthProvider.java</exclude>
+                <exclude>**/TestLogin.java</exclude>
+                <exclude>**/TestSimpleClientAuthProvider.java</exclude>
+                <exclude>**/TestIntegration.java</exclude>
+                <exclude>**/TestIncrementCoalescing.java</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 
   <dependencies>