Stephane Nicoll
ac9ee952c7
Properly merge fix
...
See gh-16666
2019-04-26 11:52:25 +03:00
Stephane Nicoll
5963542f18
Merge branch '1.5.x' into 2.0.x
2019-04-26 11:49:26 +03:00
Stephane Nicoll
0552113c98
Merge pull request #16666 from Tetsuya3850
...
* pr/16666:
Fix broken link
2019-04-26 11:44:51 +03:00
Tetsuya Hasegawa
5b3e53835e
Fix broken link
...
Closes gh-16666
2019-04-26 11:44:02 +03:00
Andy Wilkinson
3e3d7545cc
Merge branch '1.5.x' into 2.0.x
2019-04-24 10:01:50 +01:00
Andy Wilkinson
de0e065da2
Use AdoptOpenJDK for Ubuntu launch script integration tests
...
Closes gh-16633
2019-04-24 09:59:43 +01:00
Andy Wilkinson
7260c0f2c4
Merge branch '1.5.x' into 2.0.x
2019-04-16 15:46:49 +01:00
Andy Wilkinson
c11e847d6c
Fix syntax highlighting in the reference documentation
...
Closes gh-16548
2019-04-16 15:46:16 +01:00
Spring Buildmaster
8e3cbd9a2f
Next development version (v2.0.10.BUILD-SNAPSHOT)
2019-04-03 15:04:03 +00:00
Stephane Nicoll
1421ca7612
Polish
2019-04-03 13:12:37 +02:00
Stephane Nicoll
dd1bdea048
Merge branch '1.5.x' into 2.0.x
2019-04-03 12:57:35 +02:00
Stephane Nicoll
0d256da068
Fixup version numbers following release
2019-04-03 12:56:41 +02:00
Andy Wilkinson
1db848af0d
Upgrade to Solr 6.6.6
...
Closes gh-16428
2019-04-03 11:38:16 +01:00
Spring Buildmaster
ca3a864565
Next Development Version
2019-04-03 10:34:44 +00:00
Stephane Nicoll
3fb8d504c5
Upgrade to Spring Batch 4.0.3
...
Closes gh-16422
2019-04-03 12:04:40 +02:00
Andy Wilkinson
bfe65c8a5c
Merge branch '1.5.x' into 2.0.x
2019-04-03 09:52:28 +01:00
Andy Wilkinson
0f27b1a65e
Verify entry output location when extracting zip
...
Closes gh-16028
2019-04-03 09:48:56 +01:00
Stephane Nicoll
03762d5a96
Upgrade to Spring Session Apple-SR9
...
Closes gh-16356
2019-04-03 10:10:27 +02:00
Stephane Nicoll
1acc3d7161
Upgrade to Spring Integration 5.0.13
...
Closes gh-16349
2019-04-03 10:07:29 +02:00
Andy Wilkinson
49423645f7
Merge branch '1.5.x' into 2.0.x
2019-04-03 08:32:11 +01:00
Andy Wilkinson
30bba53a1f
Upgrade to Httpclient 4.5.8
...
Closes gh-16424
2019-04-03 08:30:36 +01:00
Andy Wilkinson
8a4e206e85
Upgrade to Spring Integration 4.3.20
...
Closes gh-16348
2019-04-03 08:29:44 +01:00
Andy Wilkinson
efc030adf3
Upgrade to Spring Security 4.2.12
...
Closes gh-16352
2019-04-03 08:28:54 +01:00
Phillip Webb
8c2e0a61ae
Merge branch '1.5.x' into 2.0.x
2019-04-02 20:48:00 -07:00
Phillip Webb
f25469c95f
Update formatting with spring-javaformat 0.0.9
...
See gh-16421
2019-04-02 20:43:36 -07:00
Phillip Webb
cae6a82322
Upgrade to spring-javaformat 0.0.9
...
Closes gh-16421
2019-04-02 20:34:35 -07:00
Phillip Webb
f875b74e67
Reformat samples with spring-javaformat 0.0.8
...
See gh-16418
2019-04-02 19:39:23 -07:00
Phillip Webb
07c000c5b7
Merge branch '1.5.x' into 2.0.x
2019-04-02 13:34:28 -07:00
Phillip Webb
2ff74b1559
Reformat code with spring-javaformat 0.0.8
...
See gh-16418
2019-04-02 13:30:25 -07:00
Andy Wilkinson
da4a7203c7
Upgrade to Spring Security 5.0.12
...
Closes gh-16353
2019-04-02 19:45:35 +01:00
Phillip Webb
0d8613f3eb
Upgrade to spring-javaformat 0.0.8
...
Closes gh-16418
2019-04-02 10:52:05 -07:00
Phillip Webb
a336a5c36a
Prune unnecessary P2 Eclipse installs
...
Remove a few items that are no longer necessary.
2019-04-02 10:52:05 -07:00
Phillip Webb
6246da06a6
Update Eclipse setup files
...
Update the eclipse setup files and contributing instructions for
compatibility with the latest Eclipse 2019-03 release. This commit
reverts the use the HTTPS in the `.setup` file namespace (since it
breaks the setup editor). The `xsi:schemaLocation` section still
uses HTTPS for actual XSD resolution.
See gh-16245
2019-04-02 10:52:05 -07:00
Andy Wilkinson
7b5f46d6e3
Add Spring-Boot-* manifest attributes to jars and wars built with Gradle
...
Closes gh-16068
2019-04-02 10:13:09 +01:00
Andy Wilkinson
336af93c7e
Update to Spring AMQP 2.0.12
...
Closes gh-16346
2019-04-02 09:44:22 +01:00
Andy Wilkinson
cacb120c2a
Merge branch '1.5.x' into 2.0.x
2019-04-02 09:43:48 +01:00
Andy Wilkinson
d1c9651d56
Upgrade to Spring AMQP 1.7.13
...
Closes gh-16345
2019-04-02 09:41:01 +01:00
Andy Wilkinson
f4942b76f0
Upgrade to Spring Data Kay-SR14
...
Closes gh-16359
2019-04-02 09:33:28 +01:00
Andy Wilkinson
eca9af6d86
Merge branch '1.5.x' into 2.0.x
2019-04-02 09:26:38 +01:00
Andy Wilkinson
045b364906
Upgrade to Spring Data Ingalls-SR20
...
Closes gh-16358
2019-04-02 09:25:35 +01:00
Andy Wilkinson
922ab115ab
Switch custom repository to one with JDK 9-friendly SSL certification chain
2019-04-01 14:07:01 +01:00
Andy Wilkinson
2adb6b1fa4
Override version of Maven Site Plugin for JDK 9+181 compatibility
...
See gh-16400
2019-04-01 11:53:31 +01:00
Andy Wilkinson
ef09c81ea7
Upgrade JDK 9 CI image to JDK 9+181
...
Closes gh-16400
2019-04-01 10:47:30 +01:00
Stephane Nicoll
695dc8e992
Switch to snapshots
2019-03-31 19:37:43 +02:00
Stephane Nicoll
e129f2ae20
Merge branch '1.5.x' into 2.0.x
2019-03-31 19:32:09 +02:00
Stephane Nicoll
2874d77021
Switch to snapshots
2019-03-31 19:31:44 +02:00
Stephane Nicoll
165b9d950a
Upgrade to Spring Framework 5.0.13.RELEASE
...
Closes gh-16339
2019-03-31 15:26:57 +02:00
Stephane Nicoll
65296f0b77
Merge branch '1.5.x' into 2.0.x
2019-03-31 15:26:30 +02:00
Stephane Nicoll
a0002c6ebe
Upgrade to Spring Framework 4.3.23.RELEASE
...
Closes gh-16338
2019-03-31 15:25:31 +02:00
Andy Wilkinson
7990c8ba68
Merge branch '1.5.x' into 2.0.x
2019-03-29 16:06:47 +00:00