Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[build, core, accumulo, couchbase2, hbase10, orientdb] fixes for jdk9 #712

Merged
merged 1 commit into from
Sep 30, 2016
Merged

[build, core, accumulo, couchbase2, hbase10, orientdb] fixes for jdk9 #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ services:


# Use the Container based infrastructure.
sudo: false
sudo: false
2 changes: 2 additions & 0 deletions accumulo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ LICENSE file.
<properties>
<!-- This should match up to the one from your Accumulo version -->
<hadoop.version>2.2.0</hadoop.version>
<!-- Tests do not run on jdk9 -->
<skipJDK9Tests>true</skipJDK9Tests>
</properties>
<dependencies>
<dependency>
Expand Down
19 changes: 18 additions & 1 deletion asynchbase/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ LICENSE file.
<artifactId>asynchbase-binding</artifactId>
<name>AsyncHBase Client Binding for Apache HBase</name>

<properties>
<!-- Tests do not run on jdk9 -->
<skipJDK9Tests>true</skipJDK9Tests>
</properties>

<dependencies>
<dependency>
<groupId>org.hbase</groupId>
Expand Down Expand Up @@ -79,13 +84,25 @@ LICENSE file.
<artifactId>hbase-testing-util</artifactId>
<version>${hbase10.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>jdk.tools</groupId>
<artifactId>jdk.tools</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
<version>${hbase10.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>jdk.tools</groupId>
<artifactId>jdk.tools</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -102,4 +119,4 @@ LICENSE file.
<scope>test</scope>
</dependency>
</dependencies>
</project>
</project>
17 changes: 17 additions & 0 deletions binding-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ LICENSE file.
<module>datastore-specific-descriptor</module>
</modules>

<properties>
<!-- See the test-on-jdk9 profile below. Default to 'jdk9 works' -->
<skipJDK9Tests>false</skipJDK9Tests>
</properties>

<build>
<pluginManagement>
<plugins>
Expand Down Expand Up @@ -127,6 +132,18 @@ LICENSE file.
</plugins>
</build>
</profile>
<!-- If the binding doesn't work with jdk9, it should redefine the
skipJDK9 property
-->
<profile>
<id>tests-on-jdk9</id>
<activation>
<jdk>9</jdk>
</activation>
<properties>
<skipTests>${skipJDK9Tests}</skipTests>
</properties>
</profile>
</profiles>
</project>

21 changes: 0 additions & 21 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,26 +68,5 @@ LICENSE file.
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven.assembly.version}</version>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
2 changes: 1 addition & 1 deletion couchbase2/src/main/java/com/yahoo/ycsb/db/couchbase2/Couchbase2Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,7 @@ private Status scanSpecificFields(final String table, final String startkey, fin
*/
private void waitForMutationResponse(final Observable<? extends Document<?>> input) {
if (!syncMutResponse) {
input.subscribe(new Subscriber<Document<?>>() {
((Observable<Document<?>>)input).subscribe(new Subscriber<Document<?>>() {
@Override
public void onCompleted() {
}
Expand Down
16 changes: 16 additions & 0 deletions hbase10/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,21 @@ LICENSE file.
<artifactId>hbase10-binding</artifactId>
<name>HBase 1.0 DB Binding</name>

<properties>
<!-- Tests do not run on jdk9 -->
<skipJDK9Tests>true</skipJDK9Tests>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
<version>${hbase10.version}</version>
<exclusions>
<exclusion>
<groupId>jdk.tools</groupId>
<artifactId>jdk.tools</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.yahoo.ycsb</groupId>
Expand All @@ -51,6 +61,12 @@ LICENSE file.
<artifactId>hbase-testing-util</artifactId>
<version>${hbase10.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>jdk.tools</groupId>
<artifactId>jdk.tools</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>
4 changes: 4 additions & 0 deletions orientdb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ LICENSE file.
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
</repositories>
<properties>
<!-- Tests do not run on jdk9 -->
<skipJDK9Tests>true</skipJDK9Tests>
</properties>
<dependencies>
<dependency>
<groupId>com.yahoo.ycsb</groupId>
Expand Down