Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lhirlimann patch 2 #2275

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ ES-Hadoop 2.0.x and 2.1.x are compatible with Elasticsearch __1.X__ *only*

## Installation

### Stable Release (currently `8.4.0`)
### Stable Release (currently `8.15.3`)
Available through any Maven-compatible tool:

```xml
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-hadoop</artifactId>
<version>8.4.0</version>
<version>8.15.3</version>
</dependency>
```
or as a stand-alone [ZIP](http://www.elastic.co/downloads/hadoop).
Expand All @@ -38,7 +38,7 @@ Grab the latest nightly build from the [repository](http://oss.sonatype.org/cont
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-hadoop</artifactId>
<version>8.15.0-SNAPSHOT</version>
<version>8.15.4-SNAPSHOT</version>
</dependency>
```

Expand Down
6 changes: 3 additions & 3 deletions buildSrc/esh-version.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
eshadoop = 8.15.0
elasticsearch = 8.15.0
eshadoop = 8.15.4
elasticsearch = 8.15.4
lucene = 9.0.0
build-tools = 8.15.0
build-tools = 8.15.4
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[[eshadoop-8.14.3]]
== Elasticsearch for Apache Hadoop version 8.14.3

ES-Hadoop 8.14.3 is a version compatibility release, tested specifically against
Elasticsearch 8.14.3.
11 changes: 11 additions & 0 deletions docs/src/reference/asciidoc/appendix/release-notes/8.15.0.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[[eshadoop-8.15.0]]
== Elasticsearch for Apache Hadoop version 8.15.0

[[enhancements-8.15.0]]
=== Enhancements
Build::
* Upgrade Spark to 3.4.3 and Hive to 3.1.3
https://github.com/elastic/elasticsearch-hadoop/pull/2231[#2231]
Spark::
* Clean up Spark dependency lists
https://github.com/elastic/elasticsearch-hadoop/pull/2217[#2217]
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[[eshadoop-8.15.1]]
== Elasticsearch for Apache Hadoop version 8.15.1

ES-Hadoop 8.15.1 is a version compatibility release, tested specifically against
Elasticsearch 8.15.1.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[[eshadoop-8.15.3]]
== Elasticsearch for Apache Hadoop version 8.15.3

ES-Hadoop 8.15.3 is a version compatibility release, tested specifically against
Elasticsearch 8.15.3.
8 changes: 8 additions & 0 deletions docs/src/reference/asciidoc/appendix/release.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ This section summarizes the changes in each release.
[[release-notes-8]]
===== 8.x

* <<eshadoop-8.15.3>>
* <<eshadoop-8.15.1>>
* <<eshadoop-8.15.0>>
* <<eshadoop-8.14.3>>
* <<eshadoop-8.14.2>>
* <<eshadoop-8.14.1>>
* <<eshadoop-8.14.0>>
Expand Down Expand Up @@ -110,6 +114,10 @@ Elasticsearch 5.3.1.

////////////////////////

include::release-notes/8.15.3.adoc[]
include::release-notes/8.15.1.adoc[]
include::release-notes/8.15.0.adoc[]
include::release-notes/8.14.3.adoc[]
include::release-notes/8.14.2.adoc[]
include::release-notes/8.14.1.adoc[]
include::release-notes/8.14.0.adoc[]
Expand Down
2 changes: 1 addition & 1 deletion docs/src/reference/asciidoc/core/troubleshooting.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Indexing performance depends _heavily_ on the type of data being targeted and it
[[help]]
=== Getting help

If you need help, there is a strong, helpful community of users on the https://discuss.elastic.co/c/elasticsearch-and-hadoop[forum] and http://www.elastic.co/community/[IRC] who are happy to help out.
If you need help, there is a strong, helpful community of users on the https://discuss.elastic.co/c/elasticsearch-and-hadoop[forum] and http://www.elastic.co/community/[Slack] who are happy to help out.

If something is not working, there are two possibilities:

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=a4b4158601f8636cdeeab09bd76afb640030bb5b144aafe261a5e8af027dc612
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionSha256Sum=5b9c5eb3f9fc2c94abaea57d90bd78747ca117ddbbf96c859d3741181a12bf2a
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 4 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down