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:
279
279
OWASP's dependency-check plugin will scan the third party dependencies
280
280
of this project for known CVEs (security vulnerabilities against them).
281
281
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'.
284
283
285
284
PMDK library build options:
286
285
@@ -529,7 +528,7 @@ Requirements:
529
528
530
529
* Windows 10
531
530
* JDK 1.8
532
- * Maven 3.0 or later (maven.apache.org)
531
+ * Maven 3.3 or later (maven.apache.org)
533
532
* Boost 1.86.0 (boost.org)
534
533
* Protocol Buffers 3.21.12 (https://github.com/protocolbuffers/protobuf/tags)
535
534
* 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
61
61
# #####
62
62
# Set env vars required to build Hadoop
63
63
# #####
64
- ENV MAVEN_HOME /usr
64
+ ENV MAVEN_HOME=/opt/maven
65
+ ENV PATH="${PATH}:${MAVEN_HOME}/bin"
65
66
# JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
66
67
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
67
68
@@ -88,6 +89,7 @@ ENV HADOOP_SKIP_YETUS_VERIFICATION true
88
89
# Install packages
89
90
# ###
90
91
RUN pkg-resolver/install-common-pkgs.sh
92
+ RUN pkg-resolver/install-maven.sh ubuntu:focal
91
93
RUN pkg-resolver/install-spotbugs.sh ubuntu:focal
92
94
RUN pkg-resolver/install-boost.sh ubuntu:focal
93
95
RUN 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
62
62
######
63
63
# Set env vars required to build Hadoop
64
64
######
65
- ENV MAVEN_HOME /usr
65
+ ENV MAVEN_HOME=/opt/maven
66
+ ENV PATH="${PATH}:${MAVEN_HOME}/bin"
66
67
# JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
67
68
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-arm64
68
69
@@ -92,6 +93,7 @@ ENV QT_QPA_PLATFORM offscreen
92
93
# Install packages
93
94
####
94
95
RUN pkg-resolver/install-common-pkgs.sh
96
+ RUN pkg-resolver/install-maven.sh ubuntu:focal::arch64
95
97
RUN pkg-resolver/install-spotbugs.sh ubuntu:focal::arch64
96
98
RUN pkg-resolver/install-boost.sh ubuntu:focal::arch64
97
99
RUN 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 \
54
54
######
55
55
# Set env vars required to build Hadoop
56
56
######
57
- ENV MAVEN_HOME=/usr
57
+ ENV MAVEN_HOME=/opt/maven
58
+ ENV PATH="${PATH}:${MAVEN_HOME}/bin"
58
59
# JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
59
60
ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
60
61
@@ -80,6 +81,7 @@ ENV HADOOP_SKIP_YETUS_VERIFICATION=true
80
81
####
81
82
# Install packages
82
83
####
84
+ RUN pkg-resolver/install-maven.sh debian:11
83
85
RUN pkg-resolver/install-cmake.sh debian:11
84
86
RUN pkg-resolver/install-spotbugs.sh debian:11
85
87
RUN 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
61
61
######
62
62
# Set env vars required to build Hadoop
63
63
######
64
- ENV MAVEN_HOME /usr
64
+ ENV MAVEN_HOME=/opt/maven
65
+ ENV PATH="${PATH}:${MAVEN_HOME}/bin"
65
66
# JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
66
67
ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-amd64
67
68
@@ -87,6 +88,7 @@ ENV HADOOP_SKIP_YETUS_VERIFICATION true
87
88
####
88
89
# Install packages
89
90
####
91
+ RUN pkg-resolver/install-maven.sh ubuntu:noble
90
92
RUN pkg-resolver/install-spotbugs.sh ubuntu:noble
91
93
RUN pkg-resolver/install-boost.sh ubuntu:noble
92
94
RUN 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
62
62
RUN powershell Expand-Archive -Path $Env:TEMP\zulu8.62.0.19-ca-jdk8.0.332-win_x64.zip -DestinationPath "C:\Java"
63
63
64
64
# 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"
67
67
68
68
# Install CMake 3.19.0.
69
69
RUN 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'
141
141
ENV IS_WINDOWS 1
142
142
RUN setx PATH "%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
143
143
RUN 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"
145
145
RUN setx PATH "%PATH%;C:\CMake\cmake-3.19.0-win64-x64\bin"
146
146
RUN setx PATH "%PATH%;C:\ZStd"
147
147
RUN 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
27
27
exit 1
28
28
fi
29
29
30
- default_version=" 3.6.3 "
30
+ default_version=" 3.9.11 "
31
31
version_to_install=$default_version
32
32
if [ -n " $2 " ]; then
33
33
version_to_install=" $2 "
34
34
fi
35
35
36
- if [ " $version_to_install " != " 3.6.3 " ]; then
36
+ if [ " $version_to_install " != " 3.9.11 " ]; then
37
37
echo " WARN: Don't know how to install version $version_to_install , installing the default version $default_version instead"
38
38
version_to_install=$default_version
39
39
fi
40
40
41
- if [ " $version_to_install " == " 3.6.3 " ]; then
41
+ if [ " $version_to_install " == " 3.9.11 " ]; then
42
42
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
46
46
else
47
47
echo " ERROR: Don't know how to install version $version_to_install "
48
48
exit 1
Original file line number Diff line number Diff line change 258
258
"ubuntu:focal::arch64" : " make" ,
259
259
"rockylinux:8" : " make"
260
260
},
261
- "maven" : {
262
- "debian:11" : " maven" ,
263
- "ubuntu:focal" : " maven" ,
264
- "ubuntu:noble" : " maven" ,
265
- "ubuntu:focal::arch64" : " maven"
266
- },
267
261
"java" : {
268
262
"debian:11" : [
269
263
" openjdk-11-jdk" ,
Original file line number Diff line number Diff line change @@ -18,8 +18,8 @@ Hadoop Auth, Java HTTP SPNEGO - Building It
18
18
Requirements
19
19
------------
20
20
21
- * Java 7+
22
- * Maven 3+
21
+ * JDK 1.8
22
+ * Maven 3.3 or later
23
23
* Kerberos KDC (for running Kerberos test cases)
24
24
25
25
Building
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
617
617
dependencies of this project for known CVEs (security
618
618
vulnerabilities against them). It will produce a report
619
619
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'.
622
621
-->
623
622
<groupId >org.owasp</groupId >
624
623
<artifactId >dependency-check-maven</artifactId >
You can’t perform that action at this time.
0 commit comments