File tree 6 files changed +31
-2
lines changed
spring-cloud-dataflow-build/spring-cloud-dataflow-build-dependencies
spring-cloud-dataflow-shell/src/main/resources
spring-cloud-dataflow-shell-core
src/test/java/org/springframework/cloud/dataflow/shell
spring-cloud-skipper-shell/src/main/resources
spring-cloud-skipper-shell-commands
6 files changed +31
-2
lines changed Original file line number Diff line number Diff line change 22
22
<!-- Keep spring boot version in sync between spring-cloud-dataflow-build and spring-boot-dependencies (parent and properties) -->
23
23
<spring-boot .version>3.2.2</spring-boot .version>
24
24
<spring-cloud .version>2023.0.0</spring-cloud .version>
25
- <spring-shell .version>2.1.13 </spring-shell .version>
25
+ <spring-shell .version>3.2.2 </spring-shell .version>
26
26
<commons-io .version>2.15.1</commons-io .version>
27
27
<commons-text .version>1.11.0</commons-text .version>
28
28
<!-- Specific version overrides to deal w/ CVEs -->
Original file line number Diff line number Diff line change 26
26
<groupId >org.springframework.cloud</groupId >
27
27
<artifactId >spring-cloud-dataflow-rest-client</artifactId >
28
28
<version >${project.version} </version >
29
+ <exclusions >
30
+ <exclusion >
31
+ <groupId >org.springframework.boot</groupId >
32
+ <artifactId >spring-boot-starter-data-jpa</artifactId >
33
+ </exclusion >
34
+ <exclusion >
35
+ <groupId >org.springframework.cloud</groupId >
36
+ <artifactId >spring-cloud-dataflow-common-persistence</artifactId >
37
+ </exclusion >
38
+ </exclusions >
29
39
</dependency >
30
40
<dependency >
31
41
<groupId >org.springframework.shell</groupId >
Original file line number Diff line number Diff line change 24
24
import org .springframework .shell .Input ;
25
25
import org .springframework .shell .Shell ;
26
26
import org .springframework .shell .Utils ;
27
+ import org .springframework .test .util .ReflectionTestUtils ;
27
28
28
29
import static org .assertj .core .api .Assertions .assertThat ;
29
30
@@ -62,7 +63,9 @@ public ShellCommandRunner withValidateCommandSuccess() {
62
63
public Object executeCommand (String command ) {
63
64
Parser parser = new DefaultParser ();
64
65
ParsedLine parsedLine = parser .parse (command , command .length () + 1 );
65
- Object rawResult = this .shell .evaluate (new ParsedLineInput (parsedLine ));
66
+ // TODO: evaluate is not private method in spring-shell so calling it via
67
+ // reflection until we refactor to use new shell testing system
68
+ Object rawResult = ReflectionTestUtils .invokeMethod (this .shell , "evaluate" , new ParsedLineInput (parsedLine ));
66
69
if (!this .validateCommandSuccess ) {
67
70
assertThat (rawResult ).isNotNull ();
68
71
assertThat (rawResult ).isNotInstanceOf (Exception .class );
Original file line number Diff line number Diff line change 6
6
logging :
7
7
pattern :
8
8
console :
9
+ # file:
10
+ # name: dataflow-shell.log
11
+ # level:
12
+ # org:
13
+ # springframework:
14
+ # shell: debug
Original file line number Diff line number Diff line change 40
40
<groupId >org.springframework.boot</groupId >
41
41
<artifactId >spring-boot-starter-data-jpa</artifactId >
42
42
</exclusion >
43
+ <exclusion >
44
+ <groupId >org.springframework.cloud</groupId >
45
+ <artifactId >spring-cloud-dataflow-common-persistence</artifactId >
46
+ </exclusion >
43
47
</exclusions >
44
48
</dependency >
45
49
<dependency >
Original file line number Diff line number Diff line change 6
6
logging :
7
7
pattern :
8
8
console :
9
+ # file:
10
+ # name: skipper-shell.log
11
+ # level:
12
+ # org:
13
+ # springframework:
14
+ # shell: debug
You can’t perform that action at this time.
0 commit comments