From deaa6384de5b6a56bc4652051b1113483423b805 Mon Sep 17 00:00:00 2001 From: Ryan J Field Date: Fri, 2 Sep 2022 23:04:04 +0100 Subject: [PATCH 1/4] Use local package deps --- build.gradle | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f773380..aad4c81 100644 --- a/build.gradle +++ b/build.gradle @@ -15,9 +15,29 @@ repositories { } dependencies { - implementation 'org.fairdatapipeline:api:1.0.0-rc1' + implementation files('../javaDataPipeline/api/build/libs/api-1.0.0-rc1.jar') + implementation files('../javaDataPipeline/dataregistry/build/libs/dataregistry-1.0.0-rc1.jar') + annotationProcessor 'org.immutables:value:2.9.0' implementation 'com.opencsv:opencsv:5.6' implementation('org.slf4j:slf4j-simple:1.7.36') + implementation 'commons-codec:commons-codec:1.15' + implementation 'com.google.guava:guava:31.1-jre' + implementation 'com.moandjiezana.toml:toml4j:0.7.2' + implementation 'commons-io:commons-io:2.11.0' + implementation 'jakarta.ws.rs:jakarta.ws.rs-api:3.0.0' + implementation 'org.apache.commons:commons-math3:3.6.1' + implementation 'org.apache.maven:maven-artifact:3.8.4' + implementation 'org.glassfish.jersey.core:jersey-client:3.0.4' + implementation 'org.glassfish.jersey.inject:jersey-hk2:3.0.4' + implementation 'org.glassfish.jersey:jersey-bom:3.0.4' + implementation 'org.immutables:value-annotations:2.9.0' + implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2' + implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.2' + implementation 'com.fasterxml.jackson.datatype:jackson-datatype-guava:2.13.2' + implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.2' + implementation 'com.fasterxml.jackson.core:jackson-annotations:2.13.2' + implementation 'com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.2' + implementation 'org.slf4j:slf4j-api:1.7.36' } spotless { From 3da1ef1825a252c892148ceb8cdb1ba53b0877a5 Mon Sep 17 00:00:00 2001 From: Ryan J Field Date: Fri, 2 Sep 2022 23:25:28 +0100 Subject: [PATCH 2/4] Update Git Ignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 4475249..214eb53 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,6 @@ gradlew.bat build .idea +venv +.fair/ +data_store/ \ No newline at end of file From 3bf92a264125936f8bc6d89267164bfab8bc90f6 Mon Sep 17 00:00:00 2001 From: Ryan J Field Date: Fri, 2 Sep 2022 23:58:15 +0100 Subject: [PATCH 3/4] Add jakarta --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index aad4c81..1cb27c0 100644 --- a/build.gradle +++ b/build.gradle @@ -38,6 +38,7 @@ dependencies { implementation 'com.fasterxml.jackson.core:jackson-annotations:2.13.2' implementation 'com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.2' implementation 'org.slf4j:slf4j-api:1.7.36' + implementation 'jakarta.activation:jakarta.activation-api:2.1.0' } spotless { From 0f83ee0045d023f1b4d232ca80a23be4fd91e6d1 Mon Sep 17 00:00:00 2001 From: Ryan J Field Date: Fri, 7 Jun 2024 11:33:59 +0100 Subject: [PATCH 4/4] Update Build --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 1cb27c0..b69f41a 100644 --- a/build.gradle +++ b/build.gradle @@ -15,10 +15,10 @@ repositories { } dependencies { - implementation files('../javaDataPipeline/api/build/libs/api-1.0.0-rc1.jar') - implementation files('../javaDataPipeline/dataregistry/build/libs/dataregistry-1.0.0-rc1.jar') + implementation files('../javaDataPipeline/api/build/libs/api-1.0.0-rc3.jar') + implementation files('../javaDataPipeline/dataregistry/build/libs/dataregistry-1.0.0-rc3.jar') annotationProcessor 'org.immutables:value:2.9.0' - implementation 'com.opencsv:opencsv:5.6' + implementation 'com.opencsv:opencsv:5.7.1' implementation('org.slf4j:slf4j-simple:1.7.36') implementation 'commons-codec:commons-codec:1.15' implementation 'com.google.guava:guava:31.1-jre'