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
09f4d4b9
Commit
09f4d4b9
authored
Mar 13, 2021
by
izeye
Committed by
Stephane Nicoll
Mar 13, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
See gh-25617
parent
11649bc1
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
68 additions
and
93 deletions
+68
-93
ToolchainPlugin.java
...springframework/boot/build/toolchain/ToolchainPlugin.java
+1
-1
JerseyWebEndpointIntegrationTests.java
...ndpoint/web/jersey/JerseyWebEndpointIntegrationTests.java
+0
-3
RSocketServerAutoConfigurationTests.java
...onfigure/rsocket/RSocketServerAutoConfigurationTests.java
+0
-3
ConfigurationMetadataRepositoryJsonBuilderTests.java
...data/ConfigurationMetadataRepositoryJsonBuilderTests.java
+64
-83
TomEEDeploymentIntegrationTests.java
.../intTest/java/sample/TomEEDeploymentIntegrationTests.java
+1
-1
TomcatDeploymentIntegrationTests.java
...intTest/java/sample/TomcatDeploymentIntegrationTests.java
+1
-1
WildflyDeploymentIntegrationTests.java
...ntTest/java/sample/WildflyDeploymentIntegrationTests.java
+1
-1
No files found.
buildSrc/src/main/java/org/springframework/boot/build/toolchain/ToolchainPlugin.java
View file @
09f4d4b9
...
@@ -62,7 +62,7 @@ public class ToolchainPlugin implements Plugin<Project> {
...
@@ -62,7 +62,7 @@ public class ToolchainPlugin implements Plugin<Project> {
}
}
}
}
p
ublic
boolean
isJavaVersionSupported
(
ToolchainExtension
toolchain
,
JavaLanguageVersion
toolchainVersion
)
{
p
rivate
boolean
isJavaVersionSupported
(
ToolchainExtension
toolchain
,
JavaLanguageVersion
toolchainVersion
)
{
return
toolchain
.
getMaximumCompatibleJavaVersion
().
map
((
version
)
->
version
.
canCompileOrRun
(
toolchainVersion
))
return
toolchain
.
getMaximumCompatibleJavaVersion
().
map
((
version
)
->
version
.
canCompileOrRun
(
toolchainVersion
))
.
getOrElse
(
true
);
.
getOrElse
(
true
);
}
}
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/jersey/JerseyWebEndpointIntegrationTests.java
View file @
09f4d4b9
...
@@ -27,9 +27,7 @@ import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAu
...
@@ -27,9 +27,7 @@ import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAu
import
org.springframework.boot.actuate.autoconfigure.web.jersey.JerseySameManagementContextConfiguration
;
import
org.springframework.boot.actuate.autoconfigure.web.jersey.JerseySameManagementContextConfiguration
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.autoconfigure.jersey.JerseyAutoConfiguration
;
import
org.springframework.boot.autoconfigure.jersey.JerseyAutoConfiguration
;
import
org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener
;
import
org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration
;
import
org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration
;
import
org.springframework.boot.logging.LogLevel
;
import
org.springframework.boot.test.context.FilteredClassLoader
;
import
org.springframework.boot.test.context.FilteredClassLoader
;
import
org.springframework.boot.test.context.runner.WebApplicationContextRunner
;
import
org.springframework.boot.test.context.runner.WebApplicationContextRunner
;
import
org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext
;
import
org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext
;
...
@@ -55,7 +53,6 @@ class JerseyWebEndpointIntegrationTests {
...
@@ -55,7 +53,6 @@ class JerseyWebEndpointIntegrationTests {
JerseyWebEndpointManagementContextConfiguration
.
class
))
JerseyWebEndpointManagementContextConfiguration
.
class
))
.
withUserConfiguration
(
ResourceConfigConfiguration
.
class
)
.
withUserConfiguration
(
ResourceConfigConfiguration
.
class
)
.
withClassLoader
(
new
FilteredClassLoader
(
DispatcherServlet
.
class
))
.
withClassLoader
(
new
FilteredClassLoader
(
DispatcherServlet
.
class
))
.
withInitializer
(
new
ConditionEvaluationReportLoggingListener
(
LogLevel
.
INFO
))
.
withPropertyValues
(
"spring.jersey.type=filter"
,
"server.port=0"
).
run
((
context
)
->
{
.
withPropertyValues
(
"spring.jersey.type=filter"
,
"server.port=0"
).
run
((
context
)
->
{
assertThat
(
context
).
hasNotFailed
();
assertThat
(
context
).
hasNotFailed
();
Set
<
Resource
>
resources
=
context
.
getBean
(
ResourceConfig
.
class
).
getResources
();
Set
<
Resource
>
resources
=
context
.
getBean
(
ResourceConfig
.
class
).
getResources
();
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfigurationTests.java
View file @
09f4d4b9
...
@@ -19,8 +19,6 @@ package org.springframework.boot.autoconfigure.rsocket;
...
@@ -19,8 +19,6 @@ package org.springframework.boot.autoconfigure.rsocket;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener
;
import
org.springframework.boot.logging.LogLevel
;
import
org.springframework.boot.rsocket.context.RSocketPortInfoApplicationContextInitializer
;
import
org.springframework.boot.rsocket.context.RSocketPortInfoApplicationContextInitializer
;
import
org.springframework.boot.rsocket.context.RSocketServerBootstrap
;
import
org.springframework.boot.rsocket.context.RSocketServerBootstrap
;
import
org.springframework.boot.rsocket.server.RSocketServerCustomizer
;
import
org.springframework.boot.rsocket.server.RSocketServerCustomizer
;
...
@@ -148,7 +146,6 @@ class RSocketServerAutoConfigurationTests {
...
@@ -148,7 +146,6 @@ class RSocketServerAutoConfigurationTests {
@Test
@Test
void
whenSpringWebIsNotPresentThenEmbeddedServerConfigurationBacksOff
()
{
void
whenSpringWebIsNotPresentThenEmbeddedServerConfigurationBacksOff
()
{
contextRunner
().
withClassLoader
(
new
FilteredClassLoader
(
ReactorResourceFactory
.
class
))
contextRunner
().
withClassLoader
(
new
FilteredClassLoader
(
ReactorResourceFactory
.
class
))
.
withInitializer
(
new
ConditionEvaluationReportLoggingListener
(
LogLevel
.
INFO
))
.
withPropertyValues
(
"spring.rsocket.server.port=0"
)
.
withPropertyValues
(
"spring.rsocket.server.port=0"
)
.
run
((
context
)
->
assertThat
(
context
).
doesNotHaveBean
(
RSocketServerFactory
.
class
));
.
run
((
context
)
->
assertThat
(
context
).
doesNotHaveBean
(
RSocketServerFactory
.
class
));
}
}
...
...
spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilderTests.java
View file @
09f4d4b9
This diff is collapsed.
Click to expand it.
spring-boot-tests/spring-boot-deployment-tests/src/intTest/java/sample/TomEEDeploymentIntegrationTests.java
View file @
09f4d4b9
...
@@ -25,7 +25,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
...
@@ -25,7 +25,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
* @author Christoph Dreis
* @author Christoph Dreis
*/
*/
@Testcontainers
(
disabledWithoutDocker
=
true
)
@Testcontainers
(
disabledWithoutDocker
=
true
)
public
class
TomEEDeploymentIntegrationTests
extends
AbstractDeploymentIntegrationTests
{
class
TomEEDeploymentIntegrationTests
extends
AbstractDeploymentIntegrationTests
{
@Container
@Container
static
WarDeploymentContainer
container
=
new
WarDeploymentContainer
(
"tomee:8-jre-8.0.2-webprofile"
,
static
WarDeploymentContainer
container
=
new
WarDeploymentContainer
(
"tomee:8-jre-8.0.2-webprofile"
,
...
...
spring-boot-tests/spring-boot-deployment-tests/src/intTest/java/sample/TomcatDeploymentIntegrationTests.java
View file @
09f4d4b9
...
@@ -25,7 +25,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
...
@@ -25,7 +25,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
* @author Christoph Dreis
* @author Christoph Dreis
*/
*/
@Testcontainers
(
disabledWithoutDocker
=
true
)
@Testcontainers
(
disabledWithoutDocker
=
true
)
public
class
TomcatDeploymentIntegrationTests
extends
AbstractDeploymentIntegrationTests
{
class
TomcatDeploymentIntegrationTests
extends
AbstractDeploymentIntegrationTests
{
@Container
@Container
static
WarDeploymentContainer
container
=
new
WarDeploymentContainer
(
"tomcat:9.0.37-jdk8-openjdk"
,
static
WarDeploymentContainer
container
=
new
WarDeploymentContainer
(
"tomcat:9.0.37-jdk8-openjdk"
,
...
...
spring-boot-tests/spring-boot-deployment-tests/src/intTest/java/sample/WildflyDeploymentIntegrationTests.java
View file @
09f4d4b9
...
@@ -25,7 +25,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
...
@@ -25,7 +25,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
* @author Christoph Dreis
* @author Christoph Dreis
*/
*/
@Testcontainers
(
disabledWithoutDocker
=
true
)
@Testcontainers
(
disabledWithoutDocker
=
true
)
public
class
WildflyDeploymentIntegrationTests
extends
AbstractDeploymentIntegrationTests
{
class
WildflyDeploymentIntegrationTests
extends
AbstractDeploymentIntegrationTests
{
@Container
@Container
static
WarDeploymentContainer
container
=
new
WarDeploymentContainer
(
"jboss/wildfly:20.0.1.Final"
,
static
WarDeploymentContainer
container
=
new
WarDeploymentContainer
(
"jboss/wildfly:20.0.1.Final"
,
...
...
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