adoroszlai commented on code in PR #4985:
URL: https://github.com/apache/ozone/pull/4985#discussion_r1243151852
##########
hadoop-ozone/dist/src/main/compose/ozonesecure-ha/.env:
##########
@@ -15,7 +15,7 @@
# limitations under the License.
HDDS_VERSION=${hdds.version}
-HADOOP_VERSION=3
+HADOOP_VERSION=3.3.6
Review Comment:
Now that the Docker image has the same version as Hadoop itself, we can
change this to avoid the need for future updates:
```suggestion
HADOOP_VERSION=${hadoop.version}
```
##########
hadoop-ozone/dist/src/main/compose/ozonesecure/.env:
##########
@@ -15,7 +15,7 @@
# limitations under the License.
HDDS_VERSION=${hdds.version}
-HADOOP_VERSION=3
+HADOOP_VERSION=3.3.6
Review Comment:
```suggestion
HADOOP_VERSION=${hadoop.version}
```
##########
hadoop-ozone/dist/src/main/license/jar-report.txt:
##########
@@ -1,11 +1,10 @@
-share/ozone/lib/accessors-smart.jar
+share/ozone/lib/FastInfoset.jar
Review Comment:
Nit: Three kinds of changes to `jar-report.txt` are mixed in this PR.
1. real dependency changes (see below)
2. fixing strictly out of alphabetical order items (e.g. `hdds-rocks-native`)
3. reordering due to different `sort` behavior (lowercase/uppercase, chars
other than alphabetical) across implementations
I would prefer to stick only to the first kind of change in this PR:
```diff
@@ -1,11 +1,9 @@
-share/ozone/lib/accessors-smart.jar
share/ozone/lib/activation.jar
share/ozone/lib/animal-sniffer-annotations.jar
share/ozone/lib/annotations.jar
share/ozone/lib/annotations.jar
share/ozone/lib/aopalliance.jar
share/ozone/lib/aopalliance-repackaged.jar
-share/ozone/lib/asm.jar
share/ozone/lib/aspectjrt.jar
share/ozone/lib/aspectjweaver.jar
share/ozone/lib/awaitility.jar
@@ -156,7 +154,6 @@
share/ozone/lib/jooq-meta.jar
share/ozone/lib/jsch.jar
share/ozone/lib/json-simple.jar
-share/ozone/lib/json-smart.jar
share/ozone/lib/jsp-api.jar
share/ozone/lib/jsr305.jar
share/ozone/lib/jsr311-api.jar
```
Rationale: The changes are in transitive dependencies, visible only in this
file (no POM change). Reordering lines hides the real difference.
Unfortunately `dependency` check instructs to update the file mention using
`update-jar-report.sh`:
```
Please update the hadoop-ozone/dist/src/main/license/bin/LICENSE.txt file
with the modification
AND execute hadoop-ozone/dist/src/main/license/update-jar-report.sh when
you are ready (after a full build)
```
which re-generates from scratch, causing such mixed changes. To avoid
those, one can simply manually remove the unnecessary entries.
##########
hadoop-ozone/dist/src/main/smoketest/.env:
##########
@@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-HADOOP_VERSION=3
\ No newline at end of file
+HADOOP_VERSION=3.3.6
Review Comment:
```suggestion
HADOOP_VERSION=${hadoop.version}
```
##########
hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env:
##########
@@ -16,7 +16,7 @@
HDDS_VERSION=${hdds.version}
HADOOP_IMAGE=apache/hadoop
-HADOOP_VERSION=3.3.5
+HADOOP_VERSION=3.3.6
Review Comment:
```suggestion
HADOOP_VERSION=${hadoop.version}
```
--
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]
