Commit bcdc6958 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge pull request #10447 from jfarcand:master

* pr/10447:
  Upgrade sample to Atmosphere 2.4.14
parents ce8b59fc 9dbc3e25
......@@ -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>
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment