Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bmoric/remove dep connector worker #17977

Merged
merged 55 commits into from
Oct 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
33b83bf
test [ci skip]
benmoriceau Oct 4, 2022
4134048
Remove the dependency between orchestrator APP and the worker
benmoriceau Oct 10, 2022
0d20286
Merge branch 'master' into bmoric/remove-dep-container-orchestrator-w…
benmoriceau Oct 10, 2022
d37bc19
Autogenerated files
benmoriceau Oct 10, 2022
bcf3431
Add missing annotation
benmoriceau Oct 10, 2022
db1f95d
Remove unused json2Schema block from worker
benmoriceau Oct 10, 2022
e7d1592
Move tess
benmoriceau Oct 10, 2022
0881cee
Missing deps and format
benmoriceau Oct 10, 2022
5c74045
Fix test build
benmoriceau Oct 10, 2022
7e2d449
Merge branch 'master' of github.com:airbytehq/airbyte into bmoric/rem…
benmoriceau Oct 10, 2022
203071a
TMP
benmoriceau Oct 11, 2022
390b8eb
Add missing dependencies
benmoriceau Oct 11, 2022
4b6634d
Merge branch 'master' of github.com:airbytehq/airbyte into bmoric/rem…
benmoriceau Oct 11, 2022
cbae067
PR comments
benmoriceau Oct 11, 2022
7efa2c7
Tmp
benmoriceau Oct 11, 2022
636e507
[ci skip] Tmp
benmoriceau Oct 11, 2022
628b721
Fix acceptance test and add the seed dependency
benmoriceau Oct 11, 2022
4c0de3c
Fix build
benmoriceau Oct 11, 2022
a3bce17
Merge branch 'master' of github.com:airbytehq/airbyte into bmoric/rem…
benmoriceau Oct 11, 2022
279447f
Merge branch 'bmoric/remove-dep-container-orchestrator-worker' of git…
benmoriceau Oct 11, 2022
b1defe5
Merge branch 'master' of github.com:airbytehq/airbyte into bmoric/rem…
benmoriceau Oct 12, 2022
4b2c8f2
For diff
benmoriceau Oct 12, 2022
72a11f8
tmp
benmoriceau Oct 12, 2022
dcfb012
Build pass
benmoriceau Oct 13, 2022
ae2748b
Merge branch 'master' of github.com:airbytehq/airbyte into bmoric/rem…
benmoriceau Oct 13, 2022
5424358
make the worker to be on the platform only
benmoriceau Oct 13, 2022
b243256
fix setting.yaml
benmoriceau Oct 13, 2022
1c7c2e9
remove dependency
benmoriceau Oct 13, 2022
68843af
Fix pmd
benmoriceau Oct 13, 2022
4898e50
Fix Cron
benmoriceau Oct 13, 2022
881d8fa
Merge branch 'bmoric/remove-dep-server-worker' into bmoric/remove-dep…
benmoriceau Oct 13, 2022
25a26d4
Add chart
benmoriceau Oct 13, 2022
6b8465b
Merge branch 'master' of github.com:airbytehq/airbyte into bmoric/rem…
benmoriceau Oct 14, 2022
6e4e1aa
Fix cron
benmoriceau Oct 14, 2022
7f915cb
Merge branch 'master' into bmoric/remove-dep-server-worker
benmoriceau Oct 14, 2022
d241c64
Fix server build.gradle
benmoriceau Oct 14, 2022
fada02f
Fix jar conflict
benmoriceau Oct 14, 2022
2f12031
Merge branch 'bmoric/remove-dep-server-worker' of github.com:airbyteh…
benmoriceau Oct 14, 2022
5d0cac0
Merge branch 'master' into bmoric/remove-dep-server-worker
benmoriceau Oct 17, 2022
77d3402
PR comments
benmoriceau Oct 17, 2022
4e6ab3f
Add cron micronaut environemnt
benmoriceau Oct 17, 2022
864d878
Merge branch 'bmoric/remove-dep-server-worker' into bmoric/remove-dep…
benmoriceau Oct 17, 2022
a6611d8
Merge branch 'master' into bmoric/remove-dep-connector-worker
benmoriceau Oct 17, 2022
dcdef7f
Update required build path
benmoriceau Oct 18, 2022
c12be68
remove all dependencies on worker
benmoriceau Oct 18, 2022
0805397
Typo
benmoriceau Oct 18, 2022
c092d5d
Merge branch 'master' of github.com:airbytehq/airbyte into bmoric/rem…
benmoriceau Oct 18, 2022
e935136
Add gradle exclusions
benmoriceau Oct 18, 2022
8c33312
Add exclusion to avoid conflict
benmoriceau Oct 18, 2022
6945406
more exclusion
benmoriceau Oct 18, 2022
3b039ee
Move more class
benmoriceau Oct 18, 2022
32b6ea9
Exclude worker from the general build
benmoriceau Oct 18, 2022
3d33af8
Merge branch 'master' of github.com:airbytehq/airbyte into bmoric/rem…
benmoriceau Oct 18, 2022
b26e206
Fix connector build
benmoriceau Oct 18, 2022
04f1c8b
Merge branch 'master' into bmoric/remove-dep-connector-worker
benmoriceau Oct 18, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
- 'airbyte-cdk/**'
- 'airbyte-protocol/**'
- 'airbyte-integrations/**'
- 'airbyte-workers/**'
- 'airbyte-commons-worker/**'
db:
- 'airbyte-db/**'
frontend:
Expand Down Expand Up @@ -232,7 +232,7 @@ jobs:
run: SUB_BUILD=CONNECTORS_BASE ./gradlew format --scan --info --stacktrace

- name: Build
run: SUB_BUILD=CONNECTORS_BASE ./gradlew build -x :airbyte-workers:test --scan
run: SUB_BUILD=CONNECTORS_BASE ./gradlew build --scan

- name: Ensure no file change
run: git --no-pager diff && test -z "$(git --no-pager diff)"
Expand Down
4 changes: 4 additions & 0 deletions airbyte-config/config-persistence/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ plugins {
id 'airbyte-integration-test-java'
}

configurations.all {
exclude group: 'io.micronaut.flyway'
}

dependencies {
implementation project(':airbyte-commons')
implementation project(':airbyte-commons-docker')
Expand Down
4 changes: 4 additions & 0 deletions airbyte-db/db-lib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ configurations {
migrations.extendsFrom implementation
}

configurations.all {
exclude group: 'io.micronaut.flyway'
}

dependencies {
api libs.hikaricp
api libs.jooq.meta
Expand Down
1 change: 0 additions & 1 deletion airbyte-integrations/bases/base-normalization/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ airbytePython {
}

dependencies {
implementation project(':airbyte-workers')
implementation project(':airbyte-commons-worker')
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies {
implementation project(':airbyte-config:config-models')
implementation project(':airbyte-integrations:bases:base-java')
implementation project(':airbyte-protocol:protocol-models')
implementation project(':airbyte-workers')
implementation project(':airbyte-commons-worker')

implementation(enforcedPlatform('org.junit:junit-bom:5.8.2'))
implementation 'org.junit.jupiter:junit-jupiter-api'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {
implementation project(':airbyte-config:config-models')
implementation project(':airbyte-config:config-persistence')
implementation project(':airbyte-protocol:protocol-models')
implementation project(':airbyte-workers')
implementation project(':airbyte-commons-worker')
implementation 'org.mockito:mockito-core:4.6.1'

implementation 'net.sourceforge.argparse4j:argparse4j:0.8.1'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies {

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-clickhouse')
integrationTestJavaImplementation project(':airbyte-workers')
integrationTestJavaImplementation project(':airbyte-commons-worker')
// https://mvnrepository.com/artifact/org.testcontainers/clickhouse
integrationTestJavaImplementation libs.connectors.destination.testcontainers.clickhouse
integrationTestJavaImplementation files(project(':airbyte-integrations:bases:base-normalization').airbyteDocker.outputs)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,5 @@ dependencies {

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-gcs')
integrationTestJavaImplementation project(':airbyte-workers')
integrationTestJavaImplementation project(':airbyte-commons-worker')
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ dependencies {
implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
integrationTestJavaImplementation files(project(':airbyte-integrations:bases:base-normalization').airbyteDocker.outputs)
integrationTestJavaImplementation project(':airbyte-config:config-models')
integrationTestJavaImplementation project(':airbyte-workers')
integrationTestJavaImplementation project(':airbyte-commons-worker')

}
7 changes: 6 additions & 1 deletion airbyte-test-utils/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,16 @@ plugins {
id 'java-library'
}

configurations.all {
exclude group: 'io.micronaut.jaxrs'
exclude group: 'io.micronaut.sql'
}

dependencies {
api project(':airbyte-db:db-lib')
implementation project(':airbyte-api')
implementation project(':airbyte-commons-temporal')
implementation project(':airbyte-workers')
implementation project(':airbyte-commons-worker')

implementation 'io.fabric8:kubernetes-client:5.12.2'
implementation 'io.temporal:temporal-sdk:1.8.1'
Expand Down
2 changes: 1 addition & 1 deletion airbyte-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ dependencies {
acceptanceTestsImplementation project(':airbyte-db:db-lib')
acceptanceTestsImplementation project(':airbyte-tests')
acceptanceTestsImplementation project(':airbyte-test-utils')
acceptanceTestsImplementation project(':airbyte-workers')
acceptanceTestsImplementation project(':airbyte-commons-worker')

acceptanceTestsImplementation 'com.fasterxml.jackson.core:jackson-databind'
acceptanceTestsImplementation 'io.github.cdimascio:java-dotenv:3.0.0'
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ include ':airbyte-queue'
include ':airbyte-test-utils'

// airbyte-workers has a lot of dependencies.
include ':airbyte-workers' // reused by acceptance tests in connector base.
include ':airbyte-analytics' // transitively used by airbyte-workers.
include ':airbyte-commons-temporal'
include ':airbyte-commons-worker'
Expand All @@ -98,6 +97,7 @@ if (!System.getenv().containsKey("SUB_BUILD") || System.getenv().get("SUB_BUILD"
include ':airbyte-tests'
include ':airbyte-webapp'
include ':airbyte-webapp-e2e-tests'
include ':airbyte-workers'
}

// connectors base
Expand Down