Skip to content
Permalink
Browse files
Java 11 build successfully completed
  • Loading branch information
dspavlov committed Feb 12, 2019
1 parent 1918240 commit f84bc04c1a8a310a6a33b9cd1a01a5f0b7c710a7
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 94 deletions.
@@ -49,10 +49,14 @@ dependencies {
compile group: 'org.eclipse.jetty', name: 'jetty-webapp', version: jettyVer

// problematic def jerseyVer = '2.27'
def jerseyVer = '2.25.1'
// Newer version is def jerseyVer = '2.28'; Current: def jerseyVer = '2.25.1'
def jerseyVer = '2.28'
compile group: 'org.glassfish.jersey.containers', name: 'jersey-container-servlet-core', version: jerseyVer

compile group: 'org.glassfish.jersey.core', name: 'jersey-client', version: jerseyVer
//
compile group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: jerseyVer

compile group: 'org.glassfish.jersey.media', name: 'jersey-media-json-jackson', version: jerseyVer
compile group: 'org.glassfish.jersey.media', name: 'jersey-media-multipart', version: jerseyVer

@@ -83,5 +87,15 @@ processResources {

// Minify every file here
}
}

test {
// set JVM arguments for the test JVM(s)
jvmArgs "-XX:+IgnoreUnrecognizedVMOptions",
"--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"
}
@@ -26,7 +26,6 @@
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import javax.inject.Inject;
import jersey.repackaged.com.google.common.base.Throwables;
import org.apache.ignite.ci.conf.BranchTracked;
import org.apache.ignite.ci.conf.ChainAtServerTracked;
import org.apache.ignite.ci.di.AutoProfiling;
@@ -42,6 +41,7 @@
import org.apache.ignite.ci.teamcity.ignited.ITeamcityIgnitedProvider;
import org.apache.ignite.ci.teamcity.ignited.fatbuild.FatBuildCompacted;
import org.apache.ignite.ci.user.ICredentialsProv;
import org.apache.ignite.ci.util.ExceptionUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@@ -135,7 +135,7 @@ protected String runEx() {
catch (Exception e) {
logger.error("Unable to check queue: " + e.getMessage(), e);

throw Throwables.propagate(e);
throw ExceptionUtil.propagateException(e);
}
}

@@ -75,7 +75,7 @@ public TestFailuresSummary getTrackedBranchTestFailures(
final BranchTracked tracked = tcBotConfig.getTrackedBranches().getBranchMandatory(branchNn);

tracked.chains.stream()
.filter(chainTracked -> creds.hasAccess(chainTracked.serverId))
.filter(chainTracked -> tcIgnitedProv.hasAccess(chainTracked.serverId, creds))
.map(chainTracked -> {
final String srvId = chainTracked.serverId;

@@ -148,7 +148,7 @@ public FullLRTestsSummary getTrackedBranchLongRunningTestsSummary(@Nullable Stri
final BranchTracked tracked = tcBotConfig.getTrackedBranches().getBranchMandatory(branchNn);

tracked.chains.stream()
.filter(chainTracked -> creds.hasAccess(chainTracked.serverId))
.filter(chainTracked -> tcIgnitedProv.hasAccess(chainTracked.serverId, creds))
.map(chainTracked -> {
final String srvId = chainTracked.serverId;

This file was deleted.

@@ -21,7 +21,6 @@
import org.apache.ignite.ci.web.rest.exception.ExeptionsTraceLogger;
import org.apache.ignite.ci.web.rest.exception.ServiceStartingException;
import org.apache.ignite.ci.web.rest.exception.ServiceUnauthorizedException;
import org.glassfish.jersey.filter.LoggingFilter;
import org.glassfish.jersey.logging.LoggingFeature;
import org.glassfish.jersey.server.ResourceConfig;

@@ -41,16 +41,16 @@ applicationDefaultJvmArgs = ["-Dteamcity.helper.home=../work",
"-Dcom.sun.management.jmxremote.port=9010",
"-Dcom.sun.management.jmxremote.local.only=false",
"-Dcom.sun.management.jmxremote.authenticate=false",
"-Dcom.sun.management.jmxremote.ssl=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"]
*/
// Options for running on Java 11
"-XX:+IgnoreUnrecognizedVMOptions",
"--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 {

0 comments on commit f84bc04

Please sign in to comment.