Commit Graph

4622 Commits

Author SHA1 Message Date
Eddú Meléndez 0b8fd67507 Add extra attributes to the init command
Update the CLI init command to expose additional attributes supported
by Spring Initializr. These are: groupId, artifactId, version, name,
description and language.

Closes gh-2793 and gh-2907
2015-05-13 14:07:11 +02:00
Andy Wilkinson d4dfa8d979 Polish 18453c0e
Document new configuration properties and remove redundant code
2015-05-13 08:51:01 +01:00
Andy Wilkinson 18453c0eb0 Allow JspServlet's init parameters to be configured via the environment
This commit adds support for configuring the JSP servlet’s init
parameters via the environment using server.jsp-servlet.init-parameters.*.
As part of this change the configuration of registerJspServlet and
jspServletClassName have been moved onto a new type, JspServlet, and the
existing setters on ConfigurableEmbeddedServletContainer have been 
deprecated. In addition to providing a model for configuring the JSP
servlet that’s consistent with the model for other configuration (SSL,
for example), this change also means that the class name and whether or
not the servlet is registered at all can now also be configured via the
environment.

Closes gh-2825
2015-05-12 14:20:26 +01:00
Andy Wilkinson 63a7b24d27 Fix test that was broken in b24e736c 2015-05-12 10:46:25 +01:00
Dave Syer b24e736cfe Add env var parameters to launch.script
Some of the features of the launch.script were not exposed for users
to be able to control at runtime. It now accepts things like
PID_FOLDER and LOG_FOLDER as environment variables, and also adopts
a clear naming convention where only the inputs are UPPER_CASE.
2015-05-12 10:23:44 +01:00
Andy Wilkinson 45c39cf121 Merge branch '1.2.x' 2015-05-11 17:26:45 +01:00
Andy Wilkinson fc31115668 Rely soley on underlying logger for isEnabled in Liquibase logger
Previously, CommonsLoggingLiquibaseLogger referred to its
configured level and the underlying Commons Logging log when
determining if logging was enabled for a particular level. This did
not work as intended as setLogLevel was never called leaving the
configured level stuck at its default value of INFO. As a result of
this any logging at levels below INFO would not be output,
irrespective of the configuration of the underlying logging framework.

This commit updates CommonsLoggingLiquibaseLogger to rely purely on
the Commons Logging log when determining whether or not logging for
a particular level is enabled. This brings the implementation into
line with liquibase-slf4j [1] which provides similar functionality,
albeit using SLF4J rather than Commons Logging

Closes gh-2916

[1] https://github.com/mattbertolini/liquibase-slf4j/blob/master/src/main/java/liquibase/ext/logging/slf4j/Slf4jLogger.java
2015-05-11 17:26:35 +01:00
Andy Wilkinson 3c484f8c15 Upgrade to dependency-management-plugin 0.5.1.RELEASE
Closes gh-2935
2015-05-11 16:52:10 +01:00
Andy Wilkinson 0bcbac6ce7 Merge branch '1.2.x' 2015-05-11 15:43:58 +01:00
Andy Wilkinson 4977e48ec5 Don’t rely on deduction of main application class when running tests
Previously, when SpringApplicationContextLoader created a
SpringApplication and used it to load the test’s application context,
it relied upon SpringApplication correctly deducing the application’s
main class. This would result in the wrong class being deduced as the
application’s main method is not called so the test runner’s main method
would be found instead.

This commit updates SpringApplicationContextLoader to explicitly set
SpringApplication’s main class to be the current test’s class. While
not strictly the application’s main class, it is the next best thing
available in this situation and prevents misleading log messages and
application versions from being logged.

Fixes gh-2930
2015-05-11 15:43:44 +01:00
Andy Wilkinson b9cc4ec501 Merge branch '1.2.x' 2015-05-11 12:22:20 +01:00
Andy Wilkinson 2053f4b2bf Clear JAVA_OPTS in CLI tests; avoid permsize config error with Java 8
When a Java 8 JVM is launched with -XX:MaxPermSize a warning message
is output indicating that the option will be ignored. This causes the
CLI tests that assert that no error output has been produced to fail.

This commit updates the CLI's integration test harness to remove
JAVA_OPTS from the environment of the CLI process. This prevents any
unwanted max perm size configuration from leaking into that
environment and breaking the build.
2015-05-11 12:22:02 +01:00
Andy Wilkinson 5b30716d94 Merge branch '1.2.x' 2015-05-11 11:45:11 +01:00
Andy Wilkinson a5e9a38b76 Clear JAVA_OPTS in CLI tests; avoid permsize config error with Java 8
When a Java 8 JMV is launched with -XX:MaxPermSize a warning message
is output indicating that the option will be ignored. This causes the
CLI tests that assert that no error output has been produced to fail.

This commit updates the CLI's integration test harness to remove
JAVA_OPTS from the environment of the CLI process. This prevents any
unwanted max perm size configuration from leaking into that
environment and breaking the build.
2015-05-11 11:12:22 +01:00
Mario A. Alvarez Garcia ca94bd4b94 Upgrade to Hibernate 4.3.9.Final
Closes gh-2928
2015-05-11 10:45:13 +01:00
Davide Angelocola 3179d278a2 Upgrade to SLF4J 1.7.12
Closes gh-2931
2015-05-11 10:45:08 +01:00
Andy Wilkinson d3d5b211ed Upgrade to Spring AMQP 1.4.5.RELEASE
Closes gh-2932
2015-05-11 10:38:01 +01:00
Andy Wilkinson 66be012e78 Upgrade to Undertow 1.1.4.Final
Closes gh-2754
2015-05-11 10:37:27 +01:00
Andy Wilkinson 57a51ed289 Update configuration of Jolokia’s AgentServlet to support CORS
Spring Framework 4.2 introduces improved support for CORS. Notably this
means that a DispatcherServlet will now process an OPTIONS request if
it contains an Origin header, without having to enable OPTIONS request
dispatching for every endpoint.

This commit takes advantage of these changes in Spring Framework 4.2 by
configuring the controller that wraps Jolokia’s AgentServlet to handle
OPTIONS requests. This allows Jolokia’s CORS support to be configured
using Jolokia’s standard configuration, as described in section 4.1.5
of the Jolokia documentation [1].

Closes gh-1987

[1] https://jolokia.org/reference/html/security.html
2015-05-11 10:34:39 +01:00
Andy Wilkinson 8f5b88c394 Ensure that javadoc is generated in a full build
For reasons that I don’t understand, Maven has decided to stop running
the javadoc:jar task as part of the package phase. It appears to be
related to the addition of the build-helper plugin in
spring-boot-dependencies. Binding javadoc:jar to the prepare-package
phase convinces Maven to run it, apparently without any unwanted side
effects.
2015-05-07 17:17:41 +01:00
Andy Wilkinson 51c49b69c5 Support bom-based dependency management in the CLI
Previously, the CLI’s dependency management used proprietary Properties
file-based metadata to configure its dependency management. Since
spring-boot-gradle-plugin’s move to using the separate dependency
management plugin the CLI was the only user of this format.

This commit updates the CLI to use Maven boms to configure its
dependency management. By default it uses the spring-boot-dependencies
bom. This configuration can be augmented and overridden using the new
@DependencyManagementBom annotation which replaces @GrabMetadata.

Closes gh-2688
Closes gh-2439
2015-05-07 14:58:23 +01:00
Andy Wilkinson 390e6fa690 Upgrade to Undertow 1.2.4.Final 2015-05-06 15:29:03 +01:00
Andy Wilkinson f0c0742eaf Merge branch '1.2.x' 2015-05-06 15:24:47 +01:00
Craig Walls 88d72e0598 Upgrade to Spring Social Facebook 2.0.1.RELEASE
While this is a breaking change, continuing with Spring Social
Facebook 1.1.x is also broken as it is no longer compatible with
Facebook's API. Upgrading to 2.0.1.RELEASE may require some changes
to be made to users' applications, but it will allow their
applications to use the Facebook API once again.

Closes gh-2837
2015-05-06 15:08:45 +01:00
Andy Wilkinson 9e05d5f30e Merge branch '1.2.x' 2015-05-06 15:02:15 +01:00
pasali 1cc0b19f29 Upgrade to Dropwizard Metrics 3.1.2
Closes gh-2920
2015-05-06 15:00:51 +01:00
Andy Wilkinson d2804dcf8c Merge branch '1.2.x' 2015-05-05 16:41:16 +01:00
Andy Wilkinson ffcc854d42 Include exception in warning message when pid file cannot be created
Closes gh-2905
2015-05-05 16:40:48 +01:00
Andy Wilkinson 0f62f05cdc Upgrade to Undertow 1.2.3.Final
Closes gh-2821
2015-04-30 16:55:40 +01:00
Andy Wilkinson 080c8ff286 Merge branch '1.2.x' 2015-04-30 15:30:42 +01:00
Josh Thornhill b16a973d6a Honor the endpoint.enabled property when registering MBeans
Fixes gh-2873
Closes gh-2890
2015-04-30 15:28:45 +01:00
Andy Wilkinson 7e8bad09db Merge branch '1.2.x' 2015-04-30 15:17:18 +01:00
yinheli ef49ced12a Polish Gradle example for using Undertow
Closes gh-2896
2015-04-30 15:17:01 +01:00
Andy Wilkinson 800ac2d13f Upgrade to Spring Security 4.0.1.RELEASE
Closes gh-2885
2015-04-30 14:21:18 +01:00
Andy Wilkinson 563a032157 Start building against Spring AMQP 1.5 snapshots
See gh-2899
2015-04-30 14:18:58 +01:00
Dave Syer 897834d37f Merge branch '1.2.x' (types preserved in property values) 2015-04-29 08:30:16 +02:00
Stephane Nicoll 8f7f934b82 Merge pull request #2892 from plesiecki/patch-1
* patch-1:
  Add handlebars starter to community contributions
2015-04-28 18:29:09 +02:00
Paweł Lesiecki 9b07e5109e Add handlebars starter to community contributions 2015-04-28 18:27:17 +02:00
Dave Syer efa7ad8370 Only use PropertySource.getValue() as a fallback
It converts everything to a String so it isn't helpful to use
it as a default.

Fixes gh-2891.
2015-04-28 11:47:50 +01:00
Rob Winch 8ee4166709 Merge remote-tracking branch 'local1.2.x/gh-2466' 2015-04-27 17:39:58 -05:00
Rob Winch b54960f072 Management Security uses Spring Realm
Previously ManagementSecurityAutoConfiguration used Spring Security's
default realm of "Realm" when authentication failed. This was confusing
because when prompted for authentication (i.e. no credentials provided)
the realm "Spring" was requested.

This commit ensures the Realm that is used is consistent for all of of the
security auto configuration.

Fixes #2466
2015-04-27 17:32:47 -05:00
Andy Wilkinson ee7c86a07d Start building against Reactor 2.0.1 snapshots
See gh-2719
2015-04-27 13:47:42 +01:00
Andy Wilkinson 681894a1f3 Start building against Spring Integration 4.2.0 snapshots
See gh-2883
2015-04-27 13:44:17 +01:00
Andy Wilkinson e6dfd7c533 Work around problems with GemFire 8.0’s dependencies
GemFire 8.0 depends on two different versions of xml-apis:xml-apis and
org.eclipse.jdt.core.compiler:ecj. This commit adds dependency
management for those two dependencies to address the dependency
convergence errors reported by Maven’s enforcer plugin.

GemFire 8.0 also depends on commons-logging and Spring Boot starters
should use jcl-over-slf4j instead. This commit adds an exclusion for
commons-logging

GemFire 8.0 depends (optionally) on spring-data-gemfire and
spring-data-gemfire depends on GemFire, i.e. there’s a dependency cycle
between the two projects. This commit breaks this cycle by adding an
exclusion for spring-data-gemfire to the dependency management for
com.gemstone.gemfire:gemfire.

This commit should be reverted once the problems with GemFire’s
dependencies have been addressed. See gh-2884.
2015-04-27 10:47:07 +01:00
Andy Wilkinson aa3a5ab1b9 Align GemFire version with Spring Data GemFire in Fowler
Closes gh-2859
See gh-2673
2015-04-22 17:32:37 +01:00
Andy Wilkinson 615af0834f Merge branch '1.2.x' 2015-04-22 17:29:36 +01:00
Andy Wilkinson bc27a8aa6e Show different Gradle repository config for snapshots vs releases
Closes gh-2838
2015-04-22 17:29:22 +01:00
Andy Wilkinson 606ad0d347 Merge branch '1.2.x' 2015-04-21 15:31:21 +01:00
Andy Wilkinson 3e3395304b Upgrade to javax.mail:javax.mail-api 1.5.3
Closes gh-2835
2015-04-21 15:30:01 +01:00
Andy Wilkinson 01b45d0c3a Merge branch '1.2.x' 2015-04-21 15:28:37 +01:00