Commit Graph

9814 Commits (ad4a53e3668d5139e1828ccd8fac81b1eca1a5a0)
 

Author SHA1 Message Date
Stephane Nicoll a60e356136 Enable Jest's multi-threaded support by default
Since the `JestClient` is auto-configured as a bean, it must have its
multi-threaded support enabled by default. This commit exposes a new
`spring.elasticsearch.jest.multi-threaded` property that is `true` by
default.

Closes gh-6806
8 years ago
Stephane Nicoll d0fa72a169 Filter AbstractRoutingDataSource from health indicator
Closes gh-6806
8 years ago
Stephane Nicoll ba3fae373d Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 92d313f820 Merge pull request #7755 from shubham391:patch-1
* pr/7755:
  Minor fix in description
8 years ago
Shubham Aggarwal e7f13b446a Minor fix in description
Closes gh-7755
8 years ago
Stephane Nicoll 37519ecfef Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 062104f1d6 Fix TestRestTemplate#patchFor methods visibility
Closes gh-7742
8 years ago
Stephane Nicoll f0be1d9d97 Upgrade to Spring Security 4.2.1.RELEASE
Closes gh-7745
8 years ago
Phillip Webb 5d2a2b6b64 Support and upgrade to Jetty 9.4
See gh-7599
8 years ago
Phillip Webb d05357e036 Migrate to Tomcat WebSocket client
Move samples and tests from Jetty websocket client to Tomcat since the
upcoming Jetty release contains a bug in `JsrSession`
(https://github.com/eclipse/jetty.project/issues/1202).

See gh-7599
8 years ago
Phillip Webb a116579cfc Work around Jetty websocket client bug
Add workaround for Jetty JsrSession NullPointerException bug
(https://github.com/eclipse/jetty.project/issues/1202) in
`spring-boot-sample-websocket-jetty`.

See gh-7599
8 years ago
Phillip Webb a23591e047 Support Jetty 9.4 and upgrade to 9.4.0.v20161208
Update `JettyEmbeddedServletContainerFactory` to support Jetty 9.4
directly and Jetty 9.3 via reflection. The primary difference between
Jetty 9.3 and 9.4 are the session management classes. Websocket suppport
has also been updates, but this is handled transparently by the
Spring Framework support.

Fixes gh-7599
8 years ago
Phillip Webb 5299db3806 Fix deadlock when calling LiveReloadServer.stop()
Update LiveReloadServer so that different synchronization blocks are
used for the sockets and connection lists. Prior to this commit calling
`LiveReloadServer.stop()` would always result in a 60 second delay since
`stop()` owned the monitor add `removeConnection()` (called from a
different thread) needs it to remove the active connection.

Fixes gh-7749
8 years ago
Phillip Webb 42cfef8ec1 Merge branch '1.4.x' into 1.5.x 8 years ago
Phillip Webb c3edf9e341 Fixup version numbers following release 8 years ago
Spring Buildmaster 9057f9ae1f Next development version 8 years ago
Stephane Nicoll 5d16edd067 Polish
See gh-6543
8 years ago
Stephane Nicoll e2e690d31c Exclude xml-apis
This commit excludes the transitive dependencies on xml-apis when using
Hibernate. Such dependency is no longer required on modern JDKs

Closes gh-7554
8 years ago
Stephane Nicoll ff28e2d380 Merge pull request #6900 from vpavic:flyway-vendor-dir
* pr/6900:
  Polish contribution
  Add support for vendor specific Flyway migration locations
8 years ago
Stephane Nicoll 449043bf21 Polish contribution
Closes gh-6900
8 years ago
Vedran Pavic 65c2d1f5e7 Add support for vendor specific Flyway migration locations
This commit adds support for using `{vendor}` placeholder in
`flyway.locations` configuration property value.

See gh-6900
8 years ago
Stephane Nicoll 62bff1017e Validate that AopAutoConfiguration back off properly
Closes gh-7694
8 years ago
Stephane Nicoll 4b23528eb4 Merge pull request #6613 from eddumelendez:gh-6610
* pr/6613:
  Polish contribution
  Add support for multiple beans in the Flyway and Liquibase endpoints
8 years ago
Stephane Nicoll 5d909a969f Polish contribution
Closes gh-6613
8 years ago
Eddú Meléndez 53d25999f3 Add support for multiple beans in the Flyway and Liquibase endpoints
Closes gh-6610
See gh-6613
8 years ago
Stephane Nicoll eb294956d8 Allow to customize Cluster.Builder rather than Cluster
Rework cb3d14a so that the customizer operates on the Builder rather than
the Cluster. The former exposes many more options.

See gh-7320
Closes gh-7669
8 years ago
Phillip Webb 78ee8637bc Merge pull request #7718 from artembilan/GH-2037
* pr/7718:
  Polish @IntegrationComponentScan auto-configuration
  Add @IntegrationComponentScan auto-configuration
8 years ago
Phillip Webb 982f41b70c Polish @IntegrationComponentScan auto-configuration
See gh-2037
See gh-7718
8 years ago
Artem Bilan a79f71cbe8 Add @IntegrationComponentScan auto-configuration
Update Spring Integration auto-configuration so that
`@IntegrationComponentScan` from `AutoConfigurationPackages` is
implicitly applied. Prior to this commit `@MessagingGateway` interfaces
would only get picked up if `@IntegrationComponentScan` was added
alongside with the `@SpringBootApplication`.

Fixes gh-2037
Closes gh-7718
8 years ago
Phillip Webb 02917ff00a Merge pull request #7722 from artembilan/IntegrationManagement
* pr/7722:
  Polish Spring Integration metrics support
  Refactor Spring Integration metrics support
8 years ago
Phillip Webb b87e02dde0 Polish Spring Integration metrics support
See gh-7722
8 years ago
Artem Bilan d69e43b433 Refactor Spring Integration metrics support
Update Spring Integration metrics support since Spring Integration
`4.3.6`+ no longer needs `spring-integration-jmx` enable
`MessageChannel`, `MessageHandler` and `MessageSource` metrics.

- Add `IntegrationManagementConfiguration` conditional auto-configuration
  to provide `@EnableIntegrationManagement` when JMX is `enabled` or there
  is no `IntegrationManagementConfigurer.MANAGEMENT_CONFIGURER_NAME` bean.
  By default this bean doesn't exist and you explicitly should declare it
  (e.g. via `@EnableIntegrationManagement`) if you would like to collect
  metrics. At the same time Spring Integration enables it when JMX
  management is present (that is a purpose of that new
  `IntegrationManagementConfiguration`)

- Change `SpringIntegrationMetricReader` to read metrics from the
  `IntegrationManagementConfigurer`, not `IntegrationMBeanExporter`

- Change `PublicMetricsAutoConfiguration` to register
  `IntegrationManagementConfigurer.MANAGEMENT_CONFIGURER_NAME` bean if
  not present. Since we are here in `actuator`, therefore we are
  interested in the metrics for SI as well.

- Since we don't need JMX for the metrics any more, remove SI-JMX
  dependency from the `spring-boot-starter-integration`.

- Remove `IntegrationManagementConfiguration` modification from the
  `integrationMbeanExporter()`, since that looks like mutation of an
  external object, when end-user would prefer their own options.
  Therefore we don't need `ObjectProvider<IntegrationManagementConfigurer>`, too

- Add missed `MessageSourceMetrics` gathering for the
  `SpringIntegrationMetricReader`

Closes gh-7722
8 years ago
Phillip Webb 2e0f87e753 Merge pull request #7723 from artembilan/KafkaPropertiesTypes
* pr/7723:
  Fix typo in Kafka sample
  Fix compatibility with Apache Kafka 0.10.1
8 years ago
Artem Bilan c700cf28cc Fix typo in Kafka sample 8 years ago
Phillip Webb f21e7940ba Merge pull request #7714 from izeye/polish-20161221
* pr/7714:
  Polish
8 years ago
Artem Bilan 28474aa30a Fix compatibility with Apache Kafka 0.10.1
Update KafkaProperties since  Apache Kafka `0.10.1` changed the type
for the `ConsumerConfig.AUTO_COMMIT_INTERVAL_MS_CONFIG` from the
`Long` to `Integer`.

Kafka includes the following conversion logic:

    case LONG:
        if (value instanceof Integer)
            return ((Integer) value).longValue();
        if (value instanceof Long)
            return (Long) value;
        else if (value instanceof String)
            return Long.parseLong(trimmed);

So we remain compatible with both `0.10.0` and `0.10.1`

Closes gh-7723
8 years ago
Johnny Lim e12b4a944f Polish 8 years ago
Phillip Webb 4aac1e3f90 Refine LoggingApplicationListenerTests
Update the Tomcat logging test to be more like the real scenario.

See gh-7639
8 years ago
Phillip Webb 765fd1dca0 Merge branch '1.4.x' into 1.5.x 8 years ago
Kazuki Shimizu 8ed769ae34 Update to Spring Secuirty 4.1.4
Closes gh-7721
8 years ago
Phillip Webb 2c00b4f76e Upgrade to Spring Data Hopper SR6
Closes gh-7602
8 years ago
Phillip Webb 138b96cf5f Use unique `testRestTemplate` bean name
Update `SpringBootTestContextCustomizer` to use the full qualified
TestRestTemplate as the registered bean name. Prior to this commit it
was possible that the customizer would replace the relatively common
bean name `testRestTemplate`.

Fixes gh-7711
8 years ago
Phillip Webb c23d8fb375 Ignore unresolvable placeholder in log properties
Update the RelaxedPropertyResolver used to load log properties so that
`${...}` patterns are ignored when possible.

Fixes gh-7719
8 years ago
Stephane Nicoll 33a655791c Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll a2cf7bed63 Upgrade to Spring Integration 4.3.6.RELEASE
Closes gh-7710
8 years ago
Stephane Nicoll 8becbcd6af Upgrade to Spring AMQP 1.6.6.RELEASE
Closes gh-7707
8 years ago
Stephane Nicoll d87d3fde02 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll d4b8755a7d Start building against Spring AMQP snapshots
See gh-7707
8 years ago
Stephane Nicoll 1673ce4a31 Start building against Spring Integration snapshots
See gh-7710
8 years ago
Stephane Nicoll 718ede943b Upgrade to Spring Framework 4.3.5.RELEASE
Closes gh-7601
8 years ago