Commit Graph

3529 Commits (d0f43d2e2b2defe5dd7357271d8f9a63ed435baa)
 

Author SHA1 Message Date
Andy Wilkinson d0f43d2e2b Merge branch '1.1.x'
Conflicts:
	spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
	spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java
10 years ago
Andy Wilkinson 59ebc3b320 When Logback is the logging system, ensure that JBoss logging uses it
Previously, if Logback was being used as Boot's logging system, but
Log4J was also on the classpath before SLF4J and Logback, JBoss
Logging would use Log4J for its logging. This lead to warning messages
being produced as Log4J was not configured:

log4j:WARN No appenders could be found for logger (org.jboss.logging).
log4j:WARN Please initialize the log4j system properly.

This commit updates LogbackLoggingSystem to set the
org.jboss.logging.provider to "slf4j". This ensure that JBoss Logging
will use SLF4J and Logback as intended even when Log4J is also on the
classpath.

Closes gh-1928
10 years ago
Phillip Webb f75b266d64 Add 'deprecated' field to configuration meta-data
Update the ConfigurationMetadataAnnotationProcessor to detect the
@Deprecated annotation on getters or setters.

Fixes gh-1846
10 years ago
Phillip Webb 31253d0d76 Merge pull request #1931 from juzer/master
* pull1931:
  Fixed potential ClassCastException getting error
10 years ago
juzer 428d2caac1 Fixed potential ClassCastException getting error
Update DefaultErrorAttributes to expect a `Throwable` ERROR_ATTRIBUTE
rather than an `Exception`.

Fixes gh-1931
10 years ago
Phillip Webb c34cfb27a3 Polish 10 years ago
Phillip Webb b53d72e930 Restore Java 1.6 version 10 years ago
Phillip Webb 3a4d62fb3a Gracefully ignore placeholder exceptions
Update BeanTypeRegistry to gracefully ignore LoadBeanClassException and
BeanDefinitionStoreException exceptions in the same way as
DefaultListableBeanFactory.doGetBeanNamesForType() does.

Fixes gh-1955
10 years ago
Dave Syer 7fa0ea7c3b Add support for spring.jersey.type=filter
Fixes gh-1756
10 years ago
Dave Syer 3a4f1f6f39 Attempt to get Jersey working as filter 10 years ago
Stephane Nicoll 8f488bd019 Update init to new metadata format
Spring initializr now declares an improved metadata format (v2).

InitializrServiceMetadata has been updated to parse this format. Note
that the client could be further improved by using HAL generated links.

Closes gh-1953
10 years ago
Dave Syer ae23ba13b5 Fix for Java < 1.8
Uses raw class instead of Java Type API (which has a
default method in 1.8, unavailble in 1.7).
10 years ago
Dave Syer 5d2d39e87d Add EndpointHandlerMappingCustomizer callback
Users can add @Beans of this type to customize the
EndpointHandlerMapping (e.g. add interceptors) even if
it is in a child context.

Fixes gh-1933
10 years ago
Dave Syer 1254508357 Fix tests some more
Eclipse (by default) does not create the JSON metadata when
it compiles the @ConfigurationProperties beans. So running on
the command lilne gets scarily different than in an IDE. Fixed
by externalizing the metadata location and setting it to something
empty in the tests.
10 years ago
Andy Wilkinson 90af8bf54a Add auto-configuration for Jetty 9's WebSocket support
Closes gh-1269
10 years ago
Dave Syer 0757d24d91 Fix /configprops tests 10 years ago
Dave Syer 6ad626de49 Allows /configprops endpoint to show nested properties
Including maps and lists. Beans with no metadata (in
/META-INF/*spring-configuration-metadata.json) are just serialized
as they come (so might have problems like cycles). Serialization
errors are caught and rendered as an "error" for that bean. Any
problems can be fixed by preparing metadata and specifying which
properties are to be rendered that way.

Fixes gh-1746, fixes gh-1921
10 years ago
Phillip Webb fa64f432b7 Drop unused MANIFEST 10 years ago
Phillip Webb 0bff6c4bfc Merge branch '1.1.x' 10 years ago
Phillip Webb 9059c7574b Update license details
Add LICENSE.txt file and make it clear in the README file that we
are Apache 2.0

Fixes gh-1952
10 years ago
Phillip Webb a641f0c72a Polish 10 years ago
Phillip Webb a6e4744c60 Fixup line endings 10 years ago
Phillip Webb b583262211 Use SmartInitializingSingleton when possible
Switch implementations of ApplicationListener<ContextRefreshEvent> for
SmartInitializingSingleton when possible.

Fixes gh-1939
10 years ago
Andy Wilkinson 7a783f5a18 Merge branch '1.1.x' 10 years ago
Andy Wilkinson 863c099161 Add missing copyright headers 10 years ago
Andy Wilkinson 7392e2b4d2 Merge branch 'undertow' 10 years ago
Andy Wilkinson 1864d79077 Polish Undertow contribution
Closes gh-1779
10 years ago
sopov.ivan c501b889af Add support for using Undertow as an embedded container
See gh-1779
10 years ago
Phillip Webb 21115f29cf Remove accidental SampleControllerAdvice test
Accidentally committed in 4668f59723

See gh-1950
10 years ago
Phillip Webb 7e81f164f2 Merge pull request #1943 from isopov/ssl-keystore-classpath-test
* ssl-keystore-classpath-test:
  Add Jetty SSL keystore in classpath test
10 years ago
sopov.ivan 72dd75b66e Add Jetty SSL keystore in classpath test
Update JettyEmbeddedServletContainerFactoryTests to test loading an
SSL keystore from the classpath. Currently this is a Jetty only feature,
although if https://issues.apache.org/bugzilla/show_bug.cgi?id=56777 is
fixed we could do the same thing with Tomcat.

Closes gh-1943
10 years ago
Phillip Webb 6efa2d5315 Merge branch '1.1.x' 10 years ago
Phillip Webb 0408eb413f Add profile to ConfigFileApplicationListener log
Fixes gh-1948
10 years ago
Phillip Webb 4668f59723 Improve relaxed enum binding
Update RelaxedConversionService to support more relaxed enum binding.

Fixes gh-1950
10 years ago
Andy Wilkinson f43d6925c5 Apply spring.jackson.* config to HypermediaAutoConfiguration’s ObjectMapper
Previously, HypermediaAutoConfiguration would trigger the creation of
an ObjectMapper bean named _halObjectMapper. This bean did not have the
spring.jackson.* configuration applied to it, however its presence
would revent JacksonAutoConfiguration from creating its
ObjectMapper. This left the user with an ObjectMapper that did not
honour the spring.jackson.* configuration.

This commit updates HypermediaAutoConfiguration to use the
Jackson2ObjectMapperBuilder that may have been created by
JacksonAutoConfiguration. If the builder exists it is used to configure
the _halObjectMapper bean.

Fixes gh-1949
10 years ago
Andy Wilkinson 35b7ba5cda Deprecate http.mappers.* properties
The http.mappers.* configuration properties assumed that the mapping
was JSON (on of the property names was jsonPrettyPrint) and also only
exposed a small subset of the configuration options supported by
Jackson (and GSON). The property names implied that it would configure
all HTTP mapping, however it was ignored by GsonAutoConfiguration.

This commit deprecates the support for http.mappers.* in favour of
configuring Jackson or Gson instead. Jackson can be configured
declaratively using the spring.jackson.* properties or programtically.
Gson can be configured programatically by using a GsonBuilder to
create a Gson instance with the desired configuration.
gh-1946 has been opened to add support for declarative configuration
of Gson.

Closes gh-1945
10 years ago
Andy Wilkinson 6cfd6cad64 Merge branch '1.1.x' 10 years ago
Andy Wilkinson 25c561313e Merge branch 'gh-1919' into 1.1.x 10 years ago
Andy Wilkinson 9eae29938c Test that http.mappers props are applied by JacksonAutoConfiguration
Closes gh-1919
10 years ago
Nicolás J. García f51b304c2a Update JackonAutoConfiguration to apply all http.mappers properties
Previously, only the http.mappers.json-sort-keys property was applied
by JacksonAutoConfiguration. This commit updates it to also apply the
http.mappers.json-pretty-print property as well.

See #1919
10 years ago
Andy Wilkinson 1c4f1f0ecb Merge branch 'jackson-mapper' 10 years ago
Andy Wilkinson b8d6b34038 Test that HttpMapper properties are only used when they’re defined
Closes gh-1923
10 years ago
Sebastien Deleuze c053540b03 Use HttpMapper properties only if defined
See gh-1923
10 years ago
Andy Wilkinson cea47bd48c Merge branch '1.1.x'
Conflicts:
	spring-boot-dependencies/pom.xml
10 years ago
Andy Wilkinson 33dfab08de Upgrade to Tomcat 7.0.57
Closes gh-1936
10 years ago
Andy Wilkinson 5bc48bee5a Upgrade to Spring AMQP 1.3.7.RELEASE
Closes gh-1906
10 years ago
Andy Wilkinson 1182495810 Upgrade to Spring Integration 4.0.5.RELEASE
Closes gh-1905
10 years ago
Andy Wilkinson d246dee6d6 Merge branch '1.1.x' 10 years ago
Andy Wilkinson 6ab47db19d Omit null pathInfo from ErrorPageFilter's error message
Fixes gh-1944
10 years ago
Andy Wilkinson 8635724521 Merge branch '1.1.x' 10 years ago