diff --git a/build.gradle b/build.gradle index 890cdaada57c..d2440b9770c1 100644 --- a/build.gradle +++ b/build.gradle @@ -981,8 +981,6 @@ project(':iceberg-open-api') { exclude group: 'org.apache.curator' exclude group: 'org.apache.zookeeper' exclude group: 'org.apache.kerby' - exclude group: 'org.apache.hadoop', module: 'hadoop-auth' - exclude group: 'org.apache.commons', module: 'commons-configuration2' exclude group: 'org.apache.hadoop.thirdparty', module: 'hadoop-shaded-protobuf_3_7' exclude group: 'org.eclipse.jetty' exclude group: 'com.google.re2j', module: 're2j' @@ -998,6 +996,9 @@ project(':iceberg-open-api') { testFixturesImplementation project(path: ':iceberg-bundled-guava', configuration: 'shadow') testFixturesImplementation libs.junit.jupiter + testFixturesImplementation libs.slf4j.api + testFixturesImplementation libs.slf4j.simple + testFixturesImplementation libs.jetty.servlet testFixturesImplementation libs.jetty.server testFixturesImplementation libs.sqlite.jdbc diff --git a/docker/iceberg-rest-adapter-image/Dockerfile b/docker/iceberg-rest-adapter-image/Dockerfile index 807c85ca7d8a..30189b97c53e 100644 --- a/docker/iceberg-rest-adapter-image/Dockerfile +++ b/docker/iceberg-rest-adapter-image/Dockerfile @@ -20,10 +20,9 @@ FROM azul/zulu-openjdk:17-jre-headless # Set up the user and group -RUN \ - set -xeu && \ - groupadd iceberg --gid 1000 && \ - useradd iceberg --uid 1000 --gid 1000 --create-home +RUN set -xeu && \ + groupadd iceberg --gid 1000 && \ + useradd iceberg --uid 1000 --gid 1000 --create-home # Working directory for the application WORKDIR /usr/lib/iceberg-rest diff --git a/docker/iceberg-rest-adapter-image/README.md b/docker/iceberg-rest-adapter-image/README.md index 1395409fea64..661b5397e241 100644 --- a/docker/iceberg-rest-adapter-image/README.md +++ b/docker/iceberg-rest-adapter-image/README.md @@ -17,19 +17,18 @@ - under the License. --> -# Iceberg rest adapter image +# Iceberg REST Catalog Adapter Test Fixture For converting different catalog implementations into a rest one. +Adapter for wrapping the existing catalog backends over REST. -## Building the Docker Image locally -If you want to make changes to the local files, and test them out, you can build the image locally and use that instead: +## Build the Docker Image -```bash -# Navigate to the iceberg root directory -cd ../../ +When making changes to the local files and test them out, you can build the image locally: -# Build the project +```bash +# Build the project from iceberg root directory ./gradlew :iceberg-open-api:shadowJar # Rebuild the docker image diff --git a/open-api/LICENSE b/open-api/LICENSE index ee4389e3ef8e..219c70db68c1 100644 --- a/open-api/LICENSE +++ b/open-api/LICENSE @@ -415,11 +415,22 @@ License (from POM): Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt -------------------------------------------------------------------------------- +Group: org.apache.commons Name: commons-configuration2 Version: 2.10.1 +Project URL: https://commons.apache.org/proper/commons-configuration/ +License (from POM): Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt + +-------------------------------------------------------------------------------- + Group: org.apache.hadoop Name: hadoop-common Version: 3.3.6 License (from POM): Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt -------------------------------------------------------------------------------- +Group: org.apache.hadoop Name: hadoop-auth Version: 3.3.6 +License (from POM): Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt + +-------------------------------------------------------------------------------- + Group: org.apache.httpcomponents.client5 Name: httpclient5 Version: 5.4 License (from POM): Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt diff --git a/open-api/NOTICE b/open-api/NOTICE index 15e0d63f9135..003bda712b67 100644 --- a/open-api/NOTICE +++ b/open-api/NOTICE @@ -81,6 +81,9 @@ Copyright 2002-2024 The Apache Software Foundation Apache Commons Lang Copyright 2001-2023 The Apache Software Foundation +Apache Commons Configuration +Copyright 2001-2024 The Apache Software Foundation + Apache HttpClient Copyright 1999-2021 The Apache Software Foundation diff --git a/open-api/src/testFixtures/resources/log4j.properties b/open-api/src/testFixtures/resources/log4j.properties new file mode 100644 index 000000000000..30c07034cbe4 --- /dev/null +++ b/open-api/src/testFixtures/resources/log4j.properties @@ -0,0 +1,22 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +log4j.rootLogger=INFO, stdout +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.Target=System.out +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd'T'HH:mm:ss.SSS} %-5p [%c] - %m%n \ No newline at end of file