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
ddb8694a
Commit
ddb8694a
authored
Oct 10, 2018
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '1.5.x' into 2.0.x
parents
839e686c
8124ac2b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
pom.xml
spring-boot-project/spring-boot-dependencies/pom.xml
+2
-2
UndertowServletWebServerFactory.java
...eb/embedded/undertow/UndertowServletWebServerFactory.java
+1
-1
No files found.
spring-boot-project/spring-boot-dependencies/pom.xml
View file @
ddb8694a
...
...
@@ -35,7 +35,7 @@
<!-- Dependency versions -->
<activemq.version>
5.15.6
</activemq.version>
<antlr2.version>
2.7.7
</antlr2.version>
<appengine-sdk.version>
1.9.6
4
</appengine-sdk.version>
<appengine-sdk.version>
1.9.6
6
</appengine-sdk.version>
<artemis.version>
2.4.0
</artemis.version>
<aspectj.version>
1.8.13
</aspectj.version>
<assertj.version>
3.9.1
</assertj.version>
...
...
@@ -178,7 +178,7 @@
<thymeleaf-extras-java8time.version>
3.0.1.RELEASE
</thymeleaf-extras-java8time.version>
<tomcat.version>
8.5.34
</tomcat.version>
<unboundid-ldapsdk.version>
4.0.8
</unboundid-ldapsdk.version>
<undertow.version>
1.4.2
5
.Final
</undertow.version>
<undertow.version>
1.4.2
6
.Final
</undertow.version>
<webjars-hal-browser.version>
3325375
</webjars-hal-browser.version>
<webjars-locator-core.version>
0.35
</webjars-locator-core.version>
<wsdl4j.version>
1.6.3
</wsdl4j.version>
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactory.java
View file @
ddb8694a
...
...
@@ -348,7 +348,7 @@ public class UndertowServletWebServerFactory extends AbstractServletWebServerFac
DeploymentInfo
deployment
,
ServletContextInitializer
...
initializers
)
{
ServletContextInitializer
[]
mergedInitializers
=
mergeInitializers
(
initializers
);
Initializer
initializer
=
new
Initializer
(
mergedInitializers
);
deployment
.
addServletContainerInitalizer
(
new
ServletContainerInitializerInfo
(
deployment
.
addServletContainerInit
i
alizer
(
new
ServletContainerInitializerInfo
(
Initializer
.
class
,
new
ImmediateInstanceFactory
<
ServletContainerInitializer
>(
initializer
),
NO_CLASSES
));
...
...
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