Explorar o código

Updating to use maven 3.3

vrushali %!s(int64=7) %!d(string=hai) anos
pai
achega
17213a0d27
Modificáronse 3 ficheiros con 12 adicións e 5 borrados
  1. 1 1
      BUILDING.txt
  2. 10 3
      dev-support/docker/Dockerfile
  3. 1 1
      hadoop-project/pom.xml

+ 1 - 1
BUILDING.txt

@@ -317,7 +317,7 @@ Requirements:
 
 * Windows System
 * JDK 1.8+
-* Maven 3.0 or later
+* Maven 3.3 or later
 * Findbugs 1.3.9 (if running findbugs)
 * ProtocolBuffer 2.5.0
 * CMake 2.6 or newer

+ 10 - 3
dev-support/docker/Dockerfile

@@ -65,9 +65,16 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \
     snappy \
     zlib1g-dev
 
-# Fixing the Apache commons / Maven dependency problem under Ubuntu:
-# See http://wiki.apache.org/commons/VfsProblems
-RUN cd /usr/share/maven/lib && ln -s ../../java/commons-lang.jar .
+######
+# Install Apache Maven
+######
+RUN mkdir -p /opt/maven && \
+    curl -L -s -S \
+         http://www-us.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz \
+         -o /opt/maven.tar.gz && \
+    tar xzf /opt/maven.tar.gz --strip-components 1 -C /opt/maven
+ENV MAVEN_HOME /opt/maven
+
 
 #######
 # Java OpenJDK

+ 1 - 1
hadoop-project/pom.xml

@@ -107,7 +107,7 @@
     for an open-ended enforcement
     -->
     <enforced.java.version>[${javac.version},)</enforced.java.version>
-    <enforced.maven.version>[3.0.2,)</enforced.maven.version>
+    <enforced.maven.version>[3.3.0,)</enforced.maven.version>
 
     <!-- Plugin versions and config -->
     <maven-surefire-plugin.argLine>-Xmx2048m -XX:MaxPermSize=768m -XX:+HeapDumpOnOutOfMemoryError</maven-surefire-plugin.argLine>