Skip to content

Commit

Permalink
build: Update JNA for M1 Mac (#6116)
Browse files Browse the repository at this point in the history
  • Loading branch information
david-leifker authored Oct 5, 2022
1 parent cc236f5 commit 928f294
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
12 changes: 7 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ buildscript {
ext.openTelemetryVersion = '1.18.0'
ext.neo4jVersion = '4.4.9'
ext.graphQLJavaVersion = '19.0'
ext.testContainersVersion = '1.17.4'
apply from: './repositories.gradle'
buildscript.repositories.addAll(project.repositories)
dependencies {
Expand Down Expand Up @@ -92,6 +93,7 @@ project.ext.externalDependency = [
'jerseyGuava': 'org.glassfish.jersey.bundles.repackaged:jersey-guava:2.25.1',
'jettyJaas': 'org.eclipse.jetty:jetty-jaas:9.4.46.v20220331',
'jgrapht': 'org.jgrapht:jgrapht-core:1.5.1',
'jna': 'net.java.dev.jna:jna:5.12.1',
'jsonPatch': 'com.github.java-json-tools:json-patch:1.13',
'jsonSchemaAvro': 'com.github.fge:json-schema-avro:0.1.4',
'jsonSimple': 'com.googlecode.json-simple:json-simple:1.1.1',
Expand Down Expand Up @@ -156,11 +158,11 @@ project.ext.externalDependency = [
'springActuator': "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion",
'swaggerAnnotations': 'io.swagger.core.v3:swagger-annotations:2.1.12',
'testng': 'org.testng:testng:7.3.0',
'testContainers': 'org.testcontainers:testcontainers:1.15.3',
'testContainersJunit': 'org.testcontainers:junit-jupiter:1.15.3',
'testContainersPostgresql':'org.testcontainers:postgresql:1.15.3',
'testContainersElasticsearch': 'org.testcontainers:elasticsearch:1.15.3',
'testContainersCassandra': 'org.testcontainers:cassandra:1.15.3',
'testContainers': 'org.testcontainers:testcontainers:' + testContainersVersion,
'testContainersJunit': 'org.testcontainers:junit-jupiter:' + testContainersVersion,
'testContainersPostgresql':'org.testcontainers:postgresql:' + testContainersVersion,
'testContainersElasticsearch': 'org.testcontainers:elasticsearch:' + testContainersVersion,
'testContainersCassandra': 'org.testcontainers:cassandra:' + testContainersVersion,
'typesafeConfig':'com.typesafe:config:1.4.1',
'wiremock':'com.github.tomakehurst:wiremock:2.10.0',
'zookeeper': 'org.apache.zookeeper:zookeeper:3.4.14'
Expand Down
2 changes: 2 additions & 0 deletions metadata-integration/java/datahub-client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ dependencies {
compileOnly externalDependency.httpAsyncClient
implementation externalDependency.jacksonDataBind
implementation externalDependency.javaxValidation
runtimeOnly externalDependency.jna
implementation externalDependency.springContext
implementation externalDependency.swaggerAnnotations
implementation(externalDependency.kafkaAvroSerializer) {
Expand Down Expand Up @@ -108,6 +109,7 @@ shadowJar {
relocate 'com.github.benmanes.caffeine', 'datahub.shaded.com.github.benmanes.caffeine'
relocate 'org.checkerframework', 'datahub.shaded.org.checkerframework'
relocate 'com.google.errorprone', 'datahub.shaded.com.google.errorprone'
relocate 'com.sun.jna', 'datahub.shaded.com.sun.jna'
// Below jars added for kafka emitter only
relocate 'org.apache.avro', 'datahub.shaded.org.apache.avro'
relocate 'org.codehaus.jackson', 'datahub.shaded.org.codehaus.jackson'
Expand Down
1 change: 1 addition & 0 deletions metadata-io/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ dependencies {
compile externalDependency.elasticSearchTransport
compile externalDependency.javatuples
compile externalDependency.javaxValidation
runtimeOnly externalDependency.jna
compile externalDependency.kafkaClients
compile externalDependency.ebean
enhance externalDependency.ebeanAgent
Expand Down
1 change: 1 addition & 0 deletions metadata-service/auth-ranger-impl/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ dependencies {
implementation 'org.apache.ranger:ranger-plugins-common:2.2.0'
implementation 'org.apache.logging.log4j:log4j-1.2-api:2.17.1'

runtimeOnly externalDependency.jna
compile externalDependency.lombok

annotationProcessor externalDependency.lombok
Expand Down

0 comments on commit 928f294

Please sign in to comment.