diff --git a/Jenkinsfile b/Jenkinsfile index 178d7c92ca96faee73cf746d6939fa4c3e174720..1ca43547bb6dbd75a259584604503af4f8db1ee8 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 28e63d558c65a2ac14e1396af5d2f16120284d9b..46f884e170556cce243b4cc2eb6bd0696334cde0 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 e92f9a6fade39150b5a941ab2123e8ba9978c5e3..a769f929307e4ee6d74e3280d04e88edc7a11ca8 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 -->