643dea18ee
Accommodate with Lombok generation ordering
...
Previously, if lombok was running before the configuration metadata
annotation processor, duplicated keys were created as both the
getter/setter and the special lombok handling applied.
This commit makes sure to be lenient by removing duplicate metadata
entries. This commit also makes sure to identify the getter of a
nested group if present. That way, the sourceMethod is set consistently
and avoid the creation of a duplicate group.
Closes gh-8886
2017-05-12 16:48:31 +02:00
a2e749940e
Merge branch '1.4.x' into 1.5.x
2017-05-12 15:00:58 +01:00
a3f5cbc4a2
Polishing
2017-05-12 15:00:44 +01:00
1c48e5aad7
Upgrade to Spring Session 1.3.1.RELEASE
...
Closes gh-9185
2017-05-12 10:33:58 +01:00
a79457ed1a
Upgrade to Jooq 3.9.2
...
Closes gh-9184
2017-05-12 10:33:58 +01:00
245d63f5b8
Upgrade to Narayana 5.5.24.Final
...
Closes gh-9183
2017-05-12 10:33:57 +01:00
eb834bbce8
Upgrade to Jboss Transaction Spi 7.6.0.Final
...
Closes gh-9182
2017-05-12 10:33:57 +01:00
2235d0c88a
Merge branch '1.4.x' into 1.5.x
2017-05-12 10:16:42 +01:00
7a84a48739
Upgrade to Spring Cloud Connectors 1.2.4.RELEASE
...
Closes gh-9178
2017-05-12 08:27:01 +01:00
4eb0fe6bf2
Upgrade to Jetty 9.3.19.v20170502
...
Closes gh-9177
2017-05-12 08:27:00 +01:00
bb60e034ca
Upgrade to Mysql 5.1.42
...
Closes gh-9176
2017-05-12 08:26:59 +01:00
0f35e7eb3d
Upgrade to Appengine 1.9.53
...
Closes gh-9175
2017-05-12 08:26:58 +01:00
4e9731277a
Merge pull request #9174 from helpermethod:master
...
* pr/9174:
Update link for membrane-spring-boot-starter
2017-05-12 09:11:33 +02:00
13f705a5e5
Update link for membrane-spring-boot-starter
...
The `membrane-spring-boot-starter` is now an official membrane project
thus the repository location needs to be updated.
Closes gh-9174
2017-05-12 09:11:00 +02:00
19d680cbe4
Merge branch '1.4.x' into 1.5.x
2017-05-11 23:00:44 +01:00
d757368d41
Upgrade to Tomcat 8.5.15
...
Closes gh-9171
2017-05-11 22:59:45 +01:00
931ce15d7f
Update copyright header dates
2017-05-09 21:43:52 -07:00
4a7dcc8786
Formatting
2017-05-09 21:43:24 -07:00
ea4e6fea35
Polish
2017-05-09 09:37:30 +02:00
f8e1345b75
Unify versions used in integration tests
...
This commit makes sure the integration tests use the same versions as
the one managed by `spring-boot-dependencies` (including Maven plugins).
Closes gh-8947
2017-05-09 09:36:21 +02:00
bca96932af
Merge pull request #9072 from helpermethod:master
...
* pr/9072:
Add Membrane Spring Boot Starter
2017-05-09 08:35:04 +02:00
31d4f3b638
Add Membrane Spring Boot Starter
...
Closes gh-9072
2017-05-09 08:34:05 +02:00
85ae3082b8
Merge pull request #9116 from garyrussell:amqp15
...
* pr/9116:
Upgrade to Spring Kafka 1.1.5.RELEASE
2017-05-06 10:30:58 +02:00
74985b610b
Upgrade to Spring Kafka 1.1.5.RELEASE
...
Closes gh-9116
2017-05-06 10:30:20 +02:00
e236b71615
Move RabbitMQ Simple listener support to dedicated namespace
...
Move `spring.rabbitmq.listener.*` to `spring.rabbitmq.listener.simple.*`
in preparation for Spring AMQP 2.0 that supports different container
types.
Closes gh-9108
See gh-9055
2017-05-05 10:03:47 +02:00
3d836f7730
Fix test pollution
2017-05-04 12:20:21 -07:00
189e07e9f3
Support values other than String in /env
...
Fixes gh-9079
2017-05-04 11:35:15 -07:00
216506d20f
Upgrade to Jetty 9.4.5.v20170502
...
Closes gh-9100
2017-05-04 15:41:46 +01:00
1fc6fc1790
Upgrade to Undertow 1.4.14.Final
...
Closes gh-9099
2017-05-04 15:41:46 +01:00
816ac1dc78
Remove dependency management for jetty-monitor
...
Closes gh-9010
2017-05-04 15:35:26 +01:00
3e688ecedb
Add missing dependency management for Jetty
...
Closes gh-9010
2017-05-04 11:33:52 +02:00
81e3b392c3
Merge branch '1.4.x' into 1.5.x
2017-05-04 10:42:03 +02:00
e8f99dc01c
Fix typo
...
Closes gh-9082
2017-05-04 10:41:21 +02:00
832b3d1f2f
Merge branch '1.4.x' into 1.5.x
2017-05-03 19:36:56 +01:00
08143edf19
Close streams when unpacking the CLI
...
See gh-9080
2017-05-03 19:36:28 +01:00
ce74047896
Merge branch '1.4.x' into 1.5.x
2017-05-03 18:45:32 +01:00
2f26088800
Unpack CLI for its integration tests as dir is no longer assembled
...
Closes gh-9080
2017-05-03 18:44:25 +01:00
51970f81d2
Merge branch '1.4.x' into 1.5.x
2017-05-03 16:48:59 +01:00
dc8a34f324
Fix warnings caused by CLI's assembly configuration
...
Closes gh-9080
2017-05-03 16:47:38 +01:00
2f4a1f9531
Merge branch '1.4.x' into 1.5.x
2017-05-03 13:21:59 +02:00
93bd1108bf
Fix maven warning
...
Closes gh-9075
2017-05-03 13:21:10 +02:00
ea33cc2f7d
Deprecated MustacheCompilerFactoryBean
...
Closes gh-8999
2017-05-03 13:09:52 +02:00
61f88d0c90
Provide dependency management for missing jersey dependencies
...
Closes gh-9009
2017-05-03 12:19:32 +02:00
5121b848e1
Making sure to stop embedded web servers in tests
...
Closes gh-9012
2017-05-03 11:33:42 +02:00
7b1fc01733
Fix checkstyle violations
2017-05-03 10:19:00 +02:00
b4d55a2223
Merge pull request #9007 from Dichotomia:patch-6
...
* pr/9007:
Add dependency section for jersey multipart
2017-05-03 09:18:28 +02:00
45e0912ecd
Add dependency section for jersey multipart
...
Closes gh-9007
2017-05-03 09:18:09 +02:00
063d301fd3
Make LayoutType public
...
Closes gh-9067
2017-05-03 09:15:34 +02:00
54a8dc5b33
Merge branch '1.4.x' into 1.5.x
2017-05-03 09:11:37 +02:00
625a7668c9
Merge pull request #9065 from dsyer:cachedocs
...
* pr/9065:
Polish "Clarify and re-organize docs on caching"
Clarify and re-organize docs on caching
2017-05-03 09:11:05 +02:00
Stephane Nicoll
Andy Wilkinson
Oliver Weiler
Phillip Webb
Gary Russell
Madhura Bhave
Quentin Caillard