From d7f3a12fa93f9a21cc0f013630185e41c1415afb Mon Sep 17 00:00:00 2001 From: Maxim Gorbunkov <gorbunkov@haulmont.com> Date: Tue, 1 Nov 2022 11:07:50 +0400 Subject: [PATCH] Update dependencies #3282 --- build.gradle | 2 +- .../com/haulmont/cuba/testsupport/TestContainer.java | 2 +- .../cuba/core/data_events/AllDataEventsTest.groovy | 10 +++++----- modules/global/src/com/haulmont/cuba/bom.properties | 12 ++++++------ .../haulmont/cuba/web/testsupport/TestContainer.java | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 293a7c11e8..17767b4888 100644 --- a/build.gradle +++ b/build.gradle @@ -339,7 +339,7 @@ configure(globalModule) { compile(bom['org.json:json']) compile(bom['com.google.code.gson:gson']) compile(bom['org.hibernate.validator:hibernate-validator']) - compile(bom['org.glassfish:javax.el']) + compile(bom['org.glassfish:jakarta.el']) compile(bom['org.mindrot:jbcrypt']) compile(bom['javax.inject:javax.inject']) diff --git a/modules/core-tests/src/com/haulmont/cuba/testsupport/TestContainer.java b/modules/core-tests/src/com/haulmont/cuba/testsupport/TestContainer.java index ff82f76b86..5518304463 100644 --- a/modules/core-tests/src/com/haulmont/cuba/testsupport/TestContainer.java +++ b/modules/core-tests/src/com/haulmont/cuba/testsupport/TestContainer.java @@ -436,7 +436,7 @@ protected void initAppContext() { String configProperty = AppContext.getProperty(AbstractAppContextLoader.SPRING_CONTEXT_CONFIG); StringTokenizer tokenizer = new StringTokenizer(configProperty); - List<String> locations = tokenizer.getTokenList(); + List<String> locations = new ArrayList<>(tokenizer.getTokenList()); String springConfig = getSpringConfig(); if (!Strings.isNullOrEmpty(springConfig) && !locations.contains(springConfig)) { locations.add(springConfig); diff --git a/modules/core/test/spec/cuba/core/data_events/AllDataEventsTest.groovy b/modules/core/test/spec/cuba/core/data_events/AllDataEventsTest.groovy index 11bf97d541..271667d994 100644 --- a/modules/core/test/spec/cuba/core/data_events/AllDataEventsTest.groovy +++ b/modules/core/test/spec/cuba/core/data_events/AllDataEventsTest.groovy @@ -81,8 +81,8 @@ class AllDataEventsTest extends Specification { listener.allEvents[i++].message == 'AfterInsertEntityListener' listener.allEvents[i++].message == 'JPA PostPersist' listener.allEvents[i++].message == 'EntityChangedEvent: beforeCommit, CREATED' - listener.allEvents[i++].message == 'EntityChangedEvent: afterCommit, CREATED' listener.allEvents[i++].message == 'AfterCompleteTransactionListener' + listener.allEvents[i++].message == 'EntityChangedEvent: afterCommit, CREATED' cleanup: @@ -114,8 +114,8 @@ class AllDataEventsTest extends Specification { listener.allEvents[i++].message == 'AfterUpdateEntityListener' listener.allEvents[i++].message == 'JPA PostUpdate' listener.allEvents[i++].message == 'EntityChangedEvent: beforeCommit, UPDATED' - listener.allEvents[i++].message == 'EntityChangedEvent: afterCommit, UPDATED' listener.allEvents[i++].message == 'AfterCompleteTransactionListener' + listener.allEvents[i++].message == 'EntityChangedEvent: afterCommit, UPDATED' cleanup: @@ -146,8 +146,8 @@ class AllDataEventsTest extends Specification { listener.allEvents[i++].message == 'AfterDeleteEntityListener' listener.allEvents[i++].message == 'JPA PostUpdate' listener.allEvents[i++].message == 'EntityChangedEvent: beforeCommit, DELETED' - listener.allEvents[i++].message == 'EntityChangedEvent: afterCommit, DELETED' listener.allEvents[i++].message == 'AfterCompleteTransactionListener' + listener.allEvents[i++].message == 'EntityChangedEvent: afterCommit, DELETED' cleanup: @@ -221,10 +221,10 @@ class AllDataEventsTest extends Specification { then: listener.allEvents[i++].message == 'BeforeCommitTransactionListener' + listener.allEvents[i++].message == 'AfterCompleteTransactionListener' listener.allEvents[i++].message == 'EntityChangedEvent: afterCommit, CREATED' listener.allEvents[i++].message == 'EntityChangedEvent: afterCommit, UPDATED' listener.allEvents[i++].message == 'EntityChangedEvent: afterCommit, DELETED' - listener.allEvents[i++].message == 'AfterCompleteTransactionListener' cleanup: @@ -280,8 +280,8 @@ class AllDataEventsTest extends Specification { then: listener.allEvents[i++].message == 'BeforeCommitTransactionListener' - listener.allEvents[i++].message == 'EntityChangedEvent: afterCommit, UPDATED' listener.allEvents[i++].message == 'AfterCompleteTransactionListener' + listener.allEvents[i++].message == 'EntityChangedEvent: afterCommit, UPDATED' cleanup: diff --git a/modules/global/src/com/haulmont/cuba/bom.properties b/modules/global/src/com/haulmont/cuba/bom.properties index 6c88249e3f..f16ce9d40d 100644 --- a/modules/global/src/com/haulmont/cuba/bom.properties +++ b/modules/global/src/com/haulmont/cuba/bom.properties @@ -25,7 +25,7 @@ com.microsoft.sqlserver/mssql-jdbc = 7.2.2.jre8 mysql/mysql-connector-java = 8.0.17 org.apache.commons/commons-lang3 = 3.9 -org.apache.commons/commons-text = 1.8 +org.apache.commons/commons-text = 1.10.0 commons-io/commons-io = 2.6 commons-cli/commons-cli = 1.4 commons-codec/commons-codec = 1.13 @@ -81,7 +81,7 @@ org.jgroups/jgroups = 4.1.8.Final org.aspectj/aspectjrt = 1.9.4 org.aspectj/aspectjweaver = 1.9.4 org.jmockit/jmockit = 1.48 -junit/junit = 4.12 +junit/junit = 4.13.2 org.junit.jupiter/junit-jupiter-api = 5.5.2 org.junit.vintage/junit-vintage-engine = 5.5.2 org.junit.jupiter/junit-jupiter-engine = 5.5.2 @@ -92,7 +92,7 @@ com.fifesoft/rsyntaxtextarea = 2.5.6 org.javassist/javassist = 3.24.0-GA org.hibernate.validator/hibernate-validator = 6.1.5.Final -org.glassfish/javax.el = 3.0.1-b10 +org.glassfish/jakarta.el = 3.0.4 com.vaadin = 8.14.3-1-cuba com.vaadin/vaadin-server = ${com.vaadin} @@ -104,7 +104,7 @@ com.vaadin/vaadin-push = ${com.vaadin} com.vaadin/vaadin-compatibility-server = ${com.vaadin} com.vaadin/vaadin-compatibility-client = ${com.vaadin} -org.springframework = 5.2.20.RELEASE +org.springframework = 5.3.23 org.springframework/spring-core = ${org.springframework} org.springframework/spring-beans = ${org.springframework} org.springframework/spring-context = ${org.springframework} @@ -115,13 +115,13 @@ org.springframework/spring-tx = ${org.springframework} org.springframework/spring-webmvc = ${org.springframework} org.springframework/spring-jdbc = ${org.springframework} -org.springframework.security = 5.2.11.RELEASE +org.springframework.security = 5.5.8 org.springframework.security/spring-security-core = ${org.springframework.security} org.springframework.security/spring-security-web = ${org.springframework.security} org.springframework.security/spring-security-config = ${org.springframework.security} org.springframework.security/spring-security-taglibs = ${org.springframework.security} -org.springframework.ldap/spring-ldap-core = 2.3.2.RELEASE +org.springframework.ldap/spring-ldap-core = 2.3.8.RELEASE org.thymeleaf = 3.0.11.RELEASE org.thymeleaf/thymeleaf = ${org.thymeleaf} diff --git a/modules/web-tests/src/com/haulmont/cuba/web/testsupport/TestContainer.java b/modules/web-tests/src/com/haulmont/cuba/web/testsupport/TestContainer.java index 16ff0c51c4..143ae2c090 100644 --- a/modules/web-tests/src/com/haulmont/cuba/web/testsupport/TestContainer.java +++ b/modules/web-tests/src/com/haulmont/cuba/web/testsupport/TestContainer.java @@ -306,7 +306,7 @@ protected void initAppContext() { String configProperty = AppContext.getProperty(AbstractAppContextLoader.SPRING_CONTEXT_CONFIG); StringTokenizer tokenizer = new StringTokenizer(configProperty); - List<String> locations = tokenizer.getTokenList(); + List<String> locations = new ArrayList<>(tokenizer.getTokenList()); StringTokenizer configTokenizer = new StringTokenizer(getSpringConfig()); locations.addAll(configTokenizer.getTokenList());