File tree Expand file tree Collapse file tree 10 files changed +26
-26
lines changed 
hadoop-common-project/hadoop-auth/src/site/markdown Expand file tree Collapse file tree 10 files changed +26
-26
lines changed Original file line number Diff line number Diff line change @@ -279,8 +279,7 @@ Maven build goals:
279279   OWASP's dependency-check plugin will scan the third party dependencies
280280   of this project for known CVEs (security vulnerabilities against them).
281281   It will produce a report in target/dependency-check-report.html. To
282-    invoke, run 'mvn dependency-check:aggregate'. Note that this plugin
283-    requires maven 3.1.1 or greater.
282+    invoke, run 'mvn dependency-check:aggregate'.
284283
285284 PMDK library build options:
286285
@@ -529,7 +528,7 @@ Requirements:
529528
530529* Windows 10
531530* JDK 1.8
532- * Maven 3.0  or later (maven.apache.org)
531+ * Maven 3.3  or later (maven.apache.org)
533532* Boost 1.86.0 (boost.org)
534533* Protocol Buffers 3.21.12 (https://github.com/protocolbuffers/protobuf/tags)
535534* CMake 3.19 or newer (cmake.org)
Original file line number Diff line number Diff line change @@ -61,7 +61,8 @@ ENV PYTHONIOENCODING=utf-8
6161# #####
6262#  Set env vars required to build Hadoop
6363# #####
64- ENV  MAVEN_HOME /usr
64+ ENV  MAVEN_HOME=/opt/maven
65+ ENV  PATH="${PATH}:${MAVEN_HOME}/bin" 
6566#  JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
6667ENV  JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
6768
@@ -88,6 +89,7 @@ ENV HADOOP_SKIP_YETUS_VERIFICATION true
8889#  Install packages
8990# ###
9091RUN  pkg-resolver/install-common-pkgs.sh
92+ RUN  pkg-resolver/install-maven.sh ubuntu:focal
9193RUN  pkg-resolver/install-spotbugs.sh ubuntu:focal
9294RUN  pkg-resolver/install-boost.sh ubuntu:focal
9395RUN  pkg-resolver/install-protobuf.sh ubuntu:focal
Original file line number Diff line number Diff line change @@ -62,7 +62,8 @@ ENV PYTHONIOENCODING=utf-8
6262######
6363# Set env vars required to build Hadoop
6464######
65- ENV MAVEN_HOME /usr
65+ ENV MAVEN_HOME=/opt/maven
66+ ENV PATH="${PATH}:${MAVEN_HOME}/bin"
6667# JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
6768ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-arm64
6869
@@ -92,6 +93,7 @@ ENV QT_QPA_PLATFORM offscreen
9293# Install packages
9394####
9495RUN pkg-resolver/install-common-pkgs.sh
96+ RUN pkg-resolver/install-maven.sh ubuntu:focal::arch64
9597RUN pkg-resolver/install-spotbugs.sh ubuntu:focal::arch64
9698RUN pkg-resolver/install-boost.sh ubuntu:focal::arch64
9799RUN pkg-resolver/install-protobuf.sh ubuntu:focal::arch64
Original file line number Diff line number Diff line change @@ -54,7 +54,8 @@ RUN apt-get -q update \
5454######
5555# Set env vars required to build Hadoop
5656######
57- ENV MAVEN_HOME=/usr
57+ ENV MAVEN_HOME=/opt/maven
58+ ENV PATH="${PATH}:${MAVEN_HOME}/bin"
5859# JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
5960ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
6061
@@ -80,6 +81,7 @@ ENV HADOOP_SKIP_YETUS_VERIFICATION=true
8081####
8182# Install packages
8283####
84+ RUN pkg-resolver/install-maven.sh debian:11
8385RUN pkg-resolver/install-cmake.sh debian:11
8486RUN pkg-resolver/install-spotbugs.sh debian:11
8587RUN pkg-resolver/install-boost.sh debian:11
Original file line number Diff line number Diff line change @@ -61,7 +61,8 @@ ENV PYTHONIOENCODING=utf-8
6161######
6262# Set env vars required to build Hadoop
6363######
64- ENV MAVEN_HOME /usr
64+ ENV MAVEN_HOME=/opt/maven
65+ ENV PATH="${PATH}:${MAVEN_HOME}/bin"
6566# JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
6667ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-amd64
6768
@@ -87,6 +88,7 @@ ENV HADOOP_SKIP_YETUS_VERIFICATION true
8788####
8889# Install packages
8990####
91+ RUN pkg-resolver/install-maven.sh ubuntu:noble
9092RUN pkg-resolver/install-spotbugs.sh ubuntu:noble
9193RUN pkg-resolver/install-boost.sh ubuntu:noble
9294RUN pkg-resolver/install-protobuf.sh ubuntu:noble
Original file line number Diff line number Diff line change @@ -62,8 +62,8 @@ RUN powershell Invoke-WebRequest -URI https://cdn.azul.com/zulu/bin/zulu8.62.0.1
6262RUN powershell Expand-Archive -Path $Env:TEMP\zulu8.62.0.19-ca-jdk8.0.332-win_x64.zip -DestinationPath "C:\Java"
6363
6464# Install Apache Maven.
65- RUN powershell Invoke-WebRequest -URI https://archive.apache.org/dist/maven/maven-3/3.8.8 /binaries/apache-maven-3.8.8 -bin.zip -OutFile $Env:TEMP\apache-maven-3.8.8 -bin.zip
66- RUN powershell Expand-Archive -Path $Env:TEMP\apache-maven-3.8.8 -bin.zip -DestinationPath "C:\Maven"
65+ RUN powershell Invoke-WebRequest -URI https://archive.apache.org/dist/maven/maven-3/3.9.11 /binaries/apache-maven-3.9.11 -bin.zip -OutFile $Env:TEMP\apache-maven-3.9.11 -bin.zip
66+ RUN powershell Expand-Archive -Path $Env:TEMP\apache-maven-3.9.11 -bin.zip -DestinationPath "C:\Maven"
6767
6868# Install CMake 3.19.0.
6969RUN powershell Invoke-WebRequest -URI https://cmake.org/files/v3.19/cmake-3.19.0-win64-x64.zip -OutFile $Env:TEMP\cmake-3.19.0-win64-x64.zip
@@ -141,7 +141,7 @@ ENV MAVEN_OPTS '-Xmx2048M -Xss128M'
141141ENV IS_WINDOWS 1
142142RUN setx PATH "%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
143143RUN setx PATH "%PATH%;%JAVA_HOME%\bin"
144- RUN setx PATH "%PATH%;C:\Maven\apache-maven-3.8.8 \bin"
144+ RUN setx PATH "%PATH%;C:\Maven\apache-maven-3.9.11 \bin"
145145RUN setx PATH "%PATH%;C:\CMake\cmake-3.19.0-win64-x64\bin"
146146RUN setx PATH "%PATH%;C:\ZStd"
147147RUN setx PATH "%PATH%;C:\Program Files\Git\usr\bin"
Original file line number Diff line number Diff line change @@ -27,22 +27,22 @@ if [ $? -eq 1 ]; then
2727  exit  1
2828fi 
2929
30- default_version=" 3.6.3 " 
30+ default_version=" 3.9.11 " 
3131version_to_install=$default_version 
3232if  [ -n  " $2 "   ];  then 
3333  version_to_install=" $2 " 
3434fi 
3535
36- if  [ " $version_to_install "   !=  " 3.6.3 "   ];  then 
36+ if  [ " $version_to_install "   !=  " 3.9.11 "   ];  then 
3737  echo  " WARN: Don't know how to install version $version_to_install , installing the default version $default_version  instead" 
3838  version_to_install=$default_version 
3939fi 
4040
41- if  [ " $version_to_install "   ==  " 3.6.3 "   ];  then 
41+ if  [ " $version_to_install "   ==  " 3.9.11 "   ];  then 
4242  mkdir -p /opt/maven /tmp/maven && 
43-     curl -L -s -S https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3 /apache-maven-3.6.3 -bin.tar.gz \
44-       -o /tmp/maven/apache-maven-3.6.3 -bin.tar.gz && 
45-     tar xzf /tmp/maven/apache-maven-3.6.3 -bin.tar.gz --strip-components 1 -C /opt/maven
43+     curl -L -s -S https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11 /apache-maven-3.9.11 -bin.tar.gz \
44+       -o /tmp/maven/apache-maven-3.9.11 -bin.tar.gz && 
45+     tar xzf /tmp/maven/apache-maven-3.9.11 -bin.tar.gz --strip-components 1 -C /opt/maven
4646else 
4747  echo  " ERROR: Don't know how to install version $version_to_install " 
4848  exit  1
Original file line number Diff line number Diff line change 255255    "ubuntu:focal::arch64" : " make"  ,
256256    "rockylinux:8" : " make" 
257257  },
258-   "maven" : {
259-     "debian:11" : " maven"  ,
260-     "ubuntu:focal" : " maven"  ,
261-     "ubuntu:noble" : " maven"  ,
262-     "ubuntu:focal::arch64" : " maven" 
263-   },
264258  "java" : {
265259    "debian:11" : [
266260      " openjdk-11-jdk"  ,
Original file line number Diff line number Diff line change @@ -18,8 +18,8 @@ Hadoop Auth, Java HTTP SPNEGO - Building It
1818Requirements
1919------------ 
2020
21- *  Java 7+ 
22- *  Maven 3+ 
21+ *  JDK 1.8 
22+ *  Maven 3.3 or later 
2323*  Kerberos KDC (for running Kerberos test cases)
2424
2525Building
Original file line number Diff line number Diff line change @@ -617,8 +617,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x
617617             dependencies of this project for known CVEs (security 
618618             vulnerabilities against them). It will produce a report 
619619             in target/dependency-check-report.html. To invoke, run 
620-              'mvn dependency-check:aggregate'. Note that this plugin 
621-              requires maven 3.1.1 or greater. 
620+              'mvn dependency-check:aggregate'. 
622621        -->  
623622        <groupId >org.owasp</groupId >
624623        <artifactId >dependency-check-maven</artifactId >
    
 
   
 
     
   
   
          
     
  
    
     
 
    
      
     
 
     
    You can’t perform that action at this time.
  
 
    
  
     
    
      
        
     
 
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments