22e7339404
Release version 1.2.0.M1
2014-09-04 18:41:09 -07:00
fea9ee8faa
Merge branch '1.1.x'
2014-09-04 08:51:51 +01:00
8a66d50edf
Remove binary files
2014-09-04 08:51:37 +01:00
6ee18fbabd
Remove workaround for SPR-12118
2014-09-03 18:32:17 -07:00
6f62fc854b
Merge branch '1.1.x'
2014-09-03 11:45:54 -07:00
f46fe32264
Add group discriminant in case of conflict
...
Prior to this commit, the repackage goal silently ignored the case of
two libraries having the same name and version but a different group.
As a result, the second library was overwriting the first one in the
repackaged jar.
This commit adds support for custom Library names and updates the
Maven and Gradle plugins so that the name includes the group ID
when there would otherwise be a duplicate.
Fixes gh-1475
2014-09-03 11:22:53 -07:00
236026a43a
Support mixed XA/non-XA ConnectionFactory beans
...
Update ActiveMQ and HornetQ XA configurations to also expose non-xa
ConnectionFactory variants.
Fixes gh-1461
2014-09-02 13:00:59 -07:00
104b724446
Fix Windows Atomikos/Bitronix ApplicationTests
...
Update SampleAtomikosApplicationTests and SampleBitronixApplicationTests
to not depend on any specific System.out order.
Fixes gh-1472
2014-09-01 17:46:52 -07:00
a9c2eb3919
Update JTA sample tests to work on Windows
...
Rather than hard-coding assumptions about the line endings, use a
PrintWriter to produce the multi-line expected output
2014-08-27 11:42:21 +01:00
85cfd016a6
Add JNDI Sample
...
Add a sample application that can be deployed to WildFly to demonstrate
how JTA can be used when running in a application server.
See gh-947
2014-08-26 22:34:16 -07:00
c15e3a7e2f
Add Atomikos and Bitronix JTA samples
...
Add samples and integration tests for Atomikos and Bitronix JTA.
See gh-947
2014-08-26 22:34:04 -07:00
ef2898a2f9
Fix version in new sample
2014-08-26 14:38:03 +01:00
3404850b2e
Merge branch '1.1.x'
2014-08-26 09:19:38 +01:00
95d65c2ff5
Add indirection to avoid runtime dependency on MVC in templates
...
Velocity and Freemarker share some common properties so the base class for
configuring their properties makes some sense. Unfortunately the implementation
pulls in Spring MVC at runtime because of the signature of one method (that
would never be called). We can fix that in a number of ways, but the least
disruptive is probably to change the signature of that method and only refer
to the concrete template view resolver type if the method is called.
Fixes gh-1437
2014-08-26 09:19:07 +01:00
43de5f3df8
Bump version in new sample
2014-08-25 17:21:17 +01:00
5fd9af23d6
Merge branch '1.1.x'
2014-08-25 17:18:36 +01:00
607f78a779
Add secure sample with JDBC and data.sql
...
We can't easily solve the problem by not allowing Spring Security to
eagerly instantiate everything, but we can be defensive about data.sql
and make sure it is executed even if the listener isn't yet registered.
Fixes gh-1386
2014-08-25 17:16:32 +01:00
7d4fbacecd
Fix invoker to not download remote artifacts
...
Updates to prevent the maven-invoker-plugin from downloading remote
snapshot jars. Possibly caused by the recent changes to the
spring-boot-dependencies POM.
See gh-1413
2014-08-21 00:52:00 -07:00
6634af6a25
Fix broken parent POM version
...
Update the parent POM version in spring-boot-sample-web-secure-custom
2014-08-12 13:45:19 -07:00
300910f7d5
Merge branch '1.1.x'
2014-08-11 17:43:14 -07:00
0cf1c6f0e5
Refactor AuthenticationManagerConfiguration to make sure it works
...
if user also adds @EnableWebMvcSecurity. The problem is that the ordering
of the init() and configure() methods in the Spring Security configurers
can force things to happen too early unless we are careful. It's still a bit
twitchy I would say, but this relatively small change seems to fix the GS guide
and not break any existing tests.
I added a sample which mimic ths GS guide so we get an integration test that
executes the new code paths.
Fixes gh-1364
2014-08-11 17:42:30 -07:00
7d0a3ddcce
Rename VanillaHealthIndicator to Application...
...
Rename `VanillaHealthIndicator` to `ApplicationHealthIndicator` and
changed the exposed bean name from `statusHealthIndicator` to
`applicationHealthIndicator`.
This provides less confusing JSON output:
{"status":"UP","application":{"status":"UP"}}
vs:
{"status":"UP","status":{"status":"UP"}}
Fixes gh-1291
2014-08-11 09:04:01 -07:00
6b083d7e0b
Merge branch '1.1.x'
...
Conflicts:
pom.xml
spring-boot-actuator/pom.xml
spring-boot-autoconfigure/pom.xml
spring-boot-cli/pom.xml
spring-boot-dependencies/pom.xml
spring-boot-docs/pom.xml
spring-boot-full-build/pom.xml
spring-boot-integration-tests/pom.xml
spring-boot-parent/pom.xml
spring-boot-samples/pom.xml
spring-boot-samples/spring-boot-sample-actuator-log4j/pom.xml
spring-boot-samples/spring-boot-sample-actuator-noweb/pom.xml
spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml
spring-boot-samples/spring-boot-sample-actuator/pom.xml
spring-boot-samples/spring-boot-sample-amqp/pom.xml
spring-boot-samples/spring-boot-sample-aop/pom.xml
spring-boot-samples/spring-boot-sample-batch/pom.xml
spring-boot-samples/spring-boot-sample-data-elasticsearch/pom.xml
spring-boot-samples/spring-boot-sample-data-gemfire/pom.xml
spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
spring-boot-samples/spring-boot-sample-data-mongodb/pom.xml
spring-boot-samples/spring-boot-sample-data-redis/pom.xml
spring-boot-samples/spring-boot-sample-data-rest/pom.xml
spring-boot-samples/spring-boot-sample-data-solr/pom.xml
spring-boot-samples/spring-boot-sample-flyway/pom.xml
spring-boot-samples/spring-boot-sample-hornetq/pom.xml
spring-boot-samples/spring-boot-sample-integration/pom.xml
spring-boot-samples/spring-boot-sample-jetty/pom.xml
spring-boot-samples/spring-boot-sample-liquibase/pom.xml
spring-boot-samples/spring-boot-sample-parent-context/pom.xml
spring-boot-samples/spring-boot-sample-profile/pom.xml
spring-boot-samples/spring-boot-sample-secure/pom.xml
spring-boot-samples/spring-boot-sample-servlet/pom.xml
spring-boot-samples/spring-boot-sample-simple/pom.xml
spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/pom.xml
spring-boot-samples/spring-boot-sample-tomcat/pom.xml
spring-boot-samples/spring-boot-sample-tomcat8-jsp/pom.xml
spring-boot-samples/spring-boot-sample-traditional/pom.xml
spring-boot-samples/spring-boot-sample-web-freemarker/pom.xml
spring-boot-samples/spring-boot-sample-web-groovy-templates/pom.xml
spring-boot-samples/spring-boot-sample-web-jsp/pom.xml
spring-boot-samples/spring-boot-sample-web-method-security/pom.xml
spring-boot-samples/spring-boot-sample-web-secure/pom.xml
spring-boot-samples/spring-boot-sample-web-static/pom.xml
spring-boot-samples/spring-boot-sample-web-ui/pom.xml
spring-boot-samples/spring-boot-sample-web-velocity/pom.xml
spring-boot-samples/spring-boot-sample-websocket/pom.xml
spring-boot-samples/spring-boot-sample-ws/pom.xml
spring-boot-samples/spring-boot-sample-xml/pom.xml
spring-boot-starters/pom.xml
spring-boot-starters/spring-boot-starter-actuator/pom.xml
spring-boot-starters/spring-boot-starter-amqp/pom.xml
spring-boot-starters/spring-boot-starter-aop/pom.xml
spring-boot-starters/spring-boot-starter-batch/pom.xml
spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml
spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml
spring-boot-starters/spring-boot-starter-data-jpa/pom.xml
spring-boot-starters/spring-boot-starter-data-mongodb/pom.xml
spring-boot-starters/spring-boot-starter-data-rest/pom.xml
spring-boot-starters/spring-boot-starter-data-solr/pom.xml
spring-boot-starters/spring-boot-starter-freemarker/pom.xml
spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml
spring-boot-starters/spring-boot-starter-hornetq/pom.xml
spring-boot-starters/spring-boot-starter-integration/pom.xml
spring-boot-starters/spring-boot-starter-jdbc/pom.xml
spring-boot-starters/spring-boot-starter-jetty/pom.xml
spring-boot-starters/spring-boot-starter-log4j/pom.xml
spring-boot-starters/spring-boot-starter-logging/pom.xml
spring-boot-starters/spring-boot-starter-mobile/pom.xml
spring-boot-starters/spring-boot-starter-parent/pom.xml
spring-boot-starters/spring-boot-starter-redis/pom.xml
spring-boot-starters/spring-boot-starter-remote-shell/pom.xml
spring-boot-starters/spring-boot-starter-security/pom.xml
spring-boot-starters/spring-boot-starter-social-facebook/pom.xml
spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml
spring-boot-starters/spring-boot-starter-social-twitter/pom.xml
spring-boot-starters/spring-boot-starter-test/pom.xml
spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml
spring-boot-starters/spring-boot-starter-tomcat/pom.xml
spring-boot-starters/spring-boot-starter-velocity/pom.xml
spring-boot-starters/spring-boot-starter-web/pom.xml
spring-boot-starters/spring-boot-starter-websocket/pom.xml
spring-boot-starters/spring-boot-starter-ws/pom.xml
spring-boot-starters/spring-boot-starter/pom.xml
spring-boot-tools/pom.xml
spring-boot-tools/spring-boot-dependency-tools/pom.xml
spring-boot-tools/spring-boot-gradle-plugin/pom.xml
spring-boot-tools/spring-boot-loader-tools/pom.xml
spring-boot-tools/spring-boot-loader/pom.xml
spring-boot-tools/spring-boot-maven-plugin/pom.xml
spring-boot-versions/pom.xml
spring-boot/pom.xml
2014-08-07 13:16:27 -07:00
cac3865ffa
Fixup version numbers following release
2014-08-07 13:11:16 -07:00
74d0c5185a
Next development version
2014-08-07 11:59:17 -07:00
178386abc4
Merge branch '1.1.x'
2014-08-06 19:33:57 -07:00
38f8d65756
Use ApplicationEvent to ensure that authentication event publisher is registered
...
There was a reference to an old (fixed) issue in Spring which led to some simplification
of the AuthenticationManager layering as well.
Fixes gh-1335
2014-08-06 19:30:27 -07:00
7f9ef1cf5b
Merge branch '1.1.x'
2014-08-06 14:01:36 +01:00
e185793396
Update test to correct name of metric for request that returns a 401
...
The request is being made to '/' and, while the application does have
a mapping for '/', that mapping is not looked for before Spring
Security's filter rejects the request with a 401. This means that the
request is considered to be unmapped and this is reflected in the
metric's name.
See #1331 and #1333
2014-08-06 13:38:42 +01:00
da5c36c3a9
Polish
2014-07-29 13:06:47 -07:00
0960908bd7
Add support for configuring SSL declaratively
...
Both Tomcat and Jetty can now be configured to use SSL via the
environment (typically application.properties or application.yml)
Closes #1084
2014-07-24 15:10:09 +01:00
d04f325294
Merge branch '1.1.x'
2014-07-23 15:57:53 +01:00
7945b29669
Correct the descriptions of two sample projects
2014-07-23 15:57:44 +01:00
249e09d9bc
Switch master to 1.2.0.BUILD-SNAPSHOT
2014-07-11 10:44:05 +02:00
3c7d825658
Fixup version numbers following release
2014-07-08 03:07:03 -07:00
40327e1ae6
Next development version
2014-07-08 02:33:36 -07:00
3978700b4a
More specific pointcut to be safe
2014-07-07 08:24:34 +01:00
8054426803
Format source code
2014-07-02 15:17:25 -07:00
fa88c481a5
Remote trailing whitespace
2014-07-02 15:17:14 -07:00
fd757cb371
Add logging.level to application.properties
...
E.g.
logging.level.org.springframework: DEBUG
logging.level.org.hibernate: WARN
Fixed gh-788
2014-06-27 15:49:17 +01:00
cc61d92b88
Fixup build following release
2014-06-27 07:00:57 -07:00
981669b7c0
Next development version
2014-06-26 14:09:54 -07:00
200cd535c2
Revert "Next development version"
...
This reverts commit 67189477fe
2014-06-26 11:03:09 -07:00
67189477fe
Next development version
2014-06-26 10:51:35 -07:00
9632abf825
Formatting and cleanup
2014-06-26 09:41:15 -07:00
e220f0806a
Attempt to fix Windows CI
2014-06-25 17:25:31 -07:00
8be3f33cfb
Be defensive detecting when Mono not running
2014-06-25 17:05:28 -07:00
b0bf9c776f
Fix logic error in ErrorPageFilter (fixes gh-1149)
2014-06-25 08:47:24 +01:00
91bbd20ca0
Fixup version numbers following release
2014-06-24 14:53:08 -07:00
542f3cbda8
Next development version
2014-06-24 13:53:56 -07:00
Spring Buildmaster
Dave Syer
Phillip Webb
Stephane Nicoll
Andy Wilkinson
Josh Long
Dave Syer
Phillip Webb
Andy Wilkinson
Stephane Nicoll