Skip to content

Commit 1b30182

Browse files
piotrooofmbenhassine
piotrooo
authored and
fmbenhassine
committed
Move Spring Messaging and Reactor dependencies from core to jline
Signed-off-by: Piotr Olaszewski <piotr.olaszewski@thulium.pl>
1 parent 400ca29 commit 1b30182

File tree

3 files changed

+69
-64
lines changed

3 files changed

+69
-64
lines changed

‎.editorconfig‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
root = true
2+
3+
[*.{java,xml,gradle}]
4+
indent_style = tab
5+
indent_size = 4

‎spring-shell-core/pom.xml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,6 @@
3636
<artifactId>spring-context</artifactId>
3737
<version>${spring-framework.version}</version>
3838
</dependency>
39-
<dependency>
40-
<groupId>org.springframework</groupId>
41-
<artifactId>spring-messaging</artifactId>
42-
<version>${spring-framework.version}</version>
43-
</dependency>
44-
<dependency>
45-
<groupId>io.projectreactor</groupId>
46-
<artifactId>reactor-core</artifactId>
47-
<version>${reactor.version}</version>
48-
</dependency>
4939
<dependency>
5040
<groupId>jakarta.validation</groupId>
5141
<artifactId>jakarta.validation-api</artifactId>

‎spring-shell-jline/pom.xml‎

Lines changed: 64 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -32,73 +32,83 @@
3232

3333
<dependencies>
3434
<dependency>
35-
<groupId>org.springframework.shell</groupId>
36-
<artifactId>spring-shell-core</artifactId>
37-
<version>${project.parent.version}</version>
35+
<groupId>io.projectreactor</groupId>
36+
<artifactId>reactor-core</artifactId>
37+
<version>${reactor.version}</version>
3838
</dependency>
39-
<dependency>
39+
<dependency>
40+
<groupId>org.springframework.shell</groupId>
41+
<artifactId>spring-shell-core</artifactId>
42+
<version>${project.parent.version}</version>
43+
</dependency>
44+
<dependency>
4045
<groupId>org.jline</groupId>
4146
<artifactId>jline</artifactId>
4247
<version>${jline.version}</version>
4348
</dependency>
4449
<dependency>
45-
<groupId>org.antlr</groupId>
46-
<artifactId>ST4</artifactId>
47-
<version>${antlr-st4.version}</version>
48-
</dependency>
50+
<groupId>org.antlr</groupId>
51+
<artifactId>ST4</artifactId>
52+
<version>${antlr-st4.version}</version>
53+
</dependency>
54+
<dependency>
55+
<groupId>org.springframework</groupId>
56+
<artifactId>spring-messaging</artifactId>
57+
<version>${spring-framework.version}</version>
58+
</dependency>
4959

5060
<!-- Test dependencies -->
51-
<dependency>
52-
<groupId>org.springframework</groupId>
53-
<artifactId>spring-test</artifactId>
54-
<version>${spring-framework.version}</version>
55-
<scope>test</scope>
56-
</dependency>
57-
<dependency>
58-
<groupId>io.projectreactor</groupId>
59-
<artifactId>reactor-test</artifactId>
60-
<version>${reactor.version}</version>
61-
<scope>test</scope>
62-
</dependency>
63-
<dependency>
64-
<groupId>org.awaitility</groupId>
65-
<artifactId>awaitility</artifactId>
66-
<version>${awaitility.version}</version>
67-
<scope>test</scope>
68-
<exclusions>
69-
<exclusion>
70-
<groupId>junit</groupId>
71-
<artifactId>junit</artifactId>
72-
</exclusion>
73-
<exclusion>
74-
<groupId>org.assertj</groupId>
75-
<artifactId>assertj-core</artifactId>
76-
</exclusion>
77-
</exclusions>
78-
</dependency>
79-
<dependency>
80-
<groupId>org.mockito</groupId>
81-
<artifactId>mockito-core</artifactId>
82-
<version>${mockito.version}</version>
83-
<scope>test</scope>
84-
</dependency>
85-
<dependency>
86-
<groupId>com.google.jimfs</groupId>
87-
<artifactId>jimfs</artifactId>
88-
<version>${jimfs.version}</version>
89-
<scope>test</scope>
90-
</dependency>
61+
<dependency>
62+
<groupId>org.springframework</groupId>
63+
<artifactId>spring-test</artifactId>
64+
<version>${spring-framework.version}</version>
65+
<scope>test</scope>
66+
</dependency>
67+
<dependency>
68+
<groupId>io.projectreactor</groupId>
69+
<artifactId>reactor-test</artifactId>
70+
<version>${reactor.version}</version>
71+
<scope>test</scope>
72+
</dependency>
73+
<dependency>
74+
<groupId>org.awaitility</groupId>
75+
<artifactId>awaitility</artifactId>
76+
<version>${awaitility.version}</version>
77+
<scope>test</scope>
78+
<exclusions>
79+
<exclusion>
80+
<groupId>junit</groupId>
81+
<artifactId>junit</artifactId>
82+
</exclusion>
83+
<exclusion>
84+
<groupId>org.assertj</groupId>
85+
<artifactId>assertj-core</artifactId>
86+
</exclusion>
87+
</exclusions>
88+
</dependency>
89+
<dependency>
90+
<groupId>org.mockito</groupId>
91+
<artifactId>mockito-core</artifactId>
92+
<version>${mockito.version}</version>
93+
<scope>test</scope>
94+
</dependency>
95+
<dependency>
96+
<groupId>com.google.jimfs</groupId>
97+
<artifactId>jimfs</artifactId>
98+
<version>${jimfs.version}</version>
99+
<scope>test</scope>
100+
</dependency>
91101
<dependency>
92102
<groupId>org.junit.jupiter</groupId>
93103
<artifactId>junit-jupiter</artifactId>
94104
<version>${junit-jupiter.version}</version>
95105
<scope>test</scope>
96106
</dependency>
97-
<dependency>
98-
<groupId>org.assertj</groupId>
99-
<artifactId>assertj-core</artifactId>
100-
<version>${assertj.version}</version>
101-
<scope>test</scope>
102-
</dependency>
107+
<dependency>
108+
<groupId>org.assertj</groupId>
109+
<artifactId>assertj-core</artifactId>
110+
<version>${assertj.version}</version>
111+
<scope>test</scope>
112+
</dependency>
103113
</dependencies>
104114
</project>

0 commit comments

Comments
 (0)