Skip to content

Commit 7bfcc3f

Browse files
author
gm2552
committed
Updating to spring boot 2.1.1
Adding sample cloudfoundry manifest.yml file.
1 parent 6d4c879 commit 7bfcc3f

File tree

6 files changed

+25
-88
lines changed

6 files changed

+25
-88
lines changed

manifest.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
applications:
3+
- name: direct-xd
4+
instances: 1
5+
buildpack: java_buildpack
6+
path: target/xd-6.0-SNAPSHOT.war
7+
env:
8+
spring.cloud.config.label: master
9+
services:
10+
- directhisp-config-server
11+
- directhisp-eureka
12+

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>org.springframework.boot</groupId>
2121
<artifactId>spring-boot-starter-parent</artifactId>
22-
<version>2.1.0.RELEASE</version>
22+
<version>2.1.1.RELEASE</version>
2323
<relativePath />
2424
</parent>
2525
<developers>
@@ -61,21 +61,21 @@
6161
<dependency>
6262
<groupId>org.springframework.boot</groupId>
6363
<artifactId>spring-boot-dependencies</artifactId>
64-
<version>2.1.0.RELEASE</version>
64+
<version>2.1.1.RELEASE</version>
6565
<type>pom</type>
6666
<scope>import</scope>
6767
</dependency>
6868
<dependency>
6969
<groupId>io.pivotal.spring.cloud</groupId>
7070
<artifactId>spring-cloud-services-dependencies</artifactId>
71-
<version>2.0.1.RELEASE</version>
71+
<version>2.0.3.RELEASE</version>
7272
<type>pom</type>
7373
<scope>import</scope>
7474
</dependency>
7575
<dependency>
7676
<groupId>org.springframework.cloud</groupId>
7777
<artifactId>spring-cloud-starter-parent</artifactId>
78-
<version>Greenwich.M2</version>
78+
<version>Greenwich.M3</version>
7979
<type>pom</type>
8080
<scope>import</scope>
8181
</dependency>

src/main/java/org/nhind/xdm/boot/XDApplication.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,24 @@
22

33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
5+
import org.springframework.boot.builder.SpringApplicationBuilder;
6+
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
57
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
68
import org.springframework.context.annotation.ComponentScan;
79

810
@SpringBootApplication
911
@EnableEurekaClient
1012
@ComponentScan(basePackages = {"org.nhind.xdm.springconfig"})
11-
public class XDApplication
13+
public class XDApplication extends SpringBootServletInitializer
1214
{
1315
public static void main(String[] args)
1416
{
1517
SpringApplication.run(XDApplication.class, args);
1618
}
19+
20+
@Override
21+
protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
22+
{
23+
return application.sources(XDApplication.class);
24+
}
1725
}

src/main/webapp/WEB-INF/cxf-servlet.xml

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

src/main/webapp/WEB-INF/web.xml

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

src/main/webapp/index.jsp

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

0 commit comments

Comments
 (0)