This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch spring6 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit a88ee7fb71cde57b0ed6d5b1650c80a87975f1e6 Merge: 5772137cad c638d193cb Author: Andi Huber <[email protected]> AuthorDate: Thu Feb 15 08:50:55 2024 +0100 Merge remote-tracking branch 'origin/master' into spring6 .../annotations/DisabledIfRunningWithSurefire.java | 53 ++++++++++++++++++++++ .../secondary/fetch/CommandFetcher_Test.java | 4 +- .../domainmodel/MetaModelRegressionTest.java | 2 - .../injecting/jpa/JpaEntityInjectingTest.java | 4 +- ...actionRollbackTest_usingInteractionService.java | 7 ++- ...actionRollbackTest_usingTransactionService.java | 10 ++-- .../jpa/JpaTransactionScopeListenerTest.java | 4 +- .../testdomain/rest/JsonValueEncoderTest.java | 1 - .../testdomain/rest/RestServiceStressTest.java | 4 +- scripts/ci/rename-all-published-sources.jsh | 28 ++++++------ .../annotations/DisabledIfRunningWithSurefire.java | 51 +++++++++++++++++++++ .../tooling/javamodel/test/AnalyzerTest.java | 6 +-- .../e2e/queryandmutations/Staff_IntegTest.java | 2 + .../wicket/viewer/wicketapp/CryptFactoryTest.java | 5 +- 14 files changed, 142 insertions(+), 39 deletions(-) diff --cc regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingInteractionService.java index b364563b5d,0a0e67201d..4322307d78 --- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingInteractionService.java +++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingInteractionService.java @@@ -18,10 -18,8 +18,8 @@@ */ package org.apache.causeway.testdomain.transactions.jpa; -import javax.inject.Inject; +import jakarta.inject.Inject; - import org.apache.causeway.core.transaction.events.TransactionCompletionStatus; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --cc regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactionService.java index 27e457c65b,a012b472a6..67f5b4dae3 --- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactionService.java +++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactionService.java @@@ -18,12 -18,8 +18,8 @@@ */ package org.apache.causeway.testdomain.transactions.jpa; -import javax.inject.Inject; +import jakarta.inject.Inject; - import org.apache.causeway.commons.internal.base._Refs; - - import org.apache.causeway.core.transaction.events.TransactionCompletionStatus; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --cc regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceStressTest.java index f2c0edd71d,599bfcec65..cdadfd75e8 --- a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceStressTest.java +++ b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceStressTest.java @@@ -20,12 -20,10 +20,11 @@@ package org.apache.causeway.testdomain. import java.util.stream.IntStream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; - import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Import;
