Commit Graph

10971 Commits

Author SHA1 Message Date
Stephane Nicoll
389b8641b7 Fix documentation inconsistency
Closes gh-2416
2015-01-28 15:43:30 +01:00
Stephane Nicoll
5e36473939 Fix documentation typo 2015-01-27 17:36:22 +01:00
Andy Wilkinson
528a632fd1 Allow XA DataSource and ConnFactory pools to be configured via the env
This commit adds support for configuring the XA DataSource and
ConnectionFactory pools created by Atomikos and Bitronix via the
environment. The property prefixes vary depending on the transaction
manager that’s in use. They are:

Bitronix:
 - spring.jta.bitronix.datasource
 - spring.jta.bitronix.connectionfactory

Atomikos:
 - spring.jta.atomikos.datasource
 - spring.jta.atomikos.connectionfactory

The configuration processor has been updated to ignore
javax.jms.XAConnectionFactory and javax.sql.XADataSource as neither of
these types can be created via property binding.

Closes gh-2027
2015-01-27 10:55:56 +00:00
Andy Wilkinson
37ffa6dc85 Upgrade to Tomcat 8.0.18
Closes gh-2415
See gh-1920
2015-01-26 16:26:34 +00:00
Andy Wilkinson
4802640399 Reference latest version of Tomcat 7 in the documentation 2015-01-26 14:42:55 +00:00
Andy Wilkinson
8e8bf8e177 Uses the latest version of Tomcat 7 in the sample 2015-01-26 14:38:30 +00:00
Stephane Nicoll
f5f0952837 Merge branch '1.1.x' 2015-01-26 03:28:17 +01:00
Stephane Nicoll
e70c18d05b Fix name of solr health indicator
Fixes gh-2410
2015-01-26 03:27:53 +01:00
Stephane Nicoll
4bee1b0e1b Fix wrong help page for archive detection logic
Fixes gh-2355
2015-01-23 17:24:14 +01:00
Andy Wilkinson
f96adaf3ac Add some documentation about Java 6 compatibility
Document the need to use a different JTA 1.2 API jar and Tomcat 7 or
Jetty 8 if you’re running on Java 6.

Closes gh-2347
2015-01-22 16:45:46 +00:00
Andy Wilkinson
49bc12d564 Make spring-plugin-core a compile dependency so EntityLinks can be used
See gh-2396
2015-01-22 16:03:58 +00:00
Andy Wilkinson
01344c8617 Add a starter for building a RESTful service with Spring HATEOAS
Closes gh-2396
2015-01-22 15:22:50 +00:00
Andy Wilkinson
ea7b5c6e3c Improve support for alternative Log4j 2 configuration file formats
This commit adds support for configuring Log4j 2 with YAML. It also
improves the existing support for configuring Log4j 2 with JSON.

Previously, Log4J2LoggingSystem returned a hard-coded list of standard
config locations that includes both JSON and XML file suffixes. Log4j 
2’s support for JSON configuration files requires Jackson’s ObjectMapper
to be on the classpath so, in its absence, the standard config locations
were incorrect.

This commit updates Log4J2LoggingSystem to return an array of standard
config locations based on what’s on the classpath. It also updates the
documentation to describe the additional dependencies that are required
to enable YAML or JSON-based configuration.

Closes gh-2239
2015-01-22 15:06:20 +00:00
Andy Wilkinson
f0421801fb Update spring-boot-sample-tomcat-jsp to use Tomcat 8
Closes gh-2394
2015-01-22 11:09:19 +00:00
Andy Wilkinson
b542aa3de6 Configure Hibernate with a WAS-specific JtaPlatform when running on WAS
At the time of writing WAS only supports JPA 2.0 which means that
Hibernate 4.2 is the latest version that can be used. SpringJtaPlatform
is Hibernate 4.3-specific as JtaPlatform’s package changed between
Hibernate 4.2 and 4.3. This means that SpringJtaPlatform can’t be used
on current versions of WAS. Futhermore, SpringJtaPlatform won’t work on
WAS even if we could use Hibernate 4.3 as WAS doesn’t make its
TransactionManager available to application code (it’s considered too
dangerous for general consumption) and SpringJtaPlatform
requires a TransactionManager.

This commit updates HibernateJpaAutoConfiguration to always treat WAS as
a special case and configure Hibernate with one of its WAS-specific
JtaPlatform implementations. 

Closes gh-2326
2015-01-21 18:09:23 +00:00
Andy Wilkinson
2665ef0692 Merge branch '1.1.x' 2015-01-21 15:09:27 +00:00
Andy Wilkinson
93b2a17fb8 Make repackage depend on jar tasks from runtime project dependencies
By default, when building a project's jar its runtime dependencies
are not taken into account as they are not needed to successfully
compile the code that will be packaged in the jar. A side-effect of
this was that, if a project that was being repackaged had a runtime
dependency on another project, then the repackaged jar would not
include the jar of the project on which it has the runtime dependency
as the jar had not been built.

This commit updates Boot's repackage task to have a dependency on the
jar task of any project dependencies in the runtime configuration
thereby ensuring that those dependencies' jars will have been built
before the repackaging occurs.

Fixes gh-2344
2015-01-21 15:02:10 +00:00
Andy Wilkinson
ca69156afd Merge branch '1.1.x' 2015-01-21 13:20:06 +00:00
Andy Wilkinson
bbd2486c04 Run invoker plugin with a single thread to avoid build failures
Running the invoker plugin with multiple threads against an empty
Maven cache results in strange build failures where Maven claims that
it cannot find a jar or pom file for an artifact that it should be
able to find. It would appear that Maven is unable to cope with
concurrent writes to its cache.

This commit removes the usage of multiple threads that was introduced
in 4e907f1.

Fixes gh-2389
2015-01-21 13:19:52 +00:00
Andy Wilkinson
cc221885f8 Merge branch 'gh-2361' 2015-01-21 11:18:51 +00:00
Andy Wilkinson
606ea4979a Add a test to cover the merging of an additional metadata file
This test covers the code path that caused gh-2361 and also checks that,
when an additional metadata file is found, it’s correctly merged with
the other metadata.

Closes gh-2361
2015-01-21 11:18:32 +00:00
Kris De Volder
65acaf885b Remove incorrect assumption that output will be in folder named classes
When running in Eclipse, by default Gradle builds its output into a
folder named bin. This commit update the annotation processor to remove
the failure assumption that the output will always be located beneath
a folder named classes.

Closes gh-2369
See gh-2361
2015-01-21 11:16:56 +00:00
Drummond
0025be8771 Upgrade to Flyway 3.1
The 3.1 release includes an important fix to restore JDK 6
compatibility with the Gradle plugin [1].

Closes gh-2260

[1] https://github.com/flyway/flyway/issues/779
2015-01-20 17:39:48 +00:00
Dave Syer
1be12ee945 Merge branch '1.1.x' 2015-01-20 17:38:31 +00:00
Dave Syer
4e907f19ce Carefully add nested archives from JAR in PropertiesLauncher
If user runs an executable archive then it and its lib directory will be
on the classpath. Entries from loader.path take precedence in a way that
should make sense to users (earlier wins like in CLASSPATH env var).

Also added new integration tests to verify the behaviour (big improvement
on the old ones, which probably aought to be beefed up to the same
standard).

Fixes gh-2314
2015-01-20 17:37:49 +00:00
Chris Schaefer
6975b206bc Upgrade Spring Cloud Connectors to 1.1.1.RELEASE
Closes gh-2373
2015-01-20 17:32:10 +00:00
Andy Wilkinson
160bf1ee3f Merge branch '1.1.x'
Conflicts:
	spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml

Closes gh-2366
2015-01-20 11:57:50 +00:00
Andy Wilkinson
c857f957fa Correct syntax for thread name formatting in Logback XML configuration
See gh-2366
2015-01-20 11:51:54 +00:00
Andy Wilkinson
247c596f8c Remove duplicate console appender from Actuator sample's logback config
Closes gh-2381
2015-01-20 11:44:23 +00:00
Andy Wilkinson
a1fbd1eeb5 Improve Servlet, Filter, and EventListener configuration diagnostics
ServletContextInitializerBeans handles existing registration beans and
also creates initializers for existing Servlet, Filter, etc beans.
Debug logging has been added to this class to improve things in three
main areas:

 - Distinguish between existing registration beans and those that are
   created to wrap a Servlet or Filter bean
 - Provide information about the resource (configuration class or XML)
   that resulted in the creation of the bean
 - Log information about EventListeners

Closes gh-2177
2015-01-20 11:39:50 +00:00
Andy Wilkinson
1d312171c1 Merge branch '1.1.x' 2015-01-20 09:50:47 +00:00
Andy Wilkinson
f10c9b5312 Avoid race between file creation and its contents being written
Previously, SampleIntegrationParentApplicationTests assumed that when
an output file existed on disk its contents would have been written
in their entirety. This assumption does not hold true and causes the
test to fail intermittently as it incorrectly determines that the test
has produced no output.

This commit updates the test to wait for up to 30 seconds for the
output files to appear on disk and for the expected content to be
found in one of those files. If the files exist but do not
contain the expected content the test will keep trying until it does
or until too much time as elapsed.

Fixes gh-2380
2015-01-20 09:50:35 +00:00
Andy Wilkinson
394f23a7ab Merge branch 'gh-2348' 2015-01-20 09:10:17 +00:00
Andy Wilkinson
42e1a0b069 Add a test to verify customization of Hibernate's JtaPlatform
Closes gh-2348
2015-01-20 09:07:57 +00:00
Manuel Doninger
c45604b825 Ensure that Hibernate's JtaPlatform can be customized
Previously, when JpaProperties was applying additional properties it
discarded any existing properties. This meant that custom
configuration of Hibernate's JtaPlatform was not detected and that
Boot's SpringJtaPlatform would always be configured instead.

This commit updates JpaProperties to include all of the existing
properties when it's asked to apply any additional properties.

See gh-2348
Closes gh-2359
2015-01-20 09:07:48 +00:00
Andy Wilkinson
e19bfd9251 Document how to use Tomcat 7 or Jetty 8 with Gradle
Previously, the documentation only provided examples of the required
configuration for Maven users. This commit adds equivalent configuration
snippets for those using Gradle. It also removes the recommendation to
override the version of the Servlet API as this is unnecessary. The pom
files for the Jetty 8 and Tomcat 7 samples have also been updated
accordingly.

Closes gh-2346
2015-01-19 14:20:30 +00:00
Andy Wilkinson
966e8e557d Make use of Collections.addAll instead of a for-loop where appropriate
Closes gh-2309
2015-01-19 13:20:46 +00:00
Andy Wilkinson
78432fc745 Disable javadoc linting when building with JDK 8+
Java 8 introduced new, aggressive linting of javadoc that’s enabled by
default. The linter isn’t sufficiently configurable to allow us to tune
it to meet the project’s conventions for javadoc so our only realistic
option is to disable linting.

This commit introduces a new profile to disable javadoc linting. To
maintain compatibility with JDK 7, the profile is only active when the
build’s running on JDK 8 or later.

Closes gh-2233
2015-01-19 11:32:03 +00:00
Stephane Nicoll
dc501dfd2b Merge pull request #2370 from bclozel/acceptcharset
* acceptcharset:
  Disable Accept-Charset Header in String converter
2015-01-16 17:54:56 +01:00
Brian Clozel
6d60c23460 Disable Accept-Charset Header in String converter
This commit prevents the `Accept-Charset` from being written by the
StringHttpMessageConverter. This feature is enabled by default in the
framework and writes a *quite long* response header with all charsets
supported by the server.

Closes gh-2370, see gh-1800
2015-01-16 17:39:56 +01:00
Andy Wilkinson
ff2d423fcb Correct the root context path used with Undertow
Undertow, like Tomcat, uses "" for the context path of the root
context. Previously, the Undertow deployment was being configured with
"/" for the root context. This was leading to a silent failure in
AsyncContextImpl.dispatch when it failed to look up the deployment
manager for the current request.

This commit updates UndertowEmbeddedServletContainerFactory to use the
correct context path (an empty String) for the root context.

Fixes gh-2365
2015-01-16 13:38:13 +00:00
Andy Wilkinson
f019fb217d Merge branch 'gh-2031' 2015-01-16 12:07:35 +00:00
Andy Wilkinson
e2f2839d32 Document Tomcat compression and GzipFilter auto-configuration
Closes gh-2031
2015-01-16 12:07:29 +00:00
Andy Wilkinson
69ea4beb8a Add auto-configuration for Jetty’s GzipFilter
Jetty’s GzipFilter is a container-agnostic Filter that can be used to
provide gzip and deflate encoding of HTTP responses. This commit adds
auto-configuration for GzipFilter that is enabled when
org.eclipse.jetty:jetty-servlets is on the classpath. The filter can
be configured using spring.http.gzip.*

See gh-2031
2015-01-16 12:07:28 +00:00
Andy Wilkinson
ec17c00126 Add support for configuring Tomcat’s gzip support using the environment
Tomcat provide built-it support for gzip compression of HTTP responses.
This commit adds support for enabling and configuring this compression
via the environment using server.tomcat.compression and
server.tomcat.compressableMimeTypes.

See gh-2031
2015-01-16 12:07:28 +00:00
Dave Syer
704054a861 Merge branch '1.1.x' 2015-01-16 11:30:04 +00:00
Dave Syer
b3597107ba More careful masking for the HTTP status in non-error cases
The ErrorPageFilter exposes a wrapped response to the downstream
chain and unless more care is taken the chain will be able to
set the response status, but not inspect it.

Fixes gh-2367
2015-01-16 11:29:00 +00:00
Andy Wilkinson
11c47d8a05 Merge branch '1.1.x' 2015-01-15 09:52:45 +00:00
Andy Wilkinson
a51ad5c684 Update Eclipse template copyright date to 2015 2015-01-15 09:52:10 +00:00
Andy Wilkinson
492cf4ef54 Add jersey-bean-validation to spring-boot-starter-jersey
A dependency on org.glassfish.jersey.ext:jersey-bean-validation has
been added to spring-boot-starter-jersey. jersey-bean-validation’s EL
dependencies have been excluded in favour of those provided by
spring-boot-starter-tomcat (or starter-jetty or starter-undertow should
the user choose to use a different embedded container).

Closes gh-2315
2015-01-15 09:50:05 +00:00