Merge remote-tracking branch 'palantir/master' into aash/resync-apache2

ifilonenko · Oct 13, 2017 · 373e355 · 373e355
2 parents 37e4d9d + 7bfa380
commit 373e355
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/circle.yml b/circle.yml
@@ -12,8 +12,8 @@ machine:
           echo "Using cached Miniconda install";
       fi
     - ln -s ~/miniconda $(pyenv root)/versions/miniconda3-latest
-    - 'pyenv versions | grep -q miniconda3-latest/envs/python2 || $CONDA_BIN create -y -n python2 python==2.7.11 numpy'
-    - 'pyenv versions | grep -q miniconda3-latest/envs/python3 || $CONDA_BIN create -y -n python3 python==3.4.4 numpy'
+    - 'pyenv versions | grep -q miniconda3-latest/envs/python2 || $CONDA_BIN create -y -n python2 python==2.7.11 numpy | tee -a "$CIRCLE_ARTIFACTS/run-conda.log"'
+    - 'pyenv versions | grep -q miniconda3-latest/envs/python3 || $CONDA_BIN create -y -n python3 python==3.4.4 numpy | tee -a "$CIRCLE_ARTIFACTS/run-conda.log"'
     - pyenv global miniconda3-latest/envs/python2 miniconda3-latest/envs/python3 #pypy-4.0.1
     - pyenv rehash
   environment:

diff --git a/dev/deps/spark-deps-hadoop-palantir b/dev/deps/spark-deps-hadoop-palantir
@@ -51,7 +51,7 @@ commons-httpclient-3.1.jar
 commons-io-2.4.jar
 commons-lang-2.6.jar
 commons-lang3-3.5.jar
-commons-logging-1.1.3.jar
+commons-logging-1.2.jar
 commons-math3-3.4.1.jar
 commons-net-2.2.jar
 commons-pool-1.6.jar

diff --git a/pom.xml b/pom.xml
@@ -154,6 +154,7 @@
     <!-- the producer is used in tests -->
     <aws.kinesis.producer.version>0.10.2</aws.kinesis.producer.version>
     <commons-beanutils.version>1.9.3</commons-beanutils.version>
+    <commons-logging.version>1.2</commons-logging.version>
     <!--  org.apache.httpcomponents/httpclient-->
     <commons.httpclient.version>4.5.3</commons.httpclient.version>
     <commons.httpcore.version>4.4.6</commons.httpcore.version>
@@ -511,6 +512,11 @@
         <artifactId>commons-beanutils</artifactId>
         <version>${commons-beanutils.version}</version>
       </dependency>
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>${commons-logging.version}</version>
+      </dependency>
       <dependency>
         <groupId>commons-pool</groupId>
         <artifactId>commons-pool</artifactId>