diff --git a/recipes/openjdk/all/conanfile.py b/recipes/openjdk/all/conanfile.py index a845a909d6f0e..ff574877f185b 100644 --- a/recipes/openjdk/all/conanfile.py +++ b/recipes/openjdk/all/conanfile.py @@ -13,10 +13,10 @@ class OpenJDK(ConanFile): homepage = "https://jdk.java.net" license = "GPL-2.0-with-classpath-exception" topics = ("java", "jdk", "openjdk") - settings = "os", "arch" + settings = "os", "arch", "compiler", "build_type" no_copy_source = True - def configure(self): + def validate(self): if self.settings.arch != "x86_64": raise ConanInvalidConfiguration("Unsupported Architecture. This package currently only supports x86_64.") if self.settings.os not in ["Windows", "Macos", "Linux"]: diff --git a/recipes/openjdk/all/test_v1_package/conanfile.py b/recipes/openjdk/all/test_v1_package/conanfile.py index 2ca843f3c7b71..e79724dff669e 100644 --- a/recipes/openjdk/all/test_v1_package/conanfile.py +++ b/recipes/openjdk/all/test_v1_package/conanfile.py @@ -2,7 +2,6 @@ from conans.errors import ConanException from io import StringIO -required_conan_version = ">=1.36.0" class TestPackage(ConanFile): @@ -20,7 +19,5 @@ def test(self): self.run("java --version", output=output, run_environment=True) print(output.getvalue) version_info = output.getvalue() - if "openjdk" in version_info: - pass - else: + if "openjdk" not in version_info: raise ConanException("java call seems not use the openjdk bin")