From e125ba6c79275f2b10cba651a713d4a8e253326b Mon Sep 17 00:00:00 2001
From: Makhtar DIAGNE <makhtar.diagne@teamdlab.com>
Date: Mon, 4 May 2020 14:59:03 +0200
Subject: [PATCH] [TECH] RPM update jdk from 1.8 to 11
---
cots/vitamui-logstash/Makefile | 2 +-
cots/vitamui-logstash/pom.xml | 2 +-
pom.xml | 2 +-
tools/docker/centos/Dockerfile | 2 +-
tools/docker/vitamui-base/Dockerfile | 2 +-
ui/ui-identity/pom.xml | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/cots/vitamui-logstash/Makefile b/cots/vitamui-logstash/Makefile
index f5bf6c39..dc4955ca 100644
--- a/cots/vitamui-logstash/Makefile
+++ b/cots/vitamui-logstash/Makefile
@@ -7,7 +7,7 @@
NAME := logstash
VERSION := 0.0.0
LOGSTASH_VERSION := 6.4.2
-DEPENDENCIES := systemd,java-1.8.0-openjdk
+DEPENDENCIES := systemd,java-11-openjdk
# Src configuration:
diff --git a/cots/vitamui-logstash/pom.xml b/cots/vitamui-logstash/pom.xml
index a35fc830..3bb3f6d3 100644
--- a/cots/vitamui-logstash/pom.xml
+++ b/cots/vitamui-logstash/pom.xml
@@ -51,7 +51,7 @@
If you want to changes default dependencies (only systemd), define them as a
comma separated list of packages
-->
- <argument>DEPENDENCIES=systemd,java-1.8.0-openjdk</argument>
+ <argument>DEPENDENCIES=systemd,java-11-openjdk</argument>
</arguments>
</configuration>
</execution>
diff --git a/pom.xml b/pom.xml
index 5e0585d9..36d2f5e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1320,7 +1320,7 @@
<argument>USER=vitamui</argument>
<!-- If you want to changes default dependencies (only systemd),
define them as a comma separated list of packages -->
- <argument>DEPENDENCIES=systemd,java-1.8.0-openjdk</argument>
+ <argument>DEPENDENCIES=systemd,java-11-openjdk</argument>
</arguments>
</configuration>
</execution>
diff --git a/tools/docker/centos/Dockerfile b/tools/docker/centos/Dockerfile
index f6ca750d..69a5fd00 100644
--- a/tools/docker/centos/Dockerfile
+++ b/tools/docker/centos/Dockerfile
@@ -31,7 +31,7 @@ RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == system
################################ Install build tools (rpm / maven / java) ###############################
RUN yum install -y \
- java-1.8.0-openjdk-devel \
+ java-11-openjdk-devel \
rpm-build \
rpmdevtools \
initscripts.x86_64 \
diff --git a/tools/docker/vitamui-base/Dockerfile b/tools/docker/vitamui-base/Dockerfile
index 8f2764b2..c0ca42eb 100644
--- a/tools/docker/vitamui-base/Dockerfile
+++ b/tools/docker/vitamui-base/Dockerfile
@@ -31,7 +31,7 @@ RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == system
################################ Install build tools (rpm / maven / java) ###############################
RUN yum install -y \
- java-1.8.0-openjdk-devel \
+ java-11-openjdk-devel \
rpm-build \
rpmdevtools \
initscripts.x86_64 \
diff --git a/ui/ui-identity/pom.xml b/ui/ui-identity/pom.xml
index 2a3d49ab..209a522b 100644
--- a/ui/ui-identity/pom.xml
+++ b/ui/ui-identity/pom.xml
@@ -285,7 +285,7 @@
If you want to changes default dependencies (only systemd), define them as a
comma separated list of packages
-->
- <argument>DEPENDENCIES=systemd,java-1.8.0-openjdk</argument>
+ <argument>DEPENDENCIES=systemd,java-11-openjdk</argument>
</arguments>
</configuration>
</execution>
--
GitLab