From ae5ff6b718127787c6e41b871eee6352d04fbcbc Mon Sep 17 00:00:00 2001 From: dimitrisstaratzis Date: Tue, 7 May 2024 19:56:32 +0300 Subject: [PATCH 1/2] update to TileDB-2.23.0-rc0 --- build.gradle | 2 +- cmake/Modules/FindTileDB_EP.cmake | 20 +++++++++---------- gradle.properties | 4 ++-- .../java/io/tiledb/java/api/VersionTest.java | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 6f9f33bb..38952e44 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ plugins { } group 'io.tiledb' -version '0.24.0-SNAPSHOT' +version '0.25.0-SNAPSHOT' repositories { jcenter() diff --git a/cmake/Modules/FindTileDB_EP.cmake b/cmake/Modules/FindTileDB_EP.cmake index 5aab0ae7..bcecff6b 100644 --- a/cmake/Modules/FindTileDB_EP.cmake +++ b/cmake/Modules/FindTileDB_EP.cmake @@ -48,30 +48,30 @@ if (NOT TILEDB_FOUND) # Try to download prebuilt artifacts unless the user specifies to build from source if(DOWNLOAD_TILEDB_PREBUILT) if (WIN32) # Windows - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.22.0/tiledb-windows-x86_64-2.22.0-52e981e.zip") - SET(DOWNLOAD_SHA1 "7c1852c1c916be650cf7f75b238844104370cb1f") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.23.0-rc0/tiledb-windows-x86_64-2.23.0-rc0-152093b.zip") + SET(DOWNLOAD_SHA1 "b157ec496cd41bf48e32c2a4540f69e98c0448bb") elseif(APPLE) # macOS if (CMAKE_OSX_ARCHITECTURES STREQUAL x86_64 OR CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(AMD64|amd64)|(^i.86$)") message(STATUS "Building for intel mac") - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.22.0/tiledb-macos-x86_64-2.22.0-52e981e.tar.gz") - SET(DOWNLOAD_SHA1 "a0b6b91a448aefae351cbe96c5cc2c8867eb2b07") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.23.0-rc0/tiledb-macos-x86_64-2.23.0-rc0-152093b.tar.gz") + SET(DOWNLOAD_SHA1 "93eb94fea11520493a8d449647e5f28d1c4bfcaa") elseif (CMAKE_OSX_ARCHITECTURES STREQUAL arm64 OR CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") message(STATUS "Building for apple silicon mac") - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.22.0/tiledb-macos-arm64-2.22.0-52e981e.tar.gz") - SET(DOWNLOAD_SHA1 "838ab13090f0832e3858b88aa3aa9b38bde7c7cb") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.23.0-rc0/tiledb-macos-arm64-2.23.0-rc0-152093b.tar.gz") + SET(DOWNLOAD_SHA1 "67021e6ffd3a9118b53d410c02d9cca2d35730e8") endif() else() # Linux if (USE_AVX2) message(STATUS "Using Linux binaries with AVX2") - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.22.0/tiledb-linux-x86_64-2.22.0-52e981e.tar.gz") - SET(DOWNLOAD_SHA1 "292fdd4d4034ef7e4686da04b1ffc9e7976f1601") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.23.0-rc0/tiledb-linux-x86_64-2.23.0-rc0-152093b.tar.gz") + SET(DOWNLOAD_SHA1 "400aad5812a29b09882b9ea80d7eb5acb36454b9") else() message(STATUS "Using Linux binaries without AVX2") - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.22.0/tiledb-linux-x86_64-noavx2-2.22.0-52e981e.tar.gz") - SET(DOWNLOAD_SHA1 "219cff96005c0d7c05112197f3cc546d2cbcf4b4") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.23.0-rc0/tiledb-linux-x86_64-noavx2-2.23.0-rc0-152093b.tar.gz") + SET(DOWNLOAD_SHA1 "12ba3d831d58f32bc999be7c141f31b7c39bb1f0") endif() endif() diff --git a/gradle.properties b/gradle.properties index 41a4afe4..aea36002 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,11 @@ TILEDB_GIT_REPOSITORY=https://github.com/TileDB-Inc/TileDB -TILEDB_GIT_TAG=2.22.0 +TILEDB_GIT_TAG=2.23.0-rc0 TILEDB_VERBOSE=ON TILEDB_S3=ON TILEDB_AZURE=OFF TILEDB_HDFS=OFF TILEDB_SERIALIZATION=OFF -FORCE_BUILD_TILEDB=ON +FORCE_BUILD_TILEDB=OFF DOWNLOAD_TILEDB_PREBUILT=ON TILEDB_SKIP_S3AWSSDK_DIR_LENGTH_CHECK=ON USE_AVX2=OFF diff --git a/src/test/java/io/tiledb/java/api/VersionTest.java b/src/test/java/io/tiledb/java/api/VersionTest.java index beacaab7..4577f52d 100644 --- a/src/test/java/io/tiledb/java/api/VersionTest.java +++ b/src/test/java/io/tiledb/java/api/VersionTest.java @@ -34,7 +34,7 @@ public void testVersion() { Version version = new Version(); System.out.println(version); Assert.assertTrue(version.getMajor() == 2); - Assert.assertTrue(version.getMinor() == 22); + Assert.assertTrue(version.getMinor() == 23); Assert.assertTrue(version.getRevision() == 0); } } From 9e48bece2f2813928da5e200dee28803b91e07b4 Mon Sep 17 00:00:00 2001 From: Dimitris Staratzis <33267511+DimitrisStaratzis@users.noreply.github.com> Date: Fri, 10 May 2024 17:50:04 +0300 Subject: [PATCH 2/2] update to TileDB-2.23.0 stable --- cmake/Modules/FindTileDB_EP.cmake | 20 ++++++++++---------- gradle.properties | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmake/Modules/FindTileDB_EP.cmake b/cmake/Modules/FindTileDB_EP.cmake index bcecff6b..52a9e6a6 100644 --- a/cmake/Modules/FindTileDB_EP.cmake +++ b/cmake/Modules/FindTileDB_EP.cmake @@ -48,30 +48,30 @@ if (NOT TILEDB_FOUND) # Try to download prebuilt artifacts unless the user specifies to build from source if(DOWNLOAD_TILEDB_PREBUILT) if (WIN32) # Windows - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.23.0-rc0/tiledb-windows-x86_64-2.23.0-rc0-152093b.zip") - SET(DOWNLOAD_SHA1 "b157ec496cd41bf48e32c2a4540f69e98c0448bb") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.23.0/tiledb-windows-x86_64-2.23.0-152093b.zip") + SET(DOWNLOAD_SHA1 "ea83e8482b84244407d73f72dfeec0efb0d1ef8c") elseif(APPLE) # macOS if (CMAKE_OSX_ARCHITECTURES STREQUAL x86_64 OR CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(AMD64|amd64)|(^i.86$)") message(STATUS "Building for intel mac") - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.23.0-rc0/tiledb-macos-x86_64-2.23.0-rc0-152093b.tar.gz") - SET(DOWNLOAD_SHA1 "93eb94fea11520493a8d449647e5f28d1c4bfcaa") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.23.0/tiledb-macos-x86_64-2.23.0-152093b.tar.gz") + SET(DOWNLOAD_SHA1 "b0aeef67e1e7d6a8037c4a6e088c910d692b0615") elseif (CMAKE_OSX_ARCHITECTURES STREQUAL arm64 OR CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") message(STATUS "Building for apple silicon mac") - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.23.0-rc0/tiledb-macos-arm64-2.23.0-rc0-152093b.tar.gz") - SET(DOWNLOAD_SHA1 "67021e6ffd3a9118b53d410c02d9cca2d35730e8") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.23.0/tiledb-macos-arm64-2.23.0-152093b.tar.gz") + SET(DOWNLOAD_SHA1 "6414e23bd89eb023283b9bea37b2b65deff4b769") endif() else() # Linux if (USE_AVX2) message(STATUS "Using Linux binaries with AVX2") - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.23.0-rc0/tiledb-linux-x86_64-2.23.0-rc0-152093b.tar.gz") - SET(DOWNLOAD_SHA1 "400aad5812a29b09882b9ea80d7eb5acb36454b9") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.23.0/tiledb-linux-x86_64-2.23.0-152093b.tar.gz") + SET(DOWNLOAD_SHA1 "afcedf7eac59d8ccb357fce8bcf0cfb24ff8c329") else() message(STATUS "Using Linux binaries without AVX2") - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.23.0-rc0/tiledb-linux-x86_64-noavx2-2.23.0-rc0-152093b.tar.gz") - SET(DOWNLOAD_SHA1 "12ba3d831d58f32bc999be7c141f31b7c39bb1f0") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.23.0/tiledb-linux-x86_64-noavx2-2.23.0-152093b.tar.gz") + SET(DOWNLOAD_SHA1 "3d453aaf81becd4b8ceb4fa4c1824a248d631986") endif() endif() diff --git a/gradle.properties b/gradle.properties index aea36002..3b849928 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ TILEDB_GIT_REPOSITORY=https://github.com/TileDB-Inc/TileDB -TILEDB_GIT_TAG=2.23.0-rc0 +TILEDB_GIT_TAG=2.23.0 TILEDB_VERBOSE=ON TILEDB_S3=ON TILEDB_AZURE=OFF