Skip to content

Commit 4ac51bc

Browse files
authored
Enable testing against JDK 13 EA builds (#40829)
This commit adds JDK 13 to the CI rotation for testing. For now, we will be testing against JDK 13 EA builds.
1 parent 8e18704 commit 4ac51bc

File tree

11 files changed

+27
-22
lines changed

11 files changed

+27
-22
lines changed

.ci/java-versions.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ ES_BUILD_JAVA=openjdk12
88
ES_RUNTIME_JAVA=java11
99
GRADLE_TASK=build
1010

11+

.ci/matrix-build-javas.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@
77

88
ES_BUILD_JAVA:
99
- openjdk12
10+
- openjdk13

.ci/matrix-runtime-javas.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ES_RUNTIME_JAVA:
99
- java11
1010
- java12
1111
- openjdk12
12+
- openjdk13
1213
- zulu11
1314
- zulu12
1415
- corretto11

server/src/main/java/org/elasticsearch/bootstrap/Security.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
/**
6262
* Initializes SecurityManager with necessary permissions.
6363
* <br>
64-
* <h1>Initialization</h1>
64+
* <h2>Initialization</h2>
6565
* The JVM is not initially started with security manager enabled,
6666
* instead we turn it on early in the startup process. This is a tradeoff
6767
* between security and ease of use:
@@ -72,7 +72,7 @@
7272
* otherwise be permitted.</li>
7373
* </ul>
7474
* <br>
75-
* <h1>Permissions</h1>
75+
* <h2>Permissions</h2>
7676
* Permissions use a policy file packaged as a resource, this file is
7777
* also used in tests. File permissions are generated dynamically and
7878
* combined with this policy file.
@@ -92,7 +92,7 @@
9292
* cleanups to the scripting apis). But still it can provide some defense for users
9393
* that enable dynamic scripting without being fully aware of the consequences.
9494
* <br>
95-
* <h1>Debugging Security</h1>
95+
* <h2>Debugging Security</h2>
9696
* A good place to start when there is a problem is to turn on security debugging:
9797
* <pre>
9898
* ES_JAVA_OPTS="-Djava.security.debug=access,failure" bin/elasticsearch

server/src/main/java/org/elasticsearch/common/inject/Binder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* used to create an {@link Injector}. Guice provides this object to your
3232
* application's {@link Module} implementors so they may each contribute
3333
* their own bindings and other registrations.
34-
* <h3>The Guice Binding EDSL</h3>
34+
* <h2>The Guice Binding EDSL</h2>
3535
* <p>
3636
* Guice uses an <i>embedded domain-specific language</i>, or EDSL, to help you
3737
* create bindings simply and readably. This approach is great for overall

server/src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
/**
4040
* Provides a factory that combines the caller's arguments with injector-supplied values to
4141
* construct objects.
42-
* <h3>Defining a factory</h3>
42+
* <h2>Defining a factory</h2>
4343
* Create an interface whose methods return the constructed type, or any of its supertypes. The
4444
* method's parameters are the arguments required to build the constructed type.
4545
* <pre>public interface PaymentFactory {

server/src/main/java/org/elasticsearch/common/lucene/search/XMoreLikeThis.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
* above. The frequency and length thresholds could be parameters, etc.
9898
* Doug
9999
* </pre>
100-
* <h3>Initial Usage</h3>
100+
* <h2>Initial Usage</h2>
101101
* <p>
102102
* This class has lots of options to try to make it efficient and flexible.
103103
* The simplest possible usage is as follows. The bold

server/src/main/java/org/elasticsearch/repositories/blobstore/package-info.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/**
2121
* <p>This package exposes the blobstore repository used by Elasticsearch Snapshots.</p>
2222
*
23-
* <h1>Preliminaries</h1>
23+
* <h2>Preliminaries</h2>
2424
*
2525
* <p>The {@link org.elasticsearch.repositories.blobstore.BlobStoreRepository} forms the basis of implementations of
2626
* {@link org.elasticsearch.repositories.Repository} on top of a blob store. A blobstore can be used as the basis for an implementation
@@ -84,7 +84,7 @@
8484
* }
8585
* </pre>
8686
*
87-
* <h1>Getting the Repository's RepositoryData</h1>
87+
* <h2>Getting the Repository's RepositoryData</h2>
8888
*
8989
* <p>Loading the {@link org.elasticsearch.repositories.RepositoryData} that holds the list of all snapshots as well as the mapping of
9090
* indices' names to their repository {@link org.elasticsearch.repositories.IndexId} is done by invoking
@@ -114,11 +114,11 @@
114114
* </ol>
115115
* </li>
116116
* </ol>
117-
* <h1>Creating a Snapshot</h1>
117+
* <h2>Creating a Snapshot</h2>
118118
*
119119
* <p>Creating a snapshot in the repository happens in the three steps described in detail below.</p>
120120
*
121-
* <h2>Initializing a Snapshot in the Repository</h2>
121+
* <h3>Initializing a Snapshot in the Repository</h3>
122122
*
123123
* <p>Creating a snapshot in the repository starts with a call to {@link org.elasticsearch.repositories.Repository#initializeSnapshot} which
124124
* the blob store repository implements via the following actions:</p>
@@ -130,7 +130,7 @@
130130
* </ol>
131131
* TODO: This behavior is problematic, adjust these docs once https://github.com/elastic/elasticsearch/issues/41581 is fixed
132132
*
133-
* <h2>Writing Shard Data (Segments)</h2>
133+
* <h3>Writing Shard Data (Segments)</h3>
134134
*
135135
* <p>Once all the metadata has been written by the snapshot initialization, the snapshot process moves on to writing the actual shard data
136136
* to the repository by invoking {@link org.elasticsearch.repositories.Repository#snapshotShard} on the data-nodes that hold the primaries
@@ -158,7 +158,7 @@
158158
* {@code BlobStoreIndexShardSnapshots} blob is written to the shard's path with name {@code index-${N+1}}.</li>
159159
* </ol>
160160
*
161-
* <h2>Finalizing the Snapshot</h2>
161+
* <h3>Finalizing the Snapshot</h3>
162162
*
163163
* <p>After all primaries have finished writing the necessary segment files to the blob store in the previous step, the master node moves on
164164
* to finalizing the snapshot by invoking {@link org.elasticsearch.repositories.Repository#finalizeSnapshot}. This method executes the
@@ -173,7 +173,7 @@
173173
* <li>Write the updated {@code /index.latest} blob containing the new repository generation {@code N + 1}.</li>
174174
* </ol>
175175
*
176-
* <h1>Deleting a Snapshot</h1>
176+
* <h2>Deleting a Snapshot</h2>
177177
*
178178
* <p>Deleting a snapshot is an operation that is exclusively executed on the master node that runs through the following sequence of
179179
* action when {@link org.elasticsearch.repositories.blobstore.BlobStoreRepository#deleteSnapshot} is invoked:</p>

server/src/main/java/org/elasticsearch/snapshots/package-info.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/**
2121
* <p>This package exposes the Elasticsearch Snapshot functionality.</p>
2222
*
23-
* <h1>Preliminaries</h1>
23+
* <h2>Preliminaries</h2>
2424
*
2525
* <p>There are two communication channels between all nodes and master in the snapshot functionality:</p>
2626
* <ul>
@@ -32,7 +32,7 @@
3232
* snapshot's entry in the cluster state accordingly.</li>
3333
* </ul>
3434
*
35-
* <h1>Snapshot Creation</h1>
35+
* <h2>Snapshot Creation</h2>
3636
* <p>Snapshots are created by the following sequence of events:</p>
3737
* <ol>
3838
* <li>An invocation of {@link org.elasticsearch.snapshots.SnapshotsService#createSnapshot} enqueues a cluster state update to create
@@ -68,7 +68,7 @@
6868
* </li>
6969
* </ol>
7070
*
71-
* <h1>Deleting a Snapshot</h1>
71+
* <h2>Deleting a Snapshot</h2>
7272
*
7373
* <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
7474
* and subsequently deleting it from the repository.</p>

server/src/main/resources/org/elasticsearch/bootstrap/security.policy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ grant codeBase "${codebase.elasticsearch-plugin-classloader}" {
5555
//// Everything else:
5656

5757
grant {
58+
// needed by vendored Guice
59+
permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.vm.annotation";
5860

5961
// checked by scripting engines, and before hacks and other issues in
6062
// third party code, to safeguard these against unprivileged code like scripts.

x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/package-info.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
* if possible, to one (at the moment) query DSL. Of course, this means
1414
* not all SQL queries are supported.<br>
1515
*
16-
* <h3>Premise</h3>
16+
* <h2>Premise</h2>
1717
* Since Elasticsearch is not a database nor does it supports arbitrary
1818
* {@code JOIN}s (a cornerstone of SQL), SQL module is built from the
1919
* ground-up with Elasticsearch in mind first and SQL second. In fact,
2020
* even the grammar introduces Elasticsearch specific components that
2121
* have no concept in ANSI SQL.
2222
*
23-
* <h3>Architecture</h3>
23+
* <h2>Architecture</h2>
2424
* SQL module is roughly based on the Volcano project (by Graefe
2525
* {@code &} co)
2626
* <a href="http://ieeexplore.ieee.org/document/344061">[1]</a>
@@ -53,7 +53,7 @@
5353
* (to different degrees) by the majority of SQL engines out there such
5454
* as Apache Calcite, Apache Impala, Apache Spark and Facebook Presto.
5555
*
56-
* <h3>Concepts</h3>
56+
* <h2>Concepts</h2>
5757
*
5858
* The building operation of the SQL engine is defined by an action,
5959
* namely a rule (defined in {@link org.elasticsearch.xpack.sql.rule rule}
@@ -112,8 +112,8 @@
112112
* <li>The Elasticsearch query gets executed</li>
113113
* </ol>
114114
*
115-
* <h4>Digression - Visitors, pattern matching, {@code instanceof} and
116-
* Java 10/11/12</h4>
115+
* <h3>Digression - Visitors, pattern matching, {@code instanceof} and
116+
* Java 10/11/12</h3>
117117
*
118118
* To implement the above concepts, several choices have been made in the
119119
* engine (which are not common in the rest of the XPack code base). In
@@ -146,7 +146,7 @@
146146
* {@link org.elasticsearch.xpack.sql.tree.Node#transformDown(java.util.function.Function, Class)
147147
* pre-order transformation}).
148148
*
149-
* <h3>Components</h3>
149+
* <h2>Components</h2>
150150
*
151151
* The SQL engine is made up of the following components:
152152
* <dl>

0 commit comments

Comments
 (0)