root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge pull request #10447 from jfarcand:master 

* pr/10447:
  Upgrade sample to Atmosphere 2.4.14
This commit is contained in:
Stephane Nicoll 2017-09-29 16:29:31 +02:00
parent ce8b59fc7d 9dbc3e25bb
commit bcdc6958f0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-samples/spring-boot-sample-atmosphere/pom.xml
View File

@ -32,12 +32,12 @@
<dependency>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-runtime</artifactId>
<version>2.2.4</version>
<version>2.4.14</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>atmosphere-javascript</artifactId>
<version>2.2.3</version>
<version>2.3.4</version>
</dependency>
<!-- Test -->
<dependency>

4
spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/atmosphere/SampleAtmosphereApplication.java
View File

@ -21,8 +21,8 @@ import java.util.Collections;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import org.atmosphere.cpr.AtmosphereInitializer;
import org.atmosphere.cpr.AtmosphereServlet;
import org.atmosphere.cpr.ContainerInitializer;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.SpringBootConfiguration;
@ -69,7 +69,7 @@ public class SampleAtmosphereApplication {
}
private static class EmbeddedAtmosphereInitializer extends AtmosphereInitializer
private static class EmbeddedAtmosphereInitializer extends ContainerInitializer
implements ServletContextInitializer {
@Override