From 8d67279181f81f6053659a79f013b1f6266e3f70 Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Thu, 25 Jun 2020 05:43:30 +0200 Subject: openjdk and jdk: extend the list of provided versions of java (#17151) --- var/spack/repos/builtin/packages/jdk/package.py | 1 + var/spack/repos/builtin/packages/openjdk/package.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/jdk/package.py b/var/spack/repos/builtin/packages/jdk/package.py index 92af25ae9b..a90ddff904 100644 --- a/var/spack/repos/builtin/packages/jdk/package.py +++ b/var/spack/repos/builtin/packages/jdk/package.py @@ -60,6 +60,7 @@ class Jdk(Package): url='https://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.tar.gz') provides('java@14', when='@14.0:14.999') + provides('java@13', when='@13.0:13.999') provides('java@12', when='@12.0:12.999') provides('java@11', when='@11.0:11.999') provides('java@10', when='@10.0:10.999') diff --git a/var/spack/repos/builtin/packages/openjdk/package.py b/var/spack/repos/builtin/packages/openjdk/package.py index 1ad068936c..9b520ded99 100644 --- a/var/spack/repos/builtin/packages/openjdk/package.py +++ b/var/spack/repos/builtin/packages/openjdk/package.py @@ -44,8 +44,10 @@ class Openjdk(Package): if pkg: version(ver, sha256=pkg[0], url=pkg[1]) - provides('java@8', when='@1.8.0:1.8.999') provides('java@11', when='@11.0:11.99') + provides('java@10', when='@10.0:10.99') + provides('java@9', when='@9.0:9.99') + provides('java@8', when='@1.8.0:1.8.999') conflicts('target=ppc64:', msg='openjdk is only available for x86_64 and aarch64') conflicts('target=ppc64le:', msg='openjdk is only available for x86_64 and aarch64') -- cgit v1.2.3-60-g2f50