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
4bb99e80
Commit
4bb99e80
authored
Sep 15, 2013
by
Dave Syer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade to reactor M3
parent
ef79d635
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
ReactorAutoConfiguration.java
.../boot/autoconfigure/reactor/ReactorAutoConfiguration.java
+7
-1
pom.xml
spring-boot-dependencies/pom.xml
+1
-1
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfiguration.java
View file @
4bb99e80
...
...
@@ -37,7 +37,6 @@ import reactor.spring.context.config.EnableReactor;
@ConditionalOnClass
(
EnableReactor
.
class
)
@ConditionalOnMissingBean
(
Reactor
.
class
)
@AutoConfigureAfter
(
WebMvcAutoConfiguration
.
class
)
@EnableReactor
public
class
ReactorAutoConfiguration
{
@Bean
...
...
@@ -45,4 +44,11 @@ public class ReactorAutoConfiguration {
return
environment
.
getRootReactor
();
}
@Configuration
@ConditionalOnMissingBean
(
Environment
.
class
)
@EnableReactor
protected
static
class
ReactorConfiguration
{
}
}
spring-boot-dependencies/pom.xml
View file @
4bb99e80
...
...
@@ -27,7 +27,7 @@
<log4j.version>
1.2.17
</log4j.version>
<logback.version>
1.0.13
</logback.version>
<mockito.version>
1.9.5
</mockito.version>
<reactor.version>
1.0.0.M
2
</reactor.version>
<reactor.version>
1.0.0.M
3
</reactor.version>
<servlet-api.version>
3.0.1
</servlet-api.version>
<slf4j.version>
1.7.5
</slf4j.version>
<snakeyaml.version>
1.12
</snakeyaml.version>
...
...
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