diff --git a/scripts/reset-cli.sh b/scripts/reset-cli.sh deleted file mode 100755 index 230798d..0000000 --- a/scripts/reset-cli.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -desired_spring_boot_cli_version="$(cat target/boot_cli_version)" -desired_spring_cloud_cli_version="$(cat target/cloud_cli_version)" - -source ~/.sdkman/bin/sdkman-init.sh - -echo "Use Boot CLI in version ${desired_spring_boot_cli_version}" -sdk use springboot "${desired_spring_boot_cli_version}" -echo "Use Cloud CLI in version ${desired_spring_cloud_cli_version}" -spring install org.springframework.cloud:spring-cloud-cli:"${desired_spring_cloud_cli_version}" \ No newline at end of file diff --git a/scripts/set-cli.sh b/scripts/set-cli.sh deleted file mode 100755 index 03121c4..0000000 --- a/scripts/set-cli.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/env bash - -desired_spring_boot_cli_version="${1}" -desired_spring_cloud_cli_version="${2}" - -echo -e "\nCheck if sdkman is installed" -SDK_INSTALLED="no" -[[ -s "${HOME}/.sdkman/bin/sdkman-init.sh" ]] && yes | source "${HOME}/.sdkman/bin/sdkman-init.sh" || echo "Failed to source sdkman" -sdk version && SDK_INSTALLED="true" || echo "Failed to execute SDKman" -if [[ "${SDK_INSTALLED}" == "no" ]] ; then - echo "Installing SDKman" - curl -s "https://get.sdkman.io" | bash - source "${HOME}/.sdkman/bin/sdkman-init.sh" -fi - -spring_installed="false" -spring --version && echo "Spring CLI installed" && spring_installed="true" || echo "No Spring Installed" - -source ~/.sdkman/bin/sdkman-init.sh -if [[ "${spring_installed}" == "false" ]]; then - sdk install springboot "${desired_spring_boot_cli_version}" -fi - -current_spring_cli_version="$(spring --version | cut -d' ' -f3 | cut -d'v' -f 2)" -current_spring_cloud_version="$(spring cloud --version | cut -d' ' -f4 | cut -d'v' -f 2)" - -mkdir -p target -echo "${current_spring_cli_version}" > target/boot_cli_version -echo "${current_spring_cloud_version}" > target/cloud_cli_version - -case "${desired_spring_boot_cli_version}" in - *RELEASE*) - LOCATION="https://repo.spring.io/release/org/springframework/boot/spring-boot-cli/${desired_spring_boot_cli_version}/spring-boot-cli-${desired_spring_boot_cli_version}-bin.zip" - ;; - *SR*) - LOCATION="https://repo.spring.io/release/org/springframework/boot/spring-boot-cli/${desired_spring_boot_cli_version}/spring-boot-cli-${desired_spring_boot_cli_version}-bin.zip" - ;; - *M*) - LOCATION="https://repo.spring.io/milestone/org/springframework/boot/spring-boot-cli/${desired_spring_boot_cli_version}/spring-boot-cli-${desired_spring_boot_cli_version}-bin.zip" - ;; - *BUILD-SNAPSHOT*) - LOCATION="https://repo.spring.io/snapshot/org/springframework/boot/spring-boot-cli/${desired_spring_boot_cli_version}/spring-boot-cli-${desired_spring_boot_cli_version}-bin.zip" - ;; - *) - LOCATION="https://repo.spring.io/release/org/springframework/boot/spring-boot-cli/${desired_spring_boot_cli_version}/spring-boot-cli-${desired_spring_boot_cli_version}-bin.zip" - ;; -esac - -echo "Downloading [${desired_spring_boot_cli_version}] version of Spring Boot CLI" -wget -O target/"spring-boot-cli-${desired_spring_boot_cli_version}-bin.zip" "${LOCATION}" -pushd target - unzip "spring-boot-cli-${desired_spring_boot_cli_version}-bin.zip" -popd -echo "Removing current Spring Boot CLI sc-cli-dev installation" -rm -rf ~/.sdkman/candidates/springboot/sc-cli-dev -echo "Installing [${desired_spring_boot_cli_version}] version of Spring Boot CLI" -yes | sdk install springboot sc-cli-dev "target/spring-${desired_spring_boot_cli_version}/" -echo "Use Boot CLI in version ${desired_spring_boot_cli_version}" -yes | sdk use springboot sc-cli-dev -echo "Use Cloud CLI in version ${desired_spring_cloud_cli_version}" -spring install org.springframework.cloud:spring-cloud-cli:"${desired_spring_cloud_cli_version}" \ No newline at end of file diff --git a/spring-cloud-cli-integration-tests/pom.xml b/spring-cloud-cli-integration-tests/pom.xml index e78852f..12f6249 100644 --- a/spring-cloud-cli-integration-tests/pom.xml +++ b/spring-cloud-cli-integration-tests/pom.xml @@ -50,27 +50,6 @@ - - org.codehaus.mojo - exec-maven-plugin - 1.6.0 - - - install-cli - generate-test-sources - - ${project.parent.basedir}/scripts/set-cli.sh - - ${spring-boot.version} - ${project.version} - - - - exec - - - - maven-deploy-plugin diff --git a/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml index c47eaca..829857c 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 org.springframework.cloud.launcher @@ -33,18 +34,18 @@ org.springframework.cloud spring-cloud-netflix-eureka-server - - javax.xml.bind - jaxb-api - - - org.glassfish.jaxb - jaxb-runtime - - - javax.activation - javax.activation-api - + + javax.xml.bind + jaxb-api + + + org.glassfish.jaxb + jaxb-runtime + + + javax.activation + javax.activation-api + org.springframework.boot spring-boot-starter-test