Skip to content

Commit 538e7eb

Browse files
authored
Merge branch 'main' into low-level-client-update
2 parents 3ee580e + 400fc2e commit 538e7eb

File tree

9 files changed

+200
-118
lines changed

9 files changed

+200
-118
lines changed

.ci/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# Build a Docker image that has Gradle and all project dependencies ready.
2121
# Needs to be run with .git and java-client/src mounted under /elasticsearch-java.
2222

23-
FROM openjdk:17
23+
FROM eclipse-temurin:17
2424

2525
# Default UID/GID to 1000
2626
# it can be overridden at build time
@@ -31,7 +31,8 @@ ARG BUILDER_GID=1000
3131
RUN (getent group ${BUILDER_GID} || groupadd -g ${BUILDER_GID} elastic) \
3232
&& (getent passwd ${BUILDER_UID} || useradd -u ${BUILDER_UID} -g ${BUILDER_GID} elastic) \
3333
&& mkdir -p /elasticsearch-java/build \
34-
&& chown -R ${BUILDER_UID}:${BUILDER_GID} /elasticsearch-java
34+
&& chown -R ${BUILDER_UID}:${BUILDER_GID} /elasticsearch-java \
35+
&& chown -R ${BUILDER_UID}:${BUILDER_GID} /home
3536

3637
WORKDIR /elasticsearch-java/
3738
USER ${BUILDER_UID}:${BUILDER_GID}

.github/workflows/unit-tests.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Java Unit Tests
2+
3+
on:
4+
workflow_run:
5+
workflows: ['Validate Gradle Wrapper']
6+
types: [completed]
7+
branches:
8+
- 'main'
9+
10+
jobs:
11+
tests:
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- uses: actions/checkout@v3
16+
17+
- name: Set up JDK 17
18+
uses: actions/setup-java@v3
19+
with:
20+
java-version: '17'
21+
distribution: 'temurin'
22+
23+
- name: Run java client tests
24+
run: ./gradlew test -p java-client

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ tasks.register<Task>(name = "publishForReleaseManager") {
100100

101101
println("Releasing version $version")
102102

103-
val releaseDir = File(rootProject.buildDir, "release")
103+
val releaseDir = File(rootProject.layout.buildDirectory.get().asFile, "release")
104104
releaseDir.mkdirs()
105105

106-
File(rootProject.buildDir, "repository/co/elastic/clients").listFiles()?.forEach { artifact ->
106+
File(rootProject.layout.buildDirectory.get().asFile, "repository/co/elastic/clients").listFiles()?.forEach { artifact ->
107107
println("Releasing artifact " + artifact.name)
108108

109109
val versionDir = File(artifact, version)

docs/reference/aggregations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ mapped_pages:
88
An aggregation summarizes your data as metrics, statistics, or other analytics.
99

1010
::::{note}
11-
See the [{{es}} documentation](elasticsearch://reference/data-analysis/aggregations/index.md) for a full explanation of aggregations.
11+
See the [{{es}} documentation](elasticsearch://reference/aggregations/index.md) for a full explanation of aggregations.
1212
::::
1313

1414

gradle/wrapper/gradle-wrapper.jar

1.52 KB
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)