Commit Graph

7179 Commits

Author SHA1 Message Date
Phillip Webb
b11457f5a2 Merge pull request #6118 from joshiste/1.3.x-liquibase-endpoint
* 1.3.x-liquibase-endpoint:
  Close connection after use in LiquibaseEndpoint
2016-06-10 21:04:31 -07:00
Johannes Edmeier
e89063cc07 Close connection after use in LiquibaseEndpoint
Update LiquibaseEndpoint so that connections are closed and returned to
the pool after use.

Fixes gh-6118
2016-06-10 21:03:15 -07:00
Phillip Webb
452281ca8d Fix property detection in SpringApplicationBuilder
Update SpringApplicationBuilder so that properties of the form
`abc=d:e:f` are correctly parsed. Prior to this commit the `:` delimiter
would always be chosen over `=`, even if `=` occurred first.

Fixes gh-6121
2016-06-10 20:54:50 -07:00
Phillip Webb
f27bdcb737 Prevent APT crashes on older Java versions
Update TypeUtils to guard against the use of older Java versions.
Both `Collection` and `Map` type lookups now fallback to generic free
versions of the classes.

Prior to this commit using `xmlbeans-maven-plugin` in combination with
Spring Boot's annotation processor could result in
`IllegalArgumentException: Incorrect number of type arguments`.

Fixes gh-6122
2016-06-10 17:06:45 -07:00
Phillip Webb
a9b98cada5 Allow loading from package names without dots
Update BeanDefinitionLoader to support loading from package names that
do not contain dots.

Prior to this commit `new BeanDefinitionLoader(registry, "somepackage")`
would fail because "somepackage" exists and is a resource but does not
contain valid XML. Somewhat surprisingly the InputStream returned by
the resource actually contains the listing of files in the package.

Fixes gh-6126
2016-06-10 12:28:23 -07:00
Ivan Sopov
1528764194 Fix potential offset errors in BasicJsonParser
Update BasicJsonParser to fix potential exceptions if strings happen
to be empty.

Fixes gh-6136
2016-06-10 11:48:06 -07:00
Phillip Webb
ed6f11d60d Polish 2016-06-10 11:46:26 -07:00
Stephane Nicoll
ec4c8bf50d Merge pull request #6125 from vpavic:gh-6124
* pr/6125:
  Update DataSourceBuilder aliases
2016-06-09 14:17:24 +02:00
Vedran Pavic
6dde498b87 Update DataSourceBuilder aliases
This commit adds a `user` alias for the `username` property which permits
the use of `OracleDataSource`.

Closes gh-6124, gh-6027, gh-6125
2016-06-09 14:16:21 +02:00
Dave Syer
31fc1cc6f2 Update Spring OAuth to 2.0.10 2016-06-03 13:50:07 +01:00
Andy Wilkinson
1037239efc Upgrade to Dependency Management Plugin 0.5.7.RELEASE
Closes gh-6105
2016-06-01 18:13:25 +01:00
Andy Wilkinson
9bbdbae178 Merge pull request #6056 from Martin Lippert
* gh-6056:
  Check factory method metadata to avoid NPE in devtools condition
2016-06-01 18:09:02 +01:00
Martin Lippert
efd541d26b Check factory method metadata to avoid NPE in devtools condition
Closes gh-6056
2016-06-01 18:08:17 +01:00
Andy Wilkinson
f3e9f1e6e3 Polish FileSystemWatcher and improve its thread safety
- Limit shared state between FileSystemWatcher and the watching thread
- Use a private monitor rather than synchronizing on this
- Use a Runnable implementation rather than subclassing Thread
- Synchronize consistently when reading and writing state

Closes gh-6039
2016-06-01 17:13:04 +01:00
Andy Wilkinson
3772d9f937 Update JarURLConnection to only require file read permission
Previously, JarURLConnection didn't override getPermission(). This
meant that it required all permissions. This was at odds with the
Oracle JVM's concrete sun.net.www.protocol.jar.JarURLConnection which
overrides getPermission to return a FilePermission with the read
action for the path of the underlying jar.

This commit updates our JarURLConnection to align its behaviour with
sun.net.www.protocol.jar.JarURLConnection.

Closes gh-5411
2016-06-01 15:33:36 +01:00
Andy Wilkinson
28bd6d60c8 Revert "Upgrade to Tomcat 8.0.35"
This reverts commit 66e093ed0d. There's
a regression [1] in Tomcat 8.0.35 that causes it to throw an NPE when
it scans a jar file without a manifest. It's already been fixed [2].

See gh-6087

[1] https://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java?annotate=1742274#l369
[2] https://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java?annotate=1744197#l369
2016-06-01 14:13:21 +01:00
Andy Wilkinson
9ec4e5c74a Upgrade to Spring REST Docs 1.0.2.RELEASE
Closes gh-6090
2016-06-01 13:16:40 +01:00
Andy Wilkinson
d0df8cbe51 Upgrade to HSQLDB 2.3.4
Closes gh-6089
2016-06-01 13:16:14 +01:00
Andy Wilkinson
055c318506 Upgrade to Jetty 9.2.17.v20160517
Closes gh-6088
2016-06-01 13:15:52 +01:00
Andy Wilkinson
66e093ed0d Upgrade to Tomcat 8.0.35
Closes gh-6087
2016-06-01 13:15:05 +01:00
Andy Wilkinson
b2413850c4 Upgrade to Embedded Mongo 1.50.5
Closes gh-6086
2016-06-01 13:14:39 +01:00
Andy Wilkinson
a5fdc05d82 Upgrade to H2 1.4.192
Closes gh-6085
2016-06-01 13:14:12 +01:00
Stephane Nicoll
b49c6ca616 Fix link in doc
Closes gh-6033
2016-05-26 17:25:57 +02:00
Andy Wilkinson
9f425343ae Make FileSystemWatcherTests thread-safe
The list of changes is written to on one thread and read from on
another. Without some form of sychronization this is not thread-safe.

This commit makes changes a synchronized list which should guarantee
that the reading thread can see the changes made by the writing thread.
It also removes a redundant call to clear the list of changes at the
start of waitsForPollingInterval.

See gh-6038
2016-05-25 20:59:03 +01:00
Andy Wilkinson
a98d1a41a4 Run Maven Plugin's integration tests when full profile is active
Closes gh-6036
2016-05-25 17:42:08 +01:00
Andy Wilkinson
275651e89a Skips Cassandra and Elasticsearch tests on Windows
Neither Cassandra nor Elasticsearch starts reliably on Windows. This
commit adds a custom class rule to the associated sample application
tests to skip them on Windows. A class rule is used rather than a
Unit assumption as we want to avoid starting Elasticsearch (done by
the application context) and Cassandra (done by a test execution
listener) and an assumption would be too late.
2016-05-24 17:22:48 +01:00
Andy Wilkinson
ae89cb0355 Upgrade to Spring Integration 4.2.6.RELEASE
Closes gh-5949
2016-05-13 11:59:07 +01:00
Andy Wilkinson
b07fa75664 Upgrade to jOOQ 3.7.4
Closes gh-5947
2016-05-13 11:58:40 +01:00
Andy Wilkinson
1b8ffe8f74 Upgrade to MySQL Java Connector 5.1.39
Closes gh-5946
2016-05-13 11:58:03 +01:00
Andy Wilkinson
5484000651 Upgrade to HikariCP 2.4.6
Closes gh-5945
2016-05-13 11:57:35 +01:00
Andy Wilkinson
4c65e5e704 Always handle quoted arguments correctly in the launch script
Previously, arguments passed to the script were handled in one way
if a service was being started using start-stop-daemon and in another
way if start-stop-daemon wasn’t available or the application is being
launched in run mode. This meant that quoted arguments were only 
handled correctly when the application was being started using
start-stop-daemon.

This commit updates the launch script so that argument handling is
the same across all three different way that the application can be
launched.

Closes gh-5942
2016-05-13 11:13:54 +01:00
Andy Wilkinson
e561cc1997 Don't use a separate thread in the launcher to call app's main method
Using a separate thread to call the application's main method is
unnecessary – the context class loader of the current thread can be
updated instead – and makes exception and exit code handling more
complicated than it needs to be.

This commit updates the Launcher so that it calls the main method
runner using the current (main) thread. As a result, any exception
that's thrown will be caught by the JVM and result in a non-zero exit
code being returned from the process.

Closes gh-5922
2016-05-12 16:57:16 +01:00
Phillip Webb
7fb545d26c Polish 2016-05-10 09:35:10 -07:00
Andy Wilkinson
aab65c8fcc Merge pull request #5884 from tfeiner
* gh-5884:
  Add tests for JooqExceptionTranslator
  Use JOOQ's Spring DB name during exception translation
2016-05-10 13:28:51 +01:00
Andy Wilkinson
1ab835a0f7 Add tests for JooqExceptionTranslator
See gh-5884
2016-05-10 13:21:59 +01:00
tfeiner
61cb18a69c Use JOOQ's Spring DB name during exception translation
The name of a JOOQ SQLDialect does not always match the name defined
in sql-error-codes.xml. For example, the Postgres translator was not
initialized correctly because in JOOQ the dialect is named
SQLDialect.POSTGRES, but in sql-error-codes.xml the bean is named
"PostgreSQL".

This commit updates the translator to use the dialects third-party
springDbName which ensures that it maps correctly to the entries in
sql-error-codes.xml.

Closes gh-5884
2016-05-10 13:21:59 +01:00
Stephane Nicoll
8cbbb577a0 Fixup version numbers following release 2016-05-10 08:04:41 +02:00
Spring Buildmaster
819a9574a6 Next Development Version 2016-05-10 05:28:34 +00:00
Stephane Nicoll
2cacc19c91 Polish
See gh-5901
2016-05-09 17:49:55 +02:00
Stephane Nicoll
a4ba8f61c9 Backport 6dd8415
While working on gh-5309, a regression was introduced and fixed right the
way on master. Unfortunately, the fix wasn't applied to `1.3.x` as it
should have been.

This commit applies 6dd8415 to `1.3.x`

Closes gh-5901
2016-05-09 17:49:16 +02:00
Vedran Pavic
3891b242a3 Update launch script integration tests
- Use the latest Docker image for Ubuntu 14.04 LTS based tests
- Add Ubuntu 16.04 LTS based tests

Closes gh-5868
2016-05-09 11:37:38 +01:00
Stephane Nicoll
4b93a230b7 Merge pull request #5887 from garyrussell/amqp-update13
* pr/5887:
  Upgrade to Spring AMQP 1.5.6
2016-05-07 17:15:08 +02:00
Gary Russell
e66947735d Upgrade to Spring AMQP 1.5.6
Closes gh-5887
2016-05-07 17:14:51 +02:00
Andy Wilkinson
d77d3ff236 Use a SHA256 checksum in the Homebrew formula
Closes gh-5885
2016-05-06 15:58:57 +01:00
Stephane Nicoll
72c2454218 Fixup version numbers following release 2016-05-06 14:06:51 +02:00
Spring Buildmaster
376bbe68d8 Next Development Version 2016-05-06 11:23:57 +00:00
Stephane Nicoll
3567e57ff6 Upgrade to Spring Framework 4.2.6.RELEASE
Closes gh-5322
2016-05-06 11:57:06 +02:00
Stephane Nicoll
daf0b081e7 Revert "Add support for UTF-8 in application.properties"
This reverts commit d6a424f94c.

Closes gh-5361

# Conflicts:
#	spring-boot/src/test/resources/org/springframework/boot/env/test-encoded.properties
2016-05-06 11:10:36 +02:00
Andy Wilkinson
5f6be0152b Upgrade to Spring Loaded 1.2.6.RELEASE
Closes gh-5874
2016-05-05 17:59:08 +01:00
Andy Wilkinson
a079868965 Upgrade to EhCache 2.10.2
Closes gh-5873
2016-05-05 17:58:37 +01:00