Skip to content

Commit afe74dd

Browse files
philwebbphilwebb
committedSep 24, 2016
Upgrade to Spring Boot 1.4
1 parent f9f8d64 commit afe74dd

File tree

22 files changed

+215
-93
lines changed

22 files changed

+215
-93
lines changed
 

‎livelessons-bootstrap/livelessons-bootstrap-gradle/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext { springBootVersion = '1.2.1.RELEASE' }
2+
ext { springBootVersion = '1.4.1.RELEASE' }
33
repositories { mavenCentral() }
44
dependencies { classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") }
55
}

‎livelessons-choreography/livelessons-choreography-bookmark-service/pom.xml

+11
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@
1111
<properties>
1212
<main.basedir>../..</main.basedir>
1313
</properties>
14+
<dependencyManagement>
15+
<dependencies>
16+
<dependency>
17+
<groupId>org.springframework.cloud</groupId>
18+
<artifactId>spring-cloud-dependencies</artifactId>
19+
<version>Brixton.SR4</version>
20+
<type>pom</type>
21+
<scope>import</scope>
22+
</dependency>
23+
</dependencies>
24+
</dependencyManagement>
1425
<dependencies>
1526
<dependency>
1627
<groupId>org.springframework.cloud</groupId>

‎livelessons-choreography/livelessons-choreography-contact-service/pom.xml

+11
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@
1111
<properties>
1212
<main.basedir>../..</main.basedir>
1313
</properties>
14+
<dependencyManagement>
15+
<dependencies>
16+
<dependency>
17+
<groupId>org.springframework.cloud</groupId>
18+
<artifactId>spring-cloud-dependencies</artifactId>
19+
<version>Brixton.SR4</version>
20+
<type>pom</type>
21+
<scope>import</scope>
22+
</dependency>
23+
</dependencies>
24+
</dependencyManagement>
1425
<dependencies>
1526
<dependency>
1627
<groupId>org.springframework.cloud</groupId>

‎livelessons-choreography/livelessons-choreography-eureka-service/pom.xml

+11
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@
1111
<properties>
1212
<main.basedir>../..</main.basedir>
1313
</properties>
14+
<dependencyManagement>
15+
<dependencies>
16+
<dependency>
17+
<groupId>org.springframework.cloud</groupId>
18+
<artifactId>spring-cloud-dependencies</artifactId>
19+
<version>Brixton.SR4</version>
20+
<type>pom</type>
21+
<scope>import</scope>
22+
</dependency>
23+
</dependencies>
24+
</dependencyManagement>
1425
<dependencies>
1526
<dependency>
1627
<groupId>org.springframework.cloud</groupId>

‎livelessons-choreography/livelessons-choreography-gateway/pom.xml

+15-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@
1111
<properties>
1212
<main.basedir>../..</main.basedir>
1313
</properties>
14+
<dependencyManagement>
15+
<dependencies>
16+
<dependency>
17+
<groupId>org.springframework.cloud</groupId>
18+
<artifactId>spring-cloud-dependencies</artifactId>
19+
<version>Brixton.SR4</version>
20+
<type>pom</type>
21+
<scope>import</scope>
22+
</dependency>
23+
</dependencies>
24+
</dependencyManagement>
1425
<dependencies>
1526
<dependency>
1627
<groupId>org.springframework.cloud</groupId>
@@ -31,7 +42,10 @@
3142
<dependency>
3243
<groupId>io.projectreactor</groupId>
3344
<artifactId>reactor-core</artifactId>
34-
<version>2.0.0.RC1</version>
45+
</dependency>
46+
<dependency>
47+
<groupId>io.projectreactor</groupId>
48+
<artifactId>reactor-stream</artifactId>
3549
</dependency>
3650
</dependencies>
3751
</project>

‎livelessons-choreography/livelessons-choreography-hystrix-dashboard-service/pom.xml

+11
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@
1111
<properties>
1212
<main.basedir>../..</main.basedir>
1313
</properties>
14+
<dependencyManagement>
15+
<dependencies>
16+
<dependency>
17+
<groupId>org.springframework.cloud</groupId>
18+
<artifactId>spring-cloud-dependencies</artifactId>
19+
<version>Brixton.SR4</version>
20+
<type>pom</type>
21+
<scope>import</scope>
22+
</dependency>
23+
</dependencies>
24+
</dependencyManagement>
1425
<dependencies>
1526
<dependency>
1627
<groupId>org.springframework.cloud</groupId>

‎livelessons-choreography/livelessons-choreography-hystrix/pom.xml

+11
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@
1111
<properties>
1212
<main.basedir>../..</main.basedir>
1313
</properties>
14+
<dependencyManagement>
15+
<dependencies>
16+
<dependency>
17+
<groupId>org.springframework.cloud</groupId>
18+
<artifactId>spring-cloud-dependencies</artifactId>
19+
<version>Brixton.SR4</version>
20+
<type>pom</type>
21+
<scope>import</scope>
22+
</dependency>
23+
</dependencies>
24+
</dependencyManagement>
1425
<dependencies>
1526
<dependency>
1627
<groupId>org.springframework.cloud</groupId>

‎livelessons-choreography/livelessons-choreography-ribbon-and-eureka/pom.xml

+11
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@
1111
<properties>
1212
<main.basedir>../..</main.basedir>
1313
</properties>
14+
<dependencyManagement>
15+
<dependencies>
16+
<dependency>
17+
<groupId>org.springframework.cloud</groupId>
18+
<artifactId>spring-cloud-dependencies</artifactId>
19+
<version>Brixton.SR4</version>
20+
<type>pom</type>
21+
<scope>import</scope>
22+
</dependency>
23+
</dependencies>
24+
</dependencyManagement>
1425
<dependencies>
1526
<dependency>
1627
<groupId>org.springframework.cloud</groupId>

‎livelessons-cloud/livelessons-cloud-s3/pom.xml

+11
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@
1111
<properties>
1212
<main.basedir>../..</main.basedir>
1313
</properties>
14+
<dependencyManagement>
15+
<dependencies>
16+
<dependency>
17+
<groupId>org.springframework.cloud</groupId>
18+
<artifactId>spring-cloud-dependencies</artifactId>
19+
<version>Brixton.SR4</version>
20+
<type>pom</type>
21+
<scope>import</scope>
22+
</dependency>
23+
</dependencies>
24+
</dependencyManagement>
1425
<dependencies>
1526
<dependency>
1627
<groupId>org.springframework.boot</groupId>

‎livelessons-cloud/livelessons-cloud-session/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
<dependency>
3232
<groupId>org.springframework.session</groupId>
3333
<artifactId>spring-session-data-redis</artifactId>
34-
<version>1.0.0.RELEASE</version>
3534
</dependency>
3635
</dependencies>
3736
</project>

‎livelessons-configuration/livelessons-configuration-cloudclient/pom.xml

+11
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@
1111
<properties>
1212
<main.basedir>../..</main.basedir>
1313
</properties>
14+
<dependencyManagement>
15+
<dependencies>
16+
<dependency>
17+
<groupId>org.springframework.cloud</groupId>
18+
<artifactId>spring-cloud-dependencies</artifactId>
19+
<version>Brixton.SR4</version>
20+
<type>pom</type>
21+
<scope>import</scope>
22+
</dependency>
23+
</dependencies>
24+
</dependencyManagement>
1425
<dependencies>
1526
<dependency>
1627
<groupId>org.springframework.cloud</groupId>

‎livelessons-configuration/livelessons-configuration-cloudserver/pom.xml

+11
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@
1111
<properties>
1212
<main.basedir>../..</main.basedir>
1313
</properties>
14+
<dependencyManagement>
15+
<dependencies>
16+
<dependency>
17+
<groupId>org.springframework.cloud</groupId>
18+
<artifactId>spring-cloud-dependencies</artifactId>
19+
<version>Brixton.SR4</version>
20+
<type>pom</type>
21+
<scope>import</scope>
22+
</dependency>
23+
</dependencies>
24+
</dependencyManagement>
1425
<dependencies>
1526
<dependency>
1627
<groupId>org.springframework.cloud</groupId>

‎livelessons-data/livelessons-data-elasticsearch/src/main/java/demo/DataElasticsearchApplication.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
1010
import org.springframework.data.elasticsearch.core.query.SearchQuery;
1111

12-
import static org.elasticsearch.index.query.QueryBuilders.fuzzyLikeThisFieldQuery;
12+
import static org.elasticsearch.index.query.QueryBuilders.fuzzyQuery;
1313

1414
@SpringBootApplication
1515
public class DataElasticsearchApplication {
@@ -33,7 +33,7 @@ public CommandLineRunner example(CarRepository repository,
3333

3434
System.err.println("\nFrom the template...");
3535
SearchQuery query = new NativeSearchQueryBuilder()
36-
.withQuery(fuzzyLikeThisFieldQuery("make").likeText("Ronda")).build();
36+
.withQuery(fuzzyQuery("make", "Ronda")).build();
3737
template.queryForList(query, Car.class).forEach(System.err::println);
3838
};
3939
}

‎livelessons-parent/pom.xml

+3-4
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@
77
<version>1.0.0-SNAPSHOT</version>
88
<packaging>pom</packaging>
99
<parent>
10-
<groupId>org.springframework.cloud</groupId>
11-
<artifactId>spring-cloud-starter-parent</artifactId>
12-
<version>1.0.2.RELEASE</version>
10+
<groupId>org.springframework.boot</groupId>
11+
<artifactId>spring-boot-starter-parent</artifactId>
12+
<version>1.4.1.RELEASE</version>
1313
<relativePath />
1414
</parent>
1515
<properties>
1616
<main.basedir>../..</main.basedir>
1717
<java.version>1.8</java.version>
18-
<spring-security-oauth.version>2.0.6.RELEASE</spring-security-oauth.version>
1918
</properties>
2019
<build>
2120
<plugins>

‎livelessons-security/livelessons-security-sso-resource/pom.xml

+11
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@
1111
<properties>
1212
<main.basedir>../..</main.basedir>
1313
</properties>
14+
<dependencyManagement>
15+
<dependencies>
16+
<dependency>
17+
<groupId>org.springframework.cloud</groupId>
18+
<artifactId>spring-cloud-dependencies</artifactId>
19+
<version>Brixton.SR4</version>
20+
<type>pom</type>
21+
<scope>import</scope>
22+
</dependency>
23+
</dependencies>
24+
</dependencyManagement>
1425
<dependencies>
1526
<dependency>
1627
<groupId>org.springframework.cloud</groupId>

‎livelessons-security/livelessons-security-sso-resource/src/main/java/demo/SsoResourceApplication.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import org.springframework.boot.SpringApplication;
99
import org.springframework.boot.autoconfigure.SpringBootApplication;
10-
import org.springframework.cloud.security.oauth2.resource.EnableOAuth2Resource;
10+
import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
1111
import org.springframework.web.bind.annotation.RequestMapping;
1212
import org.springframework.web.bind.annotation.RestController;
1313

@@ -16,7 +16,7 @@
1616
* @author Dave Syer (THANK YOU DAVE!)
1717
*/
1818
@SpringBootApplication
19-
@EnableOAuth2Resource
19+
@EnableResourceServer
2020
@RestController
2121
public class SsoResourceApplication {
2222

‎livelessons-security/livelessons-security-sso-resource/src/main/resources/application.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
server.port: 9000
22
server.address: 127.0.0.1
3-
spring.oauth2.resource.userInfoUri: http://localhost:9999/uaa/user
3+
security.oauth2.resource.userInfoUri: http://localhost:9999/uaa/user

‎livelessons-security/livelessons-security-sso-ui/pom.xml

+11
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,17 @@
1212
<main.basedir>../..</main.basedir>
1313
<wro4j.version>1.7.6</wro4j.version>
1414
</properties>
15+
<dependencyManagement>
16+
<dependencies>
17+
<dependency>
18+
<groupId>org.springframework.cloud</groupId>
19+
<artifactId>spring-cloud-dependencies</artifactId>
20+
<version>Brixton.SR4</version>
21+
<type>pom</type>
22+
<scope>import</scope>
23+
</dependency>
24+
</dependencies>
25+
</dependencyManagement>
1526
<dependencies>
1627
<dependency>
1728
<groupId>org.springframework.cloud</groupId>

‎livelessons-security/livelessons-security-sso-ui/src/main/java/demo/SecurityConfiguration.java

-77
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.