Skip to content
This repository was archived by the owner on May 14, 2025. It is now read-only.

Commit b651e07

Browse files
authored
Upgrade to Spring Shell 2.1.x
- Migrate from shell 1 to shell 2 - Fixes #4975
1 parent a07013c commit b651e07

File tree

62 files changed

+1700
-1968
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1700
-1968
lines changed

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373

7474
<spring-cloud-common-security-config.version>1.8.0-SNAPSHOT</spring-cloud-common-security-config.version>
7575

76-
<spring-shell.version>1.2.0.RELEASE</spring-shell.version>
76+
<spring-shell.version>2.1.0-SNAPSHOT</spring-shell.version>
7777

7878
<jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
7979
<sonar-maven-plugin.version>3.0.2</sonar-maven-plugin.version>
@@ -197,7 +197,7 @@
197197
</dependency>
198198
<dependency>
199199
<groupId>org.springframework.shell</groupId>
200-
<artifactId>spring-shell</artifactId>
200+
<artifactId>spring-shell-starter</artifactId>
201201
<version>${spring-shell.version}</version>
202202
</dependency>
203203
<dependency>
@@ -426,7 +426,7 @@
426426
<name>Spring Milestones</name>
427427
<url>https://repo.spring.io/libs-milestone-local</url>
428428
<snapshots>
429-
<enabled>false</enabled>
429+
<enabled>true</enabled>
430430
</snapshots>
431431
</repository>
432432
<repository>

spring-cloud-dataflow-docs/src/main/asciidoc/configuration-local.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ $ java -jar spring-cloud-dataflow-shell-{project-version}.jar \
624624
--dataflow.uri=http://localhost:9393 \ # <1>
625625
--dataflow.username=my_username \ # <2>
626626
--dataflow.password=my_password \ # <3>
627-
--skip-ssl-validation true \ # <4>
627+
--skip-ssl-validation \ # <4>
628628
----
629629

630630
<1> Optional, defaults to http://localhost:9393.
@@ -645,7 +645,7 @@ server-unknown:>dataflow config server \
645645
--uri http://localhost:9393 \ # <1>
646646
--username myuser \ # <2>
647647
--password mysecret \ # <3>
648-
--skip-ssl-validation true \ # <4>
648+
--skip-ssl-validation \ # <4>
649649
----
650650

651651
<1> Optional, defaults to http://localhost:9393.

spring-cloud-dataflow-shell-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</dependency>
2020
<dependency>
2121
<groupId>org.springframework.shell</groupId>
22-
<artifactId>spring-shell</artifactId>
22+
<artifactId>spring-shell-starter</artifactId>
2323
</dependency>
2424
<dependency>
2525
<groupId>org.springframework.boot</groupId>

spring-cloud-dataflow-shell-core/src/main/java/org/springframework/cloud/dataflow/shell/DataflowJLineShellComponent.java

Lines changed: 0 additions & 66 deletions
This file was deleted.

spring-cloud-dataflow-shell-core/src/main/java/org/springframework/cloud/dataflow/shell/EnableDataFlowShell.java

Lines changed: 0 additions & 41 deletions
This file was deleted.

spring-cloud-dataflow-shell-core/src/main/java/org/springframework/cloud/dataflow/shell/ShellCommandLineParser.java

Lines changed: 0 additions & 83 deletions
This file was deleted.

spring-cloud-dataflow-shell-core/src/main/java/org/springframework/cloud/dataflow/shell/ShellCommandLineRunner.java

Lines changed: 0 additions & 140 deletions
This file was deleted.

0 commit comments

Comments
 (0)