From d5884214397210df39e4c5cd66dcffbf7779ecff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Jun 2026 07:16:10 +0000 Subject: [PATCH 1/4] Bump com.codbex.platform:codbex-platform-parent from 12.89.0 to 13.0.0 Bumps [com.codbex.platform:codbex-platform-parent](https://github.com/codbex/codbex-platform-parent) from 12.89.0 to 13.0.0. - [Release notes](https://github.com/codbex/codbex-platform-parent/releases) - [Commits](https://github.com/codbex/codbex-platform-parent/compare/v12.89.0...v13.0.0) --- updated-dependencies: - dependency-name: com.codbex.platform:codbex-platform-parent dependency-version: 13.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6994297ed..0e725a4d4 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.codbex.platform codbex-platform-parent - 12.89.0 + 13.0.0 codbex - kronos - parent From 5fdd559ece5060a6a1f03892cb93dab1c5b8ebfc Mon Sep 17 00:00:00 2001 From: Iliyan Velichkov Date: Fri, 5 Jun 2026 14:55:54 +0300 Subject: [PATCH 2/4] Adapt Kronos to Dirigible 13 / Spring Boot 4 The codbex-platform-parent 13.0.0 bump brings Eclipse Dirigible 13.0.0, which migrates from Spring Boot 3.5 to Spring Boot 4.0 (Spring Framework 7, Hibernate ORM 7) and Testcontainers 2.0. Adapt the affected code: - Hibernate ORM 7 removed @LazyCollection/@LazyCollectionOption. Replace @LazyCollection(LazyCollectionOption.FALSE) with fetch = FetchType.EAGER on the @OneToMany associations in the engine-hdb domain entities, matching how Dirigible migrated its own equivalents. - Spring Boot 4 moved several types out of the monolithic autoconfigure module. Update imports: * DataSource/DataSourceTransactionManager/JdbcTemplate AutoConfiguration -> org.springframework.boot.jdbc.autoconfigure * HibernateJpaAutoConfiguration -> org.springframework.boot.hibernate.autoconfigure * @EntityScan -> org.springframework.boot.persistence.autoconfigure * @AutoConfigureTestDatabase -> org.springframework.boot.jdbc.test.autoconfigure Add the spring-boot-jdbc-test test dependency that now hosts @AutoConfigureTestDatabase. - Spring Boot 4 removed @MockBean. Replace with @MockitoBean (org.springframework.test.context.bean.override.mockito). - Testcontainers 2.0 renamed org.testcontainers:junit-jupiter to org.testcontainers:testcontainers-junit-jupiter. - JobTransformerTest component-scans org.eclipse.dirigible.components, which now pulls in the listeners engine's TenantPropertyManager (requiring a TenantContext and a @DefaultTenant Tenant) without the core-tenants provider on the test classpath. Supply both mocks via TestConfig and import it so the application context loads. All unit tests pass. Co-Authored-By: Claude Opus 4.8 (1M context) --- .../java/com/codbex/kronos/KronosApplication.java | 8 ++++---- pom.xml | 5 +++++ xs/components/engine-hdb/pom.xml | 2 +- .../com/codbex/kronos/engine/hdb/domain/HDBDD.java | 12 +++--------- .../kronos/engine/hdb/domain/HDBSynonymGroup.java | 6 +----- .../codbex/kronos/engine/hdb/domain/HDBTable.java | 8 ++------ .../engine/hdb/domain/HDBTableConstraints.java | 11 +++-------- .../kronos/engine/hdb/domain/HDBTableStructure.java | 5 +---- .../kronos/engine/hdb/domain/HDBTableType.java | 5 +---- .../parser/hdbdd/HDBDDDataStructureParserTest.java | 4 ++-- .../HDBProcedureDataStructureParserTest.java | 4 ++-- .../hdbprocedure/HDBProcedureProcessorTest.java | 4 ++-- .../hdbschema/HDBSchemaDataStructureParserTest.java | 4 ++-- .../hdb/parser/hdbschema/HDBSchemaProcessorTest.java | 4 ++-- .../HDBSequenceDataStructureParserTest.java | 4 ++-- .../hdbsequence/HDBSequenceProcessorsTest.java | 4 ++-- .../HDBTableStructureDataStructureParserTest.java | 4 ++-- .../HDBSynonymDataStructureParserTest.java | 4 ++-- .../parser/hdbsynonym/HDBSynonymProcessorTest.java | 4 ++-- .../parser/hdbtable/HDBTableAlterHandlerTest.java | 4 ++-- .../hdbtable/HDBTableDataStructureParserTest.java | 4 ++-- .../hdb/parser/hdbtable/HDBTableProcessorsTest.java | 4 ++-- .../HDBTableFunctionDataStructureParserTest.java | 4 ++-- .../HDBTableFunctionProcessorTest.java | 4 ++-- .../HDBTableTypeDataStructureParserTest.java | 4 ++-- .../hdbtabletype/HDBTableTypeDropProcessorTest.java | 4 ++-- .../hdbview/HDBViewDataStructureParserTest.java | 4 ++-- .../hdb/parser/hdbview/HDBViewProcessorTest.java | 4 ++-- .../com/codbex/kronos/xsjob/JobTransformerTest.java | 6 ++++-- .../java/com/codbex/kronos/xsjob/TestConfig.java | 7 ++++--- .../src/test/java/com/codbex/kronos/TestConfig.java | 4 ++-- 31 files changed, 69 insertions(+), 86 deletions(-) diff --git a/application/src/main/java/com/codbex/kronos/KronosApplication.java b/application/src/main/java/com/codbex/kronos/KronosApplication.java index 7002a1d02..68ec1651d 100644 --- a/application/src/main/java/com/codbex/kronos/KronosApplication.java +++ b/application/src/main/java/com/codbex/kronos/KronosApplication.java @@ -13,10 +13,10 @@ import org.apache.camel.opentelemetry.starter.CamelOpenTelemetry; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration; -import org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration; -import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; +import org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfiguration; +import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration; +import org.springframework.boot.jdbc.autoconfigure.DataSourceTransactionManagerAutoConfiguration; +import org.springframework.boot.jdbc.autoconfigure.JdbcTemplateAutoConfiguration; import org.springframework.context.annotation.ComponentScan; import org.springframework.data.jpa.repository.config.EnableJpaAuditing; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; diff --git a/pom.xml b/pom.xml index 0e725a4d4..d747fc419 100644 --- a/pom.xml +++ b/pom.xml @@ -126,6 +126,11 @@ spring-security-test test + + org.springframework.boot + spring-boot-jdbc-test + test + com.fasterxml.jackson.datatype jackson-datatype-joda diff --git a/xs/components/engine-hdb/pom.xml b/xs/components/engine-hdb/pom.xml index d19b1804e..095d3566a 100644 --- a/xs/components/engine-hdb/pom.xml +++ b/xs/components/engine-hdb/pom.xml @@ -139,7 +139,7 @@ org.testcontainers - junit-jupiter + testcontainers-junit-jupiter test diff --git a/xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBDD.java b/xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBDD.java index fdec37e57..84c9f3380 100644 --- a/xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBDD.java +++ b/xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBDD.java @@ -24,9 +24,6 @@ import jakarta.persistence.Table; import jakarta.persistence.Transient; -import org.hibernate.annotations.LazyCollection; -import org.hibernate.annotations.LazyCollectionOption; - import com.google.gson.annotations.Expose; /** @@ -46,20 +43,17 @@ public class HDBDD extends HDBDataStructure { private Long id; /** The tables. */ - @OneToMany(mappedBy = "hdbdd", fetch = FetchType.LAZY, cascade = CascadeType.ALL) - @LazyCollection(LazyCollectionOption.FALSE) + @OneToMany(mappedBy = "hdbdd", fetch = FetchType.EAGER, cascade = CascadeType.ALL) @Expose private List tables = new ArrayList(); /** The tables. */ - @OneToMany(mappedBy = "hdbdd", fetch = FetchType.LAZY, cascade = CascadeType.ALL) - @LazyCollection(LazyCollectionOption.FALSE) + @OneToMany(mappedBy = "hdbdd", fetch = FetchType.EAGER, cascade = CascadeType.ALL) @Expose private List tableTypes = new ArrayList(); /** The views. */ - @OneToMany(mappedBy = "hdbdd", fetch = FetchType.LAZY, cascade = CascadeType.ALL) - @LazyCollection(LazyCollectionOption.FALSE) + @OneToMany(mappedBy = "hdbdd", fetch = FetchType.EAGER, cascade = CascadeType.ALL) @Expose private List views = new ArrayList(); diff --git a/xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBSynonymGroup.java b/xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBSynonymGroup.java index 1a0acecc7..364b3b021 100644 --- a/xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBSynonymGroup.java +++ b/xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBSynonymGroup.java @@ -23,9 +23,6 @@ import jakarta.persistence.OneToMany; import jakarta.persistence.Table; -import org.hibernate.annotations.LazyCollection; -import org.hibernate.annotations.LazyCollectionOption; - import com.google.gson.annotations.Expose; /** @@ -45,8 +42,7 @@ public class HDBSynonymGroup extends HDBDataStructure { private Long id; /** The target. */ - @OneToMany(mappedBy = "group", fetch = FetchType.LAZY, cascade = CascadeType.ALL) - @LazyCollection(LazyCollectionOption.FALSE) + @OneToMany(mappedBy = "group", fetch = FetchType.EAGER, cascade = CascadeType.ALL) @Expose /** The synonym definitions. */ Map synonymDefinitions = new HashMap<>(); diff --git a/xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBTable.java b/xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBTable.java index 77973311a..ac67e3fd4 100644 --- a/xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBTable.java +++ b/xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBTable.java @@ -27,8 +27,6 @@ import jakarta.persistence.Table; import java.util.ArrayList; import java.util.List; -import org.hibernate.annotations.LazyCollection; -import org.hibernate.annotations.LazyCollectionOption; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; @@ -62,16 +60,14 @@ public class HDBTable extends HDBDataStructure { /** * The columns. */ - @OneToMany(mappedBy = "table", fetch = FetchType.LAZY, cascade = CascadeType.ALL) - @LazyCollection(LazyCollectionOption.FALSE) + @OneToMany(mappedBy = "table", fetch = FetchType.EAGER, cascade = CascadeType.ALL) @Expose private List columns = new ArrayList(); /** * The indexes. */ - @OneToMany(mappedBy = "table", fetch = FetchType.LAZY, cascade = CascadeType.ALL) - @LazyCollection(LazyCollectionOption.FALSE) + @OneToMany(mappedBy = "table", fetch = FetchType.EAGER, cascade = CascadeType.ALL) @Nullable @Expose private List indexes = new ArrayList(); diff --git a/xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBTableConstraints.java b/xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBTableConstraints.java index 8303fe3ec..0a9d944c5 100644 --- a/xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBTableConstraints.java +++ b/xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBTableConstraints.java @@ -26,8 +26,6 @@ import jakarta.persistence.Table; import java.util.ArrayList; import java.util.List; -import org.hibernate.annotations.LazyCollection; -import org.hibernate.annotations.LazyCollectionOption; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; @@ -51,22 +49,19 @@ public class HDBTableConstraints { private HDBTableConstraintPrimaryKey primaryKey; /** The foreign keys. */ - @OneToMany(mappedBy = "constraints", fetch = FetchType.LAZY, cascade = CascadeType.ALL) - @LazyCollection(LazyCollectionOption.FALSE) + @OneToMany(mappedBy = "constraints", fetch = FetchType.EAGER, cascade = CascadeType.ALL) @Nullable @Expose private List foreignKeys = new ArrayList(); /** The unique indices. */ - @OneToMany(mappedBy = "constraints", fetch = FetchType.LAZY, cascade = CascadeType.ALL) - @LazyCollection(LazyCollectionOption.FALSE) + @OneToMany(mappedBy = "constraints", fetch = FetchType.EAGER, cascade = CascadeType.ALL) @Nullable @Expose private List uniqueIndexes = new ArrayList(); /** The checks. */ - @OneToMany(mappedBy = "constraints", fetch = FetchType.LAZY, cascade = CascadeType.ALL) - @LazyCollection(LazyCollectionOption.FALSE) + @OneToMany(mappedBy = "constraints", fetch = FetchType.EAGER, cascade = CascadeType.ALL) @Nullable @Expose private List checks = new ArrayList(); diff --git a/xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBTableStructure.java b/xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBTableStructure.java index 6d7b8501d..93c29e5af 100644 --- a/xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBTableStructure.java +++ b/xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBTableStructure.java @@ -26,8 +26,6 @@ import jakarta.persistence.OneToOne; import java.util.ArrayList; import java.util.List; -import org.hibernate.annotations.LazyCollection; -import org.hibernate.annotations.LazyCollectionOption; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; @@ -54,8 +52,7 @@ public class HDBTableStructure extends HDBDataStructure { /** * The columns. */ - @OneToMany(mappedBy = "tableStructure", fetch = FetchType.LAZY, cascade = CascadeType.ALL) - @LazyCollection(LazyCollectionOption.FALSE) + @OneToMany(mappedBy = "tableStructure", fetch = FetchType.EAGER, cascade = CascadeType.ALL) @Expose private List columns = new ArrayList(); diff --git a/xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBTableType.java b/xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBTableType.java index 37f6d7697..5ceb06c38 100644 --- a/xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBTableType.java +++ b/xs/components/engine-hdb/src/main/java/com/codbex/kronos/engine/hdb/domain/HDBTableType.java @@ -26,8 +26,6 @@ import jakarta.persistence.OneToOne; import java.util.ArrayList; import java.util.List; -import org.hibernate.annotations.LazyCollection; -import org.hibernate.annotations.LazyCollectionOption; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; @@ -54,8 +52,7 @@ public class HDBTableType extends HDBDataStructure { /** * The columns. */ - @OneToMany(mappedBy = "tableType", fetch = FetchType.LAZY, cascade = CascadeType.ALL) - @LazyCollection(LazyCollectionOption.FALSE) + @OneToMany(mappedBy = "tableType", fetch = FetchType.EAGER, cascade = CascadeType.ALL) @Expose private List columns = new ArrayList(); diff --git a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbdd/HDBDDDataStructureParserTest.java b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbdd/HDBDDDataStructureParserTest.java index a0ae4a42a..a1b794911 100644 --- a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbdd/HDBDDDataStructureParserTest.java +++ b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbdd/HDBDDDataStructureParserTest.java @@ -22,8 +22,8 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.persistence.autoconfigure.EntityScan; +import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; diff --git a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbprocedure/HDBProcedureDataStructureParserTest.java b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbprocedure/HDBProcedureDataStructureParserTest.java index 7342a6c55..af088eedd 100644 --- a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbprocedure/HDBProcedureDataStructureParserTest.java +++ b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbprocedure/HDBProcedureDataStructureParserTest.java @@ -17,8 +17,8 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.persistence.autoconfigure.EntityScan; +import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; diff --git a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbprocedure/HDBProcedureProcessorTest.java b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbprocedure/HDBProcedureProcessorTest.java index b1fb4308d..0274c8efd 100644 --- a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbprocedure/HDBProcedureProcessorTest.java +++ b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbprocedure/HDBProcedureProcessorTest.java @@ -12,8 +12,8 @@ import org.junit.jupiter.api.Disabled; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.persistence.autoconfigure.EntityScan; +import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; diff --git a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbschema/HDBSchemaDataStructureParserTest.java b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbschema/HDBSchemaDataStructureParserTest.java index 025d4c36b..acd964e2e 100644 --- a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbschema/HDBSchemaDataStructureParserTest.java +++ b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbschema/HDBSchemaDataStructureParserTest.java @@ -16,8 +16,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.persistence.autoconfigure.EntityScan; +import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; diff --git a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbschema/HDBSchemaProcessorTest.java b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbschema/HDBSchemaProcessorTest.java index 077a629e8..a5d157cfb 100644 --- a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbschema/HDBSchemaProcessorTest.java +++ b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbschema/HDBSchemaProcessorTest.java @@ -28,8 +28,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.*; import org.mockito.junit.jupiter.MockitoExtension; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.persistence.autoconfigure.EntityScan; +import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; diff --git a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbsequence/HDBSequenceDataStructureParserTest.java b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbsequence/HDBSequenceDataStructureParserTest.java index c28c227ec..18f76431a 100644 --- a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbsequence/HDBSequenceDataStructureParserTest.java +++ b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbsequence/HDBSequenceDataStructureParserTest.java @@ -17,8 +17,8 @@ import java.nio.charset.StandardCharsets; import org.junit.jupiter.api.Test; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.persistence.autoconfigure.EntityScan; +import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; diff --git a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbsequence/HDBSequenceProcessorsTest.java b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbsequence/HDBSequenceProcessorsTest.java index f183a12b1..e299c87f3 100644 --- a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbsequence/HDBSequenceProcessorsTest.java +++ b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbsequence/HDBSequenceProcessorsTest.java @@ -33,8 +33,8 @@ import org.junit.jupiter.api.Test; import org.mockito.*; import org.mockito.stubbing.Answer; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.persistence.autoconfigure.EntityScan; +import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; diff --git a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbstructure/HDBTableStructureDataStructureParserTest.java b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbstructure/HDBTableStructureDataStructureParserTest.java index e3f179475..a9513f24d 100644 --- a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbstructure/HDBTableStructureDataStructureParserTest.java +++ b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbstructure/HDBTableStructureDataStructureParserTest.java @@ -22,8 +22,8 @@ import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.persistence.autoconfigure.EntityScan; +import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; diff --git a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbsynonym/HDBSynonymDataStructureParserTest.java b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbsynonym/HDBSynonymDataStructureParserTest.java index 2e0fae300..b33bde349 100644 --- a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbsynonym/HDBSynonymDataStructureParserTest.java +++ b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbsynonym/HDBSynonymDataStructureParserTest.java @@ -17,8 +17,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.MockitoAnnotations; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.persistence.autoconfigure.EntityScan; +import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; diff --git a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbsynonym/HDBSynonymProcessorTest.java b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbsynonym/HDBSynonymProcessorTest.java index 650a5a242..73664e080 100644 --- a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbsynonym/HDBSynonymProcessorTest.java +++ b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbsynonym/HDBSynonymProcessorTest.java @@ -29,8 +29,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.*; import org.mockito.junit.jupiter.MockitoExtension; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.persistence.autoconfigure.EntityScan; +import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; diff --git a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtable/HDBTableAlterHandlerTest.java b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtable/HDBTableAlterHandlerTest.java index 6bf8e00f2..3e017a048 100644 --- a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtable/HDBTableAlterHandlerTest.java +++ b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtable/HDBTableAlterHandlerTest.java @@ -28,8 +28,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.*; import org.mockito.junit.jupiter.MockitoExtension; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.persistence.autoconfigure.EntityScan; +import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; diff --git a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtable/HDBTableDataStructureParserTest.java b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtable/HDBTableDataStructureParserTest.java index faf890732..17caf92a1 100644 --- a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtable/HDBTableDataStructureParserTest.java +++ b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtable/HDBTableDataStructureParserTest.java @@ -33,8 +33,8 @@ import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.persistence.autoconfigure.EntityScan; +import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; diff --git a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtable/HDBTableProcessorsTest.java b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtable/HDBTableProcessorsTest.java index b1d0d14ea..2f003e91c 100644 --- a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtable/HDBTableProcessorsTest.java +++ b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtable/HDBTableProcessorsTest.java @@ -24,8 +24,8 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.persistence.autoconfigure.EntityScan; +import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; diff --git a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtablefunction/HDBTableFunctionDataStructureParserTest.java b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtablefunction/HDBTableFunctionDataStructureParserTest.java index 67ab659ad..579a89021 100644 --- a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtablefunction/HDBTableFunctionDataStructureParserTest.java +++ b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtablefunction/HDBTableFunctionDataStructureParserTest.java @@ -22,8 +22,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.persistence.autoconfigure.EntityScan; +import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; diff --git a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtablefunction/HDBTableFunctionProcessorTest.java b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtablefunction/HDBTableFunctionProcessorTest.java index bde8b00a4..d4eb9557a 100644 --- a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtablefunction/HDBTableFunctionProcessorTest.java +++ b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtablefunction/HDBTableFunctionProcessorTest.java @@ -29,8 +29,8 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.mockito.*; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.persistence.autoconfigure.EntityScan; +import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; diff --git a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtabletype/HDBTableTypeDataStructureParserTest.java b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtabletype/HDBTableTypeDataStructureParserTest.java index 0b8099b22..7e11431e5 100644 --- a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtabletype/HDBTableTypeDataStructureParserTest.java +++ b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtabletype/HDBTableTypeDataStructureParserTest.java @@ -20,8 +20,8 @@ import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.persistence.autoconfigure.EntityScan; +import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; diff --git a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtabletype/HDBTableTypeDropProcessorTest.java b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtabletype/HDBTableTypeDropProcessorTest.java index 1937eef78..44777cea2 100644 --- a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtabletype/HDBTableTypeDropProcessorTest.java +++ b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbtabletype/HDBTableTypeDropProcessorTest.java @@ -21,8 +21,8 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.mockito.*; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.persistence.autoconfigure.EntityScan; +import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; diff --git a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbview/HDBViewDataStructureParserTest.java b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbview/HDBViewDataStructureParserTest.java index 89f481da3..aa3cb3bd3 100644 --- a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbview/HDBViewDataStructureParserTest.java +++ b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbview/HDBViewDataStructureParserTest.java @@ -16,8 +16,8 @@ import java.nio.charset.StandardCharsets; import org.junit.jupiter.api.Test; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.persistence.autoconfigure.EntityScan; +import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; diff --git a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbview/HDBViewProcessorTest.java b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbview/HDBViewProcessorTest.java index 3dd7ab55c..d3f74770c 100644 --- a/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbview/HDBViewProcessorTest.java +++ b/xs/components/engine-hdb/src/test/java/com/codbex/kronos/engine/hdb/parser/hdbview/HDBViewProcessorTest.java @@ -32,8 +32,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.*; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.persistence.autoconfigure.EntityScan; +import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; diff --git a/xs/components/engine-xsjob/src/test/java/com/codbex/kronos/xsjob/JobTransformerTest.java b/xs/components/engine-xsjob/src/test/java/com/codbex/kronos/xsjob/JobTransformerTest.java index 34580a977..f1b1da375 100644 --- a/xs/components/engine-xsjob/src/test/java/com/codbex/kronos/xsjob/JobTransformerTest.java +++ b/xs/components/engine-xsjob/src/test/java/com/codbex/kronos/xsjob/JobTransformerTest.java @@ -24,10 +24,11 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; +import org.springframework.boot.persistence.autoconfigure.EntityScan; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Import; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.scheduling.annotation.EnableScheduling; @@ -42,6 +43,7 @@ @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE) @ComponentScan(basePackages = {"org.eclipse.dirigible.components", "com.codbex.kronos"}) @EntityScan(value = {"org.eclipse.dirigible.components", "com.codbex.kronos"}) +@Import(TestConfig.class) @Transactional @ExtendWith(MockitoExtension.class) public class JobTransformerTest { diff --git a/xs/components/engine-xsjob/src/test/java/com/codbex/kronos/xsjob/TestConfig.java b/xs/components/engine-xsjob/src/test/java/com/codbex/kronos/xsjob/TestConfig.java index 141abd4b9..405b637d5 100644 --- a/xs/components/engine-xsjob/src/test/java/com/codbex/kronos/xsjob/TestConfig.java +++ b/xs/components/engine-xsjob/src/test/java/com/codbex/kronos/xsjob/TestConfig.java @@ -17,7 +17,6 @@ import org.eclipse.dirigible.components.base.tenant.TenantContext; import org.mockito.Mockito; import org.springframework.boot.test.context.TestConfiguration; -import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Bean; @TestConfiguration @@ -31,7 +30,9 @@ TenantContext createTenantContext() { return context; } - @MockBean + @Bean @DefaultTenant - private Tenant defaultTenant; + Tenant defaultTenant() { + return Mockito.mock(Tenant.class); + } } diff --git a/xs/components/engine-xsjs/src/test/java/com/codbex/kronos/TestConfig.java b/xs/components/engine-xsjs/src/test/java/com/codbex/kronos/TestConfig.java index 31a81ce5a..1504f67b5 100644 --- a/xs/components/engine-xsjs/src/test/java/com/codbex/kronos/TestConfig.java +++ b/xs/components/engine-xsjs/src/test/java/com/codbex/kronos/TestConfig.java @@ -17,8 +17,8 @@ import org.eclipse.dirigible.components.base.tenant.TenantContext; import org.mockito.Mockito; import org.springframework.boot.test.context.TestConfiguration; -import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Bean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; @TestConfiguration public class TestConfig { @@ -31,7 +31,7 @@ TenantContext createTenantContext() { return context; } - @MockBean + @MockitoBean @DefaultTenant private Tenant defaultTenant; } From 463e3608e06273210ff7ab3ed24052d063a28152 Mon Sep 17 00:00:00 2001 From: Iliyan Velichkov Date: Fri, 5 Jun 2026 16:11:26 +0300 Subject: [PATCH 3/4] Bump codbex-platform-parent to 13.1.0 13.1.0 brings Eclipse Dirigible 13.1.0 (with the adapted SecurityIT) and keeps Spring Boot 4.0.6 / Testcontainers 2.0.5, so the Dirigible 13 / Spring Boot 4 adaptations remain valid. Full reactor compiles and all unit tests pass. Co-Authored-By: Claude Opus 4.8 (1M context) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d747fc419..6cde3643e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.codbex.platform codbex-platform-parent - 13.0.0 + 13.1.0 codbex - kronos - parent From ec1269ff32bfcdad61abbd89979958f5befe8c6e Mon Sep 17 00:00:00 2001 From: Iliyan Velichkov Date: Fri, 5 Jun 2026 20:22:48 +0300 Subject: [PATCH 4/4] Scan org.eclipse.dirigible.engine for JPA entities Dirigible 13 routes the synchronization chain through the new dirigible-components-engine-java module, whose JavaFile entity lives under org.eclipse.dirigible.engine.java.domain. The app's dirigible.scan.packages override only listed org.eclipse.dirigible.components and com.codbex.kronos, so the system EntityManagerFactory did not manage JavaFile, failing the application context with "Not a managed type: ...JavaFile" (KronosApplicationTest and the integration tests). Add org.eclipse.dirigible.engine to the scan packages, matching Dirigible's own default (org.eclipse.dirigible.components,org.eclipse.dirigible.engine). Co-Authored-By: Claude Opus 4.8 (1M context) --- .../src/main/resources/application-app-default.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/main/resources/application-app-default.properties b/application/src/main/resources/application-app-default.properties index 0672df705..9f69fb532 100644 --- a/application/src/main/resources/application-app-default.properties +++ b/application/src/main/resources/application-app-default.properties @@ -1,2 +1,2 @@ server.port=80 -dirigible.scan.packages=org.eclipse.dirigible.components,com.codbex.kronos +dirigible.scan.packages=org.eclipse.dirigible.components,org.eclipse.dirigible.engine,com.codbex.kronos