Skip to content

Commit fe0e0ba

Browse files
Doha2012pivovarit
Doha2012
authored and
pivovarit
committed
upgrade boot parent (eugenp#3352)
* make sure modules using java8 * move url matching code * upgrade boot parent * minor cleanup
1 parent 1273bb4 commit fe0e0ba

67 files changed

Lines changed: 172 additions & 255 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎hystrix/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<name>hystrix</name>
88

99
<parent>
10-
<artifactId>parent-boot-4</artifactId>
10+
<artifactId>parent-boot-5</artifactId>
1111
<groupId>com.baeldung</groupId>
1212
<version>0.0.1-SNAPSHOT</version>
13-
<relativePath>../parent-boot-4</relativePath>
13+
<relativePath>../parent-boot-5</relativePath>
1414
</parent>
1515

1616

‎jjwt/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
<description>Exercising the JJWT</description>
1313

1414
<parent>
15-
<artifactId>parent-boot-4</artifactId>
15+
<artifactId>parent-boot-5</artifactId>
1616
<groupId>com.baeldung</groupId>
1717
<version>0.0.1-SNAPSHOT</version>
18-
<relativePath>../parent-boot-4</relativePath>
18+
<relativePath>../parent-boot-5</relativePath>
1919
</parent>
2020

2121
<properties>

‎jjwt/src/test/java/io/jsonwebtoken/jjwtfun/DemoApplicationIntegrationTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import org.junit.Test;
44
import org.junit.runner.RunWith;
5-
import org.springframework.boot.test.SpringApplicationConfiguration;
5+
import org.springframework.boot.test.context.SpringBootTest;
66
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
77
import org.springframework.test.context.web.WebAppConfiguration;
88

99
@RunWith(SpringJUnit4ClassRunner.class)
10-
@SpringApplicationConfiguration(classes = JJWTFunApplication.class)
10+
@SpringBootTest(classes = JJWTFunApplication.class)
1111
@WebAppConfiguration
1212
public class DemoApplicationIntegrationTest {
1313

‎parent-boot-4/README.md‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎parent-boot-4/pom.xml‎

Lines changed: 0 additions & 81 deletions
This file was deleted.

‎parent-boot-5/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1414
<java.version>1.8</java.version>
15-
<rest-assured.version>3.0.1</rest-assured.version>
15+
<rest-assured.version>3.0.6</rest-assured.version>
1616
<!-- plugins -->
17-
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
17+
<maven-surefire-plugin.version>2.20.1</maven-surefire-plugin.version>
1818
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
1919
</properties>
2020

2121
<parent>
2222
<artifactId>spring-boot-starter-parent</artifactId>
2323
<groupId>org.springframework.boot</groupId>
24-
<version>1.5.3.RELEASE</version>
24+
<version>1.5.9.RELEASE</version>
2525
<relativePath />
2626
</parent>
2727

‎pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
</properties>
2929

3030
<modules>
31+
<module>parent-boot-5</module>
3132
<module>asm</module>
3233
<module>atomix</module>
3334
<module>apache-cayenne</module>

‎spring-all/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
<packaging>war</packaging>
1010

1111
<parent>
12-
<artifactId>parent-boot-4</artifactId>
12+
<artifactId>parent-boot-5</artifactId>
1313
<groupId>com.baeldung</groupId>
1414
<version>0.0.1-SNAPSHOT</version>
15-
<relativePath>../parent-boot-4</relativePath>
15+
<relativePath>../parent-boot-5</relativePath>
1616
</parent>
1717

1818
<dependencies>

‎spring-boot-keycloak/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
<parent>
1515

1616
<groupId>com.baeldung</groupId>
17-
<artifactId>parent-boot-4</artifactId>
17+
<artifactId>parent-boot-5</artifactId>
1818
<version>0.0.1-SNAPSHOT</version>
19-
<relativePath>../parent-boot-4</relativePath>
19+
<relativePath>../parent-boot-5</relativePath>
2020

2121
</parent>
2222

‎spring-cloud-data-flow/batch-job/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
<description>Demo project for Spring Boot</description>
1313

1414
<parent>
15-
<artifactId>parent-boot-4</artifactId>
15+
<artifactId>parent-boot-5</artifactId>
1616
<groupId>com.baeldung</groupId>
1717
<version>0.0.1-SNAPSHOT</version>
18-
<relativePath>../../parent-boot-4</relativePath>
18+
<relativePath>../../parent-boot-5</relativePath>
1919
</parent>
2020

2121
<properties>

0 commit comments

Comments
 (0)