From 2d98988d5c3bfba3b07f921beab962c26be5130e Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 2 Mar 2015 14:06:06 +0100 Subject: [PATCH] Latest dependency updates (SnakeYAML 1.15, FreeMarker 2.3.22, JRuby 1.7.19, JAMon 2.81, JiBX 1.2.6, XMLUnit 1.6) --- build.gradle | 14 ++-- ...monPerformanceMonitorInterceptorTests.java | 71 ++++++++++--------- spring-oxm/oxm.gradle | 2 +- 3 files changed, 46 insertions(+), 41 deletions(-) diff --git a/build.gradle b/build.gradle index 0c080f6a47..022db73ad7 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ configure(allprojects) { project -> ext.protobufVersion = "2.6.1" ext.reactorVersion = "1.1.5.RELEASE" ext.slf4jVersion = "1.7.10" - ext.snakeYamlVersion = "1.14" + ext.snakeYamlVersion = "1.15" ext.snifferVersion = "1.11" ext.tiles2Version = "2.2.2" ext.tiles3Version = "3.0.5" @@ -404,7 +404,7 @@ project("spring-aop") { compile("aopalliance:aopalliance:1.0") optional("org.aspectj:aspectjweaver:${aspectjVersion}") optional("commons-pool:commons-pool:1.6") - optional("com.jamonapi:jamon:2.79") + optional("com.jamonapi:jamon:2.81") } } @@ -459,7 +459,7 @@ project("spring-context") { optional("org.aspectj:aspectjweaver:${aspectjVersion}") optional("org.codehaus.groovy:groovy-all:${groovyVersion}") optional("org.beanshell:bsh:2.0b4") - optional("org.jruby:jruby:1.7.17") + optional("org.jruby:jruby:1.7.19") testCompile("javax.inject:javax.inject-tck:1") testCompile("commons-dbcp:commons-dbcp:1.4") testCompile("org.slf4j:slf4j-api:${slf4jVersion}") @@ -551,9 +551,9 @@ project("spring-oxm") { exclude group: 'xpp3', module: 'xpp3_min' exclude group: 'xmlpull', module: 'xmlpull' } - optional("org.jibx:jibx-run:1.2.5") + optional("org.jibx:jibx-run:1.2.6") testCompile(project(":spring-context")) - testCompile("xmlunit:xmlunit:1.5") + testCompile("xmlunit:xmlunit:1.6") testCompile("xpp3:xpp3:1.1.4c") testCompile("org.codehaus.jettison:jettison:1.3.7") { exclude group: 'stax', module: 'stax-api' @@ -616,7 +616,7 @@ project("spring-context-support") { optional("org.quartz-scheduler:quartz:2.2.1") optional("org.codehaus.fabric3.api:commonj:1.1.0") optional("org.apache.velocity:velocity:1.7") - optional("org.freemarker:freemarker:2.3.21") + optional("org.freemarker:freemarker:2.3.22") optional("com.lowagie:itext:2.1.7") optional("net.sf.jasperreports:jasperreports:$jasperReportsVersion") { exclude group: "com.fasterxml.jackson.core", module: "jackson-annotations" @@ -830,7 +830,7 @@ project("spring-webmvc") { optional("org.apache.poi:poi:3.11") optional("org.apache.velocity:velocity:1.7") optional("velocity-tools:velocity-tools-view:1.4") - optional("org.freemarker:freemarker:2.3.21") + optional("org.freemarker:freemarker:2.3.22") optional("org.codehaus.groovy:groovy-all:${groovyVersion}") optional("com.lowagie:itext:2.1.7") optional("net.sf.jasperreports:jasperreports:$jasperReportsVersion") { diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptorTests.java index 16f95775f6..262390d3ec 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,50 +32,55 @@ import static org.mockito.BDDMockito.*; */ public class JamonPerformanceMonitorInterceptorTests { - private JamonPerformanceMonitorInterceptor interceptor = new JamonPerformanceMonitorInterceptor(); + private final JamonPerformanceMonitorInterceptor interceptor = new JamonPerformanceMonitorInterceptor(); - private MethodInvocation mi = mock(MethodInvocation.class); + private final MethodInvocation mi = mock(MethodInvocation.class); - private Log log = mock(Log.class); + private final Log log = mock(Log.class); - @Before - public void setUp() { - MonitorFactory.reset(); - } + @Before + public void setUp() { + MonitorFactory.reset(); + } - @After - public void tearDown() { - MonitorFactory.reset(); - } + @After + public void tearDown() { + MonitorFactory.reset(); + } - @Test - public void testInvokeUnderTraceWithNormalProcessing() throws Throwable { - given(mi.getMethod()).willReturn(String.class.getMethod("toString")); + @Test + public void testInvokeUnderTraceWithNormalProcessing() throws Throwable { + given(mi.getMethod()).willReturn(String.class.getMethod("toString")); - interceptor.invokeUnderTrace(mi, log); + interceptor.invokeUnderTrace(mi, log); - assertEquals("jamon must track the method being invoked", 1, MonitorFactory.getNumRows()); - assertTrue("The jamon report must contain the toString method that was invoked", MonitorFactory.getReport().contains("toString")); - } + assertTrue("jamon must track the method being invoked", MonitorFactory.getNumRows() > 0); + assertTrue("The jamon report must contain the toString method that was invoked", + MonitorFactory.getReport().contains("toString")); + } - @Test - public void testInvokeUnderTraceWithExceptionTracking() throws Throwable { - given(mi.getMethod()).willReturn(String.class.getMethod("toString")); - given(mi.proceed()).willThrow(new IllegalArgumentException()); + @Test + public void testInvokeUnderTraceWithExceptionTracking() throws Throwable { + given(mi.getMethod()).willReturn(String.class.getMethod("toString")); + given(mi.proceed()).willThrow(new IllegalArgumentException()); - try { - interceptor.invokeUnderTrace(mi, log); - fail("Must have propagated the IllegalArgumentException"); - } + try { + interceptor.invokeUnderTrace(mi, log); + fail("Must have propagated the IllegalArgumentException"); + } catch (IllegalArgumentException expected) { - } + } - assertEquals("Monitors must exist for the method invocation and 2 exceptions", 3, MonitorFactory.getNumRows()); - assertTrue("The jamon report must contain the toString method that was invoked", MonitorFactory.getReport().contains("toString")); - assertTrue("The jamon report must contain the generic exception: " + MonitorFactory.EXCEPTIONS_LABEL, MonitorFactory.getReport().contains(MonitorFactory.EXCEPTIONS_LABEL)); - assertTrue("The jamon report must contain the specific exception: IllegalArgumentException'", MonitorFactory.getReport().contains("IllegalArgumentException")); - } + assertEquals("Monitors must exist for the method invocation and 2 exceptions", + 3, MonitorFactory.getNumRows()); + assertTrue("The jamon report must contain the toString method that was invoked", + MonitorFactory.getReport().contains("toString")); + assertTrue("The jamon report must contain the generic exception: " + MonitorFactory.EXCEPTIONS_LABEL, + MonitorFactory.getReport().contains(MonitorFactory.EXCEPTIONS_LABEL)); + assertTrue("The jamon report must contain the specific exception: IllegalArgumentException'", + MonitorFactory.getReport().contains("IllegalArgumentException")); + } } diff --git a/spring-oxm/oxm.gradle b/spring-oxm/oxm.gradle index b59008ce84..cedb5558de 100644 --- a/spring-oxm/oxm.gradle +++ b/spring-oxm/oxm.gradle @@ -9,7 +9,7 @@ dependencies { castor "velocity:velocity:1.5" xjc "com.sun.xml.bind:jaxb-xjc:2.1.7" xmlbeans "org.apache.xmlbeans:xmlbeans:2.6.0" - jibx "org.jibx:jibx-bind:1.2.5" + jibx "org.jibx:jibx-bind:1.2.6" jibx "bcel:bcel:5.1" }