Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update dependencies

Browse Source 
See gh-1794
This commit is contained in:
rstoyanchev
2023-03-23 12:34:00 +01:00
parent bce7f0cc91
commit 5b27250c70
4 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
build.gradle
View File

@@ -32,35 +32,28 @@ allprojects {
dependencyManagement {
imports {
mavenBom "org.springframework:spring-framework-bom:6.0.3"
mavenBom "org.springframework.security:spring-security-bom:6.0.1"
mavenBom "org.junit:junit-bom:5.7.1"
mavenBom "org.springframework:spring-framework-bom:6.0.7"
mavenBom "org.springframework.security:spring-security-bom:6.0.2"
mavenBom "org.junit:junit-bom:5.7.2"
}
dependencies {
dependency "jakarta.servlet:jakarta.servlet-api:6.0.0"
dependency "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:3.0.0"
dependency "jakarta.servlet.jsp:jakarta.servlet.jsp-api:3.1.0"
dependency "jakarta.el:jakarta.el-api:5.0.1"
dependency "jakarta.faces:jakarta.faces-api:4.0.1"
dependency "org.glassfish:jakarta.faces:4.0.2"
dependency "org.apache.myfaces.core:myfaces-impl:4.0.0"
dependency "org.apache.myfaces.core:myfaces-test:4.0.0"
dependency "jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1"
dependency "org.glassfish:jakarta.faces:4.0.0"
dependency "jakarta.validation:jakarta.validation-api:3.0.2"
dependencySet(group: 'org.hibernate', version: '5.6.10.Final') {
dependencySet(group: 'org.hibernate', version: '5.6.15.Final') {
entry 'hibernate-core-jakarta'
entry 'hibernate-entitymanager'
}
dependency "org.hibernate.validator:hibernate-validator:8.0.0.Final"
dependency "org.apache.myfaces.core:myfaces-impl:4.0.0-RC4"
dependency "org.apache.myfaces.core:myfaces-test:4.0.0-RC4"
/*
dependencySet(group: 'com.sun.faces', version: '2.2.20') {
entry 'jsf-api'
entry 'jsf-impl'
}
dependency "com.sun.facelets:jsf-facelets:1.1.14"
*/
dependencySet(group: 'org.apache.logging.log4j', version: '2.14.0') {
entry 'log4j-api'
entry 'log4j-core'
@@ -72,7 +65,7 @@ allprojects {
dependency("junit:junit:4.13.2")
dependency "org.easymock:easymock:4.2"
dependency "org.hamcrest:hamcrest:2.2"
dependency "org.apache.tomcat:tomcat-jasper-el:11.0.0-M1"
dependency "org.apache.tomcat:tomcat-jasper-el:10.1.7"
dependency "org.hsqldb:hsqldb:2.7.1"
/*

14
spring-binding/src/test/java/org/springframework/binding/expression/el/ELExpressionParserTests.java
View File

@@ -1,11 +1,5 @@
package org.springframework.binding.expression.el;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
import java.beans.FeatureDescriptor;
import java.util.Iterator;
import jakarta.el.ELContext;
import jakarta.el.ELResolver;
import jakarta.el.FunctionMapper;
@@ -14,6 +8,7 @@ import jakarta.el.VariableMapper;
import org.apache.el.ExpressionFactoryImpl;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.binding.expression.EvaluationException;
import org.springframework.binding.expression.Expression;
import org.springframework.binding.expression.ExpressionVariable;
@@ -21,6 +16,9 @@ import org.springframework.binding.expression.ParserException;
import org.springframework.binding.expression.ValueCoercionException;
import org.springframework.binding.expression.support.FluentParserContext;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
public class ELExpressionParserTests {
private ELExpressionParser parser = new ELExpressionParser(new ExpressionFactoryImpl());
@@ -233,10 +231,6 @@ public class ELExpressionParserTests {
return Object.class;
}
public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext arg0, Object arg1) {
return null;
}
public Class<?> getType(ELContext arg0, Object arg1, Object arg2) {
return String.class;
}

5
spring-faces/spring-faces.gradle
View File

@@ -11,19 +11,18 @@ dependencies {
compileOnly("org.glassfish:jakarta.faces")
compileOnly("org.apache.myfaces.core:myfaces-impl")
optional("jakarta.faces:jakarta.faces-api")
optional("org.springframework.security:spring-security-core")
optional("org.springframework.security:spring-security-web")
optional("org.springframework.security:spring-security-taglibs")
testImplementation("org.junit.jupiter:junit-jupiter")
testImplementation("org.easymock:easymock")
testImplementation("org.apache.myfaces.core:myfaces-test")
testImplementation("org.apache.tomcat:tomcat-jasper-el")
testImplementation("org.springframework:spring-test")
testImplementation("jakarta.servlet:jakarta.servlet-api")
testImplementation("org.apache.tomcat:tomcat-jasper-el")
testImplementation("org.glassfish:jakarta.faces")
testImplementation("org.apache.myfaces.core:myfaces-impl")
testImplementation("org.apache.myfaces.core:myfaces-test")
testImplementation("jakarta.enterprise:jakarta.enterprise.cdi-api")
testRuntimeOnly("org.apache.logging.log4j:log4j-core")
testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl")

6
spring-faces/src/test/java/org/springframework/faces/webflow/JsfUtilsTests.java
View File

@@ -11,7 +11,6 @@ import org.apache.myfaces.test.mock.MockFacesContextFactory;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.lifecycle.MockLifecycle;
import org.apache.myfaces.test.mock.lifecycle.MockLifecycleFactory;
import org.junit.Test;
import jakarta.faces.application.ApplicationFactory;
import jakarta.faces.context.FacesContextFactory;
@@ -20,6 +19,11 @@ import jakarta.faces.event.PhaseId;
import jakarta.faces.event.PhaseListener;
import jakarta.faces.lifecycle.LifecycleFactory;
import jakarta.faces.render.RenderKitFactory;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
public class JsfUtilsTests extends AbstractJsfTestCase {