Skip to content

Commit 71bd7f5

Browse files
davidfrigoletdavidfrigolet
authored
Merge branch 'master' into couchbase-test-kit
2 parents 50a4e31 + 69a69cf commit 71bd7f5

85 files changed

Lines changed: 35 additions & 4951 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/license-check.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: License Header Check
22

33
on:
44
pull_request:
5-
branches: [ master, develop ]
5+
branches: [ master, release/* ]
66
push:
7-
branches: [ master, develop ]
7+
branches: [ master, release/* ]
88

99
jobs:
1010
license-check:

‎.github/workflows/release.yml‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,6 @@ jobs:
4444
FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
4545
FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
4646

47-
flamingock-core-api:
48-
needs: [ build ]
49-
uses: ./.github/workflows/module-release-graalvm.yml
50-
with:
51-
module: flamingock-core-api
52-
secrets:
53-
FLAMINGOCK_JRELEASER_GITHUB_TOKEN: ${{ secrets.FLAMINGOCK_JRELEASER_GITHUB_TOKEN }}
54-
FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME }}
55-
FLAMINGOCK_JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_PASSWORD }}
56-
FLAMINGOCK_JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PUBLIC_KEY }}
57-
FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
58-
FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
59-
6047
flamingock-core-commons:
6148
needs: [ build ]
6249
uses: ./.github/workflows/module-release-graalvm.yml
@@ -70,19 +57,6 @@ jobs:
7057
FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
7158
FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
7259

73-
flamingock-template-api:
74-
needs: [ build ]
75-
uses: ./.github/workflows/module-release-graalvm.yml
76-
with:
77-
module: flamingock-template-api
78-
secrets:
79-
FLAMINGOCK_JRELEASER_GITHUB_TOKEN: ${{ secrets.FLAMINGOCK_JRELEASER_GITHUB_TOKEN }}
80-
FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME }}
81-
FLAMINGOCK_JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_PASSWORD }}
82-
FLAMINGOCK_JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PUBLIC_KEY }}
83-
FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
84-
FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
85-
8660
flamingock-test-support:
8761
needs: [ build ]
8862
uses: ./.github/workflows/module-release-graalvm.yml
@@ -396,19 +370,6 @@ jobs:
396370
FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
397371
FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
398372

399-
general-util:
400-
needs: [ build ]
401-
uses: ./.github/workflows/module-release-graalvm.yml
402-
with:
403-
module: general-util
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-
412373
test-util:
413374
needs: [ build ]
414375
uses: ./.github/workflows/module-release-graalvm.yml
@@ -569,8 +530,6 @@ jobs:
569530
needs: [
570531
flamingock-core,
571532
flamingock-core-commons,
572-
flamingock-core-api,
573-
flamingock-template-api,
574533
flamingock-processor,
575534
flamingock-graalvm,
576535
flamingock-cloud,
@@ -592,7 +551,6 @@ jobs:
592551
dynamodb-target-system,
593552
couchbase-external-system-api,
594553
couchbase-target-system,
595-
general-util,
596554
test-util,
597555
mongodb-util,
598556
mongodb-test-kit,

‎build.gradle.kts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@ allprojects {
1818
group = "io.flamingock"
1919
version = "1.2.0-beta.1"
2020

21+
extra["templateApiVersion"] = "1.3.1"
22+
extra["generalUtilVersion"] = "1.5.0"
23+
extra["coreApiVersion"] = "1.3.0"
24+
2125
repositories {
26+
mavenLocal()
2227
mavenCentral()
2328
}
2429
}

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
val coreProjects = setOf(
88
"flamingock-core",
99
"flamingock-core-commons",
10-
"flamingock-core-api",
11-
"flamingock-template-api",
1210
"flamingock-processor",
1311
"flamingock-graalvm",
1412
"flamingock-test-support"
@@ -51,7 +49,6 @@ val externalSystemProjects = setOf(
5149
)
5250

5351
val utilProjects = setOf(
54-
"general-util",
5552
"test-util",
5653
"mongodb-util",
5754
"dynamodb-util",

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
val coreApiVersion: String by extra
12
dependencies {
23
// Core
34
implementation(project(":core:flamingock-core"))
4-
api(project(":core:flamingock-core-api"))
5+
api("io.flamingock:flamingock-core-api:${coreApiVersion}")
56
// target systems
67
api(project(":core:target-systems:nontransactional-target-system"))
78
api(project(":core:target-systems:couchbase-target-system"))

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
val coreApiVersion: String by extra
12
dependencies {
23
// Core
34
api(project(":core:flamingock-core"))
4-
api(project(":core:flamingock-core-api"))
5+
api("io.flamingock:flamingock-core-api:${coreApiVersion}")
56
// target systems
67
api(project(":core:target-systems:nontransactional-target-system"))
78
api(project(":core:target-systems:couchbase-target-system"))

‎core/flamingock-core-api/build.gradle.kts‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎core/flamingock-core-api/src/main/java/io/flamingock/api/NonLockGuardedType.java‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎core/flamingock-core-api/src/main/java/io/flamingock/api/RecoveryStrategy.java‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎core/flamingock-core-api/src/main/java/io/flamingock/api/StageType.java‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)