Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
bcdc6958
Commit
bcdc6958
authored
Sep 29, 2017
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #10447 from jfarcand:master
* pr/10447: Upgrade sample to Atmosphere 2.4.14
parents
ce8b59fc
9dbc3e25
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
pom.xml
spring-boot-samples/spring-boot-sample-atmosphere/pom.xml
+2
-2
SampleAtmosphereApplication.java
...n/java/sample/atmosphere/SampleAtmosphereApplication.java
+2
-2
No files found.
spring-boot-samples/spring-boot-sample-atmosphere/pom.xml
View file @
bcdc6958
...
...
@@ -32,12 +32,12 @@
<dependency>
<groupId>
org.atmosphere
</groupId>
<artifactId>
atmosphere-runtime
</artifactId>
<version>
2.
2.
4
</version>
<version>
2.
4.1
4
</version>
</dependency>
<dependency>
<groupId>
org.webjars
</groupId>
<artifactId>
atmosphere-javascript
</artifactId>
<version>
2.
2.3
</version>
<version>
2.
3.4
</version>
</dependency>
<!-- Test -->
<dependency>
...
...
spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/atmosphere/SampleAtmosphereApplication.java
View file @
bcdc6958
...
...
@@ -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
Atmosphere
Initializer
private
static
class
EmbeddedAtmosphereInitializer
extends
Container
Initializer
implements
ServletContextInitializer
{
@Override
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment