Merge branch 'master' into ARROW-1240-upgrade-logback

wesm · Jul 24, 2017 · 3e2f676 · 3e2f676
2 parents caed163 + fabf7fb
commit 3e2f676
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 21 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -45,6 +45,13 @@ environment:
       PYTHON: "3.5"
       ARCH: "64"
       CONFIGURATION: "Release"
+    - JOB: "Build"
+      GENERATOR: Visual Studio 15 2017 Win64
+      PYTHON: "3.5"
+      ARCH: "64"
+      CONFIGURATION: "Release"
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      BOOST_ROOT: C:\Libraries\boost_1_64_0
 
   MSVC_DEFAULT_OPTIONS: ON
   BOOST_ROOT: C:\Libraries\boost_1_63_0

diff --git a/cpp/cmake_modules/SnappyConfig.h b/cpp/cmake_modules/SnappyConfig.h
@@ -29,7 +29,7 @@
 #ifndef SNAPPY_CONFIG_H
 #define SNAPPY_CONFIG_H 1
 
-#if defined(_MSC_VER) && (_MSC_VER <= 1900)
+#if defined(_MSC_VER) && (_MSC_VER <= 1910)
 typedef __int64 ssize_t;
 #endif
 

diff --git a/dev/release/02-source.sh b/dev/release/02-source.sh
@@ -88,6 +88,12 @@ rm -rf ${tag}
 git archive $release_hash --prefix ${tag}/ | tar xf -
 rm -rf ${tag}/c_glib
 mv tmp-c_glib ${tag}/c_glib
+
+# ARROW-1244 Remove cpp/src/plasma from source release until after IP clearance
+# is resolved
+rm -rf ${tag}/cpp/src/plasma
+
+# Create new tarball from modified source directory
 tar czf ${tarball} ${tag}
 rm -rf ${tag}
 

diff --git a/dev/release/rat_exclude_files.txt b/dev/release/rat_exclude_files.txt
@@ -43,21 +43,21 @@ MANIFEST.in
 __init__.pxd
 __init__.py
 requirements.txt
-version
-*.m4
-configure
-config.sub
-config.h.in
-compile
-missing
-install-sh
-config.guess
-depcomp
-ltmain.sh
-arrow-glib.types
-arrow-glib-sections.txt
-arrow-glib-overrides.txt
-gtk-doc.make
+c_glib/configure
+c_glib/version
+c_glib/m4/*.m4
+c_glib/config/config.sub
+c_glib/config.h.in
+c_glib/config/compile
+c_glib/config/missing
+c_glib/config/install-sh
+c_glib/config/config.guess
+c_glib/config/depcomp
+c_glib/config/ltmain.sh
+c_glib/doc/reference/arrow-glib.types
+c_glib/doc/reference/arrow-glib-sections.txt
+c_glib/doc/reference/arrow-glib-overrides.txt
+c_glib/doc/reference/gtk-doc.make
 *.html
 *.sgml
 *.css

diff --git a/java/format/pom.xml b/java/format/pom.xml
@@ -15,7 +15,7 @@
 <parent>
   <artifactId>arrow-java-root</artifactId>
   <groupId>org.apache.arrow</groupId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
 </parent>
 
 <artifactId>arrow-format</artifactId>

diff --git a/java/memory/pom.xml b/java/memory/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.apache.arrow</groupId>
     <artifactId>arrow-java-root</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
   </parent>
   <artifactId>arrow-memory</artifactId>
   <name>Arrow Memory</name>

diff --git a/java/pom.xml b/java/pom.xml
@@ -20,7 +20,7 @@
 
   <groupId>org.apache.arrow</groupId>
   <artifactId>arrow-java-root</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Apache Arrow Java Root POM</name>

diff --git a/java/tools/pom.xml b/java/tools/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.apache.arrow</groupId>
         <artifactId>arrow-java-root</artifactId>
-        <version>0.5.0-SNAPSHOT</version>
+        <version>0.6.0-SNAPSHOT</version>
     </parent>
     <artifactId>arrow-tools</artifactId>
     <name>Arrow Tools</name>

diff --git a/java/vector/pom.xml b/java/vector/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.apache.arrow</groupId>
     <artifactId>arrow-java-root</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
   </parent>
   <artifactId>arrow-vector</artifactId>
   <name>Arrow Vectors</name>