Skip to content
Snippets Groups Projects
Commit 7eb8d4e3 authored by OZGCloud's avatar OZGCloud
Browse files

Merge branch 'master' into ozg-5100-customlist-and-networkpolicies

parents 86bc0f9d c8d84362
Branches
Tags
No related merge requests found
pipeline {
agent {
node {
label 'ozgcloud-jenkins-build-agent'
label 'ozgcloud-jenkins-build-agent-jdk21'
}
}
......
......@@ -29,7 +29,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-dependencies</artifactId>
<version>3.0.1</version>
<version>4.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -44,19 +44,16 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<ozgcloud.license.version>1.3.0</ozgcloud.license.version>
<jakarta.interceptor.version>2.1.0</jakarta.interceptor.version>
<jakarta.annotatioin.version>2.1.1</jakarta.annotatioin.version>
<lombok.version>1.18.24</lombok.version>
<keycloak-adapter.version>22.0.5</keycloak-adapter.version>
<lombok.version>1.18.30</lombok.version>
<!-- plugins -->
<maven.compiler.release>17</maven.compiler.release>
<maven.compiler.release>21</maven.compiler.release>
<jandex-maven-plugin-version>1.2.3</jandex-maven-plugin-version>
<compiler-plugin.version>3.8.1</compiler-plugin.version>
<jacoco.plugin.version>0.8.8</jacoco.plugin.version>
<surefire-plugin.version>3.2.2</surefire-plugin.version>
<maven-failsafe-plugin.version>3.2.2</maven-failsafe-plugin.version>
<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
<compiler-plugin.version>3.11.0</compiler-plugin.version>
<jacoco.plugin.version>0.8.11</jacoco.plugin.version>
<surefire-plugin.version>3.2.5</surefire-plugin.version>
<maven-failsafe-plugin.version>3.2.5</maven-failsafe-plugin.version>
<git-commit-id-maven-plugin.version>7.0.0</git-commit-id-maven-plugin.version>
<maven-source.plugin.version>3.3.0</maven-source.plugin.version>
</properties>
......@@ -87,12 +84,12 @@
<dependency>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
<version>${jakarta.interceptor.version}</version>
<version>${jakarta.version}</version>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta.annotatioin.version}</version>
<version>${jakarta.version}</version>
</dependency>
<!-- Mapstruct -->
......@@ -181,9 +178,9 @@
<version>${maven-failsafe-plugin.version}</version>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>${git-commit-id-plugin.version}</version>
<groupId>io.github.git-commit-id</groupId>
<artifactId>git-commit-id-maven-plugin</artifactId>
<version>${git-commit-id-maven-plugin.version}</version>
<executions>
<execution>
<id>get-the-git-infos</id>
......
......@@ -239,8 +239,8 @@
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<groupId>io.github.git-commit-id</groupId>
<artifactId>git-commit-id-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
......
......@@ -25,10 +25,10 @@ package de.ozgcloud.user.sync;
import static io.quarkus.scheduler.Scheduled.ConcurrentExecution.*;
import de.ozgcloud.user.common.lock.LockService;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import de.ozgcloud.user.common.lock.LockService;
import io.quarkus.scheduler.Scheduled;
import lombok.extern.log4j.Log4j2;
......@@ -48,7 +48,7 @@ public class SyncScheduler {
sync(lock.getTimestamp());
} else {
LOG.warn("UserManager: Database is locked, no sync happend.");
LOG.debug("UserManager: Database is locked, no sync happend.");
if (syncLockService.isLockOlderThanADay()) {
LOG.warn("Database lock is older than a day, removing it now");
syncLockService.unlock();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment