Skip to content

Commit

Permalink
build(misc): misc build, config, version updates
Browse files Browse the repository at this point in the history
* fix spark smoke test auth
* update elasticsearch client defaults
* bump netty version
* fix check jar shell script
  • Loading branch information
david-leifker committed Oct 3, 2024
1 parent 107cd64 commit 4b5793d
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 8 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/metadata-io.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- "li-utils/**"
- "metadata-models/**"
- "metadata-io/**"
- ".github/workflows/metadata-io.yml"
pull_request:
branches:
- "**"
Expand All @@ -16,6 +17,7 @@ on:
- "li-utils/**"
- "metadata-models/**"
- "metadata-io/**"
- ".github/workflows/metadata-io.yml"
release:
types: [published]

Expand Down Expand Up @@ -52,6 +54,8 @@ jobs:
sudo apt-get remove 'dotnet-*' azure-cli || true
sudo rm -rf /usr/local/lib/android/ || true
sudo docker image prune -a -f || true
- name: Disk Check
run: df -h . && docker images
- uses: acryldata/sane-checkout-action@v3
- name: Set up JDK 17
uses: actions/setup-java@v4
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ subprojects {
implementation externalDependency.annotationApi
constraints {
implementation("com.google.googlejavaformat:google-java-format:$googleJavaFormatVersion")
implementation('io.netty:netty-all:4.1.100.Final')
implementation('io.netty:netty-all:4.1.114.Final')
implementation('org.apache.commons:commons-compress:1.26.0')
implementation('org.apache.velocity:velocity-engine-core:2.3')
implementation('org.hibernate:hibernate-validator:6.0.20.Final')
Expand Down
2 changes: 1 addition & 1 deletion datahub-frontend/play.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies {
play('com.nimbusds:nimbus-jose-jwt:8.18')
play('com.typesafe.akka:akka-actor_2.12:2.6.20')
play(externalDependency.jsonSmart)
play('io.netty:netty-all:4.1.86.Final')
play('io.netty:netty-all:4.1.114.Final')
implementation(externalDependency.commonsText) {
because("previous versions are vulnerable to CVE-2022-42889")
}
Expand Down
2 changes: 2 additions & 0 deletions docker/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ dockerCompose {
environment.put "ACTIONS_EXTRA_PACKAGES", 'acryl-datahub-actions[executor] acryl-datahub-actions'
environment.put "ACTIONS_CONFIG", 'https://raw.githubusercontent.com/acryldata/datahub-actions/main/docker/config/executor.yaml'
environment.put 'DATAHUB_TELEMETRY_ENABLED', 'false' // disabled when built locally
// disabled for spark-lineage smoke-test
environment.put 'DATAHUB_LOCAL_COMMON_ENV', "${rootProject.project(':metadata-integration:java:spark-lineage-legacy').projectDir}/spark-smoke-test/smoke-gms.env"

useComposeFiles = ['profiles/docker-compose.yml']
projectName = 'datahub'
Expand Down
9 changes: 5 additions & 4 deletions metadata-integration/java/datahub-client/scripts/check_jar.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,11 @@ jar -tvf $jarFile |\
grep -v "darwin" |\
grep -v "MetadataChangeProposal.avsc" |\
grep -v "aix" |\
grep -v "com/sun/"
grep -v "mozilla"
grep -v "VersionInfo.java"
grep -v "mime.types"
grep -v "com/sun/" |\
grep -v "mozilla" |\
grep -v "VersionInfo.java" |\
grep -v "mime.types" |\
grep -v "com/ibm/.*"


if [ $? -ne 0 ]; then
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
REST_API_AUTHORIZATION_ENABLED=false
METADATA_SERVICE_AUTH_ENABLED=false
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ cassandra:
elasticsearch:
host: ${ELASTICSEARCH_HOST:localhost}
port: ${ELASTICSEARCH_PORT:9200}
threadCount: ${ELASTICSEARCH_THREAD_COUNT:1}
connectionRequestTimeout: ${ELASTICSEARCH_CONNECTION_REQUEST_TIMEOUT:0}
threadCount: ${ELASTICSEARCH_THREAD_COUNT:2}
connectionRequestTimeout: ${ELASTICSEARCH_CONNECTION_REQUEST_TIMEOUT:5000}
username: ${ELASTICSEARCH_USERNAME:#{null}}
password: ${ELASTICSEARCH_PASSWORD:#{null}}
pathPrefix: ${ELASTICSEARCH_PATH_PREFIX:#{null}}
Expand Down

0 comments on commit 4b5793d

Please sign in to comment.