From c24eacdce728fe8f338427fa8f418494462832a1 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 10 Dec 2024 15:21:07 +0100
Subject: [PATCH] OZG-7346: Try out java17 and builder
---
Jenkinsfile | 2 +-
.../common/elasticsearch/ElasticsearchTestClient.java | 4 ++--
pom.xml | 6 +++++-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 178d7c9..1ca4354 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -24,7 +24,7 @@
pipeline {
agent {
node {
- label 'ozgcloud-jenkins-build-agent-jdk21'
+ label 'ozgcloud-jenkins-build-agent'
}
}
diff --git a/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchTestClient.java b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchTestClient.java
index 28e63d5..46f884e 100644
--- a/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchTestClient.java
+++ b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchTestClient.java
@@ -39,7 +39,7 @@ import co.elastic.clients.transport.rest_client.RestClientTransport;
public class ElasticsearchTestClient {
- private static final String IMAGE_NAME = "docker.elastic.co/elasticsearch/elasticsearch:8.16.1";
+ private static final String IMAGE_NAME = "docker.elastic.co/elasticsearch/elasticsearch:8.11.3";
private static final String USER = "elastic";
private static final String PASSWORD = "s3cret";
private static final int PORT = 9200;
@@ -57,7 +57,7 @@ public class ElasticsearchTestClient {
}
private static RestClient buildRestClient() {
- var host = new HttpHost("host.docker.internal", ELASTICSEARCH_CONTAINER.getMappedPort(PORT), SCHEME);
+ var host = new HttpHost("localhost", ELASTICSEARCH_CONTAINER.getMappedPort(PORT), SCHEME);
var credentialsProvider = buildCredentialsProvider();
var builder = RestClient.builder(host);
diff --git a/pom.xml b/pom.xml
index e92f9a6..a769f92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId>
- <version>4.6.0</version>
+ <version>4.7.0</version>
</parent>
<groupId>de.ozgcloud</groupId>
@@ -48,6 +48,10 @@
</modules>
<properties>
+ <java.version>17</java.version>
+ <maven.compiler.target>17</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+
<operator-sdk.version>5.4.1</operator-sdk.version>
<!-- tools -->
--
GitLab