- 23 Oct, 2014 1 commit
-
-
Domingo Suarez Torres authored
Closes gh-1748 Closes gh-1703
-
- 22 Oct, 2014 6 commits
-
-
Andy Wilkinson authored
-
Andy Wilkinson authored
Closes gh-1708
-
Andy Wilkinson authored
-
Andy Wilkinson authored
Closes gh-1742
-
Phillip Webb authored
Rework @TestPropertySource changes introduced in commit d251b513 to restore compatibility with Spring Boot 1.1 - Only add the `server.port` property when no @IntegrationTest annotation is found. - Always add a default `spring.jmx.enabled=false` property. - Restore the SpringApplicationContextLoader.getEnvironmentProperties protected method. - Remove the @IntegrationTest.properties attribute. See gh-1697
-
Phillip Webb authored
-
- 21 Oct, 2014 5 commits
-
-
Phillip Webb authored
-
Phillip Webb authored
-
Stephane Nicoll authored
Previously, the regular jms connection factory was always overriding the xaConnectionFactory when using ActiveMQ. While ActiveMQAutoConfiguration is namely shielded with a condition on a missing ConnectionFactory bean, said configuration class also imports the XA and regular configuration classes that both can create the connection factory. This commit adds a ConditionalOnMissingBean in the second class that is imported in case the XA configuration has already defined what it needs. Fixes gh-1727
-
Andy Wilkinson authored
-
Andy Wilkinson authored
Closes gh-1740
-
- 20 Oct, 2014 4 commits
-
-
Andy Wilkinson authored
Previously, Log4J2LoggingSystem did not install SLF4JBridgeHandler. SLF4JBridgeHandler is used to route logging calls made using java.util.logging into SLF4J. This resulted in entries being written to System.err instead. This commit updates Log4J2LoggingSystem to register the bridge handler thereby ensuring the logging that originates into java.util.logging is routed into SLF4J. This change has been made by extracting a new abstract superclass that performs the registration. This super class is extended by all SLF4J-based LoggingSystem implementations. Fixes gh-1737
-
Andy Wilkinson authored
-
Andy Wilkinson authored
Previously, there was a timing window where the output file had been created but it was empty. This would cause the test to fail as the output was read from the empty file and didn’t match the expected “Hello World”. This commit updates the test to only process the resources in the output directory when all the resolved resources have a non-zero content length. An @Before method has also been added to delete the output produced by the test so that the outcome of the test isn’t affected by files generated by previous runs. Fixes gh-1735
-
Andy Wilkinson authored
This is a follow-on from the changes made in 2b7bf3e7. In addition to the problematic use of @ConditionalOnClass that was addressed in 2b7bf3e7, JerseyAutoConfiguration also used @ConditionalOnBean referencing a Jersey class. This has the same problem when used on a class that implements WebApplicationInitializer. Implementing WebApplicationInitializer causes the class’s annotations to be introspected during servlet container initialiser processing. If a @ConditionalOnBean annotation references a Class that cannot be loaded an ArrayStoreException occurs. This commit updates JerseyAutoConfiguration to reference ResourceConfig as a String. This allows it annotations to be introspected without attempting to load a Jersey class that may not be on the classpath. Fixes gh-1733 Fixes gh-1719
-
- 16 Oct, 2014 2 commits
-
-
Brett Wooldridge authored
For those running applications on Java 8, dependency management for the Java 8-compatible artifact is also provided. Closes gh-1721
-
Andy Wilkinson authored
Previously, Bitronix's server ID was hard-coded to be spring-boot-jta-bitronix. This created the possibility of multiple transaction managers performing recovery on each other's behalf as they would be unable to identify their own XIDs due to the common server ID. This commit reinstates the default (which is the IP address of the machine on which Bitronix is running), and introduces a new property, spring.jta.transaction-manager-id, that can be used to configure the id for both Atomikos and Bitronix. A cautionary note has also been added to the documentation for Atomikos and Bitronix explaining the need to configure this property. Closes gh-1548
-
- 15 Oct, 2014 10 commits
-
-
Dave Syer authored
Spring 4.2 has a @TestPropertySource which has some of the features of @IntegrationTest. This change adds @TestPropertySource to the @IntegrationTest annotation, so that (for instance) the cache key for the context includes properties for the test. Since @IntegrationTest has slightly different semantics I do not propose to deprecate it. Users can use it or @TestPropertySource, the main difference being that with @IntegrationTest the Spring Boot context loader is aware of the annotation and it will set sensible defaults for server.port and spring.jmx.enabled. There are some reflection hacks to overcome the usual fortifications of Spring Test. Fixes gh-1697
-
Andy Wilkinson authored
Closes gh-1698
-
Andy Wilkinson authored
-
Andy Wilkinson authored
-
Andy Wilkinson authored
Spring 4.1 has added support for XML HTTP message conversion using Jackson. This was resulting in the response being sent back as XML rather than JSON. Jackson's XML support doesn't cope well with lists when it's being asked to deserialize to a Map [1] which is what the test was doing. This commit updates the test to indicate that it only accepts application/json, thereby ensuring that the response can be correctly deserialized into a Map. Fixes gh-1715 [1] https://github.com/FasterXML/jackson-dataformat-xml/issues/122
-
Andy Wilkinson authored
Maven is configured to run tests found in classes ending in Tests. This meant that the tests in BasicErrorControllerIntegrationTest (note the missing s) were not being run. This commit renames the test class so that it's picked up by Maven.
-
Dave Syer authored
-
Dave Syer authored
-
Andy Wilkinson authored
-
Andy Wilkinson authored
Closes gh-1710
-
- 14 Oct, 2014 7 commits
-
-
Andy Wilkinson authored
-
Andy Wilkinson authored
This reverts commit 26a528ce. Fixes gh-1706
-
Andy Wilkinson authored
Previously, the CLI did not keep track of a dependency's users. This meant that installing two extensions with a common dependency and then unistalling one extension would break the other extension as the common dependency would be deleted: 1. Install a that depends on c 2. Install b that depends on c 3. Uninstall b 4. a is now broken as c has been deleted This commit updates the CLI to maintain a count for each artifact that's installed into /lib. An artifact is now only deleted when the count reaches zero. As part of this change the code has been extensively refactored to bring the structure into line with other CLI commands and to improve testability. Closes gh-1410
-
Andy Wilkinson authored
Closes gh-1506
-
Andy Wilkinson authored
Closes gh-1704
-
Gotzon Illarramendi authored
Closes gh-1699
-
Andy Wilkinson authored
-
- 13 Oct, 2014 5 commits
-
-
Stephane Nicoll authored
Fixes gh-1701
-
Dave Syer authored
I think this fixes gh-446 (it seems unreasonable to want to log the DDL even if it is not being executed)
-
Andy Wilkinson authored
-
Andy Wilkinson authored
Fixes gh-1693
-
Andy Wilkinson authored
Previously, Spring Data’s web support was auto-configured as part of the JPA repositories auto-configuration. However, Spring Data’s web support isn’t dependent on the use of Spring Data JPA or even repositories. This commit moves the auto-configuration into a standalone class, making it independent of the use of Spring Data JPA and Spring Data repositories. Closes gh-1097
-