pig-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sz...@apache.org
Subject svn commit: r1840299 - in /pig/trunk: BUILDING.md CHANGES.txt build.xml dev-support/docker/Dockerfile
Date Fri, 07 Sep 2018 13:33:33 GMT
Author: szita
Date: Fri Sep  7 13:33:33 2018
New Revision: 1840299

URL: http://svn.apache.org/viewvc?rev=1840299&view=rev
Log:
PIG-5343: Upgrade developer build environment (nielsbasjes via szita)

Modified:
    pig/trunk/BUILDING.md
    pig/trunk/CHANGES.txt
    pig/trunk/build.xml
    pig/trunk/dev-support/docker/Dockerfile

Modified: pig/trunk/BUILDING.md
URL: http://svn.apache.org/viewvc/pig/trunk/BUILDING.md?rev=1840299&r1=1840298&r2=1840299&view=diff
==============================================================================
--- pig/trunk/BUILDING.md (original)
+++ pig/trunk/BUILDING.md Fri Sep  7 13:33:33 2018
@@ -3,7 +3,7 @@
 ## Requirements:
 
 * Unix System
-* JDK 1.7+
+* JDK 1.8+
 * Ant 1.8.1+
 * Findbugs 3.x+
 * Forrest 0.9 (for building the documentation)

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1840299&r1=1840298&r2=1840299&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Fri Sep  7 13:33:33 2018
@@ -26,6 +26,8 @@ PIG-5282: Upgade to Java 8 (satishsaley
  
 IMPROVEMENTS
 
+PIG-5343: Upgrade developer build environment (nielsbasjes via szita)
+
 PIG-5191: Pig HBase 2.0.0 support (nkollar via szita, reviewed by rohini)
 
 PIG-5344: Update Apache HTTPD LogParser to latest version (nielsbasjes via szita)

Modified: pig/trunk/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/build.xml?rev=1840299&r1=1840298&r2=1840299&view=diff
==============================================================================
--- pig/trunk/build.xml (original)
+++ pig/trunk/build.xml Fri Sep  7 13:33:33 2018
@@ -952,7 +952,7 @@
             <sysproperty key="ivy.lib.dir" value="${ivy.lib.dir}" />
             <sysproperty key="java.io.tmpdir" value="${junit.tmp.dir}" />
             <sysproperty key="hadoop.log.dir" value="${test.log.dir}"/>
-            <jvmarg line="-XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=128M ${debugArgs}
-Djava.library.path=${hadoop.root}\bin"/>
+            <jvmarg line="-XX:+CMSClassUnloadingEnabled ${debugArgs} -Djava.library.path=${hadoop.root}\bin"/>
             <sysproperty key="java.security.krb5.realm" value="" />
             <sysproperty key="java.security.krb5.kdc" value="" />
             <sysproperty key="log4j.configuration" value="file:${basedir}/conf/test-log4j.properties"/>

Modified: pig/trunk/dev-support/docker/Dockerfile
URL: http://svn.apache.org/viewvc/pig/trunk/dev-support/docker/Dockerfile?rev=1840299&r1=1840298&r2=1840299&view=diff
==============================================================================
--- pig/trunk/dev-support/docker/Dockerfile (original)
+++ pig/trunk/dev-support/docker/Dockerfile Fri Sep  7 13:33:33 2018
@@ -17,7 +17,7 @@
 # Dockerfile for installing the necessary dependencies for building Apache Pig.
 # See BUILDING.md.
 
-FROM ubuntu:trusty
+FROM ubuntu:bionic
 
 # Define working directory.
 WORKDIR /root
@@ -29,16 +29,17 @@ RUN sed -i 's/# \(.*multiverse$\)/\1/g'
     apt-get install -y build-essential && \
     apt-get install -y software-properties-common && \
     apt-get install --no-install-recommends -y \
+            sudo \
             git subversion \
             byobu htop man unzip vim \
             cabal-install \
             curl wget \
-            openjdk-7-jdk \
+            openjdk-8-jdk \
             ant ant-contrib ant-optional make maven \
             cmake gcc g++ protobuf-compiler \
             build-essential libtool \
             zlib1g-dev pkg-config libssl-dev \
-            snappy libsnappy-dev \
+            ubuntu-snappy ubuntu-snappy-cli libsnappy-dev \
             bzip2 libbz2-dev \
             libjansson-dev \
             fuse libfuse-dev \
@@ -47,11 +48,7 @@ RUN sed -i 's/# \(.*multiverse$\)/\1/g'
     rm -rf /var/lib/apt/lists/*
 
 # Define commonly used JAVA_HOME variable
-ENV JAVA_HOME /usr/lib/jvm/java-7-openjdk-amd64
-
-# 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 .
+ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
 
 # Avoid out of memory errors in builds
 ENV MAVEN_OPTS -Xms256m -Xmx512m
@@ -64,12 +61,9 @@ RUN mkdir -p /opt/findbugs && \
 ENV FINDBUGS_HOME /opt/findbugs
 
 # Install Forrest in /usr/local/apache-forrest
-# Screenscrape the download page for a local mirror URL
-RUN cd /usr/local/ && \
-    curl https://forrest.apache.org/mirrors.cgi | \
-    fgrep href | fgrep apache-forrest-0.9 | \
-    sed 's@^.*"\(http[^"]*apache-forrest-[^"]*.tar.gz\)".*@\1@' | \
-    xargs -n1 -r wget
+# Download
+RUN cd /usr/local/ && wget "http://www.apache.org/dyn/closer.lua?action=download&filename=/forrest/apache-forrest-0.9-sources.tar.gz"
     -O "apache-forrest-0.9-sources.tar.gz"
+RUN cd /usr/local/ && wget "http://www.apache.org/dyn/closer.lua?action=download&filename=/forrest/apache-forrest-0.9-dependencies.tar.gz"
-O "apache-forrest-0.9-dependencies.tar.gz"
 
 # Unpack Apache Forrest
 RUN cd /usr/local/ && \



Mime
View raw message