adoroszlai commented on code in PR #9915:
URL: https://github.com/apache/ozone/pull/9915#discussion_r3340978215
##########
hadoop-ozone/dist/src/main/license/jar-report.txt:
##########
@@ -2,14 +2,14 @@ share/ozone/lib/aircompressor.jar
share/ozone/lib/animal-sniffer-annotations.jar
share/ozone/lib/annotations.jar
share/ozone/lib/annotations.jar
-share/ozone/lib/apache-log4j-extras.jar
-share/ozone/lib/aopalliance.jar
share/ozone/lib/aopalliance-repackaged.jar
+share/ozone/lib/aopalliance.jar
+share/ozone/lib/apache-log4j-extras.jar
Review Comment:
Please don't move around lines unnecessarily.
##########
hadoop-ozone/dist/src/main/compose/ozone/docker-config:
##########
@@ -23,7 +23,7 @@ CORE-SITE.XML_hadoop.proxyuser.hadoop.groups=*
OZONE-SITE.XML_ozone.om.address=om
OZONE-SITE.XML_ozone.om.http-address=om:9874
OZONE-SITE.XML_ozone.scm.http-address=scm:9876
-OZONE-SITE.XML_ozone.scm.container.size=100MB
+OZONE-SITE.XML_ozone.scm.container.size=1GB
Review Comment:
Why was this changed? We use a small value to reduce chances of disk out of
space error in acceptance tests.
##########
hadoop-ozone/dist/src/main/license/bin/LICENSE.txt:
##########
@@ -261,6 +261,21 @@ CDDL 1.1 + GPLv2 with classpath exception
org.glassfish.jaxb:txw2
+Apache License 2.0
+=====================
+ com.squareup.okhttp3:okhttp
+ com.squareup.okhttp3:okhttp-sse
+ com.squareup.okio:okio
+ com.squareup.retrofit2:converter-jackson
+ com.squareup.retrofit2:retrofit
+ dev.ai4j:openai4j
+ dev.langchain4j:langchain4j-anthropic
+ dev.langchain4j:langchain4j-core
+ dev.langchain4j:langchain4j-open-ai
+ org.jetbrains.kotlin:kotlin-stdlib-common
+ org.jetbrains.kotlin:kotlin-stdlib-jdk7
+ org.jetbrains.kotlin:kotlin-stdlib-jdk8
+
Apache License 2.0
=====================
Review Comment:
Please don't duplicate License sections, add the dependencies in existing
sections in alphabetical order.
##########
pom.xml:
##########
@@ -1601,6 +1609,17 @@
<artifactId>jooq-meta</artifactId>
<version>${jooq.version}</version>
</dependency>
+ <dependency>
+ <!-- langchain4j-bom pins JUnit 5.10.0; override to keep Ozone on
${junit5.version}. -->
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>${junit5.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <version>${junit5.version}</version>
+ </dependency>
Review Comment:
We already import `junit-bom`.
https://github.com/apache/ozone/blob/2020d864c78c90582f9f3f661ea98a49cb51e608/pom.xml#L300-L306
##########
pom.xml:
##########
@@ -1656,6 +1675,57 @@
<artifactId>snakeyaml</artifactId>
<version>${snakeyaml.version}</version>
</dependency>
+ <dependency>
+ <!-- langchain4j-bom pins AWS SDK 2.21.44; override to keep Ozone on
${aws-java-sdk2.version}. -->
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>apache-client</artifactId>
+ <version>${aws-java-sdk2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>auth</artifactId>
+ <version>${aws-java-sdk2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>aws-core</artifactId>
+ <version>${aws-java-sdk2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>http-client-spi</artifactId>
+ <version>${aws-java-sdk2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>identity-spi</artifactId>
+ <version>${aws-java-sdk2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>regions</artifactId>
+ <version>${aws-java-sdk2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>s3</artifactId>
+ <version>${aws-java-sdk2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>s3-transfer-manager</artifactId>
+ <version>${aws-java-sdk2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>sdk-core</artifactId>
+ <version>${aws-java-sdk2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>utils</artifactId>
+ <version>${aws-java-sdk2.version}</version>
+ </dependency>
Review Comment:
These are unnecessary. AWS SDK v2 is only used in tests and that module
uses the BOM:
https://github.com/apache/ozone/blob/2020d864c78c90582f9f3f661ea98a49cb51e608/hadoop-ozone/integration-test-s3/pom.xml#L29-L30
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
