SpringCloud/spring-cloud-cli
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed cli scripts'

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-10-10 14:28:09 +02:00
parent fc7b61d884
commit db44081cc3
4 changed files with 15 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/reset-cli.sh
View File

@@ -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}"

61
scripts/set-cli.sh
View File

@@ -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}"

21
spring-cloud-cli-integration-tests/pom.xml
View File

@@ -50,27 +50,6 @@
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<executions>
<execution>
<id>install-cli</id>
<phase>generate-test-sources</phase>
<configuration>
<executable>${project.parent.basedir}/scripts/set-cli.sh</executable>
<arguments>
<argument>${spring-boot.version}</argument>
<argument>${project.version}</argument>
</arguments>
</configuration>
<goals>
<goal>exec</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>

29
spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud.launcher</groupId>
@@ -33,18 +34,18 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix-eureka-server</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>