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
c144cae6
Commit
c144cae6
authored
Nov 05, 2013
by
Dave Syer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Comment out security condition pending SPR-11069
parent
e43dcd30
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
SecurityAutoConfiguration.java
...boot/actuate/autoconfigure/SecurityAutoConfiguration.java
+3
-1
SampleDataJpaApplication.java
...mework/boot/sample/data/jpa/SampleDataJpaApplication.java
+0
-1
No files found.
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfiguration.java
View file @
c144cae6
...
...
@@ -96,7 +96,9 @@ import org.springframework.security.web.util.matcher.AnyRequestMatcher;
*/
@Configuration
@ConditionalOnClass
({
EnableWebSecurity
.
class
})
@ConditionalOnMissingBean
(
annotation
=
EnableWebSecurity
.
class
)
// TODO: re-enable this when SPR-11069 is fixed
// @ConditionalOnMissingBean(annotation = EnableWebSecurity.class)
@ConditionalOnMissingBean
(
SecurityAutoConfiguration
.
class
)
@EnableConfigurationProperties
public
class
SecurityAutoConfiguration
{
...
...
spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplication.java
View file @
c144cae6
...
...
@@ -29,5 +29,4 @@ public class SampleDataJpaApplication {
public
static
void
main
(
String
[]
args
)
throws
Exception
{
SpringApplication
.
run
(
SampleDataJpaApplication
.
class
,
args
);
}
}
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