Commit Graph

9748 Commits (ce9beefc9ae2d2016eb6fc1caceb29696d3e8633)
 

Author SHA1 Message Date
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
Stephane Nicoll 7a973cb4c4 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll ac9eb8a9a9 Fix Maven warning in samples
Closes gh-7716
8 years ago
Phillip Webb faa03788a8 Merge pull request #7395 from maust/master
* pr/7395:
  Polish `spring.redis.url` support
  Add support for `spring.redis.url` property
8 years ago
Phillip Webb 8f7efbe12a Polish `spring.redis.url` support
See gh-7395
8 years ago
Marco Aust 90eb58252e Add support for `spring.redis.url` property
Update `RedisAutoConfiguration` to optionally configure Redis using a
`spring.redis.url` property`.

Closes gh-7395
8 years ago
Phillip Webb 16ed59e92f Merge pull request #7544 from jhrishikesh/gh-7478
* pr/7544:
  Add more debug logging to DevTools
8 years ago
Hrishikesh Joshi c2992e3736 Add more debug logging to DevTools
Add debug logging for the included and excluded URL patterns and
matching URLs.

Fixes gh-7478
Closes gh-7544
8 years ago
Phillip Webb 38f7389eab Polish loggers 8 years ago
Phillip Webb e6097fb3e4 Merge pull request #7634 from mbhave/gh-7605
* pr/7634:
  Refine error message from Endpoint MVC security
  Send error with message from Endpoint MVC security
8 years ago
Phillip Webb c76bd2d81e Refine error message from Endpoint MVC security
Update the error message to return less information to the client.
Details of how to disable security are now written to the log instead.

See gh-7605
See gh-7634
8 years ago
Madhura Bhave 38eeae2166 Send error with message from Endpoint MVC security
Update `MvcEndpointSecurityInterceptor` to that it sends an error in the
same way as Spring Security. Prior to this commit the `ErrorController`
would not handle endpoint security errors.

Fixes gh-7605
Closes gh-7634
8 years ago
Phillip Webb 9aaae808a6 Merge pull request #7655 from mbhave/gh-7629
* pr/7655:
  Polish CF management skip SSL opt-in
  Switch CF management skip SSL to opt-in
8 years ago
Phillip Webb dba8ef2ba8 Polish CF management skip SSL opt-in
See gh-7629
See gh-7655
8 years ago
Madhura Bhave 34712cbf76 Switch CF management skip SSL to opt-in
Change CloudFoundryActuatorAutoConfiguration so that skipping of SSL
verification is now opt-in rather than enabled by default.

Fixes gh-7629
Closes gh-7655
8 years ago
Phillip Webb 85ed90282d Merge pull request #7672 from garyrussell/GH-7646
* pr/7672:
  Polish Kafka properties
  Support arbitrary Kafka properties
8 years ago
Phillip Webb 1f7b3cad45 Polish Kafka properties
Closes gh-7672
8 years ago