diff --git a/.github/workflows/airflow-apis-tests-3_9.yml b/.github/workflows/airflow-apis-tests-3_9.yml index efe1485f0a0..c142687f1a7 100644 --- a/.github/workflows/airflow-apis-tests-3_9.yml +++ b/.github/workflows/airflow-apis-tests-3_9.yml @@ -67,11 +67,11 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: - java-version: '11' - distribution: 'adopt' + java-version: '17' + distribution: 'temurin' - name: Set up Python 3.9 uses: actions/setup-python@v4 diff --git a/.github/workflows/cypress-integration-tests-mysql.yml b/.github/workflows/cypress-integration-tests-mysql.yml index 488f431d339..c4ab25a36db 100644 --- a/.github/workflows/cypress-integration-tests-mysql.yml +++ b/.github/workflows/cypress-integration-tests-mysql.yml @@ -101,12 +101,12 @@ jobs: restore-keys: | ${{ runner.os }}-yarn- - - name: Set up JDK 11 + - name: Set up JDK 17 if: steps.cache-output.outputs.exit-code == 0 uses: actions/setup-java@v3 with: - java-version: '11' - distribution: 'adopt' + java-version: '17' + distribution: 'temurin' - name: Generating Data Models run: | diff --git a/.github/workflows/cypress-integration-tests-postgresql.yml b/.github/workflows/cypress-integration-tests-postgresql.yml index 0c687f2ace1..8d4d0bc9304 100644 --- a/.github/workflows/cypress-integration-tests-postgresql.yml +++ b/.github/workflows/cypress-integration-tests-postgresql.yml @@ -101,12 +101,12 @@ jobs: restore-keys: | ${{ runner.os }}-yarn- - - name: Set up JDK 11 + - name: Set up JDK 17 if: steps.cache-output.outputs.exit-code == 0 uses: actions/setup-java@v3 with: - java-version: '11' - distribution: 'adopt' + java-version: '17' + distribution: 'temurin' - name: Generating Data Models run: | diff --git a/.github/workflows/docker-openmetadata-server.yml b/.github/workflows/docker-openmetadata-server.yml index 7c89d253176..7d70be039b9 100644 --- a/.github/workflows/docker-openmetadata-server.yml +++ b/.github/workflows/docker-openmetadata-server.yml @@ -29,10 +29,11 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Set up JDK 11 - uses: actions/setup-java@v1 + - name: Set up JDK 17 + uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 + distribution: 'temurin' - name: Install antlr cli run: | diff --git a/.github/workflows/java-checkstyle.yml b/.github/workflows/java-checkstyle.yml index 5a372fa84a1..a21e29cf6eb 100644 --- a/.github/workflows/java-checkstyle.yml +++ b/.github/workflows/java-checkstyle.yml @@ -63,11 +63,11 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: - java-version: '11' - distribution: 'adopt' + java-version: '17' + distribution: 'temurin' - name: Run checkstyle run: mvn googleformatter:format@reformat-sources diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index 038196a173a..10e6d1f37d8 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -85,12 +85,12 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - - name: Set up JDK 11 + - name: Set up JDK 17 if: steps.cache-output.outputs.exit-code == 0 uses: actions/setup-java@v3 with: - java-version: '11' - distribution: 'adopt' + java-version: '17' + distribution: 'temurin' - name: Install Ubuntu dependencies if: steps.cache-output.outputs.exit-code == 0 diff --git a/.github/workflows/maven-postgres-tests-build.yml b/.github/workflows/maven-postgres-tests-build.yml index 291da7f0ef0..1c2ee39d114 100644 --- a/.github/workflows/maven-postgres-tests-build.yml +++ b/.github/workflows/maven-postgres-tests-build.yml @@ -84,12 +84,12 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - - name: Set up JDK 11 + - name: Set up JDK 17 if: steps.cache-output.outputs.exit-code == 0 uses: actions/setup-java@v3 with: - java-version: '11' - distribution: 'adopt' + java-version: '17' + distribution: 'temurin' - name: Install Ubuntu dependencies if: steps.cache-output.outputs.exit-code == 0 diff --git a/.github/workflows/playwright-integration-tests-mysql.yml b/.github/workflows/playwright-integration-tests-mysql.yml index 91b5f4928d4..bac78430015 100644 --- a/.github/workflows/playwright-integration-tests-mysql.yml +++ b/.github/workflows/playwright-integration-tests-mysql.yml @@ -85,12 +85,12 @@ jobs: key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} restore-keys: | ${{ runner.os }}-yarn- - - name: Set up JDK 11 + - name: Set up JDK 17 if: steps.cache-output.outputs.exit-code == 0 uses: actions/setup-java@v3 with: - java-version: '11' - distribution: 'adopt' + java-version: '17' + distribution: 'temurin' - name: Set up Python uses: actions/setup-python@v4 with: diff --git a/.github/workflows/playwright-integration-tests-postgres.yml b/.github/workflows/playwright-integration-tests-postgres.yml index e4bc00d269a..619b8548137 100644 --- a/.github/workflows/playwright-integration-tests-postgres.yml +++ b/.github/workflows/playwright-integration-tests-postgres.yml @@ -85,12 +85,12 @@ jobs: key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} restore-keys: | ${{ runner.os }}-yarn- - - name: Set up JDK 11 + - name: Set up JDK 17 if: steps.cache-output.outputs.exit-code == 0 uses: actions/setup-java@v3 with: - java-version: '11' - distribution: 'adopt' + java-version: '17' + distribution: 'temurin' - name: Set up Python uses: actions/setup-python@v4 with: diff --git a/.github/workflows/publish-maven-package.yml b/.github/workflows/publish-maven-package.yml index 461ef844b8d..66ca2b0fb31 100644 --- a/.github/workflows/publish-maven-package.yml +++ b/.github/workflows/publish-maven-package.yml @@ -46,11 +46,11 @@ jobs: swap-storage: true - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: - java-version: 11 - distribution: 'adopt' + java-version: 17 + distribution: 'temurin' server-id: ossrh server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD diff --git a/.github/workflows/py-cli-e2e-tests.yml b/.github/workflows/py-cli-e2e-tests.yml index fda317e5ee8..3d3b21b1474 100644 --- a/.github/workflows/py-cli-e2e-tests.yml +++ b/.github/workflows/py-cli-e2e-tests.yml @@ -32,11 +32,11 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: - java-version: '11' - distribution: 'adopt' + java-version: '17' + distribution: 'temurin' - name: Set up Python 3.9 uses: actions/setup-python@v4 diff --git a/.github/workflows/py-tests.yml b/.github/workflows/py-tests.yml index 72b3b5f34da..ab0ec5a3680 100644 --- a/.github/workflows/py-tests.yml +++ b/.github/workflows/py-tests.yml @@ -62,11 +62,11 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: - java-version: '11' - distribution: 'adopt' + java-version: '17' + distribution: 'temurin' - name: Set up Python ${{ matrix.py-version }} uses: actions/setup-python@v4 diff --git a/.github/workflows/security-scan.yml b/.github/workflows/security-scan.yml index c08c4c98c6e..62739292f80 100644 --- a/.github/workflows/security-scan.yml +++ b/.github/workflows/security-scan.yml @@ -39,11 +39,11 @@ jobs: with: python-version: 3.9 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: - java-version: '11' - distribution: 'adopt' + java-version: '17' + distribution: 'temurin' - name: Install Ubuntu dependencies run: | diff --git a/.github/workflows/selenium-noIngestion-tests.yml b/.github/workflows/selenium-noIngestion-tests.yml index 0f22cd1d14e..309222bf470 100644 --- a/.github/workflows/selenium-noIngestion-tests.yml +++ b/.github/workflows/selenium-noIngestion-tests.yml @@ -53,11 +53,11 @@ jobs: docker-images: true swap-storage: true - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: - java-version: '11' - distribution: 'adopt' + java-version: '17' + distribution: 'temurin' - name: Generating Data Models run: | diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile index 3552b1509d1..94b8d7f90cf 100644 --- a/docker/development/Dockerfile +++ b/docker/development/Dockerfile @@ -23,7 +23,7 @@ FROM alpine:3.16 EXPOSE 8585 -RUN apk add --update --no-cache bash openjdk11-jre +RUN apk add --update --no-cache bash openjdk17-jre COPY --from=build /opt/openmetadata /opt/openmetadata COPY docker/openmetadata-start.sh / diff --git a/docker/docker-compose-quickstart/Dockerfile b/docker/docker-compose-quickstart/Dockerfile index fb3477b2657..e76f6c6b1c4 100644 --- a/docker/docker-compose-quickstart/Dockerfile +++ b/docker/docker-compose-quickstart/Dockerfile @@ -37,7 +37,7 @@ LABEL org.open-metadata.commit-id=$COMMIT_ID EXPOSE 8585 8586 COPY docker/openmetadata-start.sh ./ COPY --from=build /opt/openmetadata /opt/openmetadata -RUN apk add --update --no-cache bash openjdk11-jre && \ +RUN apk add --update --no-cache bash openjdk17-jre && \ chmod 777 openmetadata-start.sh WORKDIR /opt/openmetadata ENTRYPOINT [ "/bin/bash" ] diff --git a/docker/images/minimal-ubuntu/Dockerfile b/docker/images/minimal-ubuntu/Dockerfile index 15d60de9385..5457d209599 100644 --- a/docker/images/minimal-ubuntu/Dockerfile +++ b/docker/images/minimal-ubuntu/Dockerfile @@ -32,7 +32,7 @@ RUN apt install -y python-dev && \ python /tmp/get-pip.py # java -RUN apt install -y openjdk-8-jdk +RUN apt install -y openjdk-17-jdk # maven #RUN apt install -y maven=3.3.9-3 diff --git a/openmetadata-service/pom.xml b/openmetadata-service/pom.xml index fbfe63ae2d2..7122cd0674c 100644 --- a/openmetadata-service/pom.xml +++ b/openmetadata-service/pom.xml @@ -339,6 +339,12 @@ 2.0.0 test + + org.glassfish.jersey.connectors + jersey-grizzly-connector + 2.40 + test + javax.json @@ -576,7 +582,7 @@ false classes 1C - -Xmx512m + -Xmx1G @@ -626,7 +632,7 @@ false classes 1C - -Xmx512m + -Xmx1G diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/OpenMetadataApplicationTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/OpenMetadataApplicationTest.java index 62e68d2a565..4a59a3ca1b4 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/OpenMetadataApplicationTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/OpenMetadataApplicationTest.java @@ -23,14 +23,15 @@ import io.dropwizard.testing.junit5.DropwizardAppExtension; import java.util.HashSet; import java.util.Set; import javax.ws.rs.client.Client; +import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.WebTarget; import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpHost; import org.elasticsearch.client.RestClient; import org.flywaydb.core.Flyway; +import org.glassfish.jersey.client.ClientConfig; import org.glassfish.jersey.client.ClientProperties; -import org.glassfish.jersey.client.HttpUrlConnectorProvider; -import org.glassfish.jersey.client.JerseyClientBuilder; +import org.glassfish.jersey.grizzly.connector.GrizzlyConnectorProvider; import org.jdbi.v3.core.Jdbi; import org.jdbi.v3.sqlobject.SqlObjectPlugin; import org.jdbi.v3.sqlobject.SqlObjects; @@ -66,6 +67,8 @@ public abstract class OpenMetadataApplicationTest { private static String HOST; private static String PORT; + private static Client client; + static { CollectionRegistry.addTestResource(webhookCallbackResource); Fernet.getInstance().setFernetKey(FERNET_KEY_1); @@ -136,6 +139,16 @@ public abstract class OpenMetadataApplicationTest { validateAndRunSystemDataMigrations( jdbi, ConnectionType.from(sqlContainer.getDriverClassName()), nativeMigrationScripsLocation, false); APP.before(); + createClient(); + } + + private static void createClient() { + ClientConfig config = new ClientConfig(); + config.connectorProvider(new GrizzlyConnectorProvider()); + config.register(new JacksonFeature(APP.getObjectMapper())); + config.property(ClientProperties.CONNECT_TIMEOUT, 0); + config.property(ClientProperties.READ_TIMEOUT, 0); + client = ClientBuilder.newClient(config); } @AfterAll @@ -149,25 +162,16 @@ public abstract class OpenMetadataApplicationTest { ELASTIC_SEARCH_CONTAINER.stop(); } - public static Client getClient() { - return new JerseyClientBuilder() - .register(new JacksonFeature(APP.getObjectMapper())) - .property(ClientProperties.CONNECT_TIMEOUT, 0) - .property(ClientProperties.READ_TIMEOUT, 0) - .property(HttpUrlConnectorProvider.SET_METHOD_WORKAROUND, true) - .build(); - } - public static RestClient getSearchClient() { return RestClient.builder(HttpHost.create(ELASTIC_SEARCH_CONTAINER.getHttpHostAddress())).build(); } public static WebTarget getResource(String collection) { - return getClient().target(format("http://localhost:%s/api/v1/%s", APP.getLocalPort(), collection)); + return client.target(format("http://localhost:%s/api/v1/%s", APP.getLocalPort(), collection)); } public static WebTarget getConfigResource(String resource) { - return getClient().target(format("http://localhost:%s/api/v1/system/config/%s", APP.getLocalPort(), resource)); + return client.target(format("http://localhost:%s/api/v1/system/config/%s", APP.getLocalPort(), resource)); } private static void overrideElasticSearchConfig() { diff --git a/pom.xml b/pom.xml index 7288099c1f9..9347cfb8ea7 100644 --- a/pom.xml +++ b/pom.xml @@ -786,8 +786,8 @@ maven-compiler-plugin 3.10.1 - 11 - 11 + 17 + 17