Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,477 Commits 23 Branches 0 Tags
01f73d257fa903dce10fd35cf196dd0c1ba7745e
Commit Graph

8477 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
01f73d257f Merge pull request #6462 from vpavic:docs 
* pr/6462:
  Move "Using jOOQ" section under "Working with SQL databases" section
 2016-07-26 09:49:09 +02:00
Vedran Pavic
7669c3c468 Move "Using jOOQ" section under "Working with SQL databases" section 
Closes gh-6462
 2016-07-26 09:48:35 +02:00
Phillip Webb
769d393c7a Merge pull request #6456 from artembilan/SI-4.3.1 
* SI-4.3.1:
  Upgrade to Spring Integration 4.3.1
 2016-07-25 17:02:50 -07:00
Artem Bilan
c59fa6881f Upgrade to Spring Integration 4.3.1 
Closes gh-6456
 2016-07-25 17:02:08 -07:00
Phillip Webb
9fa85a9336 Merge pull request #6449 from kazuki43zoo/multi-datasource 
* multi-datasource:
  Add JdbcTemplate only on single DataSource
  Add TransactionManager only on single DataSource
 2016-07-25 17:00:23 -07:00
Kazuki Shimizu
5ecb68b226 Add JdbcTemplate only on single DataSource 
Update auto-configuration logic so that a `JdbcTemplate`
is only added when there is a single candidate DataSource bean.

Closes gh-6449
 2016-07-25 16:59:53 -07:00
Kazuki Shimizu
e0adacbeae Add TransactionManager only on single DataSource 
Update auto-configuration logic so that a `DataSourceTransactionManager`
is only added when there is a single candidate DataSource bean.

See gh-6449
 2016-07-25 16:59:30 -07:00
Phillip Webb
496b3a8d75 Relocate FileWriters to spring-boot 
Move ApplicationPidFileWriter and EmbeddedServerPortFileWriter to the
core spring-boot project since they're not really tied to the actuator.

Fixes gh-6398
 2016-07-25 13:45:29 -07:00
Phillip Webb
4a1e0d4544 Extend @AutoConfigureMockMvc print support 
Update @AutoConfigureMockMvc to support extended print options including
`System.err` and `log.debug`. In addition the "default" print option
can now be overridden by adding `spring.test.mockmvc.print=...` to
`src/test/resources/application.properties`.

Fixes gh-6455
 2016-07-25 13:17:26 -07:00
Phillip Webb
8355d8516b Add @UnmappedPropertyValue support 
Update @PropertyMapping support to allow single enum values to be marked
as an @UnmappedPropertyValue. This change is primarily so that users can
replace "default" values globally for across all tests.

See gh-6455
 2016-07-25 13:13:16 -07:00
Phillip Webb
ab9834a92e Merge pull request #6442 from izeye/checkstyle 
* checkstyle:
  Remove severity elements from checkstyle.xml
 2016-07-25 10:31:13 -07:00
Johnny Lim
65128c0ad1 Remove severity elements from checkstyle.xml 
Remove `error` severity elements from `checkstyle.xml` and rely on the
default setting instead.

Closes gh-6442
 2016-07-25 10:30:58 -07:00
Phillip Webb
254b099bfd Polish 2016-07-25 10:23:35 -07:00
Phillip Webb
b615070535 Merge branch '1.3.x' 2016-07-25 10:20:57 -07:00
Phillip Webb
e8bedacc91 Remove optional from json-simple managed dependency 
Update `spring-boot-dependencies` so that `json-simple` does not include
an `<option>true</optional>` element.

Fixes gh-6450
 2016-07-25 10:15:19 -07:00
Phillip Webb
8e22f47916 Don't limit collection sizes in property binding 
Update PropertiesConfigurationFactory so that collections can grow
beyond 256 items. Prior to this commit configuration property binding
used the default `DataBinder.autoGrowNestedPaths` setting of 256.

Fixes gh-6436
 2016-07-25 10:13:24 -07:00
Stephane Nicoll
51862f3c81 Merge pull request #6446 from joinfaces:joinfaces-2.0.0 
* pr/6446:
  Upgrade jsf-spring-boot-starter references
 2016-07-24 11:10:58 +02:00
Marcelo Romulo Fernandes
f44573d06e Upgrade jsf-spring-boot-starter references 
Closes gh-6446
 2016-07-24 11:10:29 +02:00
Andy Wilkinson
f038982b36 Merge pull request #6437 from Johnny Lim 
* gh-6437:
  Align message with regex for AbstractMvcEndpoint.path
 2016-07-21 17:04:45 +01:00
Johnny Lim
68fe8a58b8 Align message with regex for AbstractMvcEndpoint.path 
Closes gh-6437
 2016-07-21 17:04:32 +01:00
Andy Wilkinson
a1797879e6 Add a FailureAnalyzer for BeanNotOfRequiredTypeException 
Closes gh-6434
 2016-07-21 16:26:24 +01:00
Andy Wilkinson
fe22609096 Test that temp file has been deleted before triggering heap dump 
The MBean requires that a file does not exist at the location to which
it’s dumping the heap. This commit updates the test to ensure that the
temporary file that’s created to get a location for the heap dump file
is deleted before asking the MBean to dump the heap to that location.
 2016-07-21 13:51:51 +01:00
Andy Wilkinson
fbf291ee12 Make RabbitProperties’ parsed address behaviour the same for all properties 
Prior to this commit parsing addresses had an inconsistent effect on the
various properties that can be contained in an address (host, port,
username, password, and virtual host).

Three different approaches were used:

1. Return the property if no addresses were set. If there was one
   address set, return the property from the address. Otherwise return
   null. (host)
2. Return the property if no address were set, otherwise return the
   property from the first address (port)
3. Return the property if no addresses were set, otherwise return the
   property from the last address that had such property (username,
   password, virtual host).

This commit aims to make the behaviour consistent. If no addresses
were set the property is returned. Otherwise the value extracted from
the first address is returned. If the first address has no such value
the property is returned.

Closes gh-6424
 2016-07-21 13:48:57 +01:00
Stephane Nicoll
f95c63b78c Upgrade to Spring AMQP 1.6.1.RELEASE 
Closes gh-6414
 2016-07-21 13:45:16 +02:00
Andy Wilkinson
595902703b Fix level of section in build tool plugins documentation 2016-07-20 20:56:50 +01:00
Andy Wilkinson
8d79cce591 Update instructions for building the docs in the README 
As a result of ccaa19d5, the documentation is now built in the
prepare-package phase.
 2016-07-20 20:54:42 +01:00
Stephane Nicoll
9553678e1b Merge pull request #6432 from izeye:polish-20160720 
* pr/6432:
  Use the managed version for H2 in spring-boot-sample-actuator
 2016-07-20 11:30:07 +02:00
Johnny Lim
417fae4e27 Use the managed version for H2 in spring-boot-sample-actuator 
Closes gh-6432
 2016-07-20 11:29:43 +02:00
Andy Wilkinson
72b30386de Merge branch '1.3.x' 2016-07-20 09:21:19 +01:00
Andy Wilkinson
534effeaed Merge branch '1.3.x' 2016-07-20 08:54:09 +01:00
Andy Wilkinson
6a8620ac38 Update instructions for signing the CLA 2016-07-20 08:53:39 +01:00
Andy Wilkinson
9f6c659faa Update instructions for signing the CLA 2016-07-20 08:51:38 +01:00
Andy Wilkinson
2e5d189299 Merge branch '1.3.x' 2016-07-20 07:05:54 +01:00
Andy Wilkinson
197f67c867 Correct OpenShift instructions to use action_hooks not action_scripts 
Closes gh-6419
 2016-07-20 07:05:38 +01:00
Andy Wilkinson
fe5c56c84a Revert "Updated to Spring Security 4.1.2 SNAPSHOT" 
4.1.2 is not going to be out in time for inclusion in 1.4.0

See gh-6390
 2016-07-20 06:59:55 +01:00
Phillip Webb
b6fd1b515d Add / consistently in logback base.xml 
Update logback `base.xml` so that both `LOG_PATH` and `LOG_TEMP` can
be specified without a trailing slash.

Fixes gh-6423
 2016-07-19 12:49:58 -07:00
Phillip Webb
225502f7ca Fix Java 6 compatibility 
See gh-5849
 2016-07-19 10:10:53 -07:00
Phillip Webb
05cde789e1 Reduce noise in /end actuator docs 
Update the `/env` sample used in the actuator docs to use only a limited
set of keys.

Fixes gh-5849
 2016-07-19 09:41:12 -07:00
Phillip Webb
1080b990e8 Revert "Restore DataSourceProperties get...() methods" 
This reverts commit 037e697406.

See gh-6406
 2016-07-19 08:53:42 -07:00
Andy Wilkinson
93ceb980bc Recommend against using compileOnly in favour of providedRuntime 
Closes gh-5461
 2016-07-19 15:40:57 +01:00
Andy Wilkinson
409f160150 Merge branch '1.3.x' 2016-07-19 12:08:06 +01:00
Andy Wilkinson
a22071724a Make it clearer that unconfigured WebSecConfigAdapter matches any path 
Closes gh-5046
 2016-07-19 12:07:45 +01:00
Stephane Nicoll
b86241cae0 Upgrade to Ehcache 3.1.1 
Closes gh-6418
 2016-07-19 11:35:57 +02:00
Andy Wilkinson
a6f443a953 Automatically disable DevTools when running a Cucumber test 
Closes gh-6412
 2016-07-19 09:54:37 +01:00
Andy Wilkinson
e9c69f261d Merge branch '1.3.x' 2016-07-19 08:55:45 +01:00
Andy Wilkinson
e1950e34c6 Include cause when throwing exception due to unreadable manifest 
Closes gh-6417
 2016-07-19 08:48:04 +01:00
Stephane Nicoll
d5441d27f6 Polish doc 2016-07-19 09:31:03 +02:00
Phillip Webb
a2d8a769ab Fix broken tomcat-juli gradle test 
Fix Gradle test broken when `tomcat-juli` was removed.

See gh-6192
 2016-07-18 18:50:01 -07:00
Phillip Webb
05ff4ed4e0 Upgrade to Tomcat 8.5.4 & remove tomcat-juli 
Upgrade the managed Tomcat dependency to 8.5.4 and remove `tomcat-juli`
since it's now included in `tomcat-embed-core`.

Fixes gh-6192
 2016-07-18 17:52:35 -07:00
Phillip Webb
8ecf45e018 Merge pull request #6311 from qerub/tomcat-engine-valves 
* tomcat-engine-valves:
  Register valves at the engine level
  Add support for engine valves
 2016-07-18 16:31:02 -07:00