Commit Graph

242 Commits

Author SHA1 Message Date
Andy Wilkinson
4ca38d4563 Merge branch '1.5.x' 2017-03-28 20:00:21 +01:00
Andy Wilkinson
181cfd5ca8 Merge branch '1.4.x' into 1.5.x 2017-03-28 20:00:03 +01:00
Andy Wilkinson
9fa8f2e317 Tweak Checkstyle plugin config so violations are output even with -q
Closes gh-8767
2017-03-28 19:59:08 +01:00
Andy Wilkinson
25bf4a14cd Start building against Neo4j OGM 3.0.0 snapshots
This commit our Neo4j OGM dependency with the Spring Data Neo4j
snapshots that are currently included in snapshots of Spring Data Kay.

It switches to using Neo4j's Bolt driver by default, aligning it with
the default of the latest Spring Data Neo4j 5 snapshots.

It also contains a workaround for a Neo4j OGM issue [1] and a change
to Neo4jDataAutoConfigurationTests that prevents the entire classpath
from being scanned.

See gh-8687

[1] https://github.com/neo4j/neo4j-ogm/issues/340
2017-03-22 15:24:49 +00:00
Phillip Webb
33e54ed723 Relocate org.springframework.boot.web.support
Move `org.springframework.boot.web.support` under the `servlet` package.

Fixes gh-8557
2017-03-14 22:03:03 -07:00
Phillip Webb
69b72874ea Extract logging listeners
Separate logging ApplicationListeners classes to a different package
so that the root `logging` package is no longer aware of `context`
concerns.

Fixes gh-8611
2017-03-14 13:45:53 -07:00
Andy Wilkinson
703d403f7d Tweak file property of import control config to work on Windows 2017-03-13 16:22:23 +00:00
Phillip Webb
b0eb5ef71b Fix checkstyle import control
Use fully expanded referenced in an attempt to make the CI happy.

Fixes gh-8532
2017-03-12 22:27:49 -07:00
Phillip Webb
67556ba8ea Restructure embedded web server packages
Rework `org.springframework.boot.context.embedded` to relocate classes
to `org.springframework.boot.web`. Packages are now organized around
the following areas:

Packages for shared concerns, for example the `WebServer` interface
to start/stop a server and the common configuration elements:
- org.springframework.boot.web.context
- org.springframework.boot.web.server

Servlet specific packages:
- org.springframework.boot.web.servlet.server
- org.springframework.boot.web.servlet.context
- org.springframework.boot.web.servlet.filter

Reactive specific packages:
- org.springframework.boot.web.reactive.context
- org.springframework.boot.web.reactive.server

Embedded server implementations (both reactive and servlet):
- org.springframework.boot.web.embedded

In addition:

- Rename `EmbeddedServletContainerFactory` to `ServletWebServerFactory`
  to align with the `ReactiveWebServerFactory`.
- Rename `EmbeddedWebApplicationContext` to
  `ServletWebServerApplicationContext` and
- Rename `EmbeddedReactiveWebApplicationContext` to
  `ReactiveWebServerApplicationContext`.
- Add checkstyle rules to restrict imports.
- Fixup all affected code to use the correct imports and local names.

Fixes gh-8532
2017-03-12 21:08:25 -07:00
Andy Wilkinson
b35c162593 Raise the minimum supported version of Gradle to 3.4
Closes gh-7922
2017-03-11 09:03:06 +00:00
Spring Buildmaster
d23fa24340 Next Development Version 2017-03-03 16:18:26 +00:00
Spring Buildmaster
2a83e80a9b Next Development Version 2017-03-03 14:39:21 +00:00
Brian Clozel
21878f8528 Manage Netty in Boot dependencies 2017-02-24 13:03:11 +01:00
Andy Wilkinson
99683dff6f Upgrade to Logback 1.1.10
In Logback 1.1.10, the logback-classic module contains a
META-INF/services/javax.servlet.ServletContainerInitializer file that
contains a comment. This triggers a bug in Wildfly 8 [1] that has been
fixed [2] in Wildfly 9 and later. As a result, this commit also
updates our Wildfly deployment test to use 9.0.2 rather than 8.2.0.

Closes gh-8354

[1] https://issues.jboss.org/browse/WFLY-4089
[2] fef57ebdc7
2017-02-22 11:33:30 +00:00
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
Spring Buildmaster
ed1ce140c0 Next Development Version 2017-01-26 14:20:39 +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