This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 30ef4615fa Setting base Docker image for JDK 21
30ef4615fa is described below
commit 30ef4615fa33cd50c673073ee6e756e575e1e8a4
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Thu Oct 12 08:10:31 2023 +0200
Setting base Docker image for JDK 21
---
.../java/org/apache/syncope/core/persistence/jpa/dao/AbstractDAO.java | 3 +--
docker/console/src/main/resources/Dockerfile | 2 +-
docker/core/src/main/resources/Dockerfile | 2 +-
docker/enduser/src/main/resources/Dockerfile | 2 +-
docker/sra/src/main/resources/Dockerfile | 2 +-
docker/wa/src/main/resources/Dockerfile | 2 +-
6 files changed, 6 insertions(+), 7 deletions(-)
diff --git
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractDAO.java
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractDAO.java
index 8a529246e4..b6d30d3002 100644
---
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractDAO.java
+++
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractDAO.java
@@ -41,7 +41,7 @@ public abstract class AbstractDAO<E extends Entity>
implements DAO<E> {
protected static final Logger LOG = LoggerFactory.getLogger(DAO.class);
private static final Map<String, Boolean> IS_ORACLE = new
ConcurrentHashMap<>();
-
+
protected EntityManagerFactory entityManagerFactory() {
return EntityManagerFactoryUtils.findEntityManagerFactory(
ApplicationContextProvider.getBeanFactory(),
AuthContextUtils.getDomain());
@@ -71,7 +71,6 @@ public abstract class AbstractDAO<E extends Entity>
implements DAO<E> {
isOracle = ((MappingRepository) emfspi.getConfiguration()
.getMetaDataRepositoryInstance()).getDBDictionary()
instanceof OracleDictionary;
IS_ORACLE.put(AuthContextUtils.getDomain(), isOracle);
-
}
return isOracle;
}
diff --git a/docker/console/src/main/resources/Dockerfile
b/docker/console/src/main/resources/Dockerfile
index 743b783918..31f4575248 100644
--- a/docker/console/src/main/resources/Dockerfile
+++ b/docker/console/src/main/resources/Dockerfile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-FROM eclipse-temurin:17-focal
+FROM eclipse-temurin:21-jdk-jammy
MAINTAINER [email protected]
RUN set -x
diff --git a/docker/core/src/main/resources/Dockerfile
b/docker/core/src/main/resources/Dockerfile
index 71e0de25b5..a37312b05e 100644
--- a/docker/core/src/main/resources/Dockerfile
+++ b/docker/core/src/main/resources/Dockerfile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-FROM eclipse-temurin:17-focal
+FROM eclipse-temurin:21-jdk-jammy
MAINTAINER [email protected]
RUN set -x
diff --git a/docker/enduser/src/main/resources/Dockerfile
b/docker/enduser/src/main/resources/Dockerfile
index bac4affc10..6d71562060 100644
--- a/docker/enduser/src/main/resources/Dockerfile
+++ b/docker/enduser/src/main/resources/Dockerfile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-FROM eclipse-temurin:17-focal
+FROM eclipse-temurin:21-jdk-jammy
MAINTAINER [email protected]
RUN set -x
diff --git a/docker/sra/src/main/resources/Dockerfile
b/docker/sra/src/main/resources/Dockerfile
index 566a6c9ca2..ba4409d8fc 100644
--- a/docker/sra/src/main/resources/Dockerfile
+++ b/docker/sra/src/main/resources/Dockerfile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-FROM eclipse-temurin:17-focal
+FROM eclipse-temurin:21-jdk-jammy
MAINTAINER [email protected]
RUN set -x
diff --git a/docker/wa/src/main/resources/Dockerfile
b/docker/wa/src/main/resources/Dockerfile
index f5b7c10f4a..b2fabdcc53 100644
--- a/docker/wa/src/main/resources/Dockerfile
+++ b/docker/wa/src/main/resources/Dockerfile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-FROM eclipse-temurin:17-focal
+FROM eclipse-temurin:21-jdk-jammy
MAINTAINER [email protected]
RUN set -x
