0d0e5eb590
Merge branch '1.1.x'
10 years ago
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
10 years ago
68ff7d4592
Fix broken documentation links
...
Fix links to `actuator-noweb`, `actuator-log4j` and `hornetq` samples.
Fixes gh-1613
10 years ago
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
10 years ago
62a5ce52d0
Backport Jetty/Tomcat SSL support
...
Fixes gh-1570
Cherry-picked from 0960908258c6f1
10 years ago
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
10 years ago
389c4f3e0b
Merge branch '1.1.x'
10 years ago
bf0c8fc8bb
Remove JDBC from secure-web sample
...
Fixes gh-1534
10 years ago
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
10 years ago
338288205b
Fixup version numbers following release
10 years ago
d63e4b4329
Next development version
10 years ago
73a5a8730b
Fix versions in simple sample
10 years ago
fea9ee8faa
Merge branch '1.1.x'
10 years ago
8a66d50edf
Remove binary files
10 years ago
6ee18fbabd
Remove workaround for SPR-12118
10 years ago
6f62fc854b
Merge branch '1.1.x'
10 years ago
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
10 years ago
236026a43a
Support mixed XA/non-XA ConnectionFactory beans
...
Update ActiveMQ and HornetQ XA configurations to also expose non-xa
ConnectionFactory variants.
Fixes gh-1461
10 years ago
104b724446
Fix Windows Atomikos/Bitronix ApplicationTests
...
Update SampleAtomikosApplicationTests and SampleBitronixApplicationTests
to not depend on any specific System.out order.
Fixes gh-1472
10 years ago
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
10 years ago
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
10 years ago
c15e3a7e2f
Add Atomikos and Bitronix JTA samples
...
Add samples and integration tests for Atomikos and Bitronix JTA.
See gh-947
10 years ago
ef2898a2f9
Fix version in new sample
10 years ago
3404850b2e
Merge branch '1.1.x'
10 years ago
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
10 years ago
43de5f3df8
Bump version in new sample
10 years ago
5fd9af23d6
Merge branch '1.1.x'
10 years ago
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
10 years ago
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
10 years ago
6634af6a25
Fix broken parent POM version
...
Update the parent POM version in spring-boot-sample-web-secure-custom
10 years ago
300910f7d5
Merge branch '1.1.x'
10 years ago
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
10 years ago
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
10 years ago
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
10 years ago
cac3865ffa
Fixup version numbers following release
10 years ago
74d0c5185a
Next development version
10 years ago
178386abc4
Merge branch '1.1.x'
10 years ago
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
10 years ago
7f9ef1cf5b
Merge branch '1.1.x'
10 years ago
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
10 years ago
da5c36c3a9
Polish
10 years ago
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
10 years ago
d04f325294
Merge branch '1.1.x'
10 years ago
7945b29669
Correct the descriptions of two sample projects
10 years ago
249e09d9bc
Switch master to 1.2.0.BUILD-SNAPSHOT
11 years ago
3c7d825658
Fixup version numbers following release
11 years ago
40327e1ae6
Next development version
11 years ago
3978700b4a
More specific pointcut to be safe
11 years ago
8054426803
Format source code
11 years ago
fa88c481a5
Remote trailing whitespace
11 years ago
Phillip Webb
Dave Syer
Stéphane DERACO
Andy Wilkinson
Spring Buildmaster
Dave Syer
Stephane Nicoll
Josh Long
Phillip Webb
Andy Wilkinson
Stephane Nicoll