Commit Graph

4907 Commits (805263ac629d1fc72d559ad61276ef61131d21d7)
 

Author SHA1 Message Date
Andy Wilkinson 5963760c9c Merge branch '1.2.x'
Conflicts:
	spring-boot-dependencies/pom.xml
10 years ago
Andy Wilkinson 9285c9fd77 Merge branch '1.1.x' into 1.2.x
Conflicts:
	spring-boot-dependencies/pom.xml
10 years ago
Andy Wilkinson fe837c0cea Upgrade to Reactor 1.1.6.RELEASE
gh-2735
10 years ago
Andy Wilkinson de28ed4aa1 Upgrade to Groovy 2.3.11
Closes gh-2733
10 years ago
Andy Wilkinson adbd340c91 Upgrade to Logback 1.1.3
Closes gh-2729
10 years ago
Andy Wilkinson 887a7cce1e Upgrade to SLF4J 1.7.11
Closes gh-2734
10 years ago
Andy Wilkinson 0c8b2889fb Merge branch '1.2.x' 10 years ago
Andy Wilkinson d428afb45f Merge branch '1.1.x' into 1.2.x
Conflicts:
	spring-boot-dependencies/pom.xml
10 years ago
Andy Wilkinson 936e1c2152 Update to Spring Security 3.2.7.RELEASE
Closes gh-2726
10 years ago
Andy Wilkinson 03c691443e Merge branch '1.2.x' 10 years ago
Andy Wilkinson 644237d170 Merge branch '1.1.x' into 1.2.x 10 years ago
Andy Wilkinson 1307a2401d Upgrade Spring WS in 1.1.x as well
See gh-2718
10 years ago
Andy Wilkinson a6028280d2 Polishing 10 years ago
Andy Wilkinson a67a37840b Merge branch '1.2.x' 10 years ago
Greg Turnquist 599792097c Upgrade Spring WS to 2.2.1.RELEASE
Closes gh-2718
10 years ago
Andy Wilkinson 5742eeb50d Merge branch '1.2.x' 10 years ago
Andy Wilkinson 6d2bb68aba Ensure that ErrorPageFilter handles errors during async dispatch
Previously, the ErrorPageFilter was not invoked for async dispatches.
This meant that an error that was set during an async dispatch would
go undetected and a 200 response with an empty body would be returned.

This commit updates ErrorPageFilter to configure its
OncePerRequestFilter so that async dispatches are filtered and the
correct error handling is performed.

Closes gh-2711
10 years ago
Andy Wilkinson 20a2f21493 Merge branch '1.2.x' 10 years ago
Andy Wilkinson c3a040acb3 Polishing
Remove unwanted System.out.println call
10 years ago
Stephane Nicoll 36ca78f09b Merge branch '1.2.x'
Conflicts:
	spring-boot-dependencies/pom.xml
10 years ago
Stephane Nicoll c9997f7a4d Upgrade to Spring Framework 4.1.6
Closes gh-2702
10 years ago
Phillip Webb 7947bcd682 Merge branch '1.2.x' 10 years ago
Phillip Webb 35bfa16315 Use file based loader with MockServletContext
Update SpringApplicationContextLoader so that the MockServletContext
uses FileSystemResourceLoader. This allows `/src/main/webapp` folder
to be found.

See gh-2654
10 years ago
Andy Wilkinson 95a0be3cb2 Merge branch '1.2.x' 10 years ago
Andy Wilkinson 219317e8c7 Make web security config require spring-security-web on classpath
Previously, SpringBootWebSecurityConfiguration required a web
application and @EnableWebSecurity to be on the classpath.
@EnableWebSecurity is in spring-security-config so this could lead
to the configuration being active when spring-security-web isn't
on the classpath but the rest of Spring Security is.

This commit updates SpringBootWebSecurityConfiguration to also make it
conditional on a class in spring-security-web.

Fixes gh-2717
10 years ago
Andy Wilkinson 16d61f849c Merge branch 'spring-framework-4.2' 10 years ago
Andy Wilkinson bc99ad2120 Ignore Batch tests that use JDBC as they don’t work with Spring 4.2
Spring Framework’s ParamterizedRowMapper has been deprecated since
3.1 and has been removed in 4.2. Spring Batch currently relies on
ParameterizedRowMapper, making it incompatible with 4.2. To allow us to
build successfully against 4.2, this commit ignores Spring Boot’s tests
that use Spring Batch’s JDBC support.

See gh-2575
10 years ago
Andy Wilkinson 7a73c5883f Avoid using @Order on @Configuration classes as Spring now honours it
In Spring Framework 4.1, @Order on a @Configuration class had no effect.
This allowed us to use it on auto-configuration classes to control
the ordering of auto-configuration classes without it having any
broader implications for configuration class ordering.

Spring Framework 4.2 now honours @Order on @Configuration classes. This
breaks a number of tests where we were relying on the order that the
classes were passed to register when evaluating various bean conditions.

This commit replaces the use of @Order on auto-configuration classes
with a new annotation, @AutoConfigureOrder. The new annotation is
handled by AutoConfigurationSorter where it’s used to order
auto-configuration classes. This allows us to order auto-configuration
classes without the unwanted side-effect of this also affecting the
general ordering of configuration classes.

See gh-2575
10 years ago
Andy Wilkinson 04c5fc8856 Start building against Spring Framework 4.2.0 snapshots
See gh-2575
10 years ago
Phillip Webb ca4e85cb91 Merge branch '1.2.x' 10 years ago
Phillip Webb 60c1a150b3 Polish 10 years ago
Phillip Webb 83ee25e543 Merge branch '1.2.x' 10 years ago
Phillip Webb bd2735ad66 Add alwaysMapUrl flag to ServletRegistrationBean
Add an additional constructor to ServletRegistrationBean that indicates
if a URL mapping is always required. If set to false, the registration
will not longer use the default '/*' mapping.

Fixes gh-2596
10 years ago
Phillip Webb 90bff0b603 Fix outdated RandomAccessJarFile documentation
Fixes gh-2598
10 years ago
Phillip Webb 0a33d0464d Respect Boot locations in MockServletContext
Update SpringApplicationContextLoader to use a MockServletContext
subclass which also respects common Spring Boot resource locations. This
allows resources in `/META-INF/resources`, `/resources`, `/public` and
`/static` to be loaded in the same way as those in `/src/main/webapp`.

SpringBootMockServletContext also returns an empty temporary folder for
'/' when no resource locations can be found. This is primarily to
prevent superfluous warnings from Liquibase.

Fixes gh-2654
10 years ago
Phillip Webb 7d3465f858 Merge branch '1.2.x' 10 years ago
Phillip Webb 4c50c9eaa8 Allow basic SystemPublicMetrics on GAE
Update SystemPublicMetrics to silently ignore ManagementFactory
NoClassDefFoundErrors which can occur when deploying to Google App
Engine.

Fixes gh-2701
10 years ago
Phillip Webb 1d8739506a Merge branch '1.2.x' 10 years ago
Phillip Webb 6a6ae64aac Merge branch '1.1.x' into 1.2.x 10 years ago
Phillip Webb 4d8cf71496 Polish VcapApplicationListenerTests 10 years ago
Phillip Webb 6d880cf7f8 Merge pull request #2707 from nebhale/vcap-service-numbers
* vcap-service-numbers:
  Support VcapApplicationListener Number Credentials
10 years ago
Ben Hale 147755f396 Support VcapApplicationListener Number Credentials
Update VcapApplicationListener to support Number based credentials.
Previously, any service credential value that wasn't a String would
be discarded. This was particularly a problem for services that exposed
a port as a JSON Number.  This change takes numbers in the credential
payload into account, converting them to Strings so that they will pass
through the properties system properly. There's no real downside to this
as Spring will coerce them back into Numbers if needed by an application.

Fixes gh-2707
10 years ago
Andy Wilkinson cebd58ad23 Merge branch '1.2.x' 10 years ago
Phillip Webb 6322ea142d Upgrade to Spring Framework 4.1.6.BUILD-SNAPSHOT
See gh-2702
10 years ago
Phillip Webb 53ca15b478 Polish spring-boot-sample-activemq 10 years ago
Phillip Webb 4dbf55ea13 Pass context to ApplicationReadyEvent
Update ApplicationReadyEvent to also include the ApplicationContext.

See gh-2638
10 years ago
Phillip Webb 41a6fa9335 Merge branch '1.2.x' 10 years ago
Phillip Webb 7c9ab5ced2 Minor documentation polish 10 years ago
Stephane Nicoll b963a82f36 Merge branch '1.2.x' 10 years ago
Stephane Nicoll a615f8a44a Merge pull request #2698 from rtack/patch-1
* gh-2698:
  fix typo in javadoc
10 years ago