iSharkFly-Open/Java-Tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade boot parent (#3352)

Browse Source 
* make sure modules using java8

* move url matching code

* upgrade boot parent

* minor cleanup
This commit is contained in:
Doha2012
2018-01-05 20:56:21 +01:00
committed by Grzegorz Piwowarek
parent 1273bb4aee
commit fe0e0ba115
67 changed files with 175 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hystrix/pom.xml
+2 -2
View File
@@ -7,10 +7,10 @@
<name>hystrix</name>
<parent>
<artifactId>parent-boot-4</artifactId>
<artifactId>parent-boot-5</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../parent-boot-4</relativePath>
<relativePath>../parent-boot-5</relativePath>
</parent>
jjwt/pom.xml
+2 -2
View File
@@ -12,10 +12,10 @@
<description>Exercising the JJWT</description>
<parent>
<artifactId>parent-boot-4</artifactId>
<artifactId>parent-boot-5</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../parent-boot-4</relativePath>
<relativePath>../parent-boot-5</relativePath>
</parent>
<properties>
jjwt/src/test/java/io/jsonwebtoken/jjwtfun/DemoApplicationIntegrationTest.java
+2 -2
View File
@@ -2,12 +2,12 @@ package io.jsonwebtoken.jjwtfun;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = JJWTFunApplication.class)
@SpringBootTest(classes = JJWTFunApplication.class)
@WebAppConfiguration
public class DemoApplicationIntegrationTest {
parent-boot-4/README.md
-1
View File
@@ -1 +0,0 @@
## Relevant articles:
parent-boot-4/pom.xml
-81
View File
@@ -1,81 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.baeldung</groupId>
<artifactId>parent-boot-4</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Parent Boot 4</name>
<description>Parent for all spring boot 1.4 modules</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<rest-assured.version>3.0.1</rest-assured.version>
<!-- plugins -->
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
</properties>
<parent>
<artifactId>spring-boot-starter-parent</artifactId>
<groupId>org.springframework.boot</groupId>
<version>1.4.4.RELEASE</version>
<relativePath />
</parent>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<version>${rest-assured.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<forkCount>3</forkCount>
<reuseForks>true</reuseForks>
<excludes>
<exclude>**/*IntegrationTest.java</exclude>
<exclude>**/*LongRunningUnitTest.java</exclude>
<exclude>**/*ManualTest.java</exclude>
<exclude>**/JdbcTest.java</exclude>
<exclude>**/*LiveTest.java</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
parent-boot-5/pom.xml
+3 -3
View File
@@ -12,16 +12,16 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<rest-assured.version>3.0.1</rest-assured.version>
<rest-assured.version>3.0.6</rest-assured.version>
<!-- plugins -->
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
<maven-surefire-plugin.version>2.20.1</maven-surefire-plugin.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
</properties>
<parent>
<artifactId>spring-boot-starter-parent</artifactId>
<groupId>org.springframework.boot</groupId>
<version>1.5.3.RELEASE</version>
<version>1.5.9.RELEASE</version>
<relativePath />
</parent>
pom.xml
+1
View File
@@ -28,6 +28,7 @@
</properties>
<modules>
<module>parent-boot-5</module>
<module>asm</module>
<module>atomix</module>
<module>apache-cayenne</module>
spring-all/pom.xml
+2 -2
View File
@@ -9,10 +9,10 @@
<packaging>war</packaging>
<parent>
<artifactId>parent-boot-4</artifactId>
<artifactId>parent-boot-5</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../parent-boot-4</relativePath>
<relativePath>../parent-boot-5</relativePath>
</parent>
<dependencies>
spring-boot-keycloak/pom.xml
+2 -2
View File
@@ -14,9 +14,9 @@
<parent>
<groupId>com.baeldung</groupId>
<artifactId>parent-boot-4</artifactId>
<artifactId>parent-boot-5</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../parent-boot-4</relativePath>
<relativePath>../parent-boot-5</relativePath>
</parent>
spring-cloud-data-flow/batch-job/pom.xml
+2 -2
View File
@@ -12,10 +12,10 @@
<description>Demo project for Spring Boot</description>
<parent>
<artifactId>parent-boot-4</artifactId>
<artifactId>parent-boot-5</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../parent-boot-4</relativePath>
<relativePath>../../parent-boot-5</relativePath>
</parent>
<properties>
spring-cloud-data-flow/data-flow-server/pom.xml
+2 -2
View File
@@ -12,10 +12,10 @@
<description>Demo project for Spring Boot</description>
<parent>
<artifactId>parent-boot-4</artifactId>
<artifactId>parent-boot-5</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../parent-boot-4</relativePath>
<relativePath>../../parent-boot-5</relativePath>
</parent>
<properties>
spring-cloud-data-flow/data-flow-shell/pom.xml
+2 -2
View File
@@ -12,10 +12,10 @@
<description>Demo project for Spring Boot</description>
<parent>
<artifactId>parent-boot-4</artifactId>
<artifactId>parent-boot-5</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../parent-boot-4</relativePath>
<relativePath>../../parent-boot-5</relativePath>
</parent>
<properties>
spring-cloud-data-flow/log-sink/pom.xml
+2 -2
View File
@@ -12,10 +12,10 @@
<description>Demo project for Spring Boot</description>
<parent>
<artifactId>parent-boot-4</artifactId>
<artifactId>parent-boot-5</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../parent-boot-4</relativePath>
<relativePath>../../parent-boot-5</relativePath>
</parent>
<properties>
spring-cloud-data-flow/time-processor/pom.xml
+2 -2
View File
@@ -12,10 +12,10 @@
<description>Demo project for Spring Boot</description>
<parent>
<artifactId>parent-boot-4</artifactId>
<artifactId>parent-boot-5</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../parent-boot-4</relativePath>
<relativePath>../../parent-boot-5</relativePath>
</parent>
<properties>
spring-cloud-data-flow/time-source/pom.xml
+2 -2
View File
@@ -12,10 +12,10 @@
<description>Demo project for Spring Boot</description>
<parent>
<artifactId>parent-boot-4</artifactId>
<artifactId>parent-boot-5</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../parent-boot-4</relativePath>
<relativePath>../../parent-boot-5</relativePath>
</parent>
<properties>
spring-cloud/spring-cloud-bootstrap/config/pom.xml
+2 -2
View File
@@ -7,10 +7,10 @@
<version>1.0.0-SNAPSHOT</version>
<parent>
<artifactId>parent-boot-4</artifactId>
<artifactId>parent-boot-5</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../../parent-boot-4</relativePath>
<relativePath>../../../parent-boot-5</relativePath>
</parent>
<dependencies>
spring-cloud/spring-cloud-bootstrap/discovery/pom.xml
+2 -2
View File
@@ -7,10 +7,10 @@
<version>1.0.0-SNAPSHOT</version>
<parent>
<artifactId>parent-boot-4</artifactId>
<artifactId>parent-boot-5</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../../parent-boot-4</relativePath>
<relativePath>../../../parent-boot-5</relativePath>
</parent>
<dependencies>
spring-cloud/spring-cloud-bootstrap/gateway/pom.xml
+2 -2
View File
@@ -7,10 +7,10 @@
<version>1.0.0-SNAPSHOT</version>
<parent>
<artifactId>parent-boot-4</artifactId>
<artifactId>parent-boot-5</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../../parent-boot-4</relativePath>
<relativePath>../../../parent-boot-5</relativePath>
</parent>
<dependencies>
spring-cloud/spring-cloud-bootstrap/svc-book/pom.xml
+2 -2
View File
@@ -8,10 +8,10 @@
<version>1.0.0-SNAPSHOT</version>
<parent>
<artifactId>parent-boot-4</artifactId>
<artifactId>parent-boot-5</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../../parent-boot-4</relativePath>
<relativePath>../../../parent-boot-5</relativePath>
</parent>
<dependencies>
spring-cloud/spring-cloud-bootstrap/svc-rating/pom.xml
+2 -2
View File
@@ -8,10 +8,10 @@
<version>1.0.0-SNAPSHOT</version>
<parent>
<artifactId>parent-boot-4</artifactId>
<artifactId>parent-boot-5</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../../parent-boot-4</relativePath>
<relativePath>../../../parent-boot-5</relativePath>
</parent>
<dependencies>
spring-cloud/spring-cloud-bootstrap/zipkin/pom.xml
+2 -2
View File
@@ -7,10 +7,10 @@
<version>1.0.0-SNAPSHOT</version>
<parent>
<artifactId>parent-boot-4</artifactId>
<artifactId>parent-boot-5</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../../parent-boot-4</relativePath>
<relativePath>../../../parent-boot-5</relativePath>
</parent>
<dependencies>
spring-cloud/spring-cloud-config/client/src/test/java/com/baeldung/spring/cloud/config/client/ConfigClientLiveTest.java
+2 -3
View File
@@ -1,14 +1,13 @@
package com.baeldung.spring.cloud.config.client;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = ConfigClient.class)
@SpringBootTest(classes = ConfigClient.class)
@WebAppConfiguration
public class ConfigClientLiveTest {
@Test
spring-cloud/spring-cloud-config/pom.xml
+2 -2
View File
@@ -15,10 +15,10 @@
</modules>
<parent>
<artifactId>parent-boot-4</artifactId>
<artifactId>parent-boot-5</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../parent-boot-4</relativePath>
<relativePath>../../parent-boot-5</relativePath>
</parent>
<dependencyManagement>
spring-cloud/spring-cloud-config/server/src/test/java/com/baeldung/spring/cloud/config/server/ConfigServerListIntegrationTest.java
+2 -2
View File
@@ -3,12 +3,12 @@ package com.baeldung.spring.cloud.config.server;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = ConfigServer.class)
@SpringBootTest(classes = ConfigServer.class)
@WebAppConfiguration
@Ignore
public class ConfigServerListIntegrationTest {
spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/pom.xml
+2 -2
View File
@@ -12,10 +12,10 @@
<description>Simple books API</description>
<parent>
<artifactId>parent-boot-4</artifactId>
<artifactId>parent-boot-5</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../../parent-boot-4</relativePath>
<relativePath>../../../parent-boot-5</relativePath>
</parent>
<dependencies>
spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/pom.xml
+2 -2
View File
@@ -12,10 +12,10 @@
<description>Spring Cloud REST configuration server</description>
<parent>
<artifactId>parent-boot-4</artifactId>
<artifactId>parent-boot-5</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../../parent-boot-4</relativePath>
<relativePath>../../../parent-boot-5</relativePath>
</parent>
<properties>
spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/pom.xml
+2 -2
View File
@@ -12,10 +12,10 @@
<description>Spring Cloud REST server</description>
<parent>
<artifactId>parent-boot-4</artifactId>
<artifactId>parent-boot-5</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../../parent-boot-4</relativePath>
<relativePath>../../../parent-boot-5</relativePath>
</parent>
<properties>
spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/pom.xml
+2 -2
View File
@@ -12,10 +12,10 @@
<description>Simple reviews API</description>
<parent>
<artifactId>parent-boot-4</artifactId>
<artifactId>parent-boot-5</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../../parent-boot-4</relativePath>
<relativePath>../../../parent-boot-5</relativePath>
</parent>
<properties>
spring-cloud/spring-cloud-ribbon-client/pom.xml
+2 -2
View File
@@ -9,10 +9,10 @@
<description>Introduction to Spring Cloud Rest Client with Netflix Ribbon</description>
<parent>
<artifactId>parent-boot-4</artifactId>
<artifactId>parent-boot-5</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../parent-boot-4</relativePath>
<relativePath>../../parent-boot-5</relativePath>
</parent>
<properties>
spring-cucumber/pom.xml
+2 -2
View File
@@ -12,10 +12,10 @@
<description>Demo project for Spring Boot</description>
<parent>
<artifactId>parent-boot-4</artifactId>
<artifactId>parent-boot-5</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../parent-boot-4</relativePath>
<relativePath>../parent-boot-5</relativePath>
</parent>
<properties>

Some files were not shown because too many files have changed in this diff Show More