Commit Graph

27490 Commits

Author SHA1 Message Date
Andy Wilkinson
99683dff6f Upgrade to Logback 1.1.10
In Logback 1.1.10, the logback-classic module contains a
META-INF/services/javax.servlet.ServletContainerInitializer file that
contains a comment. This triggers a bug in Wildfly 8 [1] that has been
fixed [2] in Wildfly 9 and later. As a result, this commit also
updates our Wildfly deployment test to use 9.0.2 rather than 8.2.0.

Closes gh-8354

[1] https://issues.jboss.org/browse/WFLY-4089
[2] fef57ebdc7
2017-02-22 11:33:30 +00:00
Dave Syer
c544aff72f Merge remote-tracking branch 'origin/1.5.x' 2017-02-22 11:32:20 +00:00
Dave Syer
0f42c5dd94 Check there is only one ResourceServerConfiguration before modifying
Fixes gh-8347
2017-02-22 11:30:17 +00:00
Andy Wilkinson
c9f45e3ffa Merge branch '1.5.x' 2017-02-22 10:50:35 +00:00
Andy Wilkinson
f952b2492a Merge branch '1.4.x' into 1.5.x 2017-02-22 10:50:28 +00:00
Andy Wilkinson
6af4b10b9d Revert "Upgrade to Logback 1.1.10"
This reverts commit 05113d059d.

See gh-8354
2017-02-22 10:49:53 +00:00
Andy Wilkinson
0de66a19f2 Merge branch '1.5.x' 2017-02-22 10:01:29 +00:00
Andy Wilkinson
1e4830e713 Merge branch '1.4.x' into 1.5.x 2017-02-22 09:58:54 +00:00
Andy Wilkinson
b3d0b3330b Upgrade to Slf4j 1.7.23
Closes gh-8364
2017-02-22 09:49:43 +00:00
Andy Wilkinson
357667e97d Upgrade to Lombok 1.16.14
Closes gh-8363
2017-02-22 09:49:42 +00:00
Andy Wilkinson
3bf7bf86fb Upgrade to Infinispan 8.2.6.Final
Closes gh-8362
2017-02-22 09:49:42 +00:00
Andy Wilkinson
6ed5204874 Upgrade to Hibernate 5.0.12.Final
Closes gh-8361
2017-02-22 09:49:41 +00:00
Andy Wilkinson
bdf4181e35 Upgrade to Solr 5.5.4
Closes gh-8360
2017-02-22 09:49:41 +00:00
Andy Wilkinson
0a2ef8331a Upgrade to Httpclient 4.5.3
Closes gh-8359
2017-02-22 09:49:41 +00:00
Andy Wilkinson
686047f39e Upgrade to Httpasyncclient 4.1.3
Closes gh-8358
2017-02-22 09:49:40 +00:00
Andy Wilkinson
637a1a98d9 Upgrade to Undertow 1.3.27.Final
Closes gh-8357
2017-02-22 09:49:40 +00:00
Andy Wilkinson
95db8d2a31 Upgrade to Appengine 1.9.49
Closes gh-8356
2017-02-22 09:49:40 +00:00
Andy Wilkinson
55dd975c77 Upgrade to Jackson 2.8.7
Closes gh-8355
2017-02-22 09:49:39 +00:00
Andy Wilkinson
05113d059d Upgrade to Logback 1.1.10
Closes gh-8354
2017-02-22 09:49:39 +00:00
Andy Wilkinson
fcd1eb79fc Fix forward merge of new SpyBean test to use correct Mockito 2 API 2017-02-21 20:48:58 +00:00
Andy Wilkinson
1e806bbbd2 Merge branch '1.5.x' 2017-02-21 20:20:36 +00:00
Andy Wilkinson
8318177b0d Merge branch '1.4.x' into 1.5.x 2017-02-21 20:20:26 +00:00
Andy Wilkinson
70e802fba5 Use name from @SpyBean to disambiguate multiple candidates
Previously, @SpyBean's name attribute was not used when determining
the name of the bean to spy upon. When there were multiple candidates,
none of which were primary, this would lead to a failure to find the
bean to spy upon. This behaviour is also inconsistent with @MockBean
which does use the name attribute to identify the bean to mock.

This commit updates MockitoPostProcessor to use the name attribute,
when set, to identify the bean that should be spied upon. For
consistency with @MockBean it is always used when set. When not set
the previous logic will continue to be used.

Closes gh-8315
2017-02-21 20:19:50 +00:00
Madhura Bhave
b8a38d60b7 Merge branch '1.5.x' 2017-02-21 12:14:23 -08:00
Madhura Bhave
67810abd9e Match ResourceServerCondition if JWK config present
Closes gh-8350
2017-02-21 12:02:49 -08:00
Andy Wilkinson
923393d5af Merge branch '1.5.x' 2017-02-21 16:15:25 +00:00
Andy Wilkinson
98a2ae3b91 Merge branch '1.4.x' into 1.5.x 2017-02-21 16:12:06 +00:00
Andy Wilkinson
1abd91dc23 Start building against Spring Framework 4.3.7 snapshots
See gh-8248
2017-02-20 14:05:04 +00:00
Stephane Nicoll
91009cfc01 Merge branch '1.5.x' 2017-02-20 14:04:55 +01:00
Stephane Nicoll
3b886094cb Merge pull request #8195 from mouellet:gh-8171
* pr/8195:
  Polish contribution
  Add schema validation options for embedded LDAP
2017-02-20 14:03:46 +01:00
Stephane Nicoll
43a534f4ca Polish contribution
Closes gh-8195
2017-02-20 14:03:07 +01:00
Mathieu Ouellet
fa8f0a6136 Add schema validation options for embedded LDAP
See gh-8195
2017-02-20 12:07:53 +01:00
Stephane Nicoll
8181870900 Merge branch '1.5.x' 2017-02-20 12:07:06 +01:00
Stephane Nicoll
4b0c64ed88 Upgrade to Unboundid LDAP SDK 3.2.1
Closes gh-8333
2017-02-20 12:05:01 +01:00
Andy Wilkinson
ad30ad808b Merge branch '1.5.x' 2017-02-20 08:59:51 +00:00
Andy Wilkinson
4f29bc9c14 Make mvn verify work without install of spring-boot-dependencies
Previously, the custom layout sample could only be built successfully
if spring-boot-dependencies had be installed locally, making its
effective pom available in the local Maven cache.

This commit updates the sample's tests to look at its own pom to
determine the version of Spring Boot that should be used in the
Gradle tests.

Closes gh-8330
2017-02-20 08:59:13 +00:00
Stephane Nicoll
ef8846770b Merge branch '1.5.x' 2017-02-19 16:42:48 +01:00
Stephane Nicoll
9260608195 Merge pull request #8273 from rajadilipkolli:patch-1
* pr/8273:
  Fix version of `gradle-git-properties` in doc
2017-02-19 16:42:16 +01:00
Raja Kolli
a5a2c04d23 Fix version of gradle-git-properties in doc
Closes gh-8273
2017-02-19 16:41:28 +01:00
Stephane Nicoll
3c956441b5 Merge branch '1.5.x' 2017-02-17 10:33:08 +01:00
Stephane Nicoll
121ab0a71e Merge branch '1.4.x' into 1.5.x 2017-02-17 10:32:49 +01:00
Stephane Nicoll
461d5613ab Merge pull request #8319 from vpavic:fix-docs
* pr/8319:
  Fix audit events related documentation
2017-02-17 10:30:38 +01:00
Vedran Pavic
1c8f1c709c Fix audit events related documentation
Closes gh-8319
2017-02-17 10:30:07 +01:00
Andy Wilkinson
ff9788c625 Merge branch '1.5.x' 2017-02-16 09:46:26 +00:00
Andy Wilkinson
f67dd957b1 Ignore excludeDevtools on extension when it has been set on bootRepackage
Previously, bootRepackage's excludeDevtools property would be
overridden by the springBoot extension's excludeDevtools property.
This prevented devtools from being included by configuring it on the
repackaging task.

This commit corrects the logic so that the setting on the repackaging
task takes priority. It also adds some tests to verify the behaviour.

Closes gh-8308
2017-02-16 09:45:51 +00:00
Stephane Nicoll
4304cdb91a Merge branch '1.5.x' 2017-02-16 10:08:02 +01:00
Stephane Nicoll
f57ddff478 Remove dead code
Closes gh-8305
2017-02-16 10:04:57 +01:00
Madhura Bhave
b4134e239e Add autoconfiguration for JWKTokenStore
If `jwk.key-set-uri` is present.

Closes gh-4437
2017-02-15 12:05:29 -08:00
Andy Wilkinson
04a87ee4c1 Merge branch '1.5.x' 2017-02-15 17:25:18 +00:00
Andy Wilkinson
01729cc1d2 Merge branch '1.4.x' into 1.5.x 2017-02-15 17:25:07 +00:00