Skip to content

Commit 0c909de

Browse files
authored
Switch json libraries to jitpack (#12531)
* Switch json-avro-converter to jitpack * Switch jsongenerator to jitpack * Fix default config * Fix one more default config use case * Fix jitpack dependency * Move jitpack repo to root build.gradle
1 parent 8cfad1b commit 0c909de

File tree

10 files changed

+17
-48
lines changed

10 files changed

+17
-48
lines changed

airbyte-integrations/connectors/destination-bigquery/build.gradle

+1-5
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,7 @@ dependencies {
2323
implementation project(':airbyte-protocol:models')
2424
implementation project(':airbyte-integrations:connectors:destination-s3')
2525
implementation project(':airbyte-integrations:connectors:destination-gcs')
26-
implementation('tech.allegro.schema.json2avro:converter') {
27-
version {
28-
branch = 'master'
29-
}
30-
}
26+
implementation group: 'com.github.airbytehq', name: 'json-avro-converter', version: '1.0.1'
3127

3228
integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
3329
integrationTestJavaImplementation files(project(':airbyte-integrations:bases:base-normalization').airbyteDocker.outputs)

airbyte-integrations/connectors/destination-databricks/build.gradle

+1-5
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,7 @@ dependencies {
4040
implementation group: 'org.apache.hadoop', name: 'hadoop-aws', version: '3.3.0'
4141
implementation group: 'org.apache.hadoop', name: 'hadoop-mapreduce-client-core', version: '3.3.0'
4242
implementation group: 'org.apache.parquet', name: 'parquet-avro', version: '1.12.0'
43-
implementation('tech.allegro.schema.json2avro:converter') {
44-
version {
45-
branch = 'master'
46-
}
47-
}
43+
implementation group: 'com.github.airbytehq', name: 'json-avro-converter', version: '1.0.1'
4844

4945
integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
5046
integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-databricks')

airbyte-integrations/connectors/destination-gcs/build.gradle

+1-5
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,7 @@ dependencies {
3030
implementation group: 'org.apache.hadoop', name: 'hadoop-aws', version: '3.3.0'
3131
implementation group: 'org.apache.hadoop', name: 'hadoop-mapreduce-client-core', version: '3.3.0'
3232
implementation group: 'org.apache.parquet', name: 'parquet-avro', version: '1.12.0'
33-
implementation('tech.allegro.schema.json2avro:converter') {
34-
version {
35-
branch = 'master'
36-
}
37-
}
33+
implementation group: 'com.github.airbytehq', name: 'json-avro-converter', version: '1.0.1'
3834

3935
testImplementation 'org.apache.commons:commons-lang3:3.11'
4036

airbyte-integrations/connectors/destination-s3/build.gradle

+1-5
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,7 @@ dependencies {
2525
implementation group: 'org.apache.hadoop', name: 'hadoop-aws', version: '3.3.0'
2626
implementation group: 'org.apache.hadoop', name: 'hadoop-mapreduce-client-core', version: '3.3.0'
2727
implementation group: 'org.apache.parquet', name: 'parquet-avro', version: '1.12.0'
28-
implementation('tech.allegro.schema.json2avro:converter') {
29-
version {
30-
branch = 'master'
31-
}
32-
}
28+
implementation group: 'com.github.airbytehq', name: 'json-avro-converter', version: '1.0.1'
3329

3430
testImplementation 'org.apache.commons:commons-lang3:3.11'
3531
testImplementation "org.mockito:mockito-inline:4.1.0"

airbyte-integrations/connectors/source-e2e-test-cloud/build.gradle

-6
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,3 @@ dependencies {
2020
integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-source-test')
2121
integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-e2e-test-cloud')
2222
}
23-
24-
allprojects {
25-
repositories {
26-
maven { url 'https://jitpack.io' }
27-
}
28-
}

airbyte-integrations/connectors/source-e2e-test/build.gradle

+1-11
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ dependencies {
2020
// https://github.com/airbytehq/jsongenerator
2121
implementation 'net.jimblackler.jsonschemafriend:core:0.11.2'
2222
implementation 'org.mozilla:rhino-engine:1.7.14'
23-
implementation('net.jimblackler:jsongenerator') {
24-
version {
25-
branch = 'master'
26-
}
27-
}
23+
implementation group: 'com.github.airbytehq', name: 'jsongenerator', version: '1.0.0-pre'
2824

2925
testImplementation project(":airbyte-json-validation")
3026
testImplementation project(':airbyte-test-utils')
@@ -33,9 +29,3 @@ dependencies {
3329
integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-e2e-test')
3430
integrationTestJavaImplementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
3531
}
36-
37-
allprojects {
38-
repositories {
39-
maven { url 'https://jitpack.io' }
40-
}
41-
}

airbyte-integrations/connectors/source-e2e-test/src/main/java/io/airbyte/integrations/source/e2e_test/ContinuousFeedConstants.java

+8-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@
1010
public final class ContinuousFeedConstants {
1111

1212
public static final int MOCK_JSON_MAX_TREE_SIZE = 100;
13-
public static final Configuration MOCK_JSON_CONFIG = new DefaultConfig();
13+
public static final Configuration MOCK_JSON_CONFIG = DefaultConfig.build()
14+
.setPedanticTypes(true)
15+
.setGenerateNulls(false)
16+
.setGenerateMinimal(false)
17+
.setGenerateAdditionalProperties(false)
18+
.setUseRomanCharsOnly(true)
19+
.setNonRequiredPropertyChance(1.0f)
20+
.get();
1421

1522
private ContinuousFeedConstants() {}
1623

airbyte-integrations/connectors/source-e2e-test/src/test/java/io/airbyte/integrations/source/e2e_test/GeneratorTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
public class GeneratorTest {
3131

3232
private static final JsonSchemaValidator JSON_VALIDATOR = new JsonSchemaValidator();
33-
private static final Configuration CONFIG = new DefaultConfig();
33+
private static final Configuration CONFIG = ContinuousFeedConstants.MOCK_JSON_CONFIG;
3434
private static final ThreadLocalRandom RANDOM = ThreadLocalRandom.current();
3535

3636
public static class GeneratorSchemaProvider implements ArgumentsProvider {

build.gradle

+3
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,9 @@ subprojects {
200200
// TODO(Issue-4915): Remove this when upstream is merged in.
201201
url 'https://airbyte.mycloudrepo.io/public/repositories/airbyte-public-jars/'
202202
}
203+
maven {
204+
url 'https://jitpack.io'
205+
}
203206
}
204207

205208
pmd {

settings.gradle

-9
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,6 @@ gradleEnterprise {
1111
}
1212
}
1313

14-
sourceControl {
15-
gitRepository("https://github.com/airbytehq/json-avro-converter.git") {
16-
producesModule("tech.allegro.schema.json2avro:converter")
17-
}
18-
gitRepository("https://github.com/airbytehq/jsongenerator.git") {
19-
producesModule("net.jimblackler:jsongenerator")
20-
}
21-
}
22-
2314
rootProject.name = 'airbyte'
2415

2516
// SUB_BUILD is an enum of <blank>, PLATFORM, CONNECTORS_BASE, ALL_CONNECTORS and OCTAVIA_CLI. Blank is equivalent to all.

0 commit comments

Comments
 (0)