mirror of
https://github.com/apache/struts.git
synced 2026-08-07 15:46:57 +00:00
Update Struts 2.6.0 build with some newer (compatible) library versions.
- Add missing multiple-success.jsp for Showcase application.
- Enhance main pom.xml maven-surefire-plugin configuration to avoid some test-ng related duplication failures: "Cannot find JUnit method class junit.framework.TestSuite$1.warning".
- Remove unnecessary plugins/embeddedjsp/pom.xml (struts2-embeddedjsp-plugin) maven-surefire-plugin version override (noted with preceding change).
- Update Struts 2.6.0 build to use some newer (compatible) library versions.
Change the main pom.xml library versions for the following:
- spring.platformVersion 4.3.13.RELEASE -> 4.3.20.RELEASE
- oval 1.31 -> 1.90 (Note: required unit test fix for OValValidationInterceptorTest.java AND code fix for OvalValidationInterceptor.java)
(Additional Note: 1.70 was the most recent that functioned without a fix to OvalValidationInterceptor)
- jackson 2.9.6 -> 2.9.7
- fluido-skin.version 1.6 -> 1.7
- slf4j (slf4j-api, slf4j-simple) 1.7.12 -> 1.7.25
- xstream 1.4.10 -> 1.4.11.1
- jetty 6.1.9 -> 6.1.26 (last in 6.1.x line)
- xerces 2.10.0 - > 2.12.0
- org.owasp 3.1.1 -> 3.3.4
- versions-maven-plugin 2.5 -> 2.7
- doxia-core 1.7 -> 1.8
- doxia-module-markdown 1.3 -> 1.7
- org.apache.felix.main 4.0.3 -> 4.6.1 (Note: most recent 4.x)
- easymock 3.4 -> 3.5.1
- javax.el 3.0 -> 3.0.1-b10
- jasper 6.0.18 -> 6.0.53 (Note: most recent 6.0.x)
- juli 6.0.18 -> 6.0.53 (Note: most recent 6.0.x)
- commons-logging 1.1.3 -> 1.2
- commons-collections4 4.1 -> 4.2
- commons-io 2.5 -> 2.6
- commons-lang3 3.6 -> 3.8.1
- commons-text 1.2 -> 1.3 (Note: most recent compatible with Java 7)
- commons-validator 1.5.1 -> 1.6
- mockito 1.9.5 -> 1.10.19 (Note: most recent 1.x)
- cdi-api 1.0-SP1 -> 1.0-SP4 (Note: most recent 1.0.x)
- weld-core 1.0.1-Final -> 1.0.1-SP4 (Note: most recent 1.0.x)
- cglib 2.2 -> 2.2.2 (Note: most recent 2.2.x)
Note for cglib-nodep: Build succeeded with cglib-nodep 2.2.2 and 3.2.5. Although
cglib 3.2.5 matches ASM 5.2, jmock-cglib 1.2.0 identifies cglib-nodep 2.1_3 as its
requirement (on the JMock http://jmock.org/download.html download page) so it should
probably remain as long as JMock 1.2.0 is used.
This commit is contained in:
+2
-1
@@ -166,7 +166,8 @@ public class OValValidationInterceptor extends MethodFilterInterceptor {
|
||||
List<Configurer> configurers = validationManager.getConfigurers(clazz, context, validateJPAAnnotations);
|
||||
|
||||
Validator validator = configurers.isEmpty() ? new Validator() : new Validator(configurers);
|
||||
validator.addExpressionLanguage("ognl", ognlExpressionLanguage);
|
||||
// Note: For Oval <= 1.70, API requires "validator.addExpressionLanguage("ognl", ognlExpressionLanguage)".
|
||||
validator.getExpressionLanguageRegistry().registerExpressionLanguage("ognl", ognlExpressionLanguage); // Usage for Oval >= 1.80 due to API changes
|
||||
//if the method is annotated with a @Profiles annotation, use those profiles
|
||||
Method method = clazz.getMethod(methodName, new Class[0]);
|
||||
if (method != null) {
|
||||
|
||||
+27
-2
@@ -28,6 +28,8 @@ import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import junit.framework.AssertionFailedError;
|
||||
|
||||
public class OValValidationInterceptorTest extends XWorkTestCase {
|
||||
public void testSimpleFieldsXML() throws Exception {
|
||||
ActionProxy baseActionProxy = actionProxyFactory.createActionProxy("oval", "simpleFieldsXML", null, null);
|
||||
@@ -283,7 +285,18 @@ public class OValValidationInterceptorTest extends XWorkTestCase {
|
||||
assertEquals(5, fieldErrors.size()); // 5: as there will be field errors for 'model' and 'address' themselves
|
||||
assertValue(fieldErrors, "name", Arrays.asList("name cannot be null"));
|
||||
assertValue(fieldErrors, "email", Arrays.asList("email cannot be null"));
|
||||
assertValue(fieldErrors, "address.street", Arrays.asList("street cannot be smaller than 7 characters"));
|
||||
try {
|
||||
// Oval version <= 1.40 validation error for invalid data reports: "net.sf.oval.constraint.AssertValid.violated".
|
||||
assertValue(fieldErrors, "address", Arrays.asList("net.sf.oval.constraint.AssertValid.violated"));
|
||||
// Oval version <= 1.40 validation error for minimum length reports: "street cannot be smaller than 7 characters".
|
||||
assertValue(fieldErrors, "address.street", Arrays.asList("street cannot be smaller than 7 characters"));
|
||||
}
|
||||
catch (AssertionFailedError afe) {
|
||||
// Oval version >= 1.50 validation error for invalid data reports: "address is invalid".
|
||||
assertValue(fieldErrors, "address", Arrays.asList("address is invalid"));
|
||||
// Oval version >= 1.50 validation error for minimum length reports: "street cannot be shorter than 7 characters".
|
||||
assertValue(fieldErrors, "address.street", Arrays.asList("street cannot be shorter than 7 characters"));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -300,7 +313,19 @@ public class OValValidationInterceptorTest extends XWorkTestCase {
|
||||
assertEquals(5, fieldErrors.size()); // 5: as there will be field errors for 'person' and 'person.address' themselves
|
||||
assertValue(fieldErrors, "person.name", Arrays.asList("name cannot be null"));
|
||||
assertValue(fieldErrors, "person.email", Arrays.asList("email cannot be null"));
|
||||
assertValue(fieldErrors, "person.address.street", Arrays.asList("street cannot be smaller than 7 characters"));
|
||||
try {
|
||||
// Oval version <= 1.40 validation error for invalid data reports: "net.sf.oval.constraint.AssertValid.violated".
|
||||
assertValue(fieldErrors, "person.address", Arrays.asList("net.sf.oval.constraint.AssertValid.violated"));
|
||||
// Oval version <= 1.40 validation error for minimum length reports: "street cannot be smaller than 7 characters".
|
||||
assertValue(fieldErrors, "person.address.street", Arrays.asList("street cannot be smaller than 7 characters"));
|
||||
}
|
||||
catch (AssertionFailedError afe) {
|
||||
// Oval version >= 1.50 validation error for invalid data reports: "address is invalid".
|
||||
assertValue(fieldErrors, "person.address", Arrays.asList("address is invalid"));
|
||||
// Oval version >= 1.50 validation error for minimum length reports: "street cannot be shorter than 7 characters".
|
||||
assertValue(fieldErrors, "person.address.street", Arrays.asList("street cannot be shorter than 7 characters"));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user