You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by xv...@apache.org on 2019/05/28 01:40:26 UTC
[incubator-druid] branch master updated (e46bdf0 -> 58a6f0d)
This is an automated email from the ASF dual-hosted git repository.
xvrl pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-druid.git.
from e46bdf0 Remove Codehaus references from the tests (#7773)
new 484afe0 exclude hadoop system dependency
new 58a6f0d Enable compiling against Java 9+ (tests disabled)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 3 +++
extensions-contrib/ambari-metrics-emitter/pom.xml | 6 +++++
pom.xml | 29 +++++++++++++++++++++++
3 files changed, 38 insertions(+)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[incubator-druid] 02/02: Enable compiling against Java 9+ (tests
disabled)
Posted by xv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xvrl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-druid.git
commit 58a6f0d5d05c736e1ac1fc8e3308676f880a3296
Author: Xavier Léauté <xv...@apache.org>
AuthorDate: Fri Apr 19 08:59:54 2019 -0700
Enable compiling against Java 9+ (tests disabled)
This change only enables compilation to ensure code compiles against
recent Java versions going forward. Tests are still disabled in this
profile until test failures are addressed.
---
.travis.yml | 3 +++
pom.xml | 29 +++++++++++++++++++++++++++++
2 files changed, 32 insertions(+)
diff --git a/.travis.yml b/.travis.yml
index 16c6d42..be35906 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,6 +31,9 @@ cache:
matrix:
include:
+ # Java 11 build
+ - jdk: openjdk11
+
# license checks
- env:
- NAME="license checks"
diff --git a/pom.xml b/pom.xml
index daadaaa..193951a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,7 @@
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
+ <java.version>8</java.version>
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
<apache.curator.version>4.1.0</apache.curator.version>
<apache.curator.test.version>2.12.0</apache.curator.test.version>
@@ -1348,6 +1349,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
@@ -1368,6 +1370,33 @@
<profiles>
<profile>
+ <id>java-9+</id>
+ <activation>
+ <jdk>[9,)</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <inherited>true</inherited>
+ <!-- prefer release instead of source/target in JDK 9 and above -->
+ <configuration>
+ <release>${java.version}</release>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration combine.self="override">
+ <!-- disable tests until we fully support JDK 9 and above -->
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>strict</id>
<build>
<plugins>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[incubator-druid] 01/02: exclude hadoop system dependency
Posted by xv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xvrl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-druid.git
commit 484afe0afbbb3531374683162d5c73f40e83adc2
Author: Xavier Léauté <xv...@apache.org>
AuthorDate: Sun May 19 09:35:18 2019 -0700
exclude hadoop system dependency
ambari depends on hadoop-annotation. Under linux, it sometimes activates a
maven profile that includes an explicit dependency on ${java.home}/../lib/tools.jar
This change excludes this dependency, since this jar is no longer
included with Java 9. It also seems seems unlikely that we would require
this dependency at runtime, since it is only enabled on some platforms.
---
extensions-contrib/ambari-metrics-emitter/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/extensions-contrib/ambari-metrics-emitter/pom.xml b/extensions-contrib/ambari-metrics-emitter/pom.xml
index 761a19d..47bd42e 100644
--- a/extensions-contrib/ambari-metrics-emitter/pom.xml
+++ b/extensions-contrib/ambari-metrics-emitter/pom.xml
@@ -61,6 +61,12 @@
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
</exclusion>
+ <exclusion>
+ <!-- ambari depends on hadoop-annotations, which in turn depends on
+ ${java.home}/../lib/tools.jar, which was removed in Java 9+ -->
+ <groupId>jdk.tools</groupId>
+ <artifactId>jdk.tools</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org