Skip to content

Commit 1462ccf

Browse files
committed
cleanup
1 parent 720e3a9 commit 1462ccf

File tree

5 files changed

+11
-20
lines changed

5 files changed

+11
-20
lines changed

.ci/configure_signing.sh

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323

2424
set -euo pipefail
2525

26-
#if grep -sq "signing.keyId" gradle.properties; then
27-
# # Keys already present
28-
# exit 0
29-
#fi
26+
if grep -sq "signing.keyId" gradle.properties; then
27+
# Keys already present
28+
exit 0
29+
fi
3030

3131
mkdir -p /tmp/secured
3232
keyring_file="/tmp/secured/keyring.gpg"
@@ -38,16 +38,14 @@ vault kv get --field="keyring" $vault_path/gpg | base64 -d > $keyring_file
3838
signing_password=$(vault kv get --field="passphase" $vault_path/gpg)
3939
signing_key=$(vault kv get --field="key_id" $vault_path/gpg)
4040

41-
ORG_GRADLE_PROJECT_sonatypeUsername=$(vault kv get --field="username" $vault_path/maven_central)
42-
ORG_GRADLE_PROJECT_sonatypePassword=$(vault kv get --field="password" $vault_path/maven_central)
43-
export ORG_GRADLE_PROJECT_sonatypeUsername
44-
export ORG_GRADLE_PROJECT_sonatypePassword
41+
maven_username=$(vault kv get --field="username" $vault_path/maven_central)
42+
maven_password=$(vault kv get --field="password" $vault_path/maven_central)
4543

4644
cat >> gradle.properties <<EOF
4745
signing.keyId=${signing_key: -8}
4846
signing.password=${signing_password}
4947
signing.secretKeyRingFile=${keyring_file}
5048
51-
sonatypeUsername=${ORG_GRADLE_PROJECT_sonatypeUsername}
52-
sonatypePassword=${ORG_GRADLE_PROJECT_sonatypePassword}
49+
sonatypeUsername=${maven_username}
50+
sonatypePassword=${maven_password}
5351
EOF

.ci/make.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ if [[ "$CMD" == "release" ]]; then
202202
$git_mount $src_mount $output_mount \
203203
-v /tmp/secured:/tmp/secured \
204204
$docker_image \
205-
$gradle_task --scan --stacktrace --debug
205+
$gradle_task
206206
fi
207207

208208
if [[ "$CMD" == "bump" ]]; then

build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ repositories {
3131
}
3232

3333
group = "co.elastic.clients"
34-
version = "9.1.0-test-10-03-2025"
35-
description = "Maven central publish test for elasticsearch java client"
34+
description = "Maven central release of the official elasticsearch java client"
3635

3736
subprojects {
3837
group = rootProject.group

java-client/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ publishing {
137137
from(components["java"])
138138
pom {
139139
name.set("Elasticsearch Java API Client")
140-
artifactId = "elasticsearch-java-test-publish"
140+
artifactId = "elasticsearch-java"
141141
description.set("Elasticsearch Java API Client")
142142
url.set("https://github.com/elastic/elasticsearch-java/")
143143
licenses {

settings.gradle.kts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,3 @@ import java.nio.file.Paths
2222
rootProject.name = "elasticsearch-java"
2323

2424
include("java-client")
25-
26-
pluginManagement {
27-
repositories {
28-
gradlePluginPortal()
29-
}
30-
}

0 commit comments

Comments
 (0)