Skip to content

Commit 3f02fa5

Browse files
author
Christoph Büscher
committed
Merge branch 'master' into updateable-synonyms
2 parents abb6523 + a8b6811 commit 3f02fa5

File tree

468 files changed

+11953
-6861
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

468 files changed

+11953
-6861
lines changed

buildSrc/build.gradle

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,8 @@ sourceSets {
8484
}
8585
}
8686
compileMinimumRuntimeGroovy {
87-
// We can't use BuildPlugin here, so read from file
88-
String minimumRuntimeVersion = file('src/main/resources/minimumRuntimeVersion').text.trim()
89-
targetCompatibility = minimumRuntimeVersion
90-
sourceCompatibility = minimumRuntimeVersion
87+
targetCompatibility = 8
88+
sourceCompatibility = 8
9189
}
9290
dependencies {
9391
if (project.ext.has("isEclipse") == false || project.ext.isEclipse == false) {

distribution/docker/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,4 +142,6 @@ assemble.dependsOn "buildDockerImage"
142142
// We build the images used in compose locally, but the pull command insists on using a repository
143143
// thus we must disable it to prevent it from doing so.
144144
// Everything will still be pulled since we will build the local images on a pull
145-
tasks.matching { name == "composePull" }.all { enabled = false }
145+
if (tasks.findByName("composePull")) {
146+
tasks.composePull.enabled = false
147+
}

docs/Versions.asciidoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ release-state can be: released | prerelease | unreleased
3030
///////
3131
Javadoc roots used to generate links from Painless's API reference
3232
///////
33-
:java8-javadoc: https://docs.oracle.com/javase/8/docs/api
34-
:java9-javadoc: https://docs.oracle.com/javase/9/docs/api
33+
:java11-javadoc: https://docs.oracle.com/en/java/javase/11/docs/api
3534
:joda-time-javadoc: http://www.joda.org/joda-time/apidocs
3635
:lucene-core-javadoc: http://lucene.apache.org/core/{lucene_version_path}/core
3736

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
[[painless-api-reference]]
22
== Painless API Reference
33

4-
Painless has a strict whitelist for methods and classes to ensure all
5-
painless scripts are secure. Most of these methods are exposed directly
6-
from the Java Runtime Environment (JRE) while others are part of
7-
Elasticsearch or Painless itself. Below is a list of all available
8-
classes grouped with their respected methods. Clicking on the method
9-
name takes you to the documentation for that specific method. Methods
10-
defined in the JRE also have a `(java 9)` link which can be used to see
11-
the method's documentation in Java 9.
4+
Painless has a strict whitelist for methods and classes per context to
5+
ensure all painless scripts are secure. Most of these methods are
6+
exposed directly from the Java Runtime Environment (JRE) while others
7+
are part of Elasticsearch or Painless itself. Below is a list of the available
8+
APIs per context. The shared API is available to all contexts, while the
9+
specialized API available differs between contexts.
1210

1311
include::painless-api-reference/index.asciidoc[]

docs/painless/painless-api-reference/AbstractChronology.asciidoc

Lines changed: 0 additions & 7 deletions
This file was deleted.

docs/painless/painless-api-reference/AbstractCollection.asciidoc

Lines changed: 0 additions & 7 deletions
This file was deleted.

docs/painless/painless-api-reference/AbstractList.asciidoc

Lines changed: 0 additions & 7 deletions
This file was deleted.

docs/painless/painless-api-reference/AbstractMap.SimpleEntry.asciidoc

Lines changed: 0 additions & 9 deletions
This file was deleted.

docs/painless/painless-api-reference/AbstractMap.SimpleImmutableEntry.asciidoc

Lines changed: 0 additions & 9 deletions
This file was deleted.

docs/painless/painless-api-reference/AbstractMap.asciidoc

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)