Commit Graph

12882 Commits

Author SHA1 Message Date
Andy Wilkinson f92177e031 Merge branch '1.5.x' 2017-07-24 19:28:19 +01:00
Andy Wilkinson 8b2f09d35b Upgrade to Spring Data Ingalls SR5
Closes gh-9834
2017-07-24 19:27:59 +01:00
Andy Wilkinson e071a0ca9f Upgrade to Spring Security 5.0.0.M3
Closes gh-9603
2017-07-24 17:52:20 +01:00
Andy Wilkinson b52ece1ac7 Verify that Java Time config properties can be bound
Closes gh-9237
2017-07-24 16:58:19 +01:00
Andy Wilkinson 6518ffe801 Polish 2017-07-24 16:58:05 +01:00
Andy Wilkinson 0ab81e4f8f Prevent loader classes from being served by executable war
Closes gh-5550
2017-07-24 16:29:56 +01:00
Stephane Nicoll 5516e8626c Merge branch '1.5.x' 2017-07-24 15:34:09 +02:00
Stephane Nicoll 9fd94720f1 Better customization of the auto-configured ActiveMQConnectionFactory
This commit exposes additional properties and a callback interface to
further tune the auto-configured ActiveMQConnectionFactory.

Closes gh-9667
2017-07-24 15:27:17 +02:00
Stephane Nicoll 6c21b0090b Merge branch '1.5.x' 2017-07-24 14:00:24 +02:00
Stephane Nicoll 9a34d952e9 Provide an alternative to `spring.activemq.pool.configuration`
This commit expands the support of PooledConnectionFactory so that
binding the third party object is no longer necessary. All 3rd party
properties are now deprecated in favour of our explicit support.

The main reason behind this change is that a `connection-factory` and
`properties` property were exposed. The former is used to set the
`ConnectionFactory` and makes no sense as a key. The latter is
rebuilding the underlying `ActiveMQConnectionFactory` at each call
without reusing any existing settings.

Closes gh-9837
2017-07-24 13:48:53 +02:00
Stephane Nicoll 0680c4ce2b Add Hiatus for Spring Boot to the list of 3rd party starters
Closes gh-9846
2017-07-24 13:46:14 +02:00
Andy Wilkinson 9c59758abe Merge branch '1.5.x' 2017-07-24 12:37:49 +01:00
Andy Wilkinson d4ecda9030 Work around javac bug (internal review ID 9050163) 2017-07-24 12:37:14 +01:00
Andy Wilkinson dff9fb12aa Merge branch '1.5.x' 2017-07-24 11:38:40 +01:00
Andy Wilkinson feb964b559 Merge pull request #9534 from Danny Thomas
* gh-9534:
  Polish "Ensure SpringBootDITEL fails with the original failure"
  Ensure SpringBootDITEL fails with the original failure
2017-07-24 11:38:28 +01:00
Andy Wilkinson b7080ddec5 Polish "Ensure SpringBootDITEL fails with the original failure" 2017-07-24 11:37:40 +01:00
Danny Thomas 2c48087604 Ensure SpringBootDITEL fails with the original failure
See gh-9534
2017-07-24 11:23:16 +01:00
Andy Wilkinson c45a351308 Merge branch '1.5.x' 2017-07-24 11:19:51 +01:00
Andy Wilkinson 94ea3e8618 Merge pull request #9724 from Gytis Trikleris
* gh-9724:
  Polish "Make NarayanaRecoveryManagerBean conditional on missing bean"
  Make NarayanaRecoveryManagerBean conditional on missing bean
2017-07-24 11:18:33 +01:00
Andy Wilkinson bb35e772c2 Polish "Make NarayanaRecoveryManagerBean conditional on missing bean"
Closes gh-9724
2017-07-24 11:17:39 +01:00
Gytis Trikleris d8a6954744 Make NarayanaRecoveryManagerBean conditional on missing bean
See gh-9724
2017-07-24 11:16:34 +01:00
Andy Wilkinson 11fc7c1393 Merge branch '1.5.x' 2017-07-24 11:08:32 +01:00
Andy Wilkinson 8f877dcee2 Disable auto-config of Narayana's JMS support when JMS module absent
Closes gh-9844
2017-07-24 10:42:40 +01:00
Stephane Nicoll ad694fdb3a Upgrade to Spring Framework 5.0.0.RC3
Closes gh-9842
2017-07-24 10:37:44 +02:00
Stephane Nicoll 8cae031441 Remove Devtools remote debugging support
Closes gh-9489
2017-07-22 15:23:52 +02:00
Andy Wilkinson bc4603925e Configure Jetty to compress responses to requests other than GET
Closes gh-8184
2017-07-22 10:41:53 +01:00
Andy Wilkinson 6df1be3f1a Merge branch '1.5.x' 2017-07-22 08:22:35 +01:00
Andy Wilkinson be535103a7 Merge pull request #9832 from Johnny Lim
* gh-9832:
  Use currentHealth consistently in getHealth()
2017-07-22 08:22:06 +01:00
Johnny Lim d18e452fcd Use currentHealth consistently in getHealth()
Closes gh-9832
2017-07-22 08:21:43 +01:00
Andy Wilkinson fef7953ef7 Merge branch '1.5.x' 2017-07-22 08:18:01 +01:00
Andy Wilkinson 39b4ecdf63 Adapt to breaking change in Spring Data
See gh-9834
2017-07-22 08:11:26 +01:00
Andy Wilkinson 8207852bcd Ensure that detected request factories are initialized
Closes gh-9797
2017-07-22 08:10:04 +01:00
Andy Wilkinson 2baba40187 Merge branch '1.5.x' 2017-07-22 07:50:58 +01:00
Andy Wilkinson a8ad68ebc1 Start building against Spring Data Ingalls snapshots
See gh-9834
2017-07-22 07:50:09 +01:00
Andy Wilkinson 2411e265ae Upgrade to Elasticsearch 5.5.0
Closes gh-9833
2017-07-22 07:47:22 +01:00
Andy Wilkinson 0013493402 Move port in use exception test as it does not apply to Tomcat
See gh-8737
2017-07-21 22:23:28 +01:00
Andy Wilkinson 9b6b663cc7 Throw a PortInUseException when Netty start fails with a BindException
Closes gh-8737
2017-07-21 22:03:44 +01:00
Andy Wilkinson ded7cea761 Prevent webapp class loader from finding resources
Previously, TomcatEmbeddedWebappClassLoader would find resources
in WEB-INF/classes. However, unlike standalone Tomcat, we know that in
a Boot app WEB-INF/classes is on the class path of the parent class
loader so the resources will be found when the parent is queried
(which happens as part of the normal search algortithm for both
getResource(String) and getResources(String)).

This commit overrides findResource(String) and findResources(String)
to return null and an empty enumeration respectively. This prevents
TomcatEmbeddedWebappClassLoader from finding resources in
WEB-INF/classes and returning war: URLs for them that duplicate the
jar: URLs that will be found when the parent is queried.

Closes gh-9014
2017-07-21 20:53:32 +01:00
Andy Wilkinson 00feae7e8a Correct signature of link to sibling method that takes Class[] in 2.0
See gh-8898
2017-07-21 20:07:02 +01:00
Andy Wilkinson 218033fbcb Merge branch '1.5.x' 2017-07-21 19:50:50 +01:00
Andy Wilkinson f4f54047e0 Clarify behaviour of SpringApplicationBuilder.sibling(Object...)
Closes gh-8898
2017-07-21 19:50:39 +01:00
Andy Wilkinson d9837d7d1c Merge branch '1.5.x' 2017-07-21 17:31:53 +01:00
Andy Wilkinson 20a417f469 Merge pull request #9730 from Dylian Bego
* gh-9730:
  Polish "Handle possible regexes defensively in NamePatternFilter"
  Handle possible regexes defensively in NamePatternFilter
2017-07-21 17:31:28 +01:00
Andy Wilkinson bbc34a676c Polish "Handle possible regexes defensively in NamePatternFilter"
Closes gh-9730
2017-07-21 17:24:01 +01:00
dbego c29d1c756a Handle possible regexes defensively in NamePatternFilter
Previously, if a name contained part of a regex but wasn't actually
a regex, a PatternSyntaxException would be thrown and the request
would fail.

This commit updates NamePatternFilter to catch PatternSyntaxException
and treat the regex-like input as a name insteead.

See gh-9730
2017-07-21 17:21:49 +01:00
Andy Wilkinson cabb708352 Merge pull request #9827 from Johnny Lim
* gh-9827:
  Polish
2017-07-21 15:38:23 +01:00
Johnny Lim bd27d147d7 Polish
Closes gh-9827
2017-07-21 15:38:00 +01:00
Andy Wilkinson 18cfd9d3dd Merge branch '1.5.x' 2017-07-21 15:36:27 +01:00
Andy Wilkinson c70cc55db8 Polishing
See gh-9827
2017-07-21 15:35:57 +01:00
Andy Wilkinson 20577657ee Merge branch '1.5.x' 2017-07-21 15:30:35 +01:00