You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2019/01/29 14:50:51 UTC
[ignite-teamcity-bot] branch master updated: Support Java 11 local
test
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/master by this push:
new d3e9732 Support Java 11 local test
d3e9732 is described below
commit d3e97326d1cdf9ceb173933ea509872b05f08727
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Tue Jan 29 17:50:45 2019 +0300
Support Java 11 local test
---
ignite-tc-helper-web/build.gradle | 6 ++++++
.../src/main/java/org/apache/ignite/ci/web/model/Version.java | 9 +++++++--
ignite-tc-helper-web/src/main/webapp/js/common-1.6.js | 4 ++++
jetty-launcher/build.gradle | 9 +++++++++
4 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/ignite-tc-helper-web/build.gradle b/ignite-tc-helper-web/build.gradle
index 7a1382b..7c12c4f 100644
--- a/ignite-tc-helper-web/build.gradle
+++ b/ignite-tc-helper-web/build.gradle
@@ -67,6 +67,12 @@ dependencies {
compile group: 'com.google.inject', name: 'guice', version: '4.2.0'
compile group: 'org.xerial.snappy', name: 'snappy-java', version: '1.1.7.2'
+
+ /// JAXB replacement for Java 11
+ compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
+ compile group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.3.0'
+ compile group: 'com.sun.xml.bind', name: 'jaxb-core', version: '2.3.0'
+
}
processResources {
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
index a115bf2..ae6662a 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
@@ -28,7 +28,10 @@ package org.apache.ignite.ci.web.model;
public static final String GITHUB_REF = "https://github.com/apache/ignite-teamcity-bot";
/** TC Bot Version. */
- public static final String VERSION = "20190125";
+ public static final String VERSION = "20190129";
+
+ /** Java version, where Web App is running. */
+ public String javaVer;
/** TC Bot Version. */
public String version = VERSION;
@@ -48,5 +51,7 @@ package org.apache.ignite.ci.web.model;
/** Contact email. */
public String contactEmail = DEFAULT_CONTACT;
- public Version() {}
+ public Version() {
+ javaVer = System.getProperty("java.version");
+ }
}
diff --git a/ignite-tc-helper-web/src/main/webapp/js/common-1.6.js b/ignite-tc-helper-web/src/main/webapp/js/common-1.6.js
index b6a36ce..3af11ab 100644
--- a/ignite-tc-helper-web/src/main/webapp/js/common-1.6.js
+++ b/ignite-tc-helper-web/src/main/webapp/js/common-1.6.js
@@ -95,6 +95,10 @@ function showVersionInfo(result) {
res += " V" + result.ignVer;
}
+ if (isDefinedAndFilled(result.javaVer)) {
+ res += ", Java Version: " + result.javaVer;
+ }
+
res += "<br>";
res += "Managed by the <a href='https://ignite.apache.org/community/resources.html#people'>Apache Ignite Development Project.</a>";
diff --git a/jetty-launcher/build.gradle b/jetty-launcher/build.gradle
index d807358..950979b 100644
--- a/jetty-launcher/build.gradle
+++ b/jetty-launcher/build.gradle
@@ -43,6 +43,15 @@ applicationDefaultJvmArgs = ["-Dteamcity.helper.home=../work",
"-Dcom.sun.management.jmxremote.authenticate=false",
"-Dcom.sun.management.jmxremote.ssl=false"]
+/* add for running on Java 11
+["--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED",
+ "--add-exports=java.base/sun.nio.ch=ALL-UNNAMED",
+ "--add-exports=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED",
+ "--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED",
+ "--add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED",
+ "--illegal-access=permit"]
+*/
+
distributions {
main {
contents {