Commit Graph

8237 Commits

Author SHA1 Message Date
Andy Wilkinson 93307bbd5b Merge branch '1.3.x' 2016-06-23 12:59:55 +01:00
Andy Wilkinson 17546628f5 Remove springloaded from samples
springloaded isn't required in any of the samples, yet some of them
make use of it without being a springloaded-specific sample. This
is creating the false impression that springloaded is necessary in
cases where it's not.
2016-06-23 12:58:42 +01:00
Stephane Nicoll fda2505be6 Fix checkstyle violations 2016-06-23 11:14:28 +02:00
Stephane Nicoll cfe1fe8736 Merge branch '1.3.x' 2016-06-23 10:44:55 +02:00
Stephane Nicoll bffcb1aad2 Document available layouts
Closes gh-5524
2016-06-23 10:42:47 +02:00
Stephane Nicoll 2dc6e5b6fa Refactor Jest auto-configuration package space
This commit moves the Jest auto-configuration from `spring.jest` to
`spring.elasticsearch.jest`

Closes gh-6032
2016-06-23 10:39:16 +02:00
Phillip Webb 5182bc4f2b Improve startup times
Improve startup times (although not by much) by adding more background
pre-initializers and lazily evaluating the whitelabel SpEL view.

See gh-6177
2016-06-22 20:37:59 -07:00
Stephane Nicoll 0107d1134a Merge pull request #6202 from izeye:error
* pr/6202:
  Remove unnecessary constructor
2016-06-22 14:03:12 +02:00
Johnny Lim e0389cb9d8 Remove unnecessary constructor
Closes gh-6202
2016-06-22 14:02:37 +02:00
Andy Wilkinson a395679b95 Fix JarURLConnectionTests on Windows
Closes gh-6109
2016-06-22 10:02:42 +01:00
Dave Syer 13ceea5bba Fix binary compatibility issue
Existing apps get a NoSuchMethodError before this change because
they were compiled expecting a different signature for the
deprecated FilterRegistrationBean constructor.
2016-06-22 08:46:52 +01:00
Andy Wilkinson 52e8ad4b6b Drop back to Hibernate 5.0.9.Final
The upgrade to Hibernate 5.2.0.Final has provide to be too
problematic to live with. It requires Java 8, is incompatible with
a number of other projects in the Hibernate ecosystem, and it's
unclear for how long it will be maintained. We'd previously used
Hibernate 5.1.0.Final but its maintenance is also unclear with
Hibernate 5.1.1.Final being more than 3 months overdue.

This commit drops back to Hibernate 5.0.9.Final. This has a few
advantages:

- It's Java 7 compatible
- It's had some time to mature and should be reasonably free of
  regressions for those moving from 4.3.x
- It's used in both Wildfly and JBoss EAP so there's a fair chance
  that it will continue to be maintained.

Closes gh-6198
2016-06-21 20:09:21 +01:00
Andy Wilkinson f451de3759 Start building against Spring Framework 4.3.1 snapshots
See gh-6197
2016-06-21 17:12:21 +01:00
Andy Wilkinson e5827f4840 Merge branch '1.3.x' 2016-06-21 15:09:56 +01:00
Dave Syer 867f86a44a Merge remote-tracking branch 'origin/1.3.x' 2016-06-21 15:07:42 +01:00
Andy Wilkinson 6c8f8c9d82 Better diagnotics when ESCF subclass breaks with custom management port
When a custom management.port is used, the child context is configured
with an EmbeddedServletContainerFactory bean that has the same class
as the parent context’s EmbeddedServletContainerFactory bean. This
ensures that the child context uses the same type of embedded container
as its parent when there are multiple embedded containers on the
classpath. It also causes a failure when the custom
EmbeddedServletContainerFactory subclass cannot be instantiated, for
example because it’s an anonymous inner-class.

This commit improves the diagnostics so that we fail fast with an
information exception message when we detect that the embedded servlet
container factory bean’s class cannot be instantiated.

Closes gh-6193
2016-06-21 15:05:00 +01:00
Dave Syer f083447a1b Bump spring-retry to 1.1.3 2016-06-21 14:53:01 +01:00
Andy Wilkinson 02dbd6e4a7 Allow JarURLConnection to be created with a relative URL
Previously, JarURLConnection assumed that that URL with which it was
created would contain the absolute path of the underlying jar file.
This meant that when it was created with a relative URL, it could fail
to find an entry or throw a StringIndexOutOfBoundsException.

This commit updates the logic for normalizing the input URL so that
both absolute and relative URLs are supported.

Closes gh-6109
2016-06-21 11:30:51 +01:00
Stephane Nicoll cdb2c513e9 Merge pull request #6191 from persapiens:jsf-spring-boot-starter
* pr/6191:
  Update libraries supported by jsf-spring-boot-starter
2016-06-21 09:11:07 +02:00
Marcelo Romulo Fernandes c6be546f9a Update libraries supported by jsf-spring-boot-starter
Closes gh-6191
2016-06-21 09:10:24 +02:00
Phillip Webb 7446235ff4 Polish 2016-06-20 20:13:13 -07:00
Phillip Webb c136054e69 Merge branch '1.3.x' 2016-06-20 18:54:01 -07:00
Phillip Webb 5b97981c87 Polish 2016-06-20 18:13:43 -07:00
Andy Wilkinson 0c1cf7315a Fix assertion to use AssertJ 2016-06-20 20:38:16 +01:00
Andy Wilkinson 0b2f912ca2 Merge remote-tracking branch 'local/1.3.x' 2016-06-20 20:24:57 +01:00
Andy Wilkinson 9d194c2d43 Add test to verify binding of a property with all upper-case suffix
See gh-5330
2016-06-20 20:24:41 +01:00
Brian Clozel fa32ce35fb Document workaround for JSP limitation
See gh-2893
2016-06-20 18:00:31 +02:00
Brian Clozel 714ee45ff9 Merge branch '1.3.x' 2016-06-20 17:59:29 +02:00
Brian Clozel c1fcecb415 Document JSP limitation: error page customization
Closes gh-2893
2016-06-20 17:56:30 +02:00
Andy Wilkinson 2c8eaac78c Update documentation of server.server-header for changes in 3009e51
See gh-4730
2016-06-20 15:25:01 +01:00
Andy Wilkinson 3009e5146c Disable Jetty's default Server header
Following the upgrade to Tomcat 8.5, Jetty became the only container
that sends a Server header by default. This commit updates the factory
for Jetty to disable the default Server header bringing it into line
with Tomcat and Undertow.

All three containers continue to support server.server-header which
can be used to configure a custom server header.

Closes gh-4730
2016-06-20 15:15:10 +01:00
Stephane Nicoll 06aa35b9da Clarify usage of EnvironmentPostProcessor
Closes gh-6101
2016-06-20 15:29:38 +02:00
Andy Wilkinson 5e4f84cf46 Allow maximum HTTP header size to be configured when using Jetty 8
Closes gh-6190
2016-06-20 14:12:49 +01:00
Andy Wilkinson 5b688de8da Fix artifact id of new Tomcat 8.0 SSL sample
See gh-6164
2016-06-20 13:50:55 +01:00
Stephane Nicoll 97874a0749 Fix build failure 2016-06-20 14:40:57 +02:00
Andy Wilkinson f28e3d54c5 Upgrade to Tomcat 8.5.3
This commit changes the default version of Tomcat to 8.5.3 while
also retaining support for Tomcat 8.0 and 7.0. The main difference
in 8.5 is that the ServerSocketFactory abstraction that allowed the
TrustStore and KeyStore to be configured programatically no longer
exists. This logic has been replaced with the use of a custom URL
protocol (springbootssl) that provides access to the key store and
trust store of an SslStoreProvider. In addition to working with 8.5,
this approach has the advantage of also working with 8.0 and 7.0.

Closes gh-6164
2016-06-20 13:27:47 +01:00
Stephane Nicoll 06b81cf16f Use `@AliasFor` when applicable
This commit adds `@AliasFor` meta-data to annotations that declare an
alias attribute.

`@ConditionalOnProperty` and `@AutoconfigureRestDocs` were not migrated
due to the use of `AnnotationMetadata#getAnnotationAttributes`.

Closes gh-5187
2016-06-20 14:20:16 +02:00
Stephane Nicoll 62a41aeed7 Merge pull request #6188 from izeye:json
* pr/6188:
  Reuse objects in JsonParser implementations
2016-06-20 10:20:25 +02:00
Johnny Lim 25f37da466 Reuse objects in JsonParser implementations
Closes gh-6188
2016-06-20 10:19:50 +02:00
Stephane Nicoll e383752150 Merge branch '1.3.x' 2016-06-20 10:14:25 +02:00
Stephane Nicoll e93aa2057b Merge pull request #6184 from artembilan:GH-6183
* pr/6184:
  Fix relaxed binding of SI JMX config
2016-06-20 10:12:02 +02:00
Artem Bilan 3ea84f9e1d Fix relaxed binding of SI JMX config
Instead of using an expression for JMX-related properties, this commit
properly honors relaxed binding.

Closes gh-6184
2016-06-20 10:04:38 +02:00
Stephane Nicoll 976f0a7a80 Fix build failure
Fixing #5939 lead to a build failure as OAuth2 related configuration was
defined twice. This is also related to #5973.
2016-06-20 09:47:41 +02:00
Stephane Nicoll 5407cf5f7a Prevent several registration of the same config pojo
This commit detects case where the same set of keys are exposed several
times and prevents the compilation to complete. Previously, duplicate
keys were silently added to the meta-data.

Closes gh-5939
2016-06-20 09:19:02 +02:00
Stephane Nicoll 1afb653859 Merge pull request #6185 from izeye:patch-47
* pr/6185:
  Fix default value for dispatch-options-request in doc
2016-06-18 12:20:58 +02:00
Johnny Lim d47719edbd Fix default value for dispatch-options-request in doc
Closes gh-6185
2016-06-18 12:20:16 +02:00
Andy Wilkinson 971913e672 Polish 2016-06-17 21:01:29 +01:00
Stephane Nicoll 3799496dc8 Merge branch '1.3.x' 2016-06-17 17:50:47 +02:00
Stephane Nicoll 9abca48a7f Fix HAL browser entry point with contextPath
Previously, if the `contextPath` of the application wasn't the root, the
HAL browser could not initialize since the `entryPoint` was referring to
an invalid location.

This commit makes sure to take the `contextPath` into account.

Closes gh-5814
2016-06-17 17:49:49 +02:00
Stephane Nicoll 72b88790f0 Update .gitignore 2016-06-17 17:47:29 +02:00