Commit Graph

7880 Commits

Author SHA1 Message Date
Andy Wilkinson a2489b01aa Merge branch '1.3.x' 2016-04-18 15:30:30 +01:00
Andy Wilkinson 2e54078083 Tolerate possible null Flyway MigrationVersion when using Flyway 4.0
Flyway 4.0 provides support for repeatable migrations that do not
have a version. When such a migration has been performed,
MigrationInfo.getMigrationVersion() will return null and, previously,
FlywayEndpoint would fail with an NPE.

This commit updates FlywayEndpoint to use null as the version when
MigrationInfo.getMigrationVersion() returns null.

Closes gh-5700
2016-04-18 15:30:23 +01:00
Andy Wilkinson c068285586 Streamline Integration Starter and add Java DSL to it
This commit streamlines the Integration Starter by removing the file
http, ip, and stream modules as they are not always used by a majority
of apps that use Spring Integration and can also pull in other, unwanted
dependencies.

Additionally, a dependency on spring-integration-java-dsl has been
added. This makes it easy for users to configure Spring Integration
using Java configuration (the recommended approach), rather than via
XML. The Integration sample has been updated to use the DSL. Further
improvements could be made once the sample is using Java 8.

Closes gh-5528
2016-04-18 14:55:35 +01:00
Andy Wilkinson e4324a5c77 Polishing
Make RunProcessKiller final
2016-04-18 14:55:35 +01:00
Andy Wilkinson 310be23ad5 Registered shutdown hook to kill JVM forked by spring-boot:run
Previously, a JVM that was forked by spring-boot:run could be orphaned
when the parent process (the Maven build) was terminated in an IDE. Note
that this doesn’t happen when spring-boot:run is invoked from a shell.

This commits add a shutdown hook that registered when RunMojo forks the
JVM. The shutdown hook attempts to kill the forked JVM’s RunProcess
rather than relying on the death of the parent process being sufficient
to also kill the child.

Closes gh-5815
2016-04-18 13:39:50 +01:00
Andy Wilkinson 9a8e46952c Add dependency management for org.seleniumhq.selenium:selenium-java
Closes gh-5721
2016-04-18 11:31:09 +01:00
Stephane Nicoll 2591abee55 Merge pull request #5714 from izeye/polish-201417
* pr/5714:
  Polish
2016-04-17 09:26:35 +02:00
Johnny Lim 6d48ee9593 Polish
Closes gh-5714
2016-04-17 09:26:05 +02:00
Phillip Webb 15dee60049 Restore spring-boot-starter-ws
Rename spring-boot-starter-webservices back to spring-boot-starter-ws.
Unfortunately the starter exists in Spring Boot 1.3 so we can't rename
it without consequence.

See gh-5711
2016-04-16 08:30:56 -07:00
Stephane Nicoll 786004e297 Fix build 2016-04-16 10:58:28 +02:00
Stephane Nicoll 03fff6df79 Polish
See gh-5706
2016-04-16 10:43:11 +02:00
Stephane Nicoll ae9e9bc045 Merge pull request #5708 from vpavic/gh-5698
* pr/5708:
  Remove JMS transport from Spring WS starter
2016-04-16 10:28:28 +02:00
Vedran Pavic b75d7039e1 Remove JMS transport from Spring WS starter
Closes gh-5708
2016-04-16 10:27:20 +02:00
Phillip Webb cf41512e66 Don't throw checked exceptions from Assert classes
Fixes gh-5709
2016-04-15 22:46:12 -07:00
Phillip Webb 5881c9c74f Polish 2016-04-15 22:39:35 -07:00
Andy Wilkinson 43256ee7c9 Merge branch '1.3.x' 2016-04-15 17:33:25 +01:00
Andy Wilkinson b554894bb4 Polishing 2016-04-15 17:27:19 +01:00
Andy Wilkinson 06c1dd87c9 Fix spring-boot-sample-test pom following Selenium changes in 35270e9 2016-04-15 17:24:22 +01:00
Andy Wilkinson 1fbd43bdf0 Tolerate jar files with no manifest in ChangeableUrls
Closes gh-5704
2016-04-15 17:18:00 +01:00
Stephane Nicoll cc0fc07c0e Move `shell.*` to `management.shell.*`
This commit moves the `shell` namespace to `management.shell`

Closes gh-5703
2016-04-15 18:12:35 +02:00
Stephane Nicoll 6d11d73cbc Move `shell.auth` to `shell.auth.type`
This commit moves the `shell.auth` property to `shell.auth.type`. The
previous situation was unfortunate since `shell.auth` was both a group
and a particular property.

Closes gh-5139
2016-04-15 18:12:35 +02:00
Andy Wilkinson 35270e939f Update dependency management for Selenium and its HTMLUnit Driver
Closes gh-5705
2016-04-15 17:08:04 +01:00
Stephane Nicoll f364d713dd Add `LocalManagementPort`
Add an annotation alias for the actual management port, similar to what
was done for the main context (`LocalServerPort`).

See gh-5548
2016-04-15 14:02:38 +02:00
Andy Wilkinson a4f77ae275 Provide dependency management for com.fasterxml:classmate
Hibernate and Hibernate Validator depend on different versions of
Classmate (1.1 and 1.3 respectively). This can lead to build failures
when Maven's Enforcer plugin is used.

This commit adds dependency management for Classmate which ensures
that a consistent version is used and convergence errors are avoided.

Closes gh-5697
2016-04-15 11:49:13 +01:00
Andy Wilkinson eb8b77e350 Improve analysis of failures due to NoUniqueBeanDefinitionException
Closes gh-5683
2016-04-15 11:46:18 +01:00
Stephane Nicoll 2e81f87f10 Merge pull request #5645 from vpavic/gh-1045
* pr/5645:
  Polish auto-configuration for Spring Web Services
  Add auto-configuration for Spring Web Services
2016-04-15 11:02:19 +02:00
Stephane Nicoll f561d9d9d8 Polish auto-configuration for Spring Web Services
Closes gh-5645
2016-04-15 11:01:15 +02:00
Vedran Pavic a7b3a913c2 Add auto-configuration for Spring Web Services
Closes gh-1045
2016-04-15 09:00:09 +02:00
Stephane Nicoll 9da54a4579 Merge pull request #5689 from izeye/dependencies
* pr/5689:
  Additional jackson dependency management
2016-04-15 08:59:39 +02:00
Johnny Lim 3f28542f23 Additional jackson dependency management
This commit provide dependency management for
`jackson-dataformat-cbor` and `jackson-dataformat-smile`

Closes gh-5689
2016-04-15 08:58:52 +02:00
Stephane Nicoll e4106e592a Polish doc
Closes gh-5675
2016-04-15 08:58:18 +02:00
Stephane Nicoll 5bc290eac6 Improve Hibernate 5 specific documentation
Closes gh-5694
2016-04-15 08:54:35 +02:00
Stephane Nicoll 88e6185bc8 Merge pull request #5684 from Shredder121/signature-version
* pr/5684:
  Upgrade animal sniffer Java signature
2016-04-15 08:36:47 +02:00
Ruben Dijkstra 9a1db18172 Upgrade animal sniffer Java signature
Closes gh-5684
2016-04-15 08:36:15 +02:00
Stephane Nicoll a7e8a5cc46 Merge pull request #5691 from izeye/prefix
* pr/5691:
  Polish
2016-04-15 08:35:46 +02:00
Johnny Lim c154990024 Polish
Closes gh-5691
2016-04-15 08:35:25 +02:00
Phillip Webb 85d2f2950a Use RegEx for test to make Windows happy 2016-04-14 18:27:33 -07:00
Phillip Webb 21bc166c95 Rename Import*AutoConfiguration classes
Rename Import*AutoConfiguration classes to AutoConfigure*.

Fixes gh-5692
2016-04-14 10:38:22 -07:00
Stephane Nicoll a65bed47fc Merge pull request #5685 from izeye/polish-20160414
* pr/5685:
  Polish
2016-04-14 08:04:08 +02:00
Johnny Lim 90d897eb9d Polish
Closes gh-5685
2016-04-14 08:03:52 +02:00
Andy Wilkinson 5424c5668b Skip Animal Sniffer and Checkstyle plugins when building the starters
Closes gh-5681
2016-04-13 18:57:48 +01:00
Stephane Nicoll 33cc5b40fe Merge pull request #5662 from rajadileepkolli/master
* pr/5662:
  Upgrade to Maven 3.3.9
2016-04-13 11:01:24 +02:00
Raja Dilip Kolli cf560a487e Upgrade to Maven 3.3.9
Closes gh-5662
2016-04-13 11:00:51 +02:00
Phillip Webb dbd577545d Remove trailing whitespace 2016-04-12 23:02:17 -07:00
Phillip Webb 57a665cbef Merge pull request #5672 from izeye/context-close
* context-close:
  Close the context in TypeExcludeFilterTests
2016-04-12 22:50:09 -07:00
Johnny Lim e769f20477 Close the context in TypeExcludeFilterTests
Closes gh-5672
2016-04-12 22:49:31 -07:00
Phillip Webb bf1fcfc852 Merge pull request #5673 from izeye/patch-50
* patch-50:
  Remove a test doing nothing
2016-04-12 22:47:37 -07:00
Johnny Lim 10a73381e6 Remove a test doing nothing
Closes gh-5673
2016-04-12 22:47:08 -07:00
Phillip Webb 99ea724c71 Polish docs 2016-04-12 22:45:43 -07:00
Phillip Webb 296bbbc7bd Polish docs 2016-04-12 21:24:44 -07:00