Commit Graph

5990 Commits (c6bf13c0a121b9923c3b196f6dcd310084a5bca9)
 

Author SHA1 Message Date
Phillip Webb c6bf13c0a1 Support multi-profile YAML in application-* files
Update ConfigFileEnvironmentPostProcessor to load profile specific
sections for all previously processed profiles. Prior to this commit
multi-profile YAML files were only loaded from the root
`application.yml` file.

With the updated logic, an `application-test.yml` file containing the
following:

	someTestProperty: xyz
	---
	spring:
	  profiles: profile1
	  specificProperty: one

Can have the profile sub-document loaded using:

	-Dspring.profiles.active=test,profile1

Fixes gh-4132
9 years ago
Andy Wilkinson a899058ac3 Add a tip to the docs about using DB_CLOSE_ON_EXIT=false with H2
Closes gh-4135
9 years ago
Andy Wilkinson 5af0903c0e Merge branch '1.2.x' 9 years ago
Andy Wilkinson 9218d5ad11 Use Maven Central as source of Tomcat binaries for deployment tests
Closes gh-4151
9 years ago
Andy Wilkinson 667500ff49 Merge branch '1.2.x' 9 years ago
Andy Wilkinson baa2473da1 Update to CRaSH 1.3.2
Closes gh-4150
9 years ago
Andy Wilkinson 100ad995e6 Upgrade to Groovy 2.4.5
Closes gh-4149
9 years ago
Andy Wilkinson ed022fb79a Upgrade to AspectJ 1.8.7
Closes gh-4148
9 years ago
izeye acadc688bb Upgrade to Spring REST Docs 1.0.0.RELEASE
Closes gh-4140
9 years ago
Andy Wilkinson dcbb27320d Upgrade to jOOQ 3.7.0
Closes gh-4147
9 years ago
Andy Wilkinson 8ee8c9fe90 Merge branch '1.2.x' 9 years ago
Andy Wilkinson d33d068fae Upgrade to Tomcat 8.0.28 and test support for SSL config from classpath
Prior to 8.0.28 Tomcat required the key store and trust store (if any)
to be available directly on the filesystem, i.e. classpath: resources
would not work. Tomcat 8.0.28 removed this limitation.

This commit updates to Tomcat 8.0.28, updates the tests to verify
the new Tomcat capability and removes the obsolete documentation of
the restriction.

Closes gh-4048
9 years ago
Andy Wilkinson d90647d712 Merge branch '1.2.x' 9 years ago
Andy Wilkinson ee3d4b34a0 Consider parent when application is built and then run
Previously, the parent context was only considered when the builder
was used to run the application. If the application was built using
the builder and then run using SpringApplication.run, the parent
context was not considered.

This commit updates the builder to consider the parent both when it's
used to run the application and when it's used to build the
application that will later be run via SpringApplication.run

Closes gh-4014
9 years ago
Stephane Nicoll 00af1f5c10 Flag main MbeanExporter `@Primary`
When the actuator is enabled, Spring Boot provides two `MBeanExporter`
bean definitions: a general purpose one and a dedicated one for Actuator
endpoints.

This commit flag the general purpose one `@Primary` so that component
can safely inject it by type if necessary. In particular, this fix the
doc of the `JmxMetricWriter`.

Closes gh-4007
9 years ago
Andy Wilkinson 6c4e4520d4 Merge branch '1.2.x' 9 years ago
Andy Wilkinson 050a4fed17 Restore compatibility with Gradle 2.0
Gradle 2.0, and only 2.0, requires a Plugin implementation to be
public. The changes made in gh-4113 (9c14ed3) made the class
package-private.

Closes gh-4139
9 years ago
Andy Wilkinson 60a7880f62 Merge branch '1.2.x' 9 years ago
Andy Wilkinson 9c14ed3502 Remove stale Java source from src/main/groovy in the Gradle plugin
Closes gh-4113
9 years ago
Stephane Nicoll b1a38a8a44 Upgrade to Undertow 1.3.0.Final
Closes gh-3969
9 years ago
Stephane Nicoll fb4cc718c2 Reuse existing ElasticSearch client
Instead of always creating a new ElasticSearch client, we now check for
the presence of a custom bean configuration and use that if it's
available.

Closes gh-4143
Closes gh-4146
9 years ago
Stephane Nicoll dd163edc92 Merge branch '1.2.x' 9 years ago
Stephane Nicoll ed1b5cbfde Upgrade to H2 1.4.190
Closes gh-4145
9 years ago
Stephane Nicoll 6f941e3a04 Upgrade to H2 1.4.190
Closes gh-4145
9 years ago
Phillip Webb 877e6e034c Polish 9 years ago
Phillip Webb 13d9601799 Merge branch '1.2.x' 9 years ago
Phillip Webb 70214da2e4 Fix broken formatting 9 years ago
Phillip Webb 822820f256 Revert "Relax `ParenPad` checkstyle rule"
The updated formatter means that we can reinstate the rule.

This reverts commit 82fffe3062.
9 years ago
Phillip Webb b6667e8495 Reformat code using Spring code formatter plugin 9 years ago
Phillip Webb 6333426cbf Reformat package-info.java files with Eclipse Mars 9 years ago
Phillip Webb 8318698f55 Store checkout location in workspace variable
Update the Eclipse product setup so that `checkout.location` is stored
as a workspace variable. Without this things get mixed up when trying
to run different installations for different branches.

See gh-4110
9 years ago
Phillip Webb e86e8c2024 Install Spring formatter Eclipse plugin
Update Oomph project setup to install the Spring code formatter.

See gh-4136
9 years ago
Phillip Webb 04074fece1 Merge branch '1.2.x' 9 years ago
Phillip Webb 94736719f1 Reformat package-info.java files with Eclipse Mars 9 years ago
Phillip Webb b779e8e4fc Add custom Eclipse code formatter
Update Eclipse settings to make use of a custom Spring formatter
implementation. Using a custom formatter allows us to fix a couple of
issues with the version that shipped with Eclipse Mars.1 (Eclipse bugs

The custom formatter also means that it is possible to use Groovy
Eclipse despite the fact that it has formatter regressions (see
https://github.com/groovy/groovy-eclipse/issues/142).

Fixes gh-4136
9 years ago
Stephane Nicoll 3cabca7db4 Merge pull request #4118 from mdeinum/gh-4115
* pr/4118:
  Polish
  Added support for the DB2 AS400 Driver
9 years ago
Stephane Nicoll b9c885f5d2 Polish
Closes gh-4118
9 years ago
Marten Deinum bad8c1bee8 Added support for the DB2 AS400 Driver
Closes gh-4115
9 years ago
Stephane Nicoll 7fd9d58fd6 Merge pull request #4119 from mdeinum/gh-4114
* pr/4119:
  Polish
  Add support for the DB2 Universal JDBC driver
9 years ago
Stephane Nicoll 7971ef24ce Polish
Closes gh-4119
9 years ago
Marten Deinum 96830a550a Add support for the DB2 Universal JDBC driver
Closes gh-4114
9 years ago
Stephane Nicoll c8e2b27e09 Merge pull request #4120 from d10xa/fix-typo
* pr/4120:
  Fix typo
9 years ago
d10xa d5e3e991fa Fix typo
Closes gh-4120
9 years ago
Stephane Nicoll 02ef68163a Remove redundant deprecated attribute
The `deprecated` attribute is deprecated as of Spring Boot 1.3 and
replaced by the `deprecation` object. Any IDE relying on the previous
structure still expects the `deprecated` attribute though.

The annotation processor is adding that information automatically when it
merges manual content so it is not necessary to define that attribute in
the source.

Closes gh-4127
9 years ago
Stephane Nicoll ce544e8131 Add a reference to Windows service sample
Closes gh-3829
9 years ago
Andy Wilkinson 2afb641603 Merge branch '1.2.x' 9 years ago
Andy Wilkinson 04c2bd9c89 Update tests to expect additional entry in test jar
Closes gh-4124
9 years ago
Andy Wilkinson 8948322d7a Merge branch '1.2.x' 9 years ago
Andy Wilkinson 888fa90265 Ensure that JarFileArchive unpacks entries to unique location
Previously, JarFileArchive would always unpack any entries marked for
unpacking to ${java.io.tmpdir}/spring-boot-libs. This could cause
problems if multiple Spring Boot applications were running on the same
host:

- If the apps are run as different users the first application would
  create the spring-boot-libs directory and the second and subsequent
  applications may not have write permissions to that directory
- Multiple apps may overwrite each others unpacked libs. At best this
  will mean one copy of a jar is overwritten with another identical
  copy. At worst the jars may have different contents so that some of
  the contents of the original jar disappear unexpectedly.

This commit updates JarFileArchive to use an application-specific
location when unpacking libs. A directory beneath ${java.io.tmpdir} is
still used but it's now named <jar-file-name>-spring-boot-libs-<uuid>.
A loop, limited to 1000 attempts, is used to avoid problems caused by
the uuid clashing.

Closes gh-4124
9 years ago
Andy Wilkinson 9973147291 Merge branch '1.2.x' 9 years ago