Skip to content

Commit 994651a

Browse files
jzheauxjzheaux
authored
Merge pull request eugenp#8048 from alessiostalla/BAEL-10229
#BAEL-10229 Remove the spring-boot-dependencies
2 parents 749eff7 + 096ce9d commit 994651a

File tree

24 files changed

+94
-207
lines changed

24 files changed

+94
-207
lines changed

‎ethereum/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.baeldung.ethereum</groupId>
55
<artifactId>ethereum</artifactId>
@@ -215,5 +215,4 @@
215215
<slf4j.version>1.7.25</slf4j.version>
216216
<spring-boot-maven-plugin.version>2.0.4.RELEASE</spring-boot-maven-plugin.version>
217217
</properties>
218-
219218
</project>

‎jta/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,6 @@
3030
<artifactId>spring-boot-starter</artifactId>
3131
</dependency>
3232

33-
<dependency>
34-
<groupId>org.springframework.boot</groupId>
35-
<artifactId>spring-boot-starter-test</artifactId>
36-
<scope>test</scope>
37-
</dependency>
38-
3933
<dependency>
4034
<groupId>org.hsqldb</groupId>
4135
<artifactId>hsqldb</artifactId>

‎libraries-testing/pom.xml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -125,19 +125,6 @@
125125
<version>${java-hamcrest.version}</version>
126126
<scope>test</scope>
127127
</dependency>
128-
129-
<dependency>
130-
<groupId>net.serenity-bdd</groupId>
131-
<artifactId>serenity-core</artifactId>
132-
<version>${serenity.version}</version>
133-
<scope>test</scope>
134-
<exclusions>
135-
<exclusion>
136-
<groupId>org.asciidoctor</groupId>
137-
<artifactId>asciidoctorj</artifactId>
138-
</exclusion>
139-
</exclusions>
140-
</dependency>
141128
<dependency>
142129
<groupId>org.asciidoctor</groupId>
143130
<artifactId>asciidoctor-maven-plugin</artifactId>

‎parent-boot-2/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,6 @@
7878
<rest-assured.version>3.3.0</rest-assured.version>
7979
<!-- plugins -->
8080
<thin.version>1.0.22.RELEASE</thin.version>
81-
<spring-boot.version>2.1.7.RELEASE</spring-boot.version>
81+
<spring-boot.version>2.1.9.RELEASE</spring-boot.version>
8282
</properties>
8383
</project>

‎parent-kotlin/pom.xml

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
44
<modelVersion>4.0.0</modelVersion>
55
<artifactId>parent-kotlin</artifactId>
66
<name>parent-kotlin</name>
@@ -13,34 +13,34 @@
1313
<version>1.0.0-SNAPSHOT</version>
1414
</parent>
1515

16-
<repositories>
17-
<repository>
18-
<id>jcenter</id>
19-
<url>http://jcenter.bintray.com</url>
20-
</repository>
21-
<repository>
22-
<id>kotlin-ktor</id>
23-
<url>https://dl.bintray.com/kotlin/ktor/</url>
24-
</repository>
25-
<repository>
26-
<id>kotlin-eap</id>
27-
<url>http://dl.bintray.com/kotlin/kotlin-eap</url>
28-
</repository>
29-
<repository>
30-
<id>spring-milestone</id>
31-
<name>Spring Milestone Repository</name>
32-
<url>http://repo.spring.io/milestone</url>
33-
</repository>
34-
</repositories>
35-
36-
<pluginRepositories>
37-
<pluginRepository>
38-
<id>kotlin-eap</id>
39-
<url>http://dl.bintray.com/kotlin/kotlin-eap</url>
40-
</pluginRepository>
41-
</pluginRepositories>
42-
43-
<dependencyManagement>
16+
<repositories>
17+
<repository>
18+
<id>jcenter</id>
19+
<url>http://jcenter.bintray.com</url>
20+
</repository>
21+
<repository>
22+
<id>kotlin-ktor</id>
23+
<url>https://dl.bintray.com/kotlin/ktor/</url>
24+
</repository>
25+
<repository>
26+
<id>kotlin-eap</id>
27+
<url>http://dl.bintray.com/kotlin/kotlin-eap</url>
28+
</repository>
29+
<repository>
30+
<id>spring-milestone</id>
31+
<name>Spring Milestone Repository</name>
32+
<url>http://repo.spring.io/milestone</url>
33+
</repository>
34+
</repositories>
35+
36+
<pluginRepositories>
37+
<pluginRepository>
38+
<id>kotlin-eap</id>
39+
<url>http://dl.bintray.com/kotlin/kotlin-eap</url>
40+
</pluginRepository>
41+
</pluginRepositories>
42+
43+
<dependencyManagement>
4444
<dependencies>
4545
<dependency>
4646
<groupId>org.springframework.boot</groupId>
@@ -56,15 +56,15 @@
5656
<dependency>
5757
<groupId>org.jetbrains.kotlin</groupId>
5858
<artifactId>kotlin-stdlib-jdk8</artifactId>
59-
</dependency>
60-
<dependency>
61-
<groupId>org.jetbrains.kotlin</groupId>
62-
<artifactId>kotlin-stdlib</artifactId>
63-
</dependency>
59+
</dependency>
60+
<dependency>
61+
<groupId>org.jetbrains.kotlin</groupId>
62+
<artifactId>kotlin-stdlib</artifactId>
63+
</dependency>
6464
<dependency>
6565
<groupId>org.jetbrains.kotlin</groupId>
6666
<artifactId>kotlin-reflect</artifactId>
67-
</dependency>
67+
</dependency>
6868

6969
<dependency>
7070
<groupId>org.jetbrains.kotlinx</groupId>
@@ -113,9 +113,9 @@
113113
<sourceDir>${project.basedir}/src/main/java</sourceDir>
114114
</sourceDirs>
115115
<jvmTarget>${java.version}</jvmTarget>
116-
<args>
117-
<arg>-Xjvm-default=enable</arg>
118-
</args>
116+
<args>
117+
<arg>-Xjvm-default=enable</arg>
118+
</args>
119119
</configuration>
120120
</execution>
121121
<execution>

‎persistence-modules/spring-boot-persistence-h2/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@
2626
<groupId>com.h2database</groupId>
2727
<artifactId>h2</artifactId>
2828
</dependency>
29-
<dependency>
30-
<groupId>org.springframework.boot</groupId>
31-
<artifactId>spring-boot-starter-test</artifactId>
32-
<scope>test</scope>
33-
</dependency>
3429
</dependencies>
3530

3631
<build>

‎persistence-modules/spring-boot-persistence/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,17 @@
1717
<dependency>
1818
<groupId>org.springframework.boot</groupId>
1919
<artifactId>spring-boot-starter-web</artifactId>
20+
<version>${spring-boot.version}</version>
2021
</dependency>
2122
<dependency>
2223
<groupId>org.springframework.boot</groupId>
2324
<artifactId>spring-boot-starter-thymeleaf</artifactId>
25+
<version>${spring-boot.version}</version>
2426
</dependency>
2527
<dependency>
2628
<groupId>org.springframework.boot</groupId>
2729
<artifactId>spring-boot-starter-data-jpa</artifactId>
30+
<version>${spring-boot.version}</version>
2831
<exclusions>
2932
<exclusion>
3033
<groupId>com.zaxxer</groupId>
@@ -35,6 +38,7 @@
3538
<dependency>
3639
<groupId>org.springframework.boot</groupId>
3740
<artifactId>spring-boot-starter-test</artifactId>
41+
<version>${spring-boot.version}</version>
3842
</dependency>
3943
<dependency>
4044
<groupId>org.mockito</groupId>
@@ -99,6 +103,7 @@
99103
<validation-api.version>2.0.1.Final</validation-api.version>
100104
<derby.version>10.13.1.1</derby.version>
101105
<hsqldb.version>2.3.4</hsqldb.version>
106+
<spring-boot.version>2.1.7.RELEASE</spring-boot.version>
102107
</properties>
103108

104109
</project>

‎spring-5-mvc/pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,17 @@
4646
<dependency>
4747
<groupId>org.jetbrains.kotlin</groupId>
4848
<artifactId>kotlin-stdlib-jre8</artifactId>
49+
<version>${kotlin.version}</version>
4950
</dependency>
5051
<dependency>
5152
<groupId>org.jetbrains.kotlin</groupId>
5253
<artifactId>kotlin-reflect</artifactId>
54+
<version>${kotlin.version}</version>
5355
</dependency>
5456
<dependency>
5557
<groupId>com.fasterxml.jackson.module</groupId>
5658
<artifactId>jackson-module-kotlin</artifactId>
59+
<version>${jackson.version}</version>
5760
</dependency>
5861
<!-- runtime and test scoped -->
5962
<dependency>
@@ -170,7 +173,8 @@
170173

171174
<properties>
172175
<jayway-rest-assured.version>2.9.0</jayway-rest-assured.version>
173-
<kotlin.version>1.1.2</kotlin.version>
176+
<jackson.version>2.9.9</jackson.version> <!-- Same as spring-boot-dependencies:2.1.7.RELEASE -->
177+
<kotlin.version>1.2.71</kotlin.version> <!-- Same as spring-boot-dependencies:2.1.7.RELEASE -->
174178
<start-class>com.baeldung.Spring5Application</start-class>
175179
<httpclient.version>4.5.8</httpclient.version>
176180
</properties>

‎spring-5-webflux/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,6 @@
9999
</pluginRepositories>
100100

101101
<properties>
102-
<spring-boot.version>2.2.0.M3</spring-boot.version>
102+
<spring-boot.version>2.2.0.RELEASE</spring-boot.version>
103103
</properties>
104104
</project>

‎spring-5-webflux/src/main/java/com/baeldung/spring/rsocket/client/ClientConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ public RSocket rSocket() {
2525

2626
@Bean
2727
RSocketRequester rSocketRequester(RSocketStrategies rSocketStrategies) {
28-
return RSocketRequester.wrap(rSocket(), MimeTypeUtils.APPLICATION_JSON, rSocketStrategies);
28+
return RSocketRequester.wrap(rSocket(), MimeTypeUtils.APPLICATION_JSON, MimeTypeUtils.APPLICATION_JSON, rSocketStrategies);
2929
}
3030
}

0 commit comments

Comments
 (0)