Skip to content

Commit 10257d9

Browse files
philwebbphilwebb
committed
Merge branch '1.1.x'
2 parents 2fca72f + 7ac8cac commit 10257d9

File tree

50 files changed

+79
-48
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+79
-48
lines changed

‎spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepository.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2013 the original author or authors.
2+
* Copyright 2012-2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepositoryTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2013 the original author or authors.
2+
* Copyright 2012-2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/BootGlobalAuthenticationConfiguration.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.apache.commons.logging.Log;
2222
import org.apache.commons.logging.LogFactory;
2323
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
24-
import org.springframework.boot.autoconfigure.SpringBootApplication;
2524
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2625
import org.springframework.context.ApplicationContext;
2726
import org.springframework.context.annotation.Bean;
@@ -31,18 +30,19 @@
3130
import org.springframework.security.config.annotation.authentication.configurers.GlobalAuthenticationConfigurerAdapter;
3231

3332
/**
34-
* This works with the {@link AuthenticationConfiguration} to ensure that users are able
35-
* to use:
33+
* {@link GlobalAuthenticationConfigurerAdapter} to trigger early initialization of
34+
* {@code @EnableAutoConfiguration} beans. This configuration is imported from
35+
* {@link AuthenticationConfiguration} to ensure that users are able to configure the
36+
* {@link AuthenticationManagerBuilder} from their {@code @EnableAutoConfiguration} or
37+
* {@code @SpringBootApplication} configuration class:
3638
*
37-
* <pre>
39+
* <pre class="code">
40+
* &#064;Autowired
3841
* public void configureGlobal(AuthenticationManagerBuilder auth) {
3942
* ...
4043
* }
4144
* </pre>
4245
*
43-
* within their classes annotated with {@link EnableAutoConfiguration} or
44-
* {@link SpringBootApplication}.
45-
*
4646
* @author Rob Winch
4747
* @since 1.1.11
4848
*/
@@ -76,5 +76,7 @@ public void init(AuthenticationManagerBuilder auth) {
7676
logger.debug("Eagerly initializing " + beansWithAnnotation);
7777
}
7878
}
79+
7980
}
81+
8082
}

‎spring-boot-dependencies/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1682,4 +1682,4 @@
16821682
<id>integration-test</id>
16831683
</profile>
16841684
</profiles>
1685-
</project>
1685+
</project>

‎spring-boot-full-build/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
<module>../spring-boot-samples</module>
5858
<module>../spring-boot-deployment-tests</module>
5959
<module>../spring-boot-integration-tests</module>
60-
<module>../spring-boot-security-tests</module>
6160
<module>../spring-boot-docs</module>
6261
</modules>
6362
<profiles>

‎spring-boot-integration-tests/pom.xml‎

Lines changed: 11 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<relativePath>../spring-boot-parent</relativePath>
99
</parent>
1010
<artifactId>spring-boot-integration-tests</artifactId>
11-
<packaging>jar</packaging>
11+
<packaging>pom</packaging>
1212
<name>Spring Boot Integration Tests</name>
1313
<description>Spring Boot Integration Tests</description>
1414
<url>http://projects.spring.io/spring-boot/</url>
@@ -19,24 +19,10 @@
1919
<properties>
2020
<main.basedir>${basedir}/..</main.basedir>
2121
</properties>
22-
<dependencies>
23-
<dependency>
24-
<groupId>org.gradle</groupId>
25-
<artifactId>gradle-tooling-api</artifactId>
26-
<version>${gradle.version}</version>
27-
<scope>test</scope>
28-
</dependency>
29-
<dependency>
30-
<groupId>org.springframework.boot</groupId>
31-
<artifactId>spring-boot</artifactId>
32-
<scope>test</scope>
33-
</dependency>
34-
<dependency>
35-
<groupId>org.springframework.boot</groupId>
36-
<artifactId>spring-boot-dependency-tools</artifactId>
37-
<scope>test</scope>
38-
</dependency>
39-
</dependencies>
22+
<modules>
23+
<module>spring-boot-gradle-tests</module>
24+
<module>spring-boot-security-tests</module>
25+
</modules>
4026
<profiles>
4127
<profile>
4228
<id>default</id>
@@ -50,6 +36,7 @@
5036
is available -->
5137
<groupId>org.apache.maven.plugins</groupId>
5238
<artifactId>maven-invoker-plugin</artifactId>
39+
<inherited>false</inherited>
5340
<configuration>
5441
<settingsFile>src/it/settings.xml</settingsFile>
5542
<projectsDirectory>${main.basedir}/spring-boot-samples/</projectsDirectory>
@@ -60,6 +47,9 @@
6047
<profile>integration-test</profile>
6148
</profiles>
6249
<localRepositoryPath> </localRepositoryPath>
50+
<pomIncludes>
51+
<pomInclude>*/pom.xml</pomInclude>
52+
</pomIncludes>
6353
</configuration>
6454
<executions>
6555
<execution>
@@ -75,6 +65,7 @@
7565
<plugin>
7666
<groupId>org.apache.maven.plugins</groupId>
7767
<artifactId>maven-antrun-plugin</artifactId>
68+
<inherited>false</inherited>
7869
<executions>
7970
<execution>
8071
<id>clean-samples</id>
@@ -95,6 +86,7 @@
9586
<plugin>
9687
<groupId>org.apache.maven.plugins</groupId>
9788
<artifactId>maven-clean-plugin</artifactId>
89+
<inherited>false</inherited>
9890
<executions>
9991
<execution>
10092
<id>clean-samples</id>
@@ -112,16 +104,4 @@
112104
<id>full</id>
113105
</profile>
114106
</profiles>
115-
<repositories>
116-
<repository>
117-
<id>gradle</id>
118-
<url>http://repo.gradle.org/gradle/libs-releases-local</url>
119-
<releases>
120-
<enabled>true</enabled>
121-
</releases>
122-
<snapshots>
123-
<enabled>false</enabled>
124-
</snapshots>
125-
</repository>
126-
</repositories>
127107
</project>

‎spring-boot-integration-tests/spring-boot-gradle-tests/pom.xml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>org.springframework.boot</groupId>
6+
<artifactId>spring-boot-integration-tests</artifactId>
7+
<version>1.2.2.BUILD-SNAPSHOT</version>
8+
</parent>
9+
<artifactId>spring-boot-gradle-tests</artifactId>
10+
<packaging>jar</packaging>
11+
<name>Spring Boot Gradle Integration Tests</name>
12+
<description>Spring Boot Gradle Integration Tests</description>
13+
<url>http://projects.spring.io/spring-boot/</url>
14+
<organization>
15+
<name>Pivotal Software, Inc.</name>
16+
<url>http://www.spring.io</url>
17+
</organization>
18+
<properties>
19+
<main.basedir>${basedir}/../..</main.basedir>
20+
</properties>
21+
<dependencies>
22+
<dependency>
23+
<groupId>org.gradle</groupId>
24+
<artifactId>gradle-tooling-api</artifactId>
25+
<version>${gradle.version}</version>
26+
<scope>test</scope>
27+
</dependency>
28+
<dependency>
29+
<groupId>org.springframework.boot</groupId>
30+
<artifactId>spring-boot-dependency-tools</artifactId>
31+
<scope>test</scope>
32+
</dependency>
33+
</dependencies>
34+
<repositories>
35+
<repository>
36+
<id>gradle</id>
37+
<url>http://repo.gradle.org/gradle/libs-releases-local</url>
38+
<releases>
39+
<enabled>true</enabled>
40+
</releases>
41+
<snapshots>
42+
<enabled>false</enabled>
43+
</snapshots>
44+
</repository>
45+
</repositories>
46+
</project>

‎spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/ClassifierTests.java‎ renamed to ‎spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/ClassifierTests.java‎

File renamed without changes.

‎spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/CustomVersionManagementTests.java‎ renamed to ‎spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/CustomVersionManagementTests.java‎

File renamed without changes.

‎spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/FlatdirTests.java‎ renamed to ‎spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/FlatdirTests.java‎

File renamed without changes.

0 commit comments

Comments
 (0)