chore(merge): release-10.2.0 into dev

bonitasoft · Oct 4, 2024 · 4f664a6 · 4f664a6
2 parents b3f1c93 + e377395
commit 4f664a6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/...Src/src/main/groovy/org/bonitasoft/engine/gradle/docker/DatabaseExtraConfiguration.groovy b/...Src/src/main/groovy/org/bonitasoft/engine/gradle/docker/DatabaseExtraConfiguration.groovy
@@ -6,9 +6,9 @@ import org.gradle.api.Project
 @Canonical
 class DatabaseExtraConfiguration {
     /**
-     * Include an additional module in the test classpath
+     * Include an additional project in the test classpath
      */
-    Project includeTestModule
+    Project includeTestProject
     /**
      * Excludes test class patterns (e.g. '**&#47;*Test.class') applied to this database vendor.
      * It can be combined with {@link #excludeTags}.

diff --git a/...ain/groovy/org/bonitasoft/engine/gradle/docker/DockerDatabaseContainerTasksCreator.groovy b/...ain/groovy/org/bonitasoft/engine/gradle/docker/DockerDatabaseContainerTasksCreator.groovy
@@ -140,9 +140,9 @@ class DockerDatabaseContainerTasksCreator {
                 description = "Runs slow integration test suite on $vendor.name database."
                 systemProperty "bonita.version", project.version
                 jvmArgs += ['--add-opens', 'java.base/java.util=ALL-UNNAMED', '--add-opens', 'java.base/java.lang=ALL-UNNAMED', '-Dfile.encoding=UTF-8']
-                if (extension."${vendor.name}"?.includeTestModule) {
-                    testClassesDirs += extension."${vendor.name}".includeTestModule.sourceSets.test.output.classesDirs
-                    classpath += extension."${vendor.name}".includeTestModule.sourceSets.test.runtimeClasspath
+                if (extension."${vendor.name}"?.includeTestProject) {
+                    testClassesDirs += extension."${vendor.name}".includeTestProject.sourceSets.test.output.classesDirs
+                    classpath += extension."${vendor.name}".includeTestProject.sourceSets.test.runtimeClasspath
                 }
                 classpath += project.files(project.configurations.drivers)
                 if (extension."${vendor.name}"?.excludes) {

diff --git a/...a-scheduler/src/test/java/org/bonitasoft/engine/scheduler/impl/AbstractQuartzJobTest.java b/...a-scheduler/src/test/java/org/bonitasoft/engine/scheduler/impl/AbstractQuartzJobTest.java
@@ -52,7 +52,7 @@ public void before() {
     @Test
     public void should_not_unschedule_job_on_exception() throws Exception {
         // job should never throw an exception and be handled by the JobWrapper
-        // we do not unschedule the job in that case. we don't want to loose the job
+        // we do not unschedule the job in that case. we don't want to lose the job
         doReturn(jobThatFails()).when(schedulerService).getPersistedJob(any());
 
         try {