Stephane Nicoll
1f0672f651
Polish merge
2017-02-08 15:07:13 +01:00
Stephane Nicoll
5f05e9793b
Merge branch '1.5.x'
2017-02-08 15:01:28 +01:00
Stephane Nicoll
95e7fbeb1d
Make sure `spring-boot-test-support` is not public
...
The `spring-boot-test-support` module is internal and is not deployed so
we should not offer public dependency management for it.
Closes gh-8165
2017-02-08 14:38:45 +01:00
Spring Buildmaster
5c12500366
Next Development Version
2017-01-30 20:10:13 +00:00
Spring Buildmaster
a2696bf873
Next Development Version
2017-01-30 11:40:24 +00:00
Andy Wilkinson
dab7147642
Merge branch '1.5.x'
2017-01-24 12:41:05 +00:00
Andy Wilkinson
1debd83b55
Upgrade to Dependency Management Plugin 1.0.0.RELEASE
...
Closes gh-8018
2017-01-24 12:40:39 +00:00
Phillip Webb
5502fa2936
Merge branch '1.5.x'
2017-01-18 21:05:22 -08:00
Phillip Webb
d1a8d136a7
Merge branch '1.4.x' into 1.5.x
2017-01-18 13:56:42 -08:00
Phillip Webb
b28d537c78
Disable unwanted m2e activations
...
Add m2e activation properties to disable unwanted Eclipse facets.
2017-01-18 13:48:49 -08:00
Andy Wilkinson
70a8836909
Merge branch '1.5.x'
2017-01-17 17:03:57 +00:00
Andy Wilkinson
cb7ae2e60a
Add a deployment test for WebSphere Liberty Profile
...
Closes gh-7419
2017-01-17 17:03:41 +00:00
Andy Wilkinson
ae3434ba4c
Merge branch '1.4.x' into 1.5.x
2017-01-13 18:45:50 -05:00
Andy Wilkinson
d2201d5284
Correct copyright dates and enforce that starting year is 2012
...
Closes gh-7923
2017-01-13 18:43:30 -05:00
Andy Wilkinson
3c35066ed5
Merge branch '1.5.x'
2017-01-13 15:40:53 -05:00
Andy Wilkinson
426435f4af
Merge branch '1.4.x' into 1.5.x
2017-01-13 15:40:11 -05:00
Andy Wilkinson
1afb050061
Correct copyright dates and enforce that starting year is 2012
...
Closes gh-7923
2017-01-13 15:36:06 -05:00
Stephane Nicoll
c28ff4314c
Upgrade to Mockito 2
...
Closes gh-7770
2017-01-05 12:22:15 +01:00
Phillip Webb
4bfecc1307
Merge branch '1.5.x'
2017-01-04 23:52:40 -08:00
Phillip Webb
cc7c2ebb87
Migrate to android-json
...
Migrate from `org.json:json` to the clean room Apache 2.0 licensed
version that was developed for Android.
Fixes gh-5929
2017-01-04 23:00:06 -08:00
Andy Wilkinson
e9021b3653
Merge branch '1.5.x'
2017-01-04 11:32:25 +00:00
Andy Wilkinson
4e8a79bf3a
Upgrade to Dependency Management Plugin 1.0.0.RC2
...
Closes gh-7817
2017-01-04 11:27:08 +00:00
Andy Wilkinson
37f9de7dc8
Merge branch '1.5.x'
2017-01-04 11:26:10 +00:00
Andy Wilkinson
0d6a8d9aa3
Configure Animal Sniffer to exclude jar containing Java 9 bytecode
...
Closes gh-7763
2017-01-04 11:24:45 +00:00
Phillip Webb
49fa702708
Merge branch '1.5.x'
2016-12-27 15:06:22 -08:00
Phillip Webb
85504e74a6
Merge branch '1.4.x' into 1.5.x
2016-12-27 15:05:15 -08:00
Arlo O'Keeffe
3a709511c4
Notify BuildContext of changed build-info file
...
Update Maven plugin to inform the BuildContext when changes are made to
the `build-info` file. Prior to this commit Eclipse could continually
trigger refreshes whenever "Refresh using native hooks or polling" was
enabled and the file was written to `src/main/resources`.
Closes gh-7741
2016-12-27 13:20:22 -08:00
Spring Buildmaster
9057f9ae1f
Next development version
2016-12-23 00:15:23 +00:00
Andy Wilkinson
1782d778db
Merge branch '1.5.x'
2016-12-15 20:07:55 +00:00
Andy Wilkinson
6fb1fb580d
Upgrade to Dependency Management Plugin 1.0.0.RC1
...
Closes gh-7636
2016-12-15 20:07:35 +00:00
Stephane Nicoll
655bffb8eb
Merge branch '1.5.x'
2016-11-30 11:37:58 +01:00
Stephane Nicoll
740d28578b
Promote plugin dependency management
...
This commit promotes the plugin dependency management for the
`maven-enforcer-plugin` and `maven-invoker-plugin` to the root. That way
these can be used in samples as well rather than having a separate copy.
Closes gh-7517
2016-11-30 11:37:48 +01:00
Andy Wilkinson
9e4a370a98
Merge branch '1.5.x'
2016-11-22 13:47:18 +00:00
Andy Wilkinson
09a235b1e8
Upgrade to Neo4j OGM 2.1.0-M01
...
Closes gh-7448
2016-11-22 13:45:30 +00:00
Andy Wilkinson
ae8ad454b3
Merge branch '1.5.x'
2016-11-18 11:26:08 +00:00
Andy Wilkinson
af4ca7cf6e
Align Spring Data Neo4j auto-configuration with latest Ingalls snapshots
...
Closes gh-7391
2016-11-18 11:22:39 +00:00
Andy Wilkinson
971e5e834c
Merge branch '1.5.x'
2016-11-17 19:28:31 +00:00
Andy Wilkinson
eff0fc0221
Merge branch '1.4.x' into 1.5.x
2016-11-17 19:28:01 +00:00
Andy Wilkinson
918e122ddc
Fix remote DevTools' support for adding and removing classes
...
Previously, remote DevTools only correctly supported modifying
existing classes. New classes that were added would be missed, and
deleted classes could cause a failure as they would be found by
component scanning but hidden by RestartClassLoader.
This commit introduces a DevTools-specific ResourcePatternResolver
that is installed as the application context's resource loader. This
custom resolver is aware of the files that have been added and
deleted and modifies the result returned from getResource and
getResources accordingly.
New intergration tests have been introduced to verify DevTools'
behaviour. The tests cover four scenarios:
- Adding a new controller
- Removing an existing controller
- Adding a request mapping to a controller
- Removing a request mapping from a controller
These four scenarios are tested with:
- DevTools updating a local application
- DevTools updating a remote application packaged in a jar file
- DevTools updating a remote application that's been exploded
Closes gh-7379
2016-11-17 19:19:54 +00:00
Spring Buildmaster
e712a9ba8c
Next Development Version
2016-11-08 16:55:37 +00:00
Andy Wilkinson
389f2e0f7b
Make Rabbit Client milestones available to all profiles
...
See gh-7053
2016-11-04 15:36:43 +00:00
Andy Wilkinson
7c3d7d882a
Merge branch '1.5.x'
2016-11-01 16:25:07 +00:00
Andy Wilkinson
ef3395beaa
Raise the minimum supported version of Gradle to 2.9
...
Closes gh-6884
2016-11-01 16:25:02 +00:00
Andy Wilkinson
86034e5c5c
Merge branch '1.5.x'
2016-10-19 12:22:23 +01:00
Andy Wilkinson
3ea09d2e04
Merge branch '1.4.x' into 1.5.x
2016-10-19 12:22:11 +01:00
Andy Wilkinson
02e89acd1e
Add managed version for kotlin-runtime to spring-boot-parent
...
See gh-7101
2016-10-19 12:20:37 +01:00
Stephane Nicoll
d65a843856
Merge branch '1.5.x'
2016-10-12 10:37:38 +02:00
Stephane Nicoll
2d995661f4
Merge branch '1.4.x' into 1.5.x
2016-10-12 10:37:26 +02:00
Stephane Nicoll
00a10bcf61
Restore checkstyle
...
Rather than disabling checkstyle altogether, this commit enables it
again, relaxing the javadoc requirement only.
See gh-7142
2016-10-12 10:37:15 +02:00
Andy Wilkinson
312292b93e
Update Animal Sniffer and related annotations for Java 8 baseline
...
Closes gh-6981
2016-09-21 17:20:49 +01:00