Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,604 Commits 23 Branches 0 Tags
e687d3aeba57e1bd0abe0f097be1f507beb80434
Commit Graph

9604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andy Wilkinson
617a8259b4 Merge pull request #6782 from sangwook 
* gh-6782:
  Make it easier to override FILE_LOG_PATTERN
 2016-11-22 14:54:14 +00:00
sangwook
7e46f8e2e3 Make it easier to override FILE_LOG_PATTERN 
Closes gh-6782
 2016-11-22 14:52:51 +00:00
Andy Wilkinson
8d589b9a05 Merge branch '1.5.x' 2016-11-22 14:38:07 +00:00
Andy Wilkinson
112ec53baa Merge pull request #7407 from Madhura Bhave 
* gh-7407:
  Polish "Validate excluded autoconfiguration classes"
  Validate excluded autoconfiguration classes
 2016-11-22 14:10:59 +00:00
Andy Wilkinson
65d0c07fd6 Polish "Validate excluded autoconfiguration classes" 
- Apply code formatting
- Move configuration of excepted exception to immediately before line
  that will throw the exception
- Use String.format with %n to produce platform-specific new lines

See gh-7407
 2016-11-22 14:10:37 +00:00
Madhura Bhave
a9ffdca6f2 Validate excluded autoconfiguration classes 
Closes gh-7407
See gh-6865
 2016-11-22 14:02:51 +00:00
Andy Wilkinson
bc6b2a9c75 Merge branch '1.5.x' 2016-11-22 13:54:49 +00:00
Andy Wilkinson
c7a566fd24 Merge pull request #7234 from Christian Koops 
* gh-7234:
  Make launch script's logFilename and pidFilename configurable via properties
 2016-11-22 13:54:28 +00:00
Christian Koops
5c11059e1d Make launch script's logFilename and pidFilename configurable via properties 
Closes gh-7234
 2016-11-22 13:54:16 +00:00
Andy Wilkinson
9e4a370a98 Merge branch '1.5.x' 2016-11-22 13:47:18 +00:00
Andy Wilkinson
09a235b1e8 Upgrade to Neo4j OGM 2.1.0-M01 
Closes gh-7448
 2016-11-22 13:45:30 +00:00
Andy Wilkinson
fd2b417252 Merge branch '1.5.x' 2016-11-22 13:10:01 +00:00
Andy Wilkinson
d12c21ae2f Add spring-kafka dependency to spring-boot-docs for Javadoc links 
See gh-6961
 2016-11-22 13:09:15 +00:00