Skip to content

Commit

Permalink
Merge branch 'master' into retention-lease-ccr
Browse files Browse the repository at this point in the history
* master:
  Fix timezone fallback in ingest processor (elastic#38407)
  Avoid polluting download stats on builds (elastic#38660)
  SQL: Prevent grouping over grouping functions (elastic#38649)
  SQL: Relax StackOverflow circuit breaker for constants (elastic#38572)
  [DOCS] Fixes broken migration links (elastic#38655)
  Drop support for the low-level REST client on JDK 7 (elastic#38540)
  [DOCS] Adds placeholders for v8 highlights, breaking changes, release notes (elastic#38641)
  fix dissect doc "ip" --> "clientip" (elastic#38545)
  Concurrent file chunk fetching for CCR restore (elastic#38495)
  make DateMathIndexExpressionsIntegrationIT more resilient (elastic#38473)
  SQL: Replace joda with java time (elastic#38437)
  Add fuzziness example (elastic#37194) (elastic#38648)
  • Loading branch information
jasontedor committed Feb 9, 2019
2 parents 38a5170 + c0328d5 commit baec3a0
Show file tree
Hide file tree
Showing 70 changed files with 877 additions and 2,421 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import org.gradle.api.artifacts.ModuleVersionIdentifier
import org.gradle.api.artifacts.ProjectDependency
import org.gradle.api.artifacts.ResolvedArtifact
import org.gradle.api.artifacts.dsl.RepositoryHandler
import org.gradle.api.credentials.HttpHeaderCredentials
import org.gradle.api.execution.TaskExecutionGraph
import org.gradle.api.plugins.JavaBasePlugin
import org.gradle.api.plugins.JavaPlugin
Expand All @@ -50,6 +51,7 @@ import org.gradle.api.tasks.bundling.Jar
import org.gradle.api.tasks.compile.GroovyCompile
import org.gradle.api.tasks.compile.JavaCompile
import org.gradle.api.tasks.javadoc.Javadoc
import org.gradle.authentication.http.HttpHeaderAuthentication
import org.gradle.internal.jvm.Jvm
import org.gradle.process.ExecResult
import org.gradle.process.ExecSpec
Expand Down Expand Up @@ -570,6 +572,14 @@ class BuildPlugin implements Plugin<Project> {
patternLayout {
artifact "elasticsearch/[module]-[revision](-[classifier]).[ext]"
}
// this header is not a credential but we hack the capability to send this header to avoid polluting our download stats
credentials(HttpHeaderCredentials) {
name = "X-Elastic-No-KPI"
value = "1"
}
authentication {
header(HttpHeaderAuthentication)
}
}
repos.maven {
name "elastic"
Expand Down
4 changes: 2 additions & 2 deletions client/rest/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ apply plugin: 'elasticsearch.build'
apply plugin: 'nebula.maven-base-publish'
apply plugin: 'nebula.maven-scm'

targetCompatibility = JavaVersion.VERSION_1_7
sourceCompatibility = JavaVersion.VERSION_1_7
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_1_8

group = 'org.elasticsearch.client'
archivesBaseName = 'elasticsearch-rest-client'
Expand Down
4 changes: 2 additions & 2 deletions client/sniffer/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ apply plugin: 'elasticsearch.build'
apply plugin: 'nebula.maven-base-publish'
apply plugin: 'nebula.maven-scm'

targetCompatibility = JavaVersion.VERSION_1_7
sourceCompatibility = JavaVersion.VERSION_1_7
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_1_8

group = 'org.elasticsearch.client'
archivesBaseName = 'elasticsearch-rest-client-sniffer'
Expand Down
4 changes: 2 additions & 2 deletions client/test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
*/
apply plugin: 'elasticsearch.build'

targetCompatibility = JavaVersion.VERSION_1_7
sourceCompatibility = JavaVersion.VERSION_1_7
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_1_8

group = "${group}.client.test"

Expand Down
2 changes: 1 addition & 1 deletion docs/reference/ingest/processors/dissect.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ Named skip key modifier example
| *Pattern* | `%{clientip} %{?ident} %{?auth} [%{@timestamp}]`
| *Input* | 1.2.3.4 - - [30/Apr/1998:22:00:52 +0000]
| *Result* a|
* ip = 1.2.3.4
* clientip = 1.2.3.4
* @timestamp = 30/Apr/1998:22:00:52 +0000
|======

Expand Down
4 changes: 2 additions & 2 deletions docs/reference/migration/apis/deprecation.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Example response:
{
"level" : "critical",
"message" : "Cluster name cannot contain ':'",
"url" : "{ref}/breaking-changes-7.0.html#_literal_literal_is_no_longer_allowed_in_cluster_name",
"url" : "{ref-70}/breaking-changes-7.0.html#_literal_literal_is_no_longer_allowed_in_cluster_name",
"details" : "This cluster is named [mycompany:logging], which contains the illegal character ':'."
}
],
Expand All @@ -64,7 +64,7 @@ Example response:
{
"level" : "warning",
"message" : "Index name cannot contain ':'",
"url" : "{ref}/breaking-changes-7.0.html#_literal_literal_is_no_longer_allowed_in_index_name",
"url" : "{ref-70}/breaking-changes-7.0.html#_literal_literal_is_no_longer_allowed_in_index_name",
"details" : "This index is named [logs:apache], which contains the illegal character ':'."
}
]
Expand Down
4 changes: 3 additions & 1 deletion docs/reference/migration/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,7 @@ For more information, see <<setup-upgrade>>.

See also <<release-highlights>> and <<es-release-notes>>.

* <<breaking-changes-8.0,Breaking changes in 8.0>>

--
include::migrate_7_0.asciidoc[]
include::migrate_8_0.asciidoc[]
64 changes: 0 additions & 64 deletions docs/reference/migration/migrate_7_0.asciidoc

This file was deleted.

34 changes: 0 additions & 34 deletions docs/reference/migration/migrate_7_0/aggregations.asciidoc

This file was deleted.

41 changes: 0 additions & 41 deletions docs/reference/migration/migrate_7_0/analysis.asciidoc

This file was deleted.

156 changes: 0 additions & 156 deletions docs/reference/migration/migrate_7_0/api.asciidoc

This file was deleted.

Loading

0 comments on commit baec3a0

Please sign in to comment.