diff --git a/Jenkinsfile b/Jenkinsfile
index 23fee205c342e9e7f78d969c673b0047416c0ecc..23aa689bb7218b8abc18fc9fc078b6c60eb8f684 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,7 +33,7 @@ pipeline {
def parentPom = readMavenPom file: 'ozgcloud-common-parent/pom.xml'
def parentVersion = parentPom.version
- if(env.BRANCH_NAME == 'release' || env.BRANCH_NAME == 'release-v4'){
+ if(env.BRANCH_NAME == 'release'){
if ( !(rootVersion ==~ RELEASE_REGEX) || !(dependenciesVersion ==~ RELEASE_REGEX) || !(parentVersion ==~ RELEASE_REGEX)) {
error("Keine Release Version für Branch ${env.BRANCH_NAME}.")
}
@@ -95,8 +95,6 @@ pipeline {
anyOf {
branch 'master'
branch 'release'
- branch 'Version-4'
- branch 'release-v4'
}
}
steps {
@@ -112,7 +110,7 @@ pipeline {
post {
failure {
script {
- if (env.BRANCH_NAME == 'master' || env.BRANCH_NAME == 'release' || env.BRANCH_NAME == 'release-v4') {
+ if (env.BRANCH_NAME == 'master' || env.BRANCH_NAME == 'release') {
sendFailureMessage()
}
}
@@ -130,7 +128,7 @@ Void sendFailureMessage() {
if (env.BRANCH_NAME == 'master') {
room = "!iQPAvQIiRwRpNOszjw:matrix.ozg-sh.de"
}
- else if (env.BRANCH_NAME == 'release' || env.BRANCH_NAME == 'release-v4') {
+ else if (env.BRANCH_NAME == 'release') {
room = "!oWZpUGTFsxkJIYNfYg:matrix.ozg-sh.de"
}
diff --git a/README.md b/README.md
index 8eaf801024268b4ff420d58a7fddd4f4b692c340..7df10dd227b2b83347e86ce0c81765df06e2a5a9 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,11 @@
## Changelog
+### 4.3.0
+
+### 4.2.0
+* Update to Spring-Boot 3.2.6 / Spring 6.1.8
+
### 4.1.0
### 4.0.1
diff --git a/jenkins/docker-compose.yml b/jenkins/docker-compose.yml
deleted file mode 100644
index 6fe7a1a22bb0c0df2c4f7614e4199b21fb0e6ec5..0000000000000000000000000000000000000000
--- a/jenkins/docker-compose.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-version: "3"
-
-services:
- jenkins:
- container_name: jenkins
- image: jenkins/jenkins:lts-jdk11
- restart: always
- ports:
- - 8088:8080
- - 50000:50000
- volumes:
- - /home/services/jenkins/jenkins_home:/var/jenkins_home
\ No newline at end of file
diff --git a/jenkins/jenkins-build-agent-jdk-11/Dockerfile b/jenkins/jenkins-build-agent-jdk-11/Dockerfile
deleted file mode 100644
index cf0feb338ec2bf4eda23b59124cbff8777408205..0000000000000000000000000000000000000000
--- a/jenkins/jenkins-build-agent-jdk-11/Dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-FROM ubuntu:22.04
-
-ARG MAVEN_VERSION=3.8.6
-ARG OPENJDK_VERSION=11
-
-ENV LANG C.UTF-8
-
-RUN apt update \
- && apt upgrade -y \
- && apt install -y \
- git \
- openjdk-${OPENJDK_VERSION}-jdk \
- wget \
- xz-utils \
- openssh-server \
- podman \
- curl \
- maven \
- unzip
-
-ENV MAVEN_HOME /usr/share/maven
-ENV MAVEN_CONFIG "/root/.m2"
-
-RUN wget https://get.docker.com -O get-docker.sh \
- && chmod +x get-docker.sh \
- && ./get-docker.sh \
- && rm get-docker.sh
-
-RUN mkdir /run/sshd
-
-RUN wget https://github.com/jeremylong/DependencyCheck/releases/download/v8.2.1/dependency-check-8.2.1-release.zip -O dependency-check.zip \
- && unzip dependency-check.zip \
- && mkdir /dependency-check-data \
- && dependency-check/bin/dependency-check.sh -d /dependency-check-data --updateonly
-
-EXPOSE 22
-
-CMD ["/usr/sbin/sshd", "-D"]
\ No newline at end of file
diff --git a/jenkins/jenkins-build-agent-jdk-11/readme.md b/jenkins/jenkins-build-agent-jdk-11/readme.md
deleted file mode 100644
index 94a786a6fe798311a0ff94249df373c47988794e..0000000000000000000000000000000000000000
--- a/jenkins/jenkins-build-agent-jdk-11/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-# Image bauen
-
- docker build -t docker.ozg-sh.de/jenkins-build-agent-jdk-11 .
-
-# push
-
- docker push docker.ozg-sh.de/jenkins-build-agent-jdk-11
-
diff --git a/jenkins/jenkins-build-agent/Dockerfile b/jenkins/jenkins-build-agent/Dockerfile
deleted file mode 100644
index fa93c03807b3a7732fd45cdcf9fe23d4c68cda9c..0000000000000000000000000000000000000000
--- a/jenkins/jenkins-build-agent/Dockerfile
+++ /dev/null
@@ -1,75 +0,0 @@
-FROM ubuntu:22.04
-
-ARG MAVEN_VERSION=3.8.8
-ARG OPENJDK_VERSION=17
-ARG NODEJS_VERSION=v18.18.2
-ARG KUBECTL_VERSION=v1.25.0
-ARG HELM_VERSION=3
-ARG HELM_UNITTEST_VERSION=0.2.11
-
-ENV LANG C.UTF-8
-
-RUN apt update \
- && apt upgrade -y \
- && apt install -y \
- git \
- openjdk-${OPENJDK_VERSION}-jdk \
- wget \
- xz-utils \
- openssh-server \
- python3-pip \
- podman \
- curl \
- lsof \
- libgtk2.0-0 \
- libgtk-3-0 \
- libgbm-dev \
- libnotify-dev \
- libgconf-2-4 \
- libnss3 \
- libxss1 \
- libasound2 \
- libxtst6 \
- xauth \
- xvfb \
- unzip \
- jq
-
-RUN mkdir -p /usr/share/maven \
- && wget https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz -O /tmp/maven.tar.gz \
- && tar -xzf /tmp/maven.tar.gz -C /usr/share/maven --strip-components=1 \
- && rm -f /tmp/maven.tar.gz \
- && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn
-
-ENV MAVEN_HOME /usr/share/maven
-ENV MAVEN_CONFIG "/root/.m2"
-
-RUN wget https://nodejs.org/dist/${NODEJS_VERSION}/node-${NODEJS_VERSION}-linux-x64.tar.xz -O /tmp/nodejs.tar.xz \
- && tar -xJf "/tmp/nodejs.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
- && ln -s /usr/local/bin/node /usr/local/bin/nodejs
-
-RUN wget https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl -O /usr/local/bin/kubectl \
- && chmod 755 /usr/local/bin/kubectl
-
-RUN wget https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-${HELM_VERSION} -O get-helm.sh \
- && chmod +x get-helm.sh \
- && ./get-helm.sh \
- && rm get-helm.sh
-
-RUN helm plugin install https://github.com/quintush/helm-unittest --version=${HELM_UNITTEST_VERSION}
-
-RUN wget https://get.docker.com -O get-docker.sh \
- && chmod +x get-docker.sh \
- && ./get-docker.sh \
- && rm get-docker.sh
-
-RUN mkdir /run/sshd
-
-RUN wget https://github.com/jeremylong/DependencyCheck/releases/download/v8.2.1/dependency-check-8.2.1-release.zip -O dependency-check.zip \
- && unzip dependency-check.zip \
- && mkdir /dependency-check-data \
- && dependency-check/bin/dependency-check.sh -d /dependency-check-data --updateonly
-
-EXPOSE 22
-
-CMD ["/usr/sbin/sshd", "-D"]
\ No newline at end of file
diff --git a/jenkins/jenkins-build-agent/readme.md b/jenkins/jenkins-build-agent/readme.md
deleted file mode 100644
index e30ca9e2519cac0238b5af4e74e553bff3a8af6e..0000000000000000000000000000000000000000
--- a/jenkins/jenkins-build-agent/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# Image bauen
-
- docker build -t docker.ozg-sh.de/jenkins-build-agent:node-18-18-2 .
-
-# push
-
- docker push docker.ozg-sh.de/jenkins-build-agent:node-18-18-2
-
\ No newline at end of file
diff --git a/jenkins/jenkins-lasttest-agent/Dockerfile b/jenkins/jenkins-lasttest-agent/Dockerfile
deleted file mode 100644
index 78c9456b067977e4a75ce35d42528f40adc87a11..0000000000000000000000000000000000000000
--- a/jenkins/jenkins-lasttest-agent/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM ubuntu:22.04
-
-ARG K6_VERSION=v0.42.0
-ARG OPENJDK_VERSION=17
-ARG KUBECTL_VERSION=v1.25.0
-
-ENV LANG C.UTF-8
-
-RUN apt update \
- && apt upgrade -y \
- && apt install -y \
- git \
- openjdk-${OPENJDK_VERSION}-jdk \
- wget \
- openssh-server
-
-ADD lets-encrypt-staging-root-certs/*.crt /usr/local/share/ca-certificates/
-RUN update-ca-certificates --fresh
-
-RUN wget https://github.com/grafana/k6/releases/download/${K6_VERSION}/k6-${K6_VERSION}-linux-amd64.tar.gz -O /tmp/k6.tar.gz \
- && tar -xzf /tmp/k6.tar.gz -C /usr/share --strip-components=1 \
- && ln -s /usr/share/k6 /usr/bin/k6
-
-RUN wget https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl -O /usr/local/bin/kubectl \
- && chmod 755 /usr/local/bin/kubectl
-
-RUN mkdir /run/sshd
-
-EXPOSE 22
-
-CMD ["/usr/sbin/sshd", "-D"]
\ No newline at end of file
diff --git a/jenkins/jenkins-lasttest-agent/lets-encrypt-staging-root-certs/letsencrypt-stg-root-x1.crt b/jenkins/jenkins-lasttest-agent/lets-encrypt-staging-root-certs/letsencrypt-stg-root-x1.crt
deleted file mode 100644
index 37655b25dbc8fb00289fe964a41a290c38b0e285..0000000000000000000000000000000000000000
--- a/jenkins/jenkins-lasttest-agent/lets-encrypt-staging-root-certs/letsencrypt-stg-root-x1.crt
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFmDCCA4CgAwIBAgIQU9C87nMpOIFKYpfvOHFHFDANBgkqhkiG9w0BAQsFADBm
-MQswCQYDVQQGEwJVUzEzMDEGA1UEChMqKFNUQUdJTkcpIEludGVybmV0IFNlY3Vy
-aXR5IFJlc2VhcmNoIEdyb3VwMSIwIAYDVQQDExkoU1RBR0lORykgUHJldGVuZCBQ
-ZWFyIFgxMB4XDTE1MDYwNDExMDQzOFoXDTM1MDYwNDExMDQzOFowZjELMAkGA1UE
-BhMCVVMxMzAxBgNVBAoTKihTVEFHSU5HKSBJbnRlcm5ldCBTZWN1cml0eSBSZXNl
-YXJjaCBHcm91cDEiMCAGA1UEAxMZKFNUQUdJTkcpIFByZXRlbmQgUGVhciBYMTCC
-AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALbagEdDTa1QgGBWSYkyMhsc
-ZXENOBaVRTMX1hceJENgsL0Ma49D3MilI4KS38mtkmdF6cPWnL++fgehT0FbRHZg
-jOEr8UAN4jH6omjrbTD++VZneTsMVaGamQmDdFl5g1gYaigkkmx8OiCO68a4QXg4
-wSyn6iDipKP8utsE+x1E28SA75HOYqpdrk4HGxuULvlr03wZGTIf/oRt2/c+dYmD
-oaJhge+GOrLAEQByO7+8+vzOwpNAPEx6LW+crEEZ7eBXih6VP19sTGy3yfqK5tPt
-TdXXCOQMKAp+gCj/VByhmIr+0iNDC540gtvV303WpcbwnkkLYC0Ft2cYUyHtkstO
-fRcRO+K2cZozoSwVPyB8/J9RpcRK3jgnX9lujfwA/pAbP0J2UPQFxmWFRQnFjaq6
-rkqbNEBgLy+kFL1NEsRbvFbKrRi5bYy2lNms2NJPZvdNQbT/2dBZKmJqxHkxCuOQ
-FjhJQNeO+Njm1Z1iATS/3rts2yZlqXKsxQUzN6vNbD8KnXRMEeOXUYvbV4lqfCf8
-mS14WEbSiMy87GB5S9ucSV1XUrlTG5UGcMSZOBcEUpisRPEmQWUOTWIoDQ5FOia/
-GI+Ki523r2ruEmbmG37EBSBXdxIdndqrjy+QVAmCebyDx9eVEGOIpn26bW5LKeru
-mJxa/CFBaKi4bRvmdJRLAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMB
-Af8EBTADAQH/MB0GA1UdDgQWBBS182Xy/rAKkh/7PH3zRKCsYyXDFDANBgkqhkiG
-9w0BAQsFAAOCAgEAncDZNytDbrrVe68UT6py1lfF2h6Tm2p8ro42i87WWyP2LK8Y
-nLHC0hvNfWeWmjZQYBQfGC5c7aQRezak+tHLdmrNKHkn5kn+9E9LCjCaEsyIIn2j
-qdHlAkepu/C3KnNtVx5tW07e5bvIjJScwkCDbP3akWQixPpRFAsnP+ULx7k0aO1x
-qAeaAhQ2rgo1F58hcflgqKTXnpPM02intVfiVVkX5GXpJjK5EoQtLceyGOrkxlM/
-sTPq4UrnypmsqSagWV3HcUlYtDinc+nukFk6eR4XkzXBbwKajl0YjztfrCIHOn5Q
-CJL6TERVDbM/aAPly8kJ1sWGLuvvWYzMYgLzDul//rUF10gEMWaXVZV51KpS9DY/
-5CunuvCXmEQJHo7kGcViT7sETn6Jz9KOhvYcXkJ7po6d93A/jy4GKPIPnsKKNEmR
-xUuXY4xRdh45tMJnLTUDdC9FIU0flTeO9/vNpVA8OPU1i14vCz+MU8KX1bV3GXm/
-fxlB7VBBjX9v5oUep0o/j68R/iDlCOM4VVfRa8gX6T2FU7fNdatvGro7uQzIvWof
-gN9WUwCbEMBy/YhBSrXycKA8crgGg3x1mIsopn88JKwmMBa68oS7EHM9w7C4y71M
-7DiA+/9Qdp9RBWJpTS9i/mDnJg1xvo8Xz49mrrgfmcAXTCJqXi24NatI3Oc=
------END CERTIFICATE-----
diff --git a/jenkins/jenkins-lasttest-agent/lets-encrypt-staging-root-certs/letsencrypt-stg-root-x2.crt b/jenkins/jenkins-lasttest-agent/lets-encrypt-staging-root-certs/letsencrypt-stg-root-x2.crt
deleted file mode 100644
index f627e1d568d6010aaeb5d4af8b620c2cc4cfe493..0000000000000000000000000000000000000000
--- a/jenkins/jenkins-lasttest-agent/lets-encrypt-staging-root-certs/letsencrypt-stg-root-x2.crt
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICTjCCAdSgAwIBAgIRAIPgc3k5LlLVLtUUvs4K/QcwCgYIKoZIzj0EAwMwaDEL
-MAkGA1UEBhMCVVMxMzAxBgNVBAoTKihTVEFHSU5HKSBJbnRlcm5ldCBTZWN1cml0
-eSBSZXNlYXJjaCBHcm91cDEkMCIGA1UEAxMbKFNUQUdJTkcpIEJvZ3VzIEJyb2Nj
-b2xpIFgyMB4XDTIwMDkwNDAwMDAwMFoXDTQwMDkxNzE2MDAwMFowaDELMAkGA1UE
-BhMCVVMxMzAxBgNVBAoTKihTVEFHSU5HKSBJbnRlcm5ldCBTZWN1cml0eSBSZXNl
-YXJjaCBHcm91cDEkMCIGA1UEAxMbKFNUQUdJTkcpIEJvZ3VzIEJyb2Njb2xpIFgy
-MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEOvS+w1kCzAxYOJbA06Aw0HFP2tLBLKPo
-FQqR9AMskl1nC2975eQqycR+ACvYelA8rfwFXObMHYXJ23XLB+dAjPJVOJ2OcsjT
-VqO4dcDWu+rQ2VILdnJRYypnV1MMThVxo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
-VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU3tGjWWQOwZo2o0busBB2766XlWYwCgYI
-KoZIzj0EAwMDaAAwZQIwRcp4ZKBsq9XkUuN8wfX+GEbY1N5nmCRc8e80kUkuAefo
-uc2j3cICeXo1cOybQ1iWAjEA3Ooawl8eQyR4wrjCofUE8h44p0j7Yl/kBlJZT8+9
-vbtH7QiVzeKCOTQPINyRql6P
------END CERTIFICATE-----
diff --git a/jenkins/jenkins-lasttest-agent/readme.md b/jenkins/jenkins-lasttest-agent/readme.md
deleted file mode 100644
index 40c9e9cbed624066df5777d1cea8b5b044f1be68..0000000000000000000000000000000000000000
--- a/jenkins/jenkins-lasttest-agent/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Image bauen
-
-`docker build -t docker.ozg-sh.de/jenkins-lasttest-agent:v0.42.0-kubectl-staging-ca .`
-
-# push
-
-`docker push docker.ozg-sh.de/jenkins-lasttest-agent:v0.42.0-kubectl-staging-ca`
\ No newline at end of file
diff --git a/jenkins/jenkins-quarkus-build-agent/Dockerfile b/jenkins/jenkins-quarkus-build-agent/Dockerfile
deleted file mode 100644
index 11c33750ec57d99962e1496ad7c325c4eb7352a6..0000000000000000000000000000000000000000
--- a/jenkins/jenkins-quarkus-build-agent/Dockerfile
+++ /dev/null
@@ -1,40 +0,0 @@
-FROM ubuntu:22.04
-
-ARG OPENJDK_VERSION=17
-ARG HELM_VERSION=3
-ARG HELM_UNITTEST_VERSION=0.2.11
-
-ENV LANG C.UTF-8
-
-RUN apt update \
- && apt upgrade -y \
- && apt install -y \
- git \
- openjdk-${OPENJDK_VERSION}-jdk \
- wget \
- curl \
- openssh-server \
- unzip
-
-RUN wget https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-${HELM_VERSION} -O get-helm.sh \
- && chmod +x get-helm.sh \
- && ./get-helm.sh \
- && rm get-helm.sh
-
-RUN helm plugin install https://github.com/quintush/helm-unittest --version=${HELM_UNITTEST_VERSION}
-
-RUN wget https://get.docker.com -O get-docker.sh \
- && chmod +x get-docker.sh \
- && ./get-docker.sh \
- && rm get-docker.sh
-
-RUN mkdir /run/sshd
-
-RUN wget https://github.com/jeremylong/DependencyCheck/releases/download/v8.2.1/dependency-check-8.2.1-release.zip -O dependency-check.zip \
- && unzip dependency-check.zip \
- && mkdir /dependency-check-data \
- && dependency-check/bin/dependency-check.sh -d /dependency-check-data --updateonly
-
-EXPOSE 22
-
-CMD ["/usr/sbin/sshd", "-D"]
\ No newline at end of file
diff --git a/jenkins/jenkins-quarkus-build-agent/readme.md b/jenkins/jenkins-quarkus-build-agent/readme.md
deleted file mode 100644
index ba5611b08f8456632094a064356151ba0469d2be..0000000000000000000000000000000000000000
--- a/jenkins/jenkins-quarkus-build-agent/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Image bauen
-
- docker build -t docker.ozg-sh.de/jenkins-quarkus-build-agent .
-
-# push
-
- docker push docker.ozg-sh.de/jenkins-quarkus-build-agent
diff --git a/ozgcloud-common-dependencies/pom.xml b/ozgcloud-common-dependencies/pom.xml
index f408458851c784937ee3f9b07f862829ae1b140b..231a8fdd142bdbf57e77e50cd7022e4c78eba1ed 100644
--- a/ozgcloud-common-dependencies/pom.xml
+++ b/ozgcloud-common-dependencies/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>ozgcloud-common-dependencies</artifactId>
@@ -47,8 +47,8 @@
<maven.compiler.target>${java.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <spring-boot.version>3.2.4</spring-boot.version>
- <spring.version>6.1.5</spring.version>
+ <spring-boot.version>3.2.6</spring-boot.version>
+ <spring.version>6.1.8</spring.version>
<grpc.spring-boot-starter.version>5.0.0</grpc.spring-boot-starter.version>
diff --git a/ozgcloud-common-lib/pom.xml b/ozgcloud-common-lib/pom.xml
index 220fe4c8d54f02d056884afca88c549350dc4ce2..9a88b534b385eb9e7a20297549291d12024a22d0 100644
--- a/ozgcloud-common-lib/pom.xml
+++ b/ozgcloud-common-lib/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>ozgcloud-common-lib</artifactId>
diff --git a/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/logging/logger/AspectLogger.java b/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/logging/logger/AspectLogger.java
index 1f060fd284cbc04298c02a8b3b44ea72d29c51fc..3e1df9813e1d004fa55c50f255399860ededd7b5 100644
--- a/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/logging/logger/AspectLogger.java
+++ b/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/logging/logger/AspectLogger.java
@@ -23,9 +23,12 @@
*/
package de.ozgcloud.common.logging.logger;
+import org.apache.commons.lang3.ArrayUtils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.reflect.MethodSignature;
+import java.util.Optional;
+
public class AspectLogger extends CommonLogger<JoinPoint> {
public AspectLogger(JoinPoint joinPoint) {
@@ -39,7 +42,7 @@ public class AspectLogger extends CommonLogger<JoinPoint> {
@Override
String[] getParameterNames() {
- return getSignature().getParameterNames();
+ return Optional.ofNullable(getSignature()).map(MethodSignature::getParameterNames).orElse(ArrayUtils.EMPTY_STRING_ARRAY);
}
@Override
diff --git a/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/logging/logger/InterceptingLogger.java b/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/logging/logger/InterceptingLogger.java
index 349866f276437b4fb47d42e6cd9efa02ec014a0e..daba25500838ebd6c7a635cf1cfd002586bc933f 100644
--- a/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/logging/logger/InterceptingLogger.java
+++ b/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/logging/logger/InterceptingLogger.java
@@ -24,9 +24,12 @@
package de.ozgcloud.common.logging.logger;
import jakarta.interceptor.InvocationContext;
+import lombok.NonNull;
+import org.apache.commons.lang3.ArrayUtils;
import java.util.Arrays;
import java.util.Objects;
+import java.util.Optional;
public class InterceptingLogger extends CommonLogger<InvocationContext> {
@@ -41,7 +44,11 @@ public class InterceptingLogger extends CommonLogger<InvocationContext> {
@Override
String[] getParameterNames() {
- return Arrays.stream(logContext.getParameters())
+ return Optional.ofNullable(logContext.getParameters()).map(this::mapParameters).orElse(ArrayUtils.EMPTY_STRING_ARRAY);
+ }
+
+ private String[] mapParameters(@NonNull Object[] parameters) {
+ return Arrays.stream(parameters)
.filter(Objects::nonNull)
.map(param -> param.getClass().getSimpleName())
.toArray(String[]::new);
diff --git a/ozgcloud-common-parent/pom.xml b/ozgcloud-common-parent/pom.xml
index 22469416ce0085d6ed3766a7bb492f74f5cb5f4f..2f0676d1eafe80e8a6cc6d26e988f912d9107fe5 100644
--- a/ozgcloud-common-parent/pom.xml
+++ b/ozgcloud-common-parent/pom.xml
@@ -31,13 +31,13 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>3.2.4</version>
+ <version>3.2.6</version>
<relativePath />
</parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>OzgCloud Common - Parent</name>
@@ -48,11 +48,11 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <ozgcloud-common.version>4.1.0-SNAPSHOT</ozgcloud-common.version>
+ <ozgcloud-common.version>4.1.0</ozgcloud-common.version>
<ozgcloud.license.version>1.3.0</ozgcloud.license.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
- <spring-boot.version>3.2.4</spring-boot.version>
+ <spring-boot.version>3.2.6</spring-boot.version>
<!-- plugins -->
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
diff --git a/ozgcloud-common-pdf/pom.xml b/ozgcloud-common-pdf/pom.xml
index 86737122d8a4a1329d233bbdce9c187b949fe9fd..62413a61e3c7ce02ffbecf0f71c675cb52d20b2c 100644
--- a/ozgcloud-common-pdf/pom.xml
+++ b/ozgcloud-common-pdf/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-dependencies</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../ozgcloud-common-dependencies</relativePath>
</parent>
<artifactId>ozgcloud-common-pdf</artifactId>
diff --git a/ozgcloud-common-test/pom.xml b/ozgcloud-common-test/pom.xml
index dce2f4dd04f39c609068e7433b2bf9e42f9dc218..f9338b8bb117d07bf37ae0f72ac2261dceb08741 100644
--- a/ozgcloud-common-test/pom.xml
+++ b/ozgcloud-common-test/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-dependencies</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../ozgcloud-common-dependencies</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index b689ef2b2b48f209098164040fbb4277a8114b35..a32b0d08f84f8297b9c562333d662d312ad1bac1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>OzgCloud Common</name>
@@ -45,7 +45,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <ozgcloud-common.version>4.1.0-SNAPSHOT</ozgcloud-common.version>
+ <ozgcloud-common.version>4.3.0-SNAPSHOT</ozgcloud-common.version>
<ozgcloud.license.version>1.3.0</ozgcloud.license.version>
<java.version>21</java.version>