Skip to content

Commit 087445a

Browse files
dieppadieppa
authored
Merge branch 'develop' into features/flamingock-test-support-audit-sequence-strict-validator
2 parents c8a46a7 + 6b8ce79 commit 087445a

File tree

19 files changed

+118
-50
lines changed

19 files changed

+118
-50
lines changed

‎.github/workflows/github-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- name: Publish Release to Github
4646
run: ./gradlew jreleaserRelease --stacktrace --no-daemon
4747
env:
48-
JAVA_TOOL_OPTIONS: "-Xmx5g"
48+
JAVA_TOOL_OPTIONS: "-Xmx7g"
4949
JRELEASER_GITHUB_TOKEN: ${{ secrets.FLAMINGOCK_JRELEASER_GITHUB_TOKEN }}
5050
JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PUBLIC_KEY }}
5151
JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}

‎.github/workflows/release.yml‎

Lines changed: 57 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,58 @@ jobs:
396396
FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
397397
FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
398398

399+
mongock-support:
400+
needs: [ build ]
401+
uses: ./.github/workflows/module-release-graalvm.yml
402+
with:
403+
module: mongock-support
404+
secrets:
405+
FLAMINGOCK_JRELEASER_GITHUB_TOKEN: ${{ secrets.FLAMINGOCK_JRELEASER_GITHUB_TOKEN }}
406+
FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME }}
407+
FLAMINGOCK_JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_PASSWORD }}
408+
FLAMINGOCK_JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PUBLIC_KEY }}
409+
FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
410+
FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
411+
412+
mongock-importer-mongodb:
413+
needs: [ build ]
414+
uses: ./.github/workflows/module-release-graalvm.yml
415+
with:
416+
module: mongock-importer-mongodb
417+
secrets:
418+
FLAMINGOCK_JRELEASER_GITHUB_TOKEN: ${{ secrets.FLAMINGOCK_JRELEASER_GITHUB_TOKEN }}
419+
FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME }}
420+
FLAMINGOCK_JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_PASSWORD }}
421+
FLAMINGOCK_JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PUBLIC_KEY }}
422+
FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
423+
FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
424+
425+
mongock-importer-dynamodb:
426+
needs: [ build ]
427+
uses: ./.github/workflows/module-release-graalvm.yml
428+
with:
429+
module: mongock-importer-dynamodb
430+
secrets:
431+
FLAMINGOCK_JRELEASER_GITHUB_TOKEN: ${{ secrets.FLAMINGOCK_JRELEASER_GITHUB_TOKEN }}
432+
FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME }}
433+
FLAMINGOCK_JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_PASSWORD }}
434+
FLAMINGOCK_JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PUBLIC_KEY }}
435+
FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
436+
FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
437+
438+
mongock-importer-couchbase:
439+
needs: [ build ]
440+
uses: ./.github/workflows/module-release-graalvm.yml
441+
with:
442+
module: mongock-importer-couchbase
443+
secrets:
444+
FLAMINGOCK_JRELEASER_GITHUB_TOKEN: ${{ secrets.FLAMINGOCK_JRELEASER_GITHUB_TOKEN }}
445+
FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME }}
446+
FLAMINGOCK_JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_PASSWORD }}
447+
FLAMINGOCK_JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PUBLIC_KEY }}
448+
FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
449+
FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
450+
399451
github-release:
400452
needs: [
401453
flamingock-core,
@@ -424,7 +476,11 @@ jobs:
424476
mongodb-util,
425477
dynamodb-util,
426478
couchbase-util,
427-
sql-util
479+
sql-util,
480+
mongock-support,
481+
mongock-importer-mongodb,
482+
mongock-importer-dynamodb,
483+
mongock-importer-couchbase
428484
]
429485
uses: ./.github/workflows/github-release.yml
430486
secrets:

‎buildSrc/src/main/kotlin/flamingock.project-structure.gradle.kts‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,14 @@ val utilProjects = setOf(
5353
"sql-util"
5454
)
5555

56-
val allProjects = coreProjects + cloudProjects + communityProjects + pluginProjects + targetSystemProjects + templateProjects + utilProjects
56+
val legacyProjects = setOf(
57+
"mongock-support",
58+
"mongock-importer-mongodb",
59+
"mongock-importer-dynamodb",
60+
"mongock-importer-couchbase"
61+
)
62+
63+
val allProjects = coreProjects + cloudProjects + communityProjects + pluginProjects + targetSystemProjects + templateProjects + utilProjects + legacyProjects
5764

5865
// Project classification utilities
5966
fun Project.isBomModule(): Boolean = name.endsWith("-bom")
@@ -68,6 +75,7 @@ fun Project.getProjectCategory(): String? = when (name) {
6875
in targetSystemProjects -> "targetSystems"
6976
in templateProjects -> "templates"
7077
in utilProjects -> "utils"
78+
in legacyProjects -> "legacy"
7179
else -> null
7280
}
7381

@@ -80,6 +88,7 @@ fun getProjectsForBundle(bundle: String?): Set<String> = when (bundle) {
8088
"targetSystems" -> targetSystemProjects
8189
"templates" -> templateProjects
8290
"utils" -> utilProjects
91+
"legacy" -> legacyProjects
8392
"all" -> allProjects
8493
else -> setOf()
8594
}
@@ -92,6 +101,7 @@ extra["pluginProjects"] = pluginProjects
92101
extra["targetSystemProjects"] = targetSystemProjects
93102
extra["templateProjects"] = templateProjects
94103
extra["utilProjects"] = utilProjects
104+
extra["legacyProjects"] = legacyProjects
95105
extra["allProjects"] = allProjects
96106

97107
// Apply appropriate plugins based on project type

‎buildSrc/src/main/kotlin/flamingock.release-management.gradle.kts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ val projectsToRelease = if (module != null) {
3333
val targetSystemProjects = project.extra["targetSystemProjects"] as Set<String>
3434
val templateProjects = project.extra["templateProjects"] as Set<String>
3535
val utilProjects = project.extra["utilProjects"] as Set<String>
36+
val legacyProjects = project.extra["legacyProjects"] as Set<String>
3637

3738
when (releaseBundle) {
3839
"core" -> coreProjects
@@ -42,6 +43,7 @@ val projectsToRelease = if (module != null) {
4243
"targetSystems" -> targetSystemProjects
4344
"templates" -> templateProjects
4445
"utils" -> utilProjects
46+
"legacy" -> legacyProjects
4547
"all" -> allProjects
4648
else -> setOf()
4749
}

‎cli/flamingock-cli/build.gradle.kts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,16 @@ dependencies {
5050
testImplementation("org.mockito:mockito-core:5.8.0")
5151
testImplementation("org.mockito:mockito-junit-jupiter:5.8.0")
5252
testImplementation("org.assertj:assertj-core:3.24.2")
53-
testImplementation("org.testcontainers:junit-jupiter:1.19.3")
54-
testImplementation("org.testcontainers:mongodb:1.19.3")
55-
testImplementation("org.testcontainers:couchbase:1.19.3")
53+
testImplementation("org.testcontainers:testcontainers-junit-jupiter:2.0.2")
54+
testImplementation("org.testcontainers:testcontainers-mongodb:2.0.2")
55+
testImplementation("org.testcontainers:testcontainers-couchbase:2.0.2")
5656
testImplementation("com.github.stefanbirkner:system-lambda:1.2.1")
5757
// SQL Testcontainers
58-
testImplementation("org.testcontainers:mysql:1.19.3")
59-
testImplementation("org.testcontainers:mssqlserver:1.19.3")
60-
testImplementation("org.testcontainers:oracle-xe:1.19.3")
61-
testImplementation("org.testcontainers:postgresql:1.19.3")
62-
testImplementation("org.testcontainers:mariadb:1.19.3")
58+
testImplementation("org.testcontainers:testcontainers-mysql:2.0.2")
59+
testImplementation("org.testcontainers:testcontainers-mssqlserver:2.0.2")
60+
testImplementation("org.testcontainers:testcontainers-oracle-xe:2.0.2")
61+
testImplementation("org.testcontainers:testcontainers-postgresql:2.0.2")
62+
testImplementation("org.testcontainers:testcontainers-mariadb:2.0.2")
6363

6464
}
6565

‎community/flamingock-auditstore-couchbase/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ dependencies {
55

66
compileOnly("com.couchbase.client:java-client:3.6.0")
77

8-
testImplementation("org.testcontainers:couchbase:1.21.3")
9-
testImplementation("org.testcontainers:junit-jupiter:1.21.3")
8+
testImplementation("org.testcontainers:testcontainers-couchbase:2.0.2")
9+
testImplementation("org.testcontainers:testcontainers-junit-jupiter:2.0.2")
1010
}
1111

1212
description = "Couchbase audit store implementation for distributed change auditing"

‎community/flamingock-auditstore-dynamodb/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ dependencies {
1111
testImplementation(project(":core:target-systems:nontransactional-target-system"))
1212

1313
testImplementation("software.amazon.awssdk:url-connection-client:2.24.11")
14-
testImplementation("org.testcontainers:junit-jupiter:1.19.0")
15-
testImplementation("org.testcontainers:testcontainers:1.19.0")
14+
testImplementation("org.testcontainers:testcontainers-junit-jupiter:2.0.2")
15+
testImplementation("org.testcontainers:testcontainers:2.0.2")
1616

1717
// Mongock
1818
testImplementation("io.mongock:mongock-standalone:5.5.0")

‎community/flamingock-auditstore-mongodb-sync/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ dependencies {
1313
testImplementation(project(":utils:test-util"))
1414
testImplementation(project(":core:target-systems:nontransactional-target-system"))
1515
testImplementation(project(":e2e:core-e2e"))
16-
testImplementation("org.testcontainers:mongodb:1.18.3")
17-
testImplementation("org.testcontainers:junit-jupiter:1.18.3")
16+
testImplementation("org.testcontainers:testcontainers-mongodb:2.0.2")
17+
testImplementation("org.testcontainers:testcontainers-junit-jupiter:2.0.2")
1818
testImplementation("org.mockito:mockito-inline:4.11.0")
1919

2020
testImplementation("io.mongock:mongock-standalone:5.5.0")

‎community/flamingock-auditstore-sql/build.gradle.kts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ dependencies {
1010
testImplementation("com.oracle.database.jdbc:ojdbc8:21.9.0.0")
1111
testImplementation("org.postgresql:postgresql:42.7.3")
1212
testImplementation("org.mariadb.jdbc:mariadb-java-client:3.3.2")
13-
testImplementation("org.testcontainers:mysql:1.21.3")
14-
testImplementation("org.testcontainers:mssqlserver:1.21.3")
15-
testImplementation("org.testcontainers:oracle-xe:1.21.3")
16-
testImplementation("org.testcontainers:postgresql:1.21.3")
17-
testImplementation("org.testcontainers:mariadb:1.21.3")
13+
testImplementation("org.testcontainers:testcontainers-mysql:2.0.2")
14+
testImplementation("org.testcontainers:testcontainers-mssqlserver:2.0.2")
15+
testImplementation("org.testcontainers:testcontainers-oracle-xe:2.0.2")
16+
testImplementation("org.testcontainers:testcontainers-postgresql:2.0.2")
17+
testImplementation("org.testcontainers:testcontainers-mariadb:2.0.2")
1818
testImplementation(project(":utils:test-util"))
1919
testImplementation("com.zaxxer:HikariCP:3.4.5")
20-
testImplementation("org.testcontainers:junit-jupiter:1.21.3")
20+
testImplementation("org.testcontainers:testcontainers-junit-jupiter:2.0.2")
2121
testImplementation("com.h2database:h2:2.2.224")
2222
testImplementation("org.mockito:mockito-inline:4.11.0")
2323
testImplementation("org.xerial:sqlite-jdbc:3.41.2.1")

‎core/target-systems/couchbase-target-system/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ dependencies {
1010
compileOnly("com.couchbase.client:java-client:3.6.0")
1111

1212
//Test
13-
testImplementation("org.testcontainers:couchbase:1.21.3")
14-
testImplementation("org.testcontainers:junit-jupiter:1.21.3")
13+
testImplementation("org.testcontainers:testcontainers-couchbase:2.0.2")
14+
testImplementation("org.testcontainers:testcontainers-junit-jupiter:2.0.2")
1515

1616
testImplementation(project(":cloud:flamingock-cloud"))
1717
testImplementation(project(":utils:test-util"))

0 commit comments

Comments
 (0)