Skip to content

Commit ae64433

Browse files
robertvolkmannrobertvolkmann
authored
dependencies: update spring-boot-dependencies 2.0.9 to 2.7.5 (iluwatar#2156)
Remove explicit dependencies that are covered by spring-boot-dependencies hibernate 5.4.24 -> 5.6.12 spring-webmvc 5.0.17 -> 5.3.23 spring-data-jpa 2.0.14 -> 2.7.5 junit 4.12 -> 4.13.2 junit-jupiter 5.7.1 -> 5.8.2 slf4j 1.7.30 -> 1.7.36 logback 1.2.9 -> 1.2.11 jackson 2.12.3 -> 2.13.4 lombok 1.18.22 -> 1.18.24 byte-buddy 1.11.5 -> 1.12.8 jaxb-impl 2.3.2 -> 2.3.7
1 parent f8a3d93 commit ae64433

File tree

14 files changed

+29
-125
lines changed

14 files changed

+29
-125
lines changed

‎cqrs/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@
4848
<artifactId>hibernate-core</artifactId>
4949
</dependency>
5050
<dependency>
51-
<groupId>com.sun.xml.bind</groupId>
52-
<artifactId>jaxb-impl</artifactId>
53-
<version>2.1.17</version>
51+
<groupId>org.glassfish.jaxb</groupId>
52+
<artifactId>jaxb-runtime</artifactId>
5453
<scope>test</scope>
5554
</dependency>
5655
<dependency>

‎dirty-flag/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
<dependency>
4949
<groupId>org.mockito</groupId>
5050
<artifactId>mockito-junit-jupiter</artifactId>
51-
<version>3.5.0</version>
5251
<scope>test</scope>
5352
</dependency>
5453
</dependencies>

‎eip-aggregator/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
<version>${camel.version}</version>
4949
</dependency>
5050
<dependency>
51-
<groupId>com.sun.xml.bind</groupId>
52-
<artifactId>jaxb-impl</artifactId>
51+
<groupId>org.glassfish.jaxb</groupId>
52+
<artifactId>jaxb-runtime</artifactId>
5353
</dependency>
5454
<dependency>
5555
<groupId>javax.xml.bind</groupId>

‎eip-splitter/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
<version>${camel.version}</version>
4949
</dependency>
5050
<dependency>
51-
<groupId>com.sun.xml.bind</groupId>
52-
<artifactId>jaxb-impl</artifactId>
51+
<groupId>org.glassfish.jaxb</groupId>
52+
<artifactId>jaxb-runtime</artifactId>
5353
</dependency>
5454
<dependency>
5555
<groupId>javax.xml.bind</groupId>

‎eip-wire-tap/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
<version>${camel.version}</version>
4949
</dependency>
5050
<dependency>
51-
<groupId>com.sun.xml.bind</groupId>
52-
<artifactId>jaxb-impl</artifactId>
51+
<groupId>org.glassfish.jaxb</groupId>
52+
<artifactId>jaxb-runtime</artifactId>
5353
</dependency>
5454
<dependency>
5555
<groupId>javax.xml.bind</groupId>

‎layers/src/main/resources/applicationContext.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,7 @@
4949
</map>
5050
</property>
5151
</bean>
52+
<context:component-scan base-package="com.iluwatar.layers.dao">
53+
<context:include-filter type="annotation" expression="org.springframework.stereotype.Repository" />
54+
</context:component-scan>
5255
</beans>

‎metadata-mapping/pom.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@
4242
<artifactId>junit-jupiter-engine</artifactId>
4343
<scope>test</scope>
4444
</dependency>
45-
<dependency>
46-
<groupId>com.h2database</groupId>
47-
<artifactId>h2</artifactId>
48-
</dependency>
4945
<dependency>
5046
<groupId>org.hibernate</groupId>
5147
<artifactId>hibernate-core</artifactId>
@@ -59,8 +55,8 @@
5955
<artifactId>jaxb-api</artifactId>
6056
</dependency>
6157
<dependency>
62-
<groupId>com.sun.xml.bind</groupId>
63-
<artifactId>jaxb-impl</artifactId>
58+
<groupId>org.glassfish.jaxb</groupId>
59+
<artifactId>jaxb-runtime</artifactId>
6460
</dependency>
6561
<dependency>
6662
<groupId>com.sun.istack</groupId>

‎naked-objects/dom/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
<plugin>
5353
<groupId>org.apache.maven.plugins</groupId>
5454
<artifactId>maven-compiler-plugin</artifactId>
55-
<version>${compiler.version}</version>
5655
<configuration>
5756
<source>8</source>
5857
<target>8</target>

‎page-object/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,6 @@
3737
<artifactId>htmlunit</artifactId>
3838
<scope>test</scope>
3939
</dependency>
40-
<dependency>
41-
<groupId>org.junit.jupiter</groupId>
42-
<artifactId>junit-jupiter</artifactId>
43-
<version>RELEASE</version>
44-
<scope>test</scope>
45-
</dependency>
4640
</dependencies>
4741
<parent>
4842
<groupId>com.iluwatar</groupId>

‎partial-response/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
<dependency>
3838
<groupId>org.mockito</groupId>
3939
<artifactId>mockito-junit-jupiter</artifactId>
40-
<version>3.5.0</version>
4140
<scope>test</scope>
4241
</dependency>
4342
<dependency>

‎pom.xml

Lines changed: 10 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,8 @@
3636
<properties>
3737
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3838
<sonar-maven-plugin.version>3.8.0.2131</sonar-maven-plugin.version>
39-
<hibernate.version>5.4.24.Final</hibernate.version>
40-
<spring.version>5.0.17.RELEASE</spring.version>
41-
<spring-boot.version>2.0.9.RELEASE</spring-boot.version>
42-
<spring-data.version>2.0.14.RELEASE</spring-data.version>
39+
<spring-boot.version>2.7.5</spring-boot.version>
4340
<h2.version>1.4.190</h2.version>
44-
<junit.version>4.12</junit.version>
45-
<junit-jupiter.version>5.7.1</junit-jupiter.version>
46-
<junit-vintage.version>${junit-jupiter.version}</junit-vintage.version>
47-
<compiler.version>3.8.1</compiler.version>
4841
<jacoco.version>0.8.8</jacoco.version>
4942
<commons-dbcp.version>1.4</commons-dbcp.version>
5043
<camel.version>2.25.1</camel.version>
@@ -53,20 +46,11 @@
5346
<htmlunit.version>2.22</htmlunit.version>
5447
<guice.version>4.0</guice.version>
5548
<mongo-java-driver.version>3.12.8</mongo-java-driver.version>
56-
<slf4j.version>1.7.30</slf4j.version>
57-
<logback.version>1.2.9</logback.version>
5849
<aws-lambda-core.version>1.1.0</aws-lambda-core.version>
5950
<aws-java-sdk-dynamodb.version>1.12.13</aws-java-sdk-dynamodb.version>
6051
<aws-lambda-java-events.version>2.0.1</aws-lambda-java-events.version>
61-
<jackson.version>2.12.3</jackson.version>
62-
<jaxb-api.version>2.3.1</jaxb-api.version>
63-
<jaxb-impl.version>2.3.2</jaxb-impl.version>
64-
<annotation-api.version>1.3.2</annotation-api.version>
6552
<system-lambda.version>1.1.0</system-lambda.version>
6653
<urm.version>2.0.0</urm.version>
67-
<mockito-junit-jupiter.version>3.5.0</mockito-junit-jupiter.version>
68-
<lombok.version>1.18.22</lombok.version>
69-
<byte-buddy.version>1.11.5</byte-buddy.version>
7054
<javassist.version>3.27.0-GA</javassist.version>
7155
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
7256
<maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
@@ -240,21 +224,19 @@
240224
<dependencyManagement>
241225
<dependencies>
242226
<dependency>
243-
<groupId>net.bytebuddy</groupId>
244-
<artifactId>byte-buddy</artifactId>
245-
<version>${byte-buddy.version}</version>
246-
<scope>test</scope>
227+
<groupId>org.mockito</groupId>
228+
<artifactId>mockito-core</artifactId>
229+
<version>${mockito.version}</version>
247230
</dependency>
248231
<dependency>
249-
<groupId>net.bytebuddy</groupId>
250-
<artifactId>byte-buddy-agent</artifactId>
251-
<version>${byte-buddy.version}</version>
252-
<scope>test</scope>
232+
<groupId>org.mockito</groupId>
233+
<artifactId>mockito-inline</artifactId>
234+
<version>${mockito.version}</version>
253235
</dependency>
254236
<dependency>
255-
<groupId>org.hibernate</groupId>
256-
<artifactId>hibernate-core</artifactId>
257-
<version>${hibernate.version}</version>
237+
<groupId>org.mockito</groupId>
238+
<artifactId>mockito-junit-jupiter</artifactId>
239+
<version>${mockito.version}</version>
258240
</dependency>
259241
<dependency>
260242
<groupId>org.springframework.boot</groupId>
@@ -263,16 +245,6 @@
263245
<type>pom</type>
264246
<scope>import</scope>
265247
</dependency>
266-
<dependency>
267-
<groupId>org.springframework.data</groupId>
268-
<artifactId>spring-data-jpa</artifactId>
269-
<version>${spring-data.version}</version>
270-
</dependency>
271-
<dependency>
272-
<groupId>org.springframework</groupId>
273-
<artifactId>spring-webmvc</artifactId>
274-
<version>${spring.version}</version>
275-
</dependency>
276248
<dependency>
277249
<groupId>com.h2database</groupId>
278250
<artifactId>h2</artifactId>
@@ -293,42 +265,6 @@
293265
<artifactId>camel-stream</artifactId>
294266
<version>${camel.version}</version>
295267
</dependency>
296-
<dependency>
297-
<groupId>org.junit.jupiter</groupId>
298-
<artifactId>junit-jupiter-api</artifactId>
299-
<version>${junit-jupiter.version}</version>
300-
<scope>test</scope>
301-
</dependency>
302-
<dependency>
303-
<groupId>org.junit.jupiter</groupId>
304-
<artifactId>junit-jupiter-engine</artifactId>
305-
<version>${junit-jupiter.version}</version>
306-
<scope>test</scope>
307-
</dependency>
308-
<dependency>
309-
<groupId>org.junit.jupiter</groupId>
310-
<artifactId>junit-jupiter-params</artifactId>
311-
<version>${junit-jupiter.version}</version>
312-
<scope>test</scope>
313-
</dependency>
314-
<dependency>
315-
<groupId>org.junit.jupiter</groupId>
316-
<artifactId>junit-jupiter-migrationsupport</artifactId>
317-
<version>${junit-jupiter.version}</version>
318-
<scope>test</scope>
319-
</dependency>
320-
<dependency>
321-
<groupId>org.junit.vintage</groupId>
322-
<artifactId>junit-vintage-engine</artifactId>
323-
<version>${junit-vintage.version}</version>
324-
<scope>test</scope>
325-
</dependency>
326-
<dependency>
327-
<groupId>org.mockito</groupId>
328-
<artifactId>mockito-core</artifactId>
329-
<version>${mockito.version}</version>
330-
<scope>test</scope>
331-
</dependency>
332268
<dependency>
333269
<groupId>com.google.guava</groupId>
334270
<artifactId>guava</artifactId>
@@ -349,21 +285,6 @@
349285
<artifactId>mongo-java-driver</artifactId>
350286
<version>${mongo-java-driver.version}</version>
351287
</dependency>
352-
<dependency>
353-
<groupId>javax.xml.bind</groupId>
354-
<artifactId>jaxb-api</artifactId>
355-
<version>${jaxb-api.version}</version>
356-
</dependency>
357-
<dependency>
358-
<groupId>javax.annotation</groupId>
359-
<artifactId>javax.annotation-api</artifactId>
360-
<version>${annotation-api.version}</version>
361-
</dependency>
362-
<dependency>
363-
<groupId>com.sun.xml.bind</groupId>
364-
<artifactId>jaxb-impl</artifactId>
365-
<version>${jaxb-impl.version}</version>
366-
</dependency>
367288
<dependency>
368289
<groupId>org.javassist</groupId>
369290
<artifactId>javassist</artifactId>
@@ -391,22 +312,18 @@
391312
<dependency>
392313
<groupId>org.slf4j</groupId>
393314
<artifactId>slf4j-api</artifactId>
394-
<version>${slf4j.version}</version>
395315
</dependency>
396316
<dependency>
397317
<groupId>ch.qos.logback</groupId>
398318
<artifactId>logback-classic</artifactId>
399-
<version>${logback.version}</version>
400319
</dependency>
401320
<dependency>
402321
<groupId>ch.qos.logback</groupId>
403322
<artifactId>logback-core</artifactId>
404-
<version>${logback.version}</version>
405323
</dependency>
406324
<dependency>
407325
<groupId>org.projectlombok</groupId>
408326
<artifactId>lombok</artifactId>
409-
<version>${lombok.version}</version>
410327
<scope>provided</scope>
411328
</dependency>
412329
</dependencies>
@@ -416,7 +333,6 @@
416333
<plugin>
417334
<groupId>org.apache.maven.plugins</groupId>
418335
<artifactId>maven-compiler-plugin</artifactId>
419-
<version>${compiler.version}</version>
420336
<configuration>
421337
<source>11</source>
422338
<target>11</target>
@@ -430,7 +346,6 @@
430346
<plugin>
431347
<groupId>org.springframework.boot</groupId>
432348
<artifactId>spring-boot-maven-plugin</artifactId>
433-
<version>${spring-boot.version}</version>
434349
</plugin>
435350
<!-- Maven assembly plugin template for all child project to follow -->
436351
<plugin>

‎repository/src/main/resources/applicationContext.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
2525
-->
2626
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:context="http://www.springframework.org/schema/context" xmlns:jpa="http://www.springframework.org/schema/data/jpa" xmlns:security="http://www.springframework.org/schema/security" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd">
27-
<jpa:repositories base-package="com.iluwatar" base-class="org.springframework.data.jpa.repository.support.SimpleJpaRepository" />
27+
<jpa:repositories base-package="com.iluwatar" />
2828
<bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
2929
<property name="entityManagerFactory" ref="entityManagerFactory" />
3030
</bean>
@@ -48,4 +48,7 @@
4848
</map>
4949
</property>
5050
</bean>
51+
<context:component-scan base-package="com.iluwatar.repository">
52+
<context:include-filter type="annotation" expression="org.springframework.stereotype.Repository" />
53+
</context:component-scan>
5154
</beans>

‎serverless/pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,14 @@
5252
<dependency>
5353
<groupId>com.fasterxml.jackson.core</groupId>
5454
<artifactId>jackson-core</artifactId>
55-
<version>${jackson.version}</version>
5655
</dependency>
5756
<dependency>
5857
<groupId>com.fasterxml.jackson.core</groupId>
5958
<artifactId>jackson-databind</artifactId>
60-
<version>${jackson.version}</version>
6159
</dependency>
6260
<dependency>
6361
<groupId>com.fasterxml.jackson.core</groupId>
6462
<artifactId>jackson-annotations</artifactId>
65-
<version>${jackson.version}</version>
6663
</dependency>
6764
<dependency>
6865
<groupId>org.junit.jupiter</groupId>

‎service-layer/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
<artifactId>h2</artifactId>
4444
</dependency>
4545
<dependency>
46-
<groupId>com.sun.xml.bind</groupId>
47-
<artifactId>jaxb-impl</artifactId>
46+
<groupId>org.glassfish.jaxb</groupId>
47+
<artifactId>jaxb-runtime</artifactId>
4848
</dependency>
4949
<dependency>
5050
<groupId>javax.xml.bind</groupId>

0 commit comments

Comments
 (0)