Commit Graph

3782 Commits (6ad23b1cc45cd73f44a1b5fd13e6e73c4220f89d)
 

Author SHA1 Message Date
Phillip Webb 6ad23b1cc4 Merge pull request #2113 from BigMichi1/thymleaf-conditional-comments
* thymleaf-conditional-comments:
  Auto-configure for Thymeleaf conditionalcomments
10 years ago
Michael Cramer 3b858edfa9 Auto-configure for Thymeleaf conditionalcomments
Add auto-configuration for thymeleaf-extras-conditionalcomments which
allows parsing of conditional comments for IE.

Example:

	<!--[if lt IE 8]>
		<link rel="stylesheet" th:href="@{/styleIE.css}"
		type="text/css"/>
	<![endif]-->

Without this dialect all Thymeleaf attributes are ignored inside the
comment.

Fixes gh-2113
10 years ago
Phillip Webb 5c27cba86b Merge pull request #2172 from ceefour/patch-1
* patch-1:
  Clarify SSL "How-to" documentation
10 years ago
Hendy Irawan ba97090375 Clarify SSL "How-to" documentation
Update the SSL "How-to" documentation to make it clearer that SSL
configuration replaces the usual connector.

Closes gh-2172
See gh-2167
10 years ago
Phillip Webb a663f07375 Upgrade to Jersey 2.14
Closes gh-2166
10 years ago
Phillip Webb b27d500934 Merge pull request #2179 from izeye/master
* pull2179:
  Rename SecurityPrequisite -> SecurityPrerequisite
10 years ago
izeye 3784959b6f Rename SecurityPrequisite -> SecurityPrerequisite
Closes gh-2179
10 years ago
Stephane Nicoll cdbc0c7f46 Harmonize JTA dependency
Mixing Hibernate and a JTA provider may lead to duplicate JTA
dependencies as the API is published with different coordinates.

The following has been applied:

* We now use `javax.transaction:javax.transaction-api` everywhere.
* The `data-jpa` starter has been updated to replace the JBoss JTA
  dependency with the standard one.
* The `jta-bitronix` starter has been updated to use JTA 1.2 instead of
  JTA 1.1 (unfortunately, JTA 1.1 is published with different
  coordinates).
* The `jta-atomikos` starter has been updated to define a dependency on
  JTA as the current version does not do it at all.
* The HornetQ JMS server is also relying on JTA but that dependency
  should have been optional. It has been excluded for the time being as
  it was using (yet) another set of coordinates.

Fixes gh-2092
10 years ago
Andy Wilkinson 843ee14cea Merge branch '1.1.x' 10 years ago
Andy Wilkinson 5c67e6f141 Update war layout to package custom scope dependencies in WEB-INF/lib/
Fixes gh-2187
10 years ago
Andy Wilkinson ff714f6c17 Update module layout to package custom scope dependencies in lib/
Fixes gh-2187
10 years ago
Phillip Webb 6391973ed0 Always reinitialize logging system
Update LoggingSystems so that they can reinitialize themselves
before logging begins. This allows reset of the root logger (which
may have been set to OFF in beforeInitialize) and also re-evaluation
of systems properties such as PID which may not have been set when
logging configuration was first loaded.

This commit may possibly reintroduce gh-1091, but it seems like
reloading is our only option.

Fixes gh-2125
10 years ago
Phillip Webb 8fd99bde8b Update samples to use specific log configuration 10 years ago
Phillip Webb f35135e43d Polish documentation 10 years ago
Dave Syer 80d55c4720 Additional condition to protect Reactor 2.0 users 10 years ago
Stephane Nicoll 1b039e78e6 Documentation improvement of DataSource configuration
Closes gh-2126
10 years ago
Stephane Nicoll f6ab41dfc5 Merge pull request #2181 from panchenko/master
* pull2181:
  Remove duplicate "should" word from README
10 years ago
Alex Panchenko 8f869e6be3 Remove duplicate "should" word from README 10 years ago
Phillip Webb a724d4581f Set Jetty temp dir
Ensure that the system temp directory is passed to the Jetty
WebAppContext. This prevents `jsp` folders from appearing in the current
directory.

Fixes gh-2169
10 years ago
Phillip Webb 917723a883 Automatically alias MultipartResolver beans
Update DispatcherServletAutoConfiguration to alias a MultipartResolver
that is not named correctly. This allows the DispatcherServlet to pick
up any MultipartResolver bean, regardless of its name.

See gh-2162
10 years ago
Phillip Webb 4a0c33e7fc Drop `joda-time-*.jar` from SkipPatternJarScanner
The `joda-time-jsptags.jar` jar file cannot be skipped.

Fixes gh-2168
10 years ago
Phillip Webb f2af8b30b0 Code formatting 10 years ago
Stephane Nicoll fe5800f8be Fix typo 10 years ago
Stephane Nicoll 77427f53cc Support of Lombok annotated ConfigurationProperties
Previously, no configuration properties were discovered on a class using
lombok instead of regular getters/setters.

This commit adds a support for some of the lombok annotations,
specifically that is @Data, @Getter and @Setter. Provides the same
semantic as what lombok is generating.

Closes gh-2114
10 years ago
Stephane Nicoll 82c6142166 Merge pull request #2165 from izeye/master
* pull2165:
  Fix typo in tests
10 years ago
izeye d5435da495 Fix typo in tests 10 years ago
Phillip Webb f4fbc3e339 Fix Maven Spring Loaded detection logic
Ensure that the Maven plugin RunMojo attempts to detect the Spring
Loaded agent before deciding if the JVM should be forked.

Fixes gh-2140
10 years ago
Phillip Webb 9f31e09cf0 Fix 'pid' references in the PortFileWriter
Fix numerous copy-paste errors in EmbeddedServerPortFileWriter
where PID concepts are referenced.

Fixes gh-2161
10 years ago
Phillip Webb 4293b7b797 Ensure CharacterEncodingFilter is ordered highest
Update HttpEncodingAutoConfiguration to ensure that the
CharacterEncodingFilter is ordered above any HiddenHttpMethodFilter.

Fixes gh-2148
10 years ago
Michael Cramer 6806689c08 Upgrade to Spring Integration 4.1.1.RELEASE
Closes gh-2155
10 years ago
Michael Cramer 790e5fcf67 Upgrade to H2 1.4.183
Closes gh-2154
10 years ago
Michael Cramer 24ba436e2b Upgrade to Spring AMQP 1.4.1.RELEASE
Closes gh-2152
10 years ago
Andy Wilkinson cfd17eb479 Merge branch '1.1.x'
Conflicts:
	spring-boot-dependencies/pom.xml
10 years ago
Michael Cramer ef64186bb9 Upgrade to SLF4J 1.7.8
Closes gh-2151
10 years ago
Phillip Webb 7f33d942f4 Fix banner NPE when when using the default package
Update ResourceBanner to protect against a null application package.

Fixes gh-2143
10 years ago
Phillip Webb e24196b863 Merge branch '1.1.x'
Conflicts:
	spring-boot/src/main/java/org/springframework/boot/StartupInfoLogger.java
	spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
10 years ago
Phillip Webb 1ef77d7d97 Protect against null CodeSource location
Update LogbackLoggingSystem to protect against a potential null
CodeSource result.

Fixes gh-2149
10 years ago
Phillip Webb c22018aaa1 Polish 10 years ago
Stephane Nicoll ca4d1f97b5 Adding meta-data for spring.output.ansi.enabled
Closes gh-2145
10 years ago
Phillip Webb 6b4bb4d654 Unify console and file logback patterns
Update the file log pattern to write the thread name after the `---`
separator. The allows both file and console logs to be parsed in the
same way.

Fixes gh-2136
10 years ago
Phillip Webb df1dede57f Substitute ${PID} variables with file logging
Update DefaultLogbackConfiguration to include OptionHelper.substVars
when setting the encoder pattern so that ${PID} is correctly expanded.

Fixes gh-2119
10 years ago
Phillip Webb fc2e616cc2 Restore Spring Boot 1.1 logging behavior
Refactor LoggingApplicationListener and LoggingSystem to restore
Spring Boot 1.1 logging behavior. The LOG_FILE and LOG_PATH system
properties are now set before configuring the logger.

The `logging.path` property is now once again optional and will not be
used when `logging.file` is specified. The documentation has also been
updated to reflect the changes.

Fixes gh-2121
Fixes gh-2117
10 years ago
Phillip Webb 5dd40e6999 Polish 10 years ago
Stephane Nicoll 4c39073d2a Merge branch '1.1.x' 10 years ago
Stephane Nicoll f1c893e523 Polish indent 10 years ago
Stephane Nicoll b8612d99c6 Add explicit reference to health.*
Health indicator configuration keys have moved from the health.* to the
management.health.* namespace. This commit adds an explicit reference
to the previous location.

See gh-2128
10 years ago
Stephane Nicoll 2fa1a5df36 Merge branch '1.1.x' 10 years ago
Stephane Nicoll 2416a935e6 Properly document health indicator config
Health indicator configuration keys have moved from the health.* to the
management.health.* namespace. This commit makes sure that these are
documented properly in 1.1.x as well.

See gh-2118
10 years ago
Stephane Nicoll 11f5c76968 Properly guard ManagementSecurityAutoConfiguration
ManagementSecurityAutoConfiguration fully relies on the presence of a
web environment, yet the configuration class itself was not guarded by
`@ConditionalOnWebApplication` (while nested config where).

This turned out to be a problem for command-line applications using
spring security (i.e. CRaSH integration).

Fixes gh-2112
10 years ago
Stephane Nicoll 8f6f25f88e Improve property target name
Previously, non camel case properties were wrongly resolved, i.e.
getFOO() leading to a 'f-o-o'. While unusual, underscores can also be
added to a property name. In that case, the hyphen should not be added
as the binder consider this to be a single "word". Typically setFoo_Bar
on the "something" prefix is mapped using "something.foo_bar".

All these cases are now handled properly, generating the target name that
the binder expects.

Fixes gh-2118
10 years ago