Upgrade Conan to fix a certificate issue

See conan-io/conan#9695. Signed-off-by: Sebastian Schuberth <sebastian.schuberth@bosch.io>
oss-review-toolkit · Oct 1, 2021 · b6ea323 · b6ea323
1 parent 7b08086
commit b6ea323
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
@@ -18,7 +18,7 @@ variables:
   BOWER_VERSION: 1.8.8
   BUNDLER_VERSION: 2.1.4
   COMPOSER_VERSION: 5.1.0 # The version refers to the installer, not to Composer.
-  CONAN_VERSION: 1.18.0
+  CONAN_VERSION: 1.40.3
   GO_DEP_VERSION: 0.5.4
   PYTHON_PIPENV_VERSION: 2018.11.26
   RUST_VERSION: 1.35.0

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,7 @@
 # syntax=docker/dockerfile:1.2
 
 # Copyright (C) 2020 Bosch Software Innovations GmbH
+# Copyright (C) 2021 Bosch.IO GmbH
 # Copyright (C) 2021 Alliander N.V.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -51,7 +52,7 @@ ENV \
     BUNDLER_VERSION=1.16.1-1 \
     CARGO_VERSION=0.52.0-0ubuntu1~18.04.1 \
     COMPOSER_VERSION=1.6.3-1 \
-    CONAN_VERSION=1.18.0 \
+    CONAN_VERSION=1.40.3 \
     GO_DEP_VERSION=0.5.4 \
     GO_VERSION=1.16.5 \
     HASKELL_STACK_VERSION=2.1.3 \