root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 16 Packages Projects Releases Wiki Activity

Update dependencies to latest maintenance releases 

Despite Javassist 3.18.2-GA being available, it has not be upgraded.
This is to keep it in sync with Hibernate.
This commit is contained in:
Andy Wilkinson 2014-06-03 17:03:26 +01:00
parent 156dadaebe
commit 9b44c322d4
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java
View File

@ -238,9 +238,15 @@ public class CrshAutoConfiguration {
Assert.notNull(filterPatterns, "FilterPatterns must not be null"); Assert.notNull(filterPatterns, "FilterPatterns must not be null");
FS fileSystem = new FS(); FS fileSystem = new FS();
for (String pathPattern : pathPatterns) { for (String pathPattern : pathPatterns) {
try {
fileSystem.mount(new SimpleFileSystemDriver(new DirectoryHandle( fileSystem.mount(new SimpleFileSystemDriver(new DirectoryHandle(
pathPattern, this.resourceLoader, filterPatterns))); pathPattern, this.resourceLoader, filterPatterns)));
} }
catch (IOException ex) {
throw new IllegalStateException("Failed to mount file system for '"
+ pathPattern + "'", ex);
}
}
return fileSystem; return fileSystem;
} }

2
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfigurationTests.java
View File

@ -25,7 +25,7 @@ import java.util.UUID;
import org.crsh.auth.AuthenticationPlugin; import org.crsh.auth.AuthenticationPlugin;
import org.crsh.auth.JaasAuthenticationPlugin; import org.crsh.auth.JaasAuthenticationPlugin;
import org.crsh.lang.groovy.GroovyRepl; import org.crsh.lang.impl.groovy.GroovyRepl;
import org.crsh.plugin.PluginContext; import org.crsh.plugin.PluginContext;
import org.crsh.plugin.PluginLifeCycle; import org.crsh.plugin.PluginLifeCycle;
import org.crsh.plugin.ResourceKind; import org.crsh.plugin.ResourceKind;

10
spring-boot-dependencies/pom.xml
View File

@ -50,13 +50,13 @@
<activemq.version>5.9.1</activemq.version> <activemq.version>5.9.1</activemq.version>
<aspectj.version>1.8.0</aspectj.version> <aspectj.version>1.8.0</aspectj.version>
<codahale-metrics.version>3.0.2</codahale-metrics.version> <codahale-metrics.version>3.0.2</codahale-metrics.version>
<commons-beanutils.version>1.9.1</commons-beanutils.version> <commons-beanutils.version>1.9.2</commons-beanutils.version>
<commons-collections.version>3.2.1</commons-collections.version> <commons-collections.version>3.2.1</commons-collections.version>
<commons-dbcp.version>1.4</commons-dbcp.version> <commons-dbcp.version>1.4</commons-dbcp.version>
<commons-digester.version>2.1</commons-digester.version> <commons-digester.version>2.1</commons-digester.version>
<commons-pool.version>1.6</commons-pool.version> <commons-pool.version>1.6</commons-pool.version>
<commons-pool2.version>2.2</commons-pool2.version> <commons-pool2.version>2.2</commons-pool2.version>
<crashub.version>1.3.0-beta20</crashub.version> <crashub.version>1.3.0-cr4</crashub.version>
<flyway.version>3.0</flyway.version> <flyway.version>3.0</flyway.version>
<freemarker.version>2.3.20</freemarker.version> <freemarker.version>2.3.20</freemarker.version>
<gemfire.version>7.0.2</gemfire.version> <gemfire.version>7.0.2</gemfire.version>
@ -76,10 +76,10 @@
<jackson.version>2.3.3</jackson.version> <jackson.version>2.3.3</jackson.version>
<javassist.version>3.18.1-GA</javassist.version> <!-- Same as Hibernate --> <javassist.version>3.18.1-GA</javassist.version> <!-- Same as Hibernate -->
<jedis.version>2.4.1</jedis.version> <jedis.version>2.4.1</jedis.version>
<jetty.version>8.1.14.v20131031</jetty.version> <jetty.version>8.1.15.v20140411</jetty.version>
<jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version> <jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version>
<joda-time.version>2.3</joda-time.version> <joda-time.version>2.3</joda-time.version>
<jolokia.version>1.2.0</jolokia.version> <jolokia.version>1.2.1</jolokia.version>
<jstl.version>1.2</jstl.version> <jstl.version>1.2</jstl.version>
<junit.version>4.11</junit.version> <junit.version>4.11</junit.version>
<liquibase.version>3.0.8</liquibase.version> <liquibase.version>3.0.8</liquibase.version>
@ -88,7 +88,7 @@
<mockito.version>1.9.5</mockito.version> <mockito.version>1.9.5</mockito.version>
<mongodb.version>2.12.1</mongodb.version> <mongodb.version>2.12.1</mongodb.version>
<mysql.version>5.1.30</mysql.version> <mysql.version>5.1.30</mysql.version>
<reactor.version>1.1.1.RELEASE</reactor.version> <reactor.version>1.1.2.RELEASE</reactor.version>
<servlet-api.version>3.0.1</servlet-api.version> <servlet-api.version>3.0.1</servlet-api.version>
<slf4j.version>1.7.7</slf4j.version> <slf4j.version>1.7.7</slf4j.version>
<snakeyaml.version>1.13</snakeyaml.version> <snakeyaml.version>1.13</snakeyaml.version>