Skip to content

Commit 81b11a2

Browse files
bercianorbercianor
authored
fix: an error in the jReleaser configuration (#715)
* fix: an error in the jReleaser configuration * fix: update artifacts to deploy list * fix: quick fix * fix: change transactioners bundle to targetSystems * fix: add flamingock-importer again * fix: quick fix
1 parent 76e05a8 commit 81b11a2

File tree

6 files changed

+67
-103
lines changed

6 files changed

+67
-103
lines changed

‎.github/workflows/release.yml‎

Lines changed: 39 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,11 @@ jobs:
161161
FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
162162
FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
163163

164-
flamingock-auditstore-mongodb-springdata:
164+
flamingock-auditstore-couchbase:
165165
needs: [ build ]
166166
uses: ./.github/workflows/module-release-graalvm.yml
167167
with:
168-
module: flamingock-auditstore-mongodb-springdata
168+
module: flamingock-auditstore-couchbase
169169
secrets:
170170
FLAMINGOCK_JRELEASER_GITHUB_TOKEN: ${{ secrets.FLAMINGOCK_JRELEASER_GITHUB_TOKEN }}
171171
FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME }}
@@ -174,11 +174,11 @@ jobs:
174174
FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
175175
FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
176176

177-
flamingock-auditstore-couchbase:
177+
flamingock-auditstore-dynamodb:
178178
needs: [ build ]
179179
uses: ./.github/workflows/module-release-graalvm.yml
180180
with:
181-
module: flamingock-auditstore-couchbase
181+
module: flamingock-auditstore-dynamodb
182182
secrets:
183183
FLAMINGOCK_JRELEASER_GITHUB_TOKEN: ${{ secrets.FLAMINGOCK_JRELEASER_GITHUB_TOKEN }}
184184
FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME }}
@@ -187,11 +187,11 @@ jobs:
187187
FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
188188
FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
189189

190-
flamingock-auditstore-dynamodb:
190+
flamingock-importer:
191191
needs: [ build ]
192192
uses: ./.github/workflows/module-release-graalvm.yml
193193
with:
194-
module: flamingock-auditstore-dynamodb
194+
module: flamingock-importer
195195
secrets:
196196
FLAMINGOCK_JRELEASER_GITHUB_TOKEN: ${{ secrets.FLAMINGOCK_JRELEASER_GITHUB_TOKEN }}
197197
FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME }}
@@ -200,11 +200,11 @@ jobs:
200200
FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
201201
FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
202202

203-
flamingock-importer:
203+
flamingock-springboot-integration:
204204
needs: [ build ]
205205
uses: ./.github/workflows/module-release-graalvm.yml
206206
with:
207-
module: flamingock-importer
207+
module: flamingock-springboot-integration
208208
secrets:
209209
FLAMINGOCK_JRELEASER_GITHUB_TOKEN: ${{ secrets.FLAMINGOCK_JRELEASER_GITHUB_TOKEN }}
210210
FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME }}
@@ -213,11 +213,11 @@ jobs:
213213
FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
214214
FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
215215

216-
flamingock-springboot-integration:
216+
nontransactional-target-system:
217217
needs: [ build ]
218218
uses: ./.github/workflows/module-release-graalvm.yml
219219
with:
220-
module: flamingock-springboot-integration
220+
module: nontransactional-target-system
221221
secrets:
222222
FLAMINGOCK_JRELEASER_GITHUB_TOKEN: ${{ secrets.FLAMINGOCK_JRELEASER_GITHUB_TOKEN }}
223223
FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME }}
@@ -226,11 +226,11 @@ jobs:
226226
FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
227227
FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
228228

229-
sql-target-system:
229+
mongodb-sync-target-system:
230230
needs: [ build ]
231231
uses: ./.github/workflows/module-release-graalvm.yml
232232
with:
233-
module: sql-target-system
233+
module: mongodb-sync-target-system
234234
secrets:
235235
FLAMINGOCK_JRELEASER_GITHUB_TOKEN: ${{ secrets.FLAMINGOCK_JRELEASER_GITHUB_TOKEN }}
236236
FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME }}
@@ -239,11 +239,11 @@ jobs:
239239
FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
240240
FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
241241

242-
mongodb-sync-target-system:
242+
mongodb-springdata-target-system:
243243
needs: [ build ]
244244
uses: ./.github/workflows/module-release-graalvm.yml
245245
with:
246-
module: mongodb-sync-target-system
246+
module: mongodb-springdata-target-system
247247
secrets:
248248
FLAMINGOCK_JRELEASER_GITHUB_TOKEN: ${{ secrets.FLAMINGOCK_JRELEASER_GITHUB_TOKEN }}
249249
FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME }}
@@ -252,11 +252,11 @@ jobs:
252252
FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
253253
FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
254254

255-
dynamodb-transactioner:
255+
sql-target-system:
256256
needs: [ build ]
257257
uses: ./.github/workflows/module-release-graalvm.yml
258258
with:
259-
module: dynamodb-transactioner
259+
module: sql-target-system
260260
secrets:
261261
FLAMINGOCK_JRELEASER_GITHUB_TOKEN: ${{ secrets.FLAMINGOCK_JRELEASER_GITHUB_TOKEN }}
262262
FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME }}
@@ -265,11 +265,11 @@ jobs:
265265
FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
266266
FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
267267

268-
flamingock-sql-template:
268+
dynamodb-target-system:
269269
needs: [ build ]
270270
uses: ./.github/workflows/module-release-graalvm.yml
271271
with:
272-
module: flamingock-sql-template
272+
module: dynamodb-target-system
273273
secrets:
274274
FLAMINGOCK_JRELEASER_GITHUB_TOKEN: ${{ secrets.FLAMINGOCK_JRELEASER_GITHUB_TOKEN }}
275275
FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME }}
@@ -278,11 +278,11 @@ jobs:
278278
FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
279279
FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
280280

281-
flamingock-mongodb-sync-template:
281+
couchbase-target-system:
282282
needs: [ build ]
283283
uses: ./.github/workflows/module-release-graalvm.yml
284284
with:
285-
module: flamingock-mongodb-sync-template
285+
module: couchbase-target-system
286286
secrets:
287287
FLAMINGOCK_JRELEASER_GITHUB_TOKEN: ${{ secrets.FLAMINGOCK_JRELEASER_GITHUB_TOKEN }}
288288
FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME }}
@@ -343,51 +343,20 @@ jobs:
343343
FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
344344
FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
345345

346-
# run-examples-with-released-version:
347-
# needs: [
348-
# flamingock-core,
349-
# flamingock-core-commons,
350-
# flamingock-core-api,
351-
# flamingock-processor,
352-
# flamingock-graalvm,
353-
# flamingock-cloud,
354-
# flamingock-cloud-bom,
355-
# flamingock-community,
356-
# flamingock-community-bom,
357-
# flamingock-auditstore-mongodb-sync,
358-
# flamingock-auditstore-mongodb-springdata,
359-
# flamingock-auditstore-couchbase,
360-
# flamingock-auditstore-dynamodb,
361-
# flamingock-importer,
362-
# flamingock-springboot-integration,
363-
# sql-target-system,
364-
# mongodb-sync-target-system,
365-
# dynamodb-transactioner,
366-
# flamingock-sql-template,
367-
# flamingock-mongodb-sync-template,
368-
# general-util,
369-
# test-util,
370-
# mongodb-util,
371-
# dynamodb-util
372-
# ]
373-
# runs-on: ubuntu-latest
374-
# continue-on-error: true
375-
# steps:
376-
# - name: Checkout flamingock-examples repository
377-
# uses: actions/checkout@v3
378-
# with:
379-
# repository: flamingock/flamingock-examples # Checkout flamingock-examples repo
380-
# ref: master # Use the master branch of flamingock-examples
381-
# - name: Setup java
382-
# uses: actions/setup-java@v3
383-
# with:
384-
# distribution: 'temurin'
385-
# java-version: '17'
386-
# - name: Run Gradle build on flamingock-examples
387-
# run: ./misc/buildAll.sh
346+
couchbase-util:
347+
needs: [ build ]
348+
uses: ./.github/workflows/module-release-graalvm.yml
349+
with:
350+
module: couchbase-util
351+
secrets:
352+
FLAMINGOCK_JRELEASER_GITHUB_TOKEN: ${{ secrets.FLAMINGOCK_JRELEASER_GITHUB_TOKEN }}
353+
FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME }}
354+
FLAMINGOCK_JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_PASSWORD }}
355+
FLAMINGOCK_JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PUBLIC_KEY }}
356+
FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
357+
FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
388358

389359
github-release:
390-
# needs: [run-examples-with-released-version]
391360
needs: [
392361
flamingock-core,
393362
flamingock-core-commons,
@@ -399,20 +368,21 @@ jobs:
399368
flamingock-community,
400369
flamingock-community-bom,
401370
flamingock-auditstore-mongodb-sync,
402-
flamingock-auditstore-mongodb-springdata,
403371
flamingock-auditstore-couchbase,
404372
flamingock-auditstore-dynamodb,
405373
flamingock-importer,
406374
flamingock-springboot-integration,
407-
sql-target-system,
375+
nontransactional-target-system,
408376
mongodb-sync-target-system,
409-
dynamodb-transactioner,
410-
flamingock-sql-template,
411-
flamingock-mongodb-sync-template,
377+
mongodb-springdata-target-system,
378+
sql-target-system,
379+
dynamodb-target-system,
380+
couchbase-target-system,
412381
general-util,
413382
test-util,
414383
mongodb-util,
415-
dynamodb-util
384+
dynamodb-util,
385+
couchbase-util
416386
]
417387
uses: ./.github/workflows/github-release.yml
418388
secrets:
@@ -422,17 +392,3 @@ jobs:
422392
FLAMINGOCK_JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PUBLIC_KEY }}
423393
FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
424394
FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
425-
# test-examples:
426-
# needs: [ flamingock-core,flamingock-core-api,flamingock-core-commons,flamingock-springboot-v2-integration,flamingock-springboot-v3-integration,utils,driver-common,couchbase-driver,couchbase-springboot-v2-driver,flamingock-auditstore-dynamodb,mongodb-util,flamingock-auditstore-mongodb-springdata-v2,flamingock-auditstore-mongodb-springdata-v3,flamingock-auditstore-mongodb-springdata-v4,flamingock-auditstore-mongodb-sync,flamingock-ce-mongodb-v3,flamingock-sql-template,sql-target-system ]
427-
# run: |
428-
# curl -X POST \
429-
# -H "Accept: application/vnd.github+json" \
430-
# -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
431-
# https://api.github.com/repos/mongock/flamingock-examples/dispatches \
432-
433-
# - name: Synchronizing develop branch
434-
# run: |
435-
# git pull origin
436-
# git checkout develop
437-
# git merge -X theirs master --allow-unrelated-histories
438-
# git push origin develop

‎build.gradle.kts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,16 @@ plugins {
1616

1717
allprojects {
1818
group = "io.flamingock"
19-
version = "0.0.42-beta"
19+
version = "0.0.43-beta"
2020

2121
repositories {
2222
mavenCentral()
2323
}
2424
}
2525

2626
subprojects {
27-
apply(plugin = "flamingock.project-structure")
28-
apply(plugin = "flamingock.release-management")
27+
if (project.file("build.gradle.kts").exists()) {
28+
apply(plugin = "flamingock.project-structure")
29+
apply(plugin = "flamingock.release-management")
30+
}
2931
}

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

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ val coreProjects = setOf(
99
"flamingock-core-commons",
1010
"flamingock-core-api",
1111
"flamingock-processor",
12-
"flamingock-graalvm",
13-
// "flamingock-cli"
12+
"flamingock-graalvm"
1413
)
1514

1615
val cloudProjects = setOf(
@@ -22,7 +21,6 @@ val communityProjects = setOf(
2221
"flamingock-community-bom",
2322
"flamingock-community",
2423
"flamingock-auditstore-mongodb-sync",
25-
"flamingock-auditstore-mongodb-springdata",
2624
"flamingock-auditstore-couchbase",
2725
"flamingock-auditstore-dynamodb",
2826
"flamingock-importer"
@@ -32,10 +30,13 @@ val pluginProjects = setOf(
3230
"flamingock-springboot-integration"
3331
)
3432

35-
val transactionerProjects = setOf(
36-
"sql-target-system",
33+
val targetSystemProjects = setOf(
34+
"nontransactional-target-system",
3735
"mongodb-sync-target-system",
38-
"dynamodb-transactioner"
36+
"mongodb-springdata-target-system",
37+
"sql-target-system",
38+
"dynamodb-target-system",
39+
"couchbase-target-system"
3940
)
4041

4142
val templateProjects = setOf(
@@ -47,10 +48,11 @@ val utilProjects = setOf(
4748
"general-util",
4849
"test-util",
4950
"mongodb-util",
50-
"dynamodb-util"
51+
"dynamodb-util",
52+
"couchbase-util"
5153
)
5254

53-
val allProjects = coreProjects + cloudProjects + communityProjects + pluginProjects + transactionerProjects + templateProjects + utilProjects
55+
val allProjects = coreProjects + cloudProjects + communityProjects + pluginProjects + targetSystemProjects + templateProjects + utilProjects
5456

5557
// Project classification utilities
5658
fun Project.isBomModule(): Boolean = name.endsWith("-bom")
@@ -62,7 +64,7 @@ fun Project.getProjectCategory(): String? = when (name) {
6264
in cloudProjects -> "cloud"
6365
in communityProjects -> "community"
6466
in pluginProjects -> "plugins"
65-
in transactionerProjects -> "transactioners"
67+
in targetSystemProjects -> "targetSystems"
6668
in templateProjects -> "templates"
6769
in utilProjects -> "utils"
6870
else -> null
@@ -74,7 +76,7 @@ fun getProjectsForBundle(bundle: String?): Set<String> = when (bundle) {
7476
"cloud" -> cloudProjects
7577
"community" -> communityProjects
7678
"plugins" -> pluginProjects
77-
"transactioners" -> transactionerProjects
79+
"targetSystems" -> targetSystemProjects
7880
"templates" -> templateProjects
7981
"utils" -> utilProjects
8082
"all" -> allProjects
@@ -86,7 +88,7 @@ extra["coreProjects"] = coreProjects
8688
extra["cloudProjects"] = cloudProjects
8789
extra["communityProjects"] = communityProjects
8890
extra["pluginProjects"] = pluginProjects
89-
extra["transactionerProjects"] = transactionerProjects
91+
extra["targetSystemProjects"] = targetSystemProjects
9092
extra["templateProjects"] = templateProjects
9193
extra["utilProjects"] = utilProjects
9294
extra["allProjects"] = allProjects

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ val projectsToRelease = if (module != null) {
3030
val cloudProjects = project.extra["cloudProjects"] as Set<String>
3131
val communityProjects = project.extra["communityProjects"] as Set<String>
3232
val pluginProjects = project.extra["pluginProjects"] as Set<String>
33-
val transactionerProjects = project.extra["transactionerProjects"] as Set<String>
33+
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>
3636

@@ -39,7 +39,7 @@ val projectsToRelease = if (module != null) {
3939
"cloud" -> cloudProjects
4040
"community" -> communityProjects
4141
"plugins" -> pluginProjects
42-
"transactioners" -> transactionerProjects
42+
"targetSystems" -> targetSystemProjects
4343
"templates" -> templateProjects
4444
"utils" -> utilProjects
4545
"all" -> allProjects
@@ -48,6 +48,12 @@ val projectsToRelease = if (module != null) {
4848
}
4949

5050
// JReleaser configuration
51+
jreleaser {
52+
project {
53+
inceptionYear.set("2024")
54+
authors.set(setOf("dieppa", "osantana", "bercianor", "dfrigolet"))
55+
}
56+
}
5157
if (project != rootProject) {
5258
tasks.named("jreleaserRelease") {
5359
enabled = false

‎infra/bundle-release-with-retry.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
validate_bundle() {
44
case "$1" in
5-
all|core|cloud|community|plugins|transactioners|templates|utils)
5+
all|core|cloud|community|plugins|targetSystems|templates|utils)
66
return 0
77
;;
88
*)
@@ -31,4 +31,4 @@ for (( i=1; i<=maxAttempts; i++ )); do
3131
sleep "$waitingSeconds"
3232
echo
3333
echo "********************************************************************************** RELEASE ATTEMPT($((i + 1))) **********************************************************************************"
34-
done
34+
done

‎settings.gradle.kts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,5 +174,3 @@ project(":cli:flamingock-cli").projectDir = file("cli/flamingock-cli")
174174
include("e2e:core-e2e")
175175
project(":e2e:core-e2e").name = "core-e2e"
176176
project(":e2e:core-e2e").projectDir = file("e2e/core-e2e")
177-
178-
include("core:target-systems:nontransactional-target-system")

0 commit comments

Comments
 (0)