Skip to content

Commit 166e87e

Browse files
ath0sath0s
authored
Use Spring Boot dependencies (#134)
* Use Spring Boot dependencies Import spring-boot-dependencies pom to manage compatible dependencies. * Update gs-test to 2.1.3 Update surefire and failsafe to 3.0.0-M7
1 parent 42e37bd commit 166e87e

File tree

3 files changed

+8
-123
lines changed

3 files changed

+8
-123
lines changed

‎examples/lunch-tests/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
<dependency>
3333
<groupId>org.mockito</groupId>
3434
<artifactId>mockito-core</artifactId>
35-
<version>${mockito.version}</version>
3635
<scope>test</scope>
3736
</dependency>
3837
</dependencies>

‎examples/lunch-web/pom.xml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77
</parent>
88
<artifactId>lunch-web</artifactId>
99

10-
<properties>
11-
<spring.boot.version>2.6.7</spring.boot.version>
12-
</properties>
13-
1410
<dependencies>
1511
<!-- Spring Boot -->
1612
<dependency>
@@ -91,17 +87,6 @@
9187
</dependency>
9288
</dependencies>
9389

94-
<dependencyManagement>
95-
<dependencies>
96-
<dependency>
97-
<groupId>org.springframework.boot</groupId>
98-
<artifactId>spring-boot-dependencies</artifactId>
99-
<version>${spring.boot.version}</version>
100-
<type>pom</type>
101-
<scope>import</scope>
102-
</dependency>
103-
</dependencies>
104-
</dependencyManagement>
10590
<build>
10691
<resources>
10792
<resource>
@@ -112,7 +97,7 @@
11297
<plugin>
11398
<groupId>org.springframework.boot</groupId>
11499
<artifactId>spring-boot-maven-plugin</artifactId>
115-
<version>${spring.boot.version}</version>
100+
<version>${spring-boot.version}</version>
116101
<executions>
117102
<execution>
118103
<goals>

‎pom.xml

Lines changed: 7 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -138,25 +138,14 @@
138138
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
139139
<java.version>11</java.version>
140140

141-
<log4j.version>2.17.2</log4j.version>
142-
<spring.version>5.3.19</spring.version>
143-
<slf4j.version>1.7.32</slf4j.version>
141+
<spring-boot.version>2.6.7</spring-boot.version>
144142
<gigaspaces.version>16.1.1</gigaspaces.version>
145-
<rxjava.version>1.3.8</rxjava.version>
146-
<reactor-bom.version>2020.0.18</reactor-bom.version>
147143
<hystrix.version>1.5.18</hystrix.version>
148144
<archaius.version>0.4.1</archaius.version>
149-
<jackson2.version>2.13.2.1</jackson2.version>
150-
<junit.version>4.13.2</junit.version>
151-
<junit-jupiter.version>5.8.2</junit-jupiter.version>
152-
<hamcrest.version>2.2</hamcrest.version>
153-
<mockito.version>3.12.4</mockito.version>
154145
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
155-
<dropwizard.version>4.2.9</dropwizard.version>
156-
<netty.version>4.1.76.Final</netty.version>
157146
<mimer-config.version>0.0.8</mimer-config.version>
158147
<hystrix-multiconfig.version>0.0.3</hystrix-multiconfig.version>
159-
<gs-test.version>2.1.1</gs-test.version>
148+
<gs-test.version>2.1.3</gs-test.version>
160149

161150
<!-- Plugins -->
162151
<maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
@@ -172,8 +161,8 @@
172161
<maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
173162
<maven-source-plugin.version>3.2.0</maven-source-plugin.version>
174163
<maven-plugin-plugin.version>3.6.0</maven-plugin-plugin.version>
175-
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
176-
<maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
164+
<maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
165+
<maven-failsafe-plugin.version>3.0.0-M7</maven-failsafe-plugin.version>
177166
<maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>
178167
<maven-scm-plugin.version>1.11.2</maven-scm-plugin.version>
179168
<exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
@@ -189,33 +178,9 @@
189178
<!-- Third party dependencies -->
190179
<dependencies>
191180
<dependency>
192-
<groupId>io.dropwizard.metrics</groupId>
193-
<artifactId>metrics-bom</artifactId>
194-
<version>${dropwizard.version}</version>
195-
<type>pom</type>
196-
<scope>import</scope>
197-
</dependency>
198-
199-
<dependency>
200-
<groupId>org.apache.logging.log4j</groupId>
201-
<artifactId>log4j-bom</artifactId>
202-
<version>${log4j.version}</version>
203-
<type>pom</type>
204-
<scope>import</scope>
205-
</dependency>
206-
207-
<dependency>
208-
<groupId>org.springframework</groupId>
209-
<artifactId>spring-framework-bom</artifactId>
210-
<version>${spring.version}</version>
211-
<type>pom</type>
212-
<scope>import</scope>
213-
</dependency>
214-
215-
<dependency>
216-
<groupId>io.projectreactor</groupId>
217-
<artifactId>reactor-bom</artifactId>
218-
<version>${reactor-bom.version}</version>
181+
<groupId>org.springframework.boot</groupId>
182+
<artifactId>spring-boot-dependencies</artifactId>
183+
<version>${spring-boot.version}</version>
219184
<type>pom</type>
220185
<scope>import</scope>
221186
</dependency>
@@ -226,41 +191,13 @@
226191
<version>3.0.2</version>
227192
</dependency>
228193

229-
<!-- Java 11 back-comp -->
230-
<dependency>
231-
<groupId>javax.annotation</groupId>
232-
<artifactId>javax.annotation-api</artifactId>
233-
<version>1.3.2</version>
234-
</dependency>
235-
236194
<!-- Reflections for annotation scanning-->
237195
<dependency>
238196
<groupId>org.reflections</groupId>
239197
<artifactId>reflections</artifactId>
240198
<version>0.10.2</version>
241199
</dependency>
242200

243-
<!-- Jackson 2.x -->
244-
<dependency>
245-
<groupId>com.fasterxml.jackson</groupId>
246-
<artifactId>jackson-bom</artifactId>
247-
<version>${jackson2.version}</version>
248-
<type>pom</type>
249-
<scope>import</scope>
250-
</dependency>
251-
252-
<dependency>
253-
<groupId>org.slf4j</groupId>
254-
<artifactId>slf4j-api</artifactId>
255-
<version>${slf4j.version}</version>
256-
</dependency>
257-
258-
<dependency>
259-
<groupId>io.netty</groupId>
260-
<artifactId>netty-all</artifactId>
261-
<version>${netty.version}</version>
262-
</dependency>
263-
264201
<dependency>
265202
<groupId>org.gigaspaces</groupId>
266203
<artifactId>xap-openspaces</artifactId>
@@ -283,42 +220,6 @@
283220
<version>${gigaspaces.version}</version>
284221
</dependency>
285222

286-
<!-- TEST -->
287-
<dependency>
288-
<groupId>junit</groupId>
289-
<artifactId>junit</artifactId>
290-
<version>${junit.version}</version>
291-
<exclusions>
292-
<exclusion>
293-
<groupId>org.hamcrest</groupId>
294-
<artifactId>hamcrest-core</artifactId>
295-
</exclusion>
296-
</exclusions>
297-
</dependency>
298-
<dependency>
299-
<groupId>org.junit</groupId>
300-
<artifactId>junit-bom</artifactId>
301-
<version>${junit-jupiter.version}</version>
302-
<type>pom</type>
303-
<scope>import</scope>
304-
</dependency>
305-
<dependency>
306-
<groupId>org.hamcrest</groupId>
307-
<artifactId>hamcrest</artifactId>
308-
<version>${hamcrest.version}</version>
309-
</dependency>
310-
311-
<dependency>
312-
<groupId>org.mockito</groupId>
313-
<artifactId>mockito-core</artifactId>
314-
<version>${mockito.version}</version>
315-
</dependency>
316-
317-
<dependency>
318-
<groupId>io.reactivex</groupId>
319-
<artifactId>rxjava</artifactId>
320-
<version>${rxjava.version}</version>
321-
</dependency>
322223
<dependency>
323224
<groupId>com.netflix.hystrix</groupId>
324225
<artifactId>hystrix-core</artifactId>

0 commit comments

Comments
 (0)