Skip to content

Commit

Permalink
Enable testing against JDK 13 EA builds (#40829)
Browse files Browse the repository at this point in the history
This commit adds JDK 13 to the CI rotation for testing. For now, we will
be testing against JDK 13 EA builds.
  • Loading branch information
jasontedor committed Jun 5, 2019
1 parent 117df87 commit 78be3dd
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 15 deletions.
1 change: 1 addition & 0 deletions .ci/java-versions.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ ES_BUILD_JAVA=openjdk12
ES_RUNTIME_JAVA=java8
GRADLE_TASK=build


1 change: 1 addition & 0 deletions .ci/matrix-build-javas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@

ES_BUILD_JAVA:
- openjdk12
- openjdk13
1 change: 1 addition & 0 deletions .ci/matrix-runtime-javas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ ES_RUNTIME_JAVA:
- java11
- java12
- openjdk12
- openjdk13
- zulu8
- zulu11
- zulu12
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
/**
* Initializes SecurityManager with necessary permissions.
* <br>
* <h1>Initialization</h1>
* <h2>Initialization</h2>
* The JVM is not initially started with security manager enabled,
* instead we turn it on early in the startup process. This is a tradeoff
* between security and ease of use:
Expand All @@ -72,7 +72,7 @@
* otherwise be permitted.</li>
* </ul>
* <br>
* <h1>Permissions</h1>
* <h2>Permissions</h2>
* Permissions use a policy file packaged as a resource, this file is
* also used in tests. File permissions are generated dynamically and
* combined with this policy file.
Expand All @@ -92,7 +92,7 @@
* cleanups to the scripting apis). But still it can provide some defense for users
* that enable dynamic scripting without being fully aware of the consequences.
* <br>
* <h1>Debugging Security</h1>
* <h2>Debugging Security</h2>
* A good place to start when there is a problem is to turn on security debugging:
* <pre>
* ES_JAVA_OPTS="-Djava.security.debug=access,failure" bin/elasticsearch
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* used to create an {@link Injector}. Guice provides this object to your
* application's {@link Module} implementors so they may each contribute
* their own bindings and other registrations.
* <h3>The Guice Binding EDSL</h3>
* <h2>The Guice Binding EDSL</h2>
* <p>
* Guice uses an <i>embedded domain-specific language</i>, or EDSL, to help you
* create bindings simply and readably. This approach is great for overall
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
/**
* Provides a factory that combines the caller's arguments with injector-supplied values to
* construct objects.
* <h3>Defining a factory</h3>
* <h2>Defining a factory</h2>
* Create an interface whose methods return the constructed type, or any of its supertypes. The
* method's parameters are the arguments required to build the constructed type.
* <pre>public interface PaymentFactory {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
* above. The frequency and length thresholds could be parameters, etc.
* Doug
* </pre>
* <h3>Initial Usage</h3>
* <h2>Initial Usage</h2>
* <p>
* This class has lots of options to try to make it efficient and flexible.
* The simplest possible usage is as follows. The bold
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
/**
* <p>This package exposes the Elasticsearch Snapshot functionality.</p>
*
* <h1>Preliminaries</h1>
* <h2>Preliminaries</h2>
*
* <p>There are two communication channels between all nodes and master in the snapshot functionality:</p>
* <ul>
Expand All @@ -32,7 +32,7 @@
* snapshot's entry in the cluster state accordingly.</li>
* </ul>
*
* <h1>Snapshot Creation</h1>
* <h2>Snapshot Creation</h2>
* <p>Snapshots are created by the following sequence of events:</p>
* <ol>
* <li>An invocation of {@link org.elasticsearch.snapshots.SnapshotsService#createSnapshot} enqueues a cluster state update to create
Expand Down Expand Up @@ -68,7 +68,7 @@
* </li>
* </ol>
*
* <h1>Deleting a Snapshot</h1>
* <h2>Deleting a Snapshot</h2>
*
* <p>Deleting a snapshot can take the form of either simply deleting it from the repository or (if it has not completed yet) aborting it
* and subsequently deleting it from the repository.</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ grant codeBase "${codebase.elasticsearch-plugin-classloader}" {
//// Everything else:

grant {
// needed by vendored Guice
permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.vm.annotation";

// checked by scripting engines, and before hacks and other issues in
// third party code, to safeguard these against unprivileged code like scripts.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
* if possible, to one (at the moment) query DSL. Of course, this means
* not all SQL queries are supported.<br>
*
* <h3>Premise</h3>
* <h2>Premise</h2>
* Since Elasticsearch is not a database nor does it supports arbitrary
* {@code JOIN}s (a cornerstone of SQL), SQL module is built from the
* ground-up with Elasticsearch in mind first and SQL second. In fact,
* even the grammar introduces Elasticsearch specific components that
* have no concept in ANSI SQL.
*
* <h3>Architecture</h3>
* <h2>Architecture</h2>
* SQL module is roughly based on the Volcano project (by Graefe
* {@code &} co)
* <a href="http://ieeexplore.ieee.org/document/344061">[1]</a>
Expand Down Expand Up @@ -53,7 +53,7 @@
* (to different degrees) by the majority of SQL engines out there such
* as Apache Calcite, Apache Impala, Apache Spark and Facebook Presto.
*
* <h3>Concepts</h3>
* <h2>Concepts</h2>
*
* The building operation of the SQL engine is defined by an action,
* namely a rule (defined in {@link org.elasticsearch.xpack.sql.rule rule}
Expand Down Expand Up @@ -112,8 +112,8 @@
* <li>The Elasticsearch query gets executed</li>
* </ol>
*
* <h4>Digression - Visitors, pattern matching, {@code instanceof} and
* Java 10/11/12</h4>
* <h3>Digression - Visitors, pattern matching, {@code instanceof} and
* Java 10/11/12</h3>
*
* To implement the above concepts, several choices have been made in the
* engine (which are not common in the rest of the XPack code base). In
Expand Down Expand Up @@ -146,7 +146,7 @@
* {@link org.elasticsearch.xpack.sql.tree.Node#transformDown(java.util.function.Function, Class)
* pre-order transformation}).
*
* <h3>Components</h3>
* <h2>Components</h2>
*
* The SQL engine is made up of the following components:
* <dl>
Expand Down

0 comments on commit 78be3dd

Please sign in to comment.