spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-24 02:09:05 +00:00
Code Issues Projects Releases Wiki Activity
9,617 Commits 28 Branches 394 Tags
fd62707cbb600bf255fa8b585ae40079aaaed67c
Commit Graph
9617 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll fd62707cbb Merge branch '1.5.x' 2016-11-24 16:46:52 +01:00
Stephane Nicoll 7e25c0dcdd Fix build 2016-11-24 16:46:34 +01:00
Stephane Nicoll 03ff6c5814 Merge branch '1.5.x' 2016-11-24 16:12:03 +01:00
Stephane Nicoll 25c4f0b5bb Merge branch '1.4.x' into 1.5.x 2016-11-24 16:11:51 +01:00
Stephane Nicoll 1f8281931d Merge pull request #7462 from kuhnroyal:gh-7460 
* pr/7462:
  Polish contribution
  Fix undertow session persistence with spring-boot-devtools
 2016-11-24 16:07:16 +01:00
Stephane Nicoll 4c61c9f26a Polish contribution 
Closes gh-7462
 2016-11-24 16:07:03 +01:00
Peter Leibiger 203b6f2f2c Fix undertow session persistence with spring-boot-devtools 
Fixes gh-7460
 2016-11-24 16:00:23 +01:00
Stephane Nicoll c62f340c34 Merge branch '1.5.x' 2016-11-24 15:53:51 +01:00
Stephane Nicoll 57605b6749 Merge branch '1.4.x' into 1.5.x 2016-11-24 15:53:38 +01:00
Stephane Nicoll 65b6d8f4f7 Handle NoClassDefFoundError in OnBeanCondition 
If `OnBeanCondition` is used with a `String` literal representing the
fully qualified name of a bean and such type does not exist, it
gracefully manages it as if it was not found. Prior to this commit, an
exception would be thrown if any related class such as the parent
class does not exist.

This commit handles this additional case, catching `NoClassDefFoundError`
the same way it did handle `ClassNotFoundException`. That way, a
missing type will now be considered as absent if it's not on the
classpath.

Closes gh-7459
 2016-11-24 15:48:56 +01:00
Stephane Nicoll c212f1078f Merge branch '1.5.x' 2016-11-24 15:31:55 +01:00
Stephane Nicoll ca788a90e6 Merge branch '1.4.x' into 1.5.x 2016-11-24 15:31:40 +01:00
Stephane Nicoll 4bf645c615 AutoconfigureTestDatabase replace with a fresh database 
Previously, two or more `@DataJpaTest` tests in the same test suite were
sharing the same in-memory database instance. This commit makes sure
that `TestDatabaseAutoConfiguration` creates a unique embedded database
for each test it operates on.

Closes gh-7473
 2016-11-24 15:31:27 +01:00
Stephane Nicoll e687d3aeba Merge branch '1.5.x' 2016-11-24 10:40:08 +01:00
Stephane Nicoll c9fa1a1f70 Merge branch '1.4.x' into 1.5.x 2016-11-24 10:39:51 +01:00
Stephane Nicoll 0359b2f6f5 Document how to disable JMS transacted session 
Closes gh-7463
 2016-11-24 10:39:40 +01:00
Stephane Nicoll 662b05b90c Merge branch '1.5.x' 2016-11-24 10:01:53 +01:00
Stephane Nicoll 64a50b60ab Merge branch '1.4.x' into 1.5.x 2016-11-24 10:01:23 +01:00
Stephane Nicoll 5e8ba5cef6 Fix Couchbase condition on Spring Data class 
This commit reverts 7e2d0fd so that the Couchbase auto-configuration can
work without Spring Data again. It also removes the `Class` reference to
a Spring Data class to a `String` reference to make sure the condition
operates properly when said class isn't on the classpath.

Closes gh-7453
 2016-11-24 09:41:19 +01:00
Andy Wilkinson 15401a3078 Correct the version of spring-boot-junit-runners in dependencies pom 2016-11-23 20:42:30 +00:00
Stephane Nicoll 94542cee1f Merge branch '1.5.x' 2016-11-23 15:17:12 +01:00
Stephane Nicoll 64e0899456 Polish customize Cassandra's Cluster 
Closes gh-7320
 2016-11-23 15:16:49 +01:00
Eddú Meléndez cb3d14a305 Allow to customize Casssandra's Cluster 
This commit allows to configure special customizers to be used by
Cluster.

Closes gh-7312
 2016-11-23 15:16:49 +01:00
Andy Wilkinson c714880001 Merge branch '1.5.x' 2016-11-23 14:05:10 +00:00
Andy Wilkinson 655ab9871b Merge branch '1.4.x' into 1.5.x 2016-11-23 14:04:59 +00:00
Andy Wilkinson 5e79657d4b Treat URLs for same file in nested archive and from jar root as equal 
Consider the following two URLs:

jar:file:/test.jar!/BOOT-INF/classes!/foo.txt
jar:file:/test.jar!/BOOT-INF/classes/foo.txt

They both reference the same foo.txt file in the BOOT-INF/classes
directory of test.jar, however the first URL does so via the
nested BOOT-INF/classes archive. Previously, this difference in the
URLs would lead to PathMatchingResourcePatternResolver returning two
resources for foo.txt when asked to find all resources matching the
pattern classpath*:/**/*.txt.

This commit updates our Handler that is used for jar: URLs to consider
the two URLs above to be equivalent such that url1 is equal to url2
and the two urls will produce the same hash code.

Closes gh-7449
 2016-11-23 14:04:45 +00:00
Stephane Nicoll 2f57e1885a Merge branch '1.5.x' 2016-11-23 14:40:29 +01:00
Stephane Nicoll 2826cd3856 Merge pull request #7457 from vpavic:upgrade-spring-session 
* pr/7457:
  Polish upgrade to Spring Session 1.3.0.RC1
  Upgrade Spring Session to 1.3.0.RC1
 2016-11-23 14:40:06 +01:00
Stephane Nicoll ea023618a4 Polish upgrade to Spring Session 1.3.0.RC1 
Closes gh-7457
 2016-11-23 14:39:56 +01:00
Vedran Pavic ffec6fddd2 Upgrade Spring Session to 1.3.0.RC1 
See gh-7457
 2016-11-23 14:39:56 +01:00
Stephane Nicoll d96e013c71 Upgrade to Artemis 1.5.0 
Closes gh-7458
 2016-11-23 14:38:59 +01:00
Stephane Nicoll 3fb90f1078 Merge branch '1.5.x' 2016-11-23 10:58:18 +01:00
Stephane Nicoll 85e835d3ff Merge branch '1.4.x' into 1.5.x 2016-11-23 10:58:01 +01:00
Stephane Nicoll a5681c018d Add dependency management for hazelcast-client 
Closes gh-7452
 2016-11-23 10:55:46 +01:00
Phillip Webb ab3a001286 Merge branch '1.5.x' 2016-11-22 15:49:27 -08:00
Phillip Webb dc237043b8 Merge branch '1.4.x' into 1.5.x 2016-11-22 15:48:52 -08:00
Phillip Webb 74670cb20f Allow WebDriver beans to define their own scope 
Update `WebDriverScope` so that only `WebDriver` beans with no explicit
scope are moved.

Fixes gh-7454
 2016-11-22 15:48:28 -08:00
Phillip Webb e0dfff2b23 Merge branch '1.5.x' 2016-11-22 14:54:17 -08:00
Phillip Webb 88c84ce234 Merge branch '1.4.x' into 1.5.x 2016-11-22 14:53:30 -08:00
Phillip Webb b6b8bef009 Polish 2016-11-22 14:51:56 -08:00
Phillip Webb 7e2d0fd1c0 Check for Spring Data before configuring Couchbase 
Add guard to `CouchbaseAutoConfiguration` so ensure that Spring Data
Couchbase is on the classpath.

Fixes gh-7453
 2016-11-22 14:32:38 -08:00
Phillip Webb 288398b8b7 Merge pull request #7425 from PostalBear/1.4.x 
* pr/7425:
  Add additional Tomcat timeout test
  Fix connector used to configure connection timeout
 2016-11-22 14:31:37 -08:00
Phillip Webb ce58e16860 Add additional Tomcat timeout test 
Update the Tomcat sample to also test that the connection timeout is
set.

See gh-7425
 2016-11-22 14:30:36 -08:00
Grigory Fadeev 1ea829e003 Fix connector used to configure connection timeout 
Fix Tomcat customization so that the main connection is configured with
any timeout.

Closes gh-7425
 2016-11-22 14:28:57 -08:00
Phillip Webb a3b79be6b3 Support @MockBean on FactoryBeans 
Update @MockBean support so that FactoryBean classes can be mocked.

Fixes gh-7439
 2016-11-22 13:49:28 -08:00
Phillip Webb 1452d3cd51 Ensure withBasicAuth keeps error handler 
Fix `TestRestTemplate` so that any custom `ErrorHandler` isn't lost
when calling `withBasicAuth`.

Fixes gh-7441
 2016-11-22 10:58:30 -08:00
Andy Wilkinson 50c19250f2 Merge branch '1.5.x' 2016-11-22 15:05:48 +00:00
Andy Wilkinson af67decab6 Merge pull request #6957 from Vedran Pavić 
* gh-6957:
  Update Docker images used by launch script integration tests
 2016-11-22 15:05:35 +00:00
Vedran Pavic 8bd2e69915 Update Docker images used by launch script integration tests 2016-11-22 15:05:15 +00:00
Andy Wilkinson 2913ea9733 Merge branch '1.5.x' 2016-11-22 14:55:22 +00:00