#210 - Migrate to Adoptium temurin. Remove old deprecated repositories

sorobon · sorobon · commit 241a7f0096a4 · 2023-08-14T14:46:07.000+02:00
diff --git a/tasks/install_openjdk.yml b/tasks/install_openjdk.yml
@@ -41,6 +41,7 @@
         repo: "{{ item }}"
         state: absent
       with_items: "{{ java_deprecated_repositories_adoptopenjdk }}"
+      when: java_deprecated_repositories_adoptopenjdk | length > 0
     - name: Java | Install extra apt tools
       package:
         name: "{{ java_open_jdk_apt_extra_packages }}"
diff --git a/vars/corretto/CentOS-8.yml b/vars/corretto/CentOS-8.yml
@@ -12,3 +12,4 @@ __java_open_jdk_package: java-{{ java_open_jdk_version_major }}-amazon-corretto-
 
 __java_open_jdk_home_dir: java-{{ java_open_jdk_version_major }}-amazon-corretto
 __java_open_jdk_home: /usr/lib/jvm/{{ java_open_jdk_home_dir }}
+__java_deprecated_repositories_adoptopenjdk: []
diff --git a/vars/corretto/Debian-10.yml b/vars/corretto/Debian-10.yml
@@ -15,3 +15,4 @@ __java_required_libs_openjdk: []
 __java_open_jdk_package: java-{{ java_open_jdk_version_major }}-amazon-corretto-jdk
 
 __java_open_jdk_home_dir: java-{{ java_open_jdk_version_major }}-amazon-corretto
+__java_deprecated_repositories_adoptopenjdk: []
diff --git a/vars/corretto/Debian-11.yml b/vars/corretto/Debian-11.yml
@@ -16,3 +16,4 @@ __java_required_libs_openjdk: []
 __java_open_jdk_package: java-{{ java_open_jdk_version_major }}-amazon-corretto-jdk
 
 __java_open_jdk_home_dir: java-{{ java_open_jdk_version_major }}-amazon-corretto
+__java_deprecated_repositories_adoptopenjdk: []
diff --git a/vars/corretto/Debian-12.yml b/vars/corretto/Debian-12.yml
@@ -16,3 +16,4 @@ __java_required_libs_openjdk: []
 __java_open_jdk_package: java-{{ java_open_jdk_version_major }}-amazon-corretto-jdk
 
 __java_open_jdk_home_dir: java-{{ java_open_jdk_version_major }}-amazon-corretto
+__java_deprecated_repositories_adoptopenjdk: []
diff --git a/vars/openjdk/CentOS-7.yml b/vars/openjdk/CentOS-7.yml
@@ -11,3 +11,4 @@ __java_required_key_repositories_openjdk: []
 
 __java_open_jdk_package: "java-{{ java_open_jdk_version_major }}-openjdk-headless"
 __java_open_jdk_home_dir: "jre-{{ java_open_jdk_version_major }}"
+__java_deprecated_repositories_adoptopenjdk: []
diff --git a/vars/openjdk/CentOS-8.yml b/vars/openjdk/CentOS-8.yml
@@ -11,3 +11,4 @@ __java_required_key_repositories_openjdk: []
 
 __java_open_jdk_package: "java-{{ java_open_jdk_version_major }}-openjdk-headless"
 __java_open_jdk_home_dir: "jre-{{ java_open_jdk_version_major }}"
+__java_deprecated_repositories_adoptopenjdk: []
diff --git a/vars/openjdk/Debian-10.yml b/vars/openjdk/Debian-10.yml
@@ -11,3 +11,5 @@ __java_required_key_repositories_openjdk: []
 
 __java_open_jdk_package: openjdk-{{ java_open_jdk_version_major }}-jdk-headless
 __java_open_jdk_home_dir: java-{{ java_open_jdk_version_major }}-openjdk-{{ java_open_jdk_home_dir_suffix }}
+__java_deprecated_repositories_adoptopenjdk:
+  - deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ {{ ansible_distribution_release }} main
diff --git a/vars/openjdk/Debian-11.yml b/vars/openjdk/Debian-11.yml
@@ -14,3 +14,5 @@ __java_open_jdk_package: openjdk-{{ java_open_jdk_version_major }}-jdk-headless
 __java_open_jdk_home_dir: java-{{ java_open_jdk_version_major }}-openjdk-{{ java_open_jdk_home_dir_suffix }}
 
 ansible_python_interpreter: /usr/bin/python3
+__java_deprecated_repositories_adoptopenjdk:
+  - deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ {{ ansible_distribution_release }} main
diff --git a/vars/openjdk/Debian-12.yml b/vars/openjdk/Debian-12.yml
@@ -14,3 +14,5 @@ __java_open_jdk_package: openjdk-{{ java_open_jdk_version_major }}-jdk-headless
 __java_open_jdk_home_dir: java-{{ java_open_jdk_version_major }}-openjdk-{{ java_open_jdk_home_dir_suffix }}
 
 ansible_python_interpreter: /usr/bin/python3
+__java_deprecated_repositories_adoptopenjdk:
+  - deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ {{ ansible_distribution_release }} main
diff --git a/vars/openjdk/Debian-9.yml b/vars/openjdk/Debian-9.yml
@@ -11,3 +11,5 @@ __java_required_key_repositories_openjdk: []
 
 __java_open_jdk_package: openjdk-{{ java_open_jdk_version_major }}-jdk-headless
 __java_open_jdk_home_dir: java-{{ java_open_jdk_version_major }}-openjdk-{{ java_open_jdk_home_dir_suffix }}
+__java_deprecated_repositories_adoptopenjdk:
+  - deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ {{ ansible_distribution_release }} main
diff --git a/vars/openjdk/Ubuntu-18.yml b/vars/openjdk/Ubuntu-18.yml
@@ -15,3 +15,4 @@ __java_required_key_repositories_openjdk: []
 
 __java_open_jdk_package: openjdk-{{ java_open_jdk_version_major }}-jdk-headless
 __java_open_jdk_home_dir: java-{{ java_open_jdk_version_major }}-openjdk-{{ java_open_jdk_home_dir_suffix }}
+__java_deprecated_repositories_adoptopenjdk: []
diff --git a/vars/openjdk/Ubuntu-20.yml b/vars/openjdk/Ubuntu-20.yml
@@ -14,3 +14,4 @@ __java_required_key_repositories_openjdk: []
 
 __java_open_jdk_package: openjdk-{{ java_open_jdk_version_major }}-jdk-headless
 __java_open_jdk_home_dir: java-{{ java_open_jdk_version_major }}-openjdk-{{ java_open_jdk_home_dir_suffix }}
+__java_deprecated_repositories_adoptopenjdk: []
diff --git a/vars/openjdk/Ubuntu-22.yml b/vars/openjdk/Ubuntu-22.yml
@@ -14,3 +14,4 @@ __java_required_key_repositories_openjdk: []
 
 __java_open_jdk_package: openjdk-{{ java_open_jdk_version_major }}-jdk-headless
 __java_open_jdk_home_dir: java-{{ java_open_jdk_version_major }}-openjdk-{{ java_open_jdk_home_dir_suffix }}
+__java_deprecated_repositories_adoptopenjdk: []

Original file line number	Diff line number	Diff line change
`@@ -12,3 +12,4 @@ __java_open_jdk_package: java-{{ java_open_jdk_version_major }}-amazon-corretto-`
`12`	`12`
`13`	`13`	`__java_open_jdk_home_dir: java-{{ java_open_jdk_version_major }}-amazon-corretto`
`14`	`14`	`__java_open_jdk_home: /usr/lib/jvm/{{ java_open_jdk_home_dir }}`
	`15`	`+__java_deprecated_repositories_adoptopenjdk: []`
Original file line number	Diff line number	Diff line change
`@@ -15,3 +15,4 @@ __java_required_libs_openjdk: []`
`15`	`15`	`__java_open_jdk_package: java-{{ java_open_jdk_version_major }}-amazon-corretto-jdk`
`16`	`16`
`17`	`17`	`__java_open_jdk_home_dir: java-{{ java_open_jdk_version_major }}-amazon-corretto`
	`18`	`+__java_deprecated_repositories_adoptopenjdk: []`
Original file line number	Diff line number	Diff line change
`@@ -16,3 +16,4 @@ __java_required_libs_openjdk: []`
`16`	`16`	`__java_open_jdk_package: java-{{ java_open_jdk_version_major }}-amazon-corretto-jdk`
`17`	`17`
`18`	`18`	`__java_open_jdk_home_dir: java-{{ java_open_jdk_version_major }}-amazon-corretto`
	`19`	`+__java_deprecated_repositories_adoptopenjdk: []`
Original file line number	Diff line number	Diff line change
`@@ -11,3 +11,4 @@ __java_required_key_repositories_openjdk: []`
`11`	`11`
`12`	`12`	`__java_open_jdk_package: "java-{{ java_open_jdk_version_major }}-openjdk-headless"`
`13`	`13`	`__java_open_jdk_home_dir: "jre-{{ java_open_jdk_version_major }}"`
	`14`	`+__java_deprecated_repositories_adoptopenjdk: []`