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
2d79d63a
Commit
2d79d63a
authored
Sep 05, 2017
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resume building against Spring Framework 5 snapshots
See gh-10123 Closes gh-9949
parent
0e21af40
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
ReactorCoreAutoConfiguration.java
...oconfigure/reactor/core/ReactorCoreAutoConfiguration.java
+1
-1
HttpMessageConvertersTests.java
...k/boot/autoconfigure/http/HttpMessageConvertersTests.java
+3
-0
pom.xml
spring-boot-dependencies/pom.xml
+2
-2
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/core/ReactorCoreAutoConfiguration.java
View file @
2d79d63a
...
@@ -40,7 +40,7 @@ public class ReactorCoreAutoConfiguration {
...
@@ -40,7 +40,7 @@ public class ReactorCoreAutoConfiguration {
@Autowired
@Autowired
protected
void
initialize
(
ReactorCoreProperties
properties
)
{
protected
void
initialize
(
ReactorCoreProperties
properties
)
{
if
(
properties
.
getStacktraceMode
().
isEnabled
())
{
if
(
properties
.
getStacktraceMode
().
isEnabled
())
{
Hooks
.
onOperator
(
Hooks
.
OperatorHook
::
operatorStacktrace
);
Hooks
.
onOperator
Debug
(
);
}
}
}
}
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersTests.java
View file @
2d79d63a
...
@@ -26,6 +26,7 @@ import org.junit.Test;
...
@@ -26,6 +26,7 @@ import org.junit.Test;
import
org.springframework.http.converter.ByteArrayHttpMessageConverter
;
import
org.springframework.http.converter.ByteArrayHttpMessageConverter
;
import
org.springframework.http.converter.HttpMessageConverter
;
import
org.springframework.http.converter.HttpMessageConverter
;
import
org.springframework.http.converter.ResourceHttpMessageConverter
;
import
org.springframework.http.converter.ResourceHttpMessageConverter
;
import
org.springframework.http.converter.ResourceRegionHttpMessageConverter
;
import
org.springframework.http.converter.StringHttpMessageConverter
;
import
org.springframework.http.converter.StringHttpMessageConverter
;
import
org.springframework.http.converter.cbor.MappingJackson2CborHttpMessageConverter
;
import
org.springframework.http.converter.cbor.MappingJackson2CborHttpMessageConverter
;
import
org.springframework.http.converter.json.MappingJackson2HttpMessageConverter
;
import
org.springframework.http.converter.json.MappingJackson2HttpMessageConverter
;
...
@@ -55,6 +56,7 @@ public class HttpMessageConvertersTests {
...
@@ -55,6 +56,7 @@ public class HttpMessageConvertersTests {
}
}
assertThat
(
converterClasses
).
containsExactly
(
ByteArrayHttpMessageConverter
.
class
,
assertThat
(
converterClasses
).
containsExactly
(
ByteArrayHttpMessageConverter
.
class
,
StringHttpMessageConverter
.
class
,
ResourceHttpMessageConverter
.
class
,
StringHttpMessageConverter
.
class
,
ResourceHttpMessageConverter
.
class
,
ResourceRegionHttpMessageConverter
.
class
,
SourceHttpMessageConverter
.
class
,
SourceHttpMessageConverter
.
class
,
AllEncompassingFormHttpMessageConverter
.
class
,
AllEncompassingFormHttpMessageConverter
.
class
,
MappingJackson2HttpMessageConverter
.
class
,
MappingJackson2HttpMessageConverter
.
class
,
...
@@ -128,6 +130,7 @@ public class HttpMessageConvertersTests {
...
@@ -128,6 +130,7 @@ public class HttpMessageConvertersTests {
}
}
assertThat
(
converterClasses
).
containsExactly
(
ByteArrayHttpMessageConverter
.
class
,
assertThat
(
converterClasses
).
containsExactly
(
ByteArrayHttpMessageConverter
.
class
,
StringHttpMessageConverter
.
class
,
ResourceHttpMessageConverter
.
class
,
StringHttpMessageConverter
.
class
,
ResourceHttpMessageConverter
.
class
,
ResourceRegionHttpMessageConverter
.
class
,
SourceHttpMessageConverter
.
class
,
SourceHttpMessageConverter
.
class
,
AllEncompassingFormHttpMessageConverter
.
class
,
AllEncompassingFormHttpMessageConverter
.
class
,
MappingJackson2HttpMessageConverter
.
class
,
MappingJackson2HttpMessageConverter
.
class
,
...
...
spring-boot-dependencies/pom.xml
View file @
2d79d63a
...
@@ -142,7 +142,7 @@
...
@@ -142,7 +142,7 @@
<postgresql.version>
42.1.3
</postgresql.version>
<postgresql.version>
42.1.3
</postgresql.version>
<quartz.version>
2.3.0
</quartz.version>
<quartz.version>
2.3.0
</quartz.version>
<querydsl.version>
4.1.4
</querydsl.version>
<querydsl.version>
4.1.4
</querydsl.version>
<reactor-bom.version>
Bismuth-
M3
</reactor-bom.version>
<reactor-bom.version>
Bismuth-
BUILD-SNAPSHOT
</reactor-bom.version>
<rxjava.version>
1.3.0
</rxjava.version>
<rxjava.version>
1.3.0
</rxjava.version>
<rxjava-adapter.version>
1.2.1
</rxjava-adapter.version>
<rxjava-adapter.version>
1.2.1
</rxjava-adapter.version>
<rxjava2.version>
2.1.1
</rxjava2.version>
<rxjava2.version>
2.1.1
</rxjava2.version>
...
@@ -154,7 +154,7 @@
...
@@ -154,7 +154,7 @@
<slf4j.version>
1.7.25
</slf4j.version>
<slf4j.version>
1.7.25
</slf4j.version>
<snakeyaml.version>
1.18
</snakeyaml.version>
<snakeyaml.version>
1.18
</snakeyaml.version>
<solr.version>
6.6.0
</solr.version>
<solr.version>
6.6.0
</solr.version>
<spring.version>
5.0.0.
RC3
</spring.version>
<spring.version>
5.0.0.
BUILD-SNAPSHOT
</spring.version>
<spring-amqp.version>
2.0.0.M5
</spring-amqp.version>
<spring-amqp.version>
2.0.0.M5
</spring-amqp.version>
<spring-cloud-connectors.version>
2.0.0.M1
</spring-cloud-connectors.version>
<spring-cloud-connectors.version>
2.0.0.M1
</spring-cloud-connectors.version>
<spring-batch.version>
4.0.0.M3
</spring-batch.version>
<spring-batch.version>
4.0.0.M3
</spring-batch.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