Commit Graph

10971 Commits

Author SHA1 Message Date
Andy Wilkinson
fd2ab2fee0 Merge branch '1.4.x' into 1.5.x 2017-05-15 17:44:42 +01:00
Andy Wilkinson
198093c6a8 Fix violation reported by Checkstyle 2017-05-15 17:44:17 +01:00
Andy Wilkinson
5693acf558 Merge branch '1.4.x' into 1.5.x 2017-05-15 17:08:53 +01:00
Andy Wilkinson
a6f8351dd6 Close Liquibase-specific DataSource once database has been migrated
Previously, when the liquibase.url, .username, and .password
properties were used to configure a DataSource specifically for
Liquibase that DataSource would never be explicitly closed. As it is
created by DataSourceBuilder with no explicitly configured type it
will use whichever connection pool is available and, therefore, will
create and keep open the pool's minimum number of connections. This
is an unnecessary use of resources both in the application and in the
database.

This commit updates LiquibaseAutoConfiguration so that if it uses
DataSourceBuilder to create a DataSource then it will also close that
DataSource once the database has been migrated.

Closes gh-9218
2017-05-15 17:08:45 +01:00
Stephane Nicoll
cdf5f6e0ee Add support for deprecation level in manual metadata
This commit allows to specify a deprecation level to a manual metadata
entry. The purpose of that new attribute is to distinguish cases where
the property is still bound (default) from cases where the property no
longer exists and won't be bound.

This gives the opportunity to IDEs to still show the property as an
error and offer documentation and an action to rename it if a
replacement exists.

Closes gh-9074
2017-05-15 12:39:15 +03:00
Stephane Nicoll
a22b3d9515 Merge branch '1.4.x' into 1.5.x 2017-05-12 17:27:28 +02:00
Stephane Nicoll
4056542bd4 Merge pull request #9212 from sslavic:patch-1
* pr/9212:
  Fix typo in javadoc
2017-05-12 17:27:00 +02:00
Stevo Slavić
6e1d99aa10 Fix typo in javadoc
Closes gh-9212
2017-05-12 17:26:26 +02:00
Stephane Nicoll
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
Andy Wilkinson
a2e749940e Merge branch '1.4.x' into 1.5.x 2017-05-12 15:00:58 +01:00
Andy Wilkinson
a3f5cbc4a2 Polishing 2017-05-12 15:00:44 +01:00
Andy Wilkinson
1c48e5aad7 Upgrade to Spring Session 1.3.1.RELEASE
Closes gh-9185
2017-05-12 10:33:58 +01:00
Andy Wilkinson
a79457ed1a Upgrade to Jooq 3.9.2
Closes gh-9184
2017-05-12 10:33:58 +01:00
Andy Wilkinson
245d63f5b8 Upgrade to Narayana 5.5.24.Final
Closes gh-9183
2017-05-12 10:33:57 +01:00
Andy Wilkinson
eb834bbce8 Upgrade to Jboss Transaction Spi 7.6.0.Final
Closes gh-9182
2017-05-12 10:33:57 +01:00
Andy Wilkinson
2235d0c88a Merge branch '1.4.x' into 1.5.x 2017-05-12 10:16:42 +01:00
Andy Wilkinson
7a84a48739 Upgrade to Spring Cloud Connectors 1.2.4.RELEASE
Closes gh-9178
2017-05-12 08:27:01 +01:00
Andy Wilkinson
4eb0fe6bf2 Upgrade to Jetty 9.3.19.v20170502
Closes gh-9177
2017-05-12 08:27:00 +01:00
Andy Wilkinson
bb60e034ca Upgrade to Mysql 5.1.42
Closes gh-9176
2017-05-12 08:26:59 +01:00
Andy Wilkinson
0f35e7eb3d Upgrade to Appengine 1.9.53
Closes gh-9175
2017-05-12 08:26:58 +01:00
Stephane Nicoll
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
Oliver Weiler
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
Andy Wilkinson
19d680cbe4 Merge branch '1.4.x' into 1.5.x 2017-05-11 23:00:44 +01:00
Andy Wilkinson
d757368d41 Upgrade to Tomcat 8.5.15
Closes gh-9171
2017-05-11 22:59:45 +01:00
Phillip Webb
931ce15d7f Update copyright header dates 2017-05-09 21:43:52 -07:00
Phillip Webb
4a7dcc8786 Formatting 2017-05-09 21:43:24 -07:00
Stephane Nicoll
ea4e6fea35 Polish 2017-05-09 09:37:30 +02:00
Stephane Nicoll
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
Stephane Nicoll
bca96932af Merge pull request #9072 from helpermethod:master
* pr/9072:
  Add Membrane Spring Boot Starter
2017-05-09 08:35:04 +02:00
Oliver Weiler
31d4f3b638 Add Membrane Spring Boot Starter
Closes gh-9072
2017-05-09 08:34:05 +02:00
Stephane Nicoll
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
Gary Russell
74985b610b Upgrade to Spring Kafka 1.1.5.RELEASE
Closes gh-9116
2017-05-06 10:30:20 +02:00
Stephane Nicoll
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
Madhura Bhave
3d836f7730 Fix test pollution 2017-05-04 12:20:21 -07:00
Madhura Bhave
189e07e9f3 Support values other than String in /env
Fixes gh-9079
2017-05-04 11:35:15 -07:00
Andy Wilkinson
216506d20f Upgrade to Jetty 9.4.5.v20170502
Closes gh-9100
2017-05-04 15:41:46 +01:00
Andy Wilkinson
1fc6fc1790 Upgrade to Undertow 1.4.14.Final
Closes gh-9099
2017-05-04 15:41:46 +01:00
Andy Wilkinson
816ac1dc78 Remove dependency management for jetty-monitor
Closes gh-9010
2017-05-04 15:35:26 +01:00
Stephane Nicoll
3e688ecedb Add missing dependency management for Jetty
Closes gh-9010
2017-05-04 11:33:52 +02:00
Stephane Nicoll
81e3b392c3 Merge branch '1.4.x' into 1.5.x 2017-05-04 10:42:03 +02:00
Stephane Nicoll
e8f99dc01c Fix typo
Closes gh-9082
2017-05-04 10:41:21 +02:00
Andy Wilkinson
832b3d1f2f Merge branch '1.4.x' into 1.5.x 2017-05-03 19:36:56 +01:00
Andy Wilkinson
08143edf19 Close streams when unpacking the CLI
See gh-9080
2017-05-03 19:36:28 +01:00
Andy Wilkinson
ce74047896 Merge branch '1.4.x' into 1.5.x 2017-05-03 18:45:32 +01:00
Andy Wilkinson
2f26088800 Unpack CLI for its integration tests as dir is no longer assembled
Closes gh-9080
2017-05-03 18:44:25 +01:00
Andy Wilkinson
51970f81d2 Merge branch '1.4.x' into 1.5.x 2017-05-03 16:48:59 +01:00
Andy Wilkinson
dc8a34f324 Fix warnings caused by CLI's assembly configuration
Closes gh-9080
2017-05-03 16:47:38 +01:00
Stephane Nicoll
2f4a1f9531 Merge branch '1.4.x' into 1.5.x 2017-05-03 13:21:59 +02:00
Stephane Nicoll
93bd1108bf Fix maven warning
Closes gh-9075
2017-05-03 13:21:10 +02:00
Stephane Nicoll
ea33cc2f7d Deprecated MustacheCompilerFactoryBean
Closes gh-8999
2017-05-03 13:09:52 +02:00