Merge pull request #724 from ystia/feature/GH-723-A4C-3-2-0

Bootstrap A4C 3.2.0 / JDK 15
ystia · Apr 21, 2021 · c747889 · c747889
2 parents caa9563 + 7628d0e
commit c747889
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## UNRELEASED
 
+### ENHANCEMENTS
+
+* Support Alien4Cloud 3.2.0 ([GH-723](https://github.com/ystia/yorc/issues/723))
+
+
 ## 4.1.0 (April 11, 2021)
 
 ### DEPENDENCIES

diff --git a/commands/bootstrap/inputs.go b/commands/bootstrap/inputs.go
@@ -178,11 +178,11 @@ var (
 	jdkDefaultInputs = map[string]defaultInputType{
 		"jdk.download_url": defaultInputType{
 			description: "Java Development Kit download URL",
-			value:       "https://api.adoptopenjdk.net/v2/binary/releases/openjdk8?openjdk_impl=hotspot&os=linux&arch=x64&release=jdk8u212-b03&type=jdk",
+			value:       "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz",
 		},
 		"jdk.version": defaultInputType{
-			description: "Java Development Kit version",
-			value:       "1.8.0-212-b03",
+			description: "OpenJDK version",
+			value:       "15.0.2",
 		},
 	}
 

diff --git a/commands/bootstrap/resources/topology/tosca_types.zip b/commands/bootstrap/resources/topology/tosca_types.zip
diff --git a/versions.yaml b/versions.yaml
@@ -1,6 +1,6 @@
 yorc_version: 4.2.0-SNAPSHOT
 # Alien4Cloud version used by the bootstrap as the default version to download/install
-alien4cloud_version: 3.0.0-M8
+alien4cloud_version: 3.2.0
 consul_version: 1.2.3
 terraform_version: 0.11.8
 ansible_version: 2.10.0