62eb01f0b8
Polish
2014-10-06 12:03:51 -07:00
09d5812c3b
Merge branch '1.1.x'
2014-10-06 11:07:28 -07:00
b616e9fdc4
Rename SampleIntegrationApplicationTests
2014-10-06 10:47:40 -07:00
64ef03aafd
Fix Jersey1 integration test
2014-10-02 15:28:27 +01:00
339f3b7bf0
Add autoconfig support for Jersey (2)
...
Jersey 2 has some Spring support built in but it's a bit awkward to
use in a Boot app, so autoconfiguration seems appropriate. The tests
and sample show how to use it, but the short story is that any
@Component can define JAX-RS endpoints via @GET etc.
There's a sample for Jersey 1 as well (pay careful attention to
the plugin configuration if you want to build an executable jar)
Fixes gh-1651
2014-10-02 11:22:00 +01:00
02e33c125c
Use reflection to load Hibernate version specific classes
...
This adds support for Hibernate 4.2 again by loading the specific
classes with reflection.
Fixes gh-1460, fixes gh-1557
2014-10-02 09:49:11 +01:00
fcd855cd5e
Merge branch '1.1.x'
2014-09-30 10:30:08 +01:00
61e90f5b6e
Add tests to Data REST sample for search operations
...
Closes gh-1627
2014-09-30 10:29:38 +01:00
b798d001d7
Add missing @Param annotations to CityRepository in Data REST sample
...
Without the @Param annotations, using either of the search URIs would
resulted in a 400 response and an error describing the lack of @Param
annotation.
See gh-1627
2014-09-30 10:18:26 +01:00
4f9258a345
Fixup version numbers following release
2014-09-25 21:37:40 -07:00
edb4b7ed7d
Next development version
2014-09-25 21:02:37 -07:00
0d0e5eb590
Merge branch '1.1.x'
2014-09-25 10:05:35 -07:00
336b96b81c
Copy server customization to management context
...
If the actuator endpoints are configured on a different port then there
are some settings in the main ServerProperties that we would like to
re-use (e.g. the access log). The easiest way to do that is to just
configure the management server using the same ServerProperties instance
and then overwrite the things that are different (and stored in
ManagementServerProperties).
Fixes gh-1581
2014-09-25 09:57:24 -07:00
68ff7d4592
Fix broken documentation links
...
Fix links to `actuator-noweb`, `actuator-log4j` and `hornetq` samples.
Fixes gh-1613
2014-09-25 09:47:07 -07:00
4f610fa5a1
Merge branch '1.1.x'
...
Conflicts:
spring-boot-samples/spring-boot-sample-tomcat-ssl/pom.xml
spring-boot-samples/spring-boot-sample-tomcat-ssl/src/test/java/sample/tomcat/SampleTomcatSslApplicationTests.java
spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainer.java
spring-boot/src/main/java/org/springframework/boot/context/embedded/Ssl.java
2014-09-17 10:11:30 -07:00
62a5ce52d0
Backport Jetty/Tomcat SSL support
...
Fixes gh-1570
Cherry-picked from 0960908258c6f1
2014-09-17 10:08:05 -07:00
5a160fbe5a
Reinstate repository configuration in spring-boot-samples pom
...
The repository configuration is there in 1.1.x but missing in master.
This commit brings the two branches back into line.
Closes gh-1473
2014-09-15 17:48:01 +01:00
389c4f3e0b
Merge branch '1.1.x'
2014-09-13 06:44:03 -05:00
bf0c8fc8bb
Remove JDBC from secure-web sample
...
Fixes gh-1534
2014-09-13 06:42:59 -05:00
9902f98a3d
Ensure the AuthenticationManager is created when needed
...
There was too much state really in the old implementation of
AuthenticationManagerConfiguration, and it was leading occasionally
to null pointers when method A assumed that method B had already
been called and it hadn't. This change manages to concentrate all the
references to an AuthenticationManagerBuilder into a single method
call, removoing the need for storing it at all.
Fixes gh-1556
2014-09-13 06:42:46 -05:00
338288205b
Fixup version numbers following release
2014-09-04 15:40:55 -07:00
d63e4b4329
Next development version
2014-09-04 12:15:18 -07:00
73a5a8730b
Fix versions in simple sample
2014-09-04 10:20:54 +01: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
Phillip Webb
Dave Syer
Manuel Doninger
Andy Wilkinson
bangsen.yin
Spring Buildmaster
Stéphane DERACO
Dave Syer
Stephane Nicoll
Josh Long