Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
50,613 Commits 23 Branches 0 Tags
38d96aabef94debe6ae5647802e61b9510d88a67
Commit Graph

50613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Wilkinson
466f8926b5 Add dependency management for Commons Lang3 
Closes gh-7896
 2017-02-22 16:17:25 +00:00
Andy Wilkinson
145e2d206c Upgrade to Selenium HtmlUnit 2.24 
Closes gh-7232
 2017-02-22 16:09:37 +00:00
Andy Wilkinson
9cbb857111 Add explicit dependency on Gson 
It used to be pulled in transitively by selenium-api but that's no
longer that case.

See gh-8381
 2017-02-22 16:07:23 +00:00
Andy Wilkinson
233e6151b9 Upgrade to Webjars Hal Browser 3325375 
Closes gh-8382
 2017-02-22 15:06:20 +00:00
Andy Wilkinson
89845fb2eb Upgrade to Selenium 3.1.0 
Closes gh-8381
 2017-02-22 15:06:19 +00:00
Andy Wilkinson
008953adc9 Upgrade to Hibernate Validator 5.4.0.Final 
Closes gh-8380
 2017-02-22 15:06:18 +00:00
Andy Wilkinson
d0fb8fc46a Upgrade to Hibernate 5.2.8.Final 
Closes gh-8379
 2017-02-22 15:06:17 +00:00
Andy Wilkinson
ab06600fa9 Upgrade to Rxjava2 2.0.6 
Closes gh-8378
 2017-02-22 15:06:16 +00:00
Andy Wilkinson
4b7f90a0c6 Upgrade to Rxjava 1.2.6 
Closes gh-8377
 2017-02-22 15:06:16 +00:00
Andy Wilkinson
7cb5edf590 Upgrade to Reactor Bom Aluminium-SR1 
Closes gh-8376
 2017-02-22 15:06:15 +00:00
Andy Wilkinson
f52449b5f5 Upgrade to Netty 4.1.8.Final 
Closes gh-8375
 2017-02-22 15:06:14 +00:00
Andy Wilkinson
5bace9dff6 Merge branch '1.5.x' 2017-02-22 14:56:04 +00:00
Andy Wilkinson
50bc321621 Upgrade to Spring Kafka 1.1.3.RELEASE 
Closes gh-8374
 2017-02-22 14:54:55 +00:00
Andy Wilkinson
cbffc51b48 Upgrade to Mongodb 3.4.2 
Closes gh-8373
 2017-02-22 14:54:55 +00:00
Andy Wilkinson
73b7b3d7be Upgrade to Mariadb 1.5.8 
Closes gh-8372
 2017-02-22 14:54:54 +00:00
Andy Wilkinson
e211602f4a Upgrade to Narayana 5.5.2.Final 
Closes gh-8371
 2017-02-22 14:54:54 +00:00
Andy Wilkinson
e5c05b3193 Upgrade to Artemis 1.5.3 
Closes gh-8370
 2017-02-22 14:54:53 +00:00
Andy Wilkinson
789257b76b Upgrade to Undertow 1.4.10.Final 
Closes gh-8369
 2017-02-22 14:54:52 +00:00
Andy Wilkinson
1f6c52022d Upgrade to Cassandra Driver 3.1.4 
Closes gh-8368
 2017-02-22 14:54:52 +00:00
Andy Wilkinson
4ff159adbe Merge branch '1.5.x' 2017-02-22 12:19:14 +00:00
Andy Wilkinson
b034a505a5 Polish 0f42c5dd 
- Apply standard code formatting
- Add class javadoc to MultipleResourceServerConfigurationTests
- Add missing @Override annotations
- Remove unused ExpectedException field
- Remove use of SpringApplicationBuilder from the tests
- Use @ImportAutoConfiguration to import auto-configuration
- Add assertions to verify that the orders haven't been changed
- Remove unnecessary mocking of EmbeddedServletContainerFactory

See gh-8347
 2017-02-22 12:16:05 +00:00
Andy Wilkinson
5e6ff9a855 Merge branch '1.5.x' 2017-02-22 11:45:38 +00:00
Andy Wilkinson
f4eb45ac6d Merge branch '1.4.x' into 1.5.x 2017-02-22 11:43:33 +00:00
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