This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new c5ecba0 GEODE-9189: Upgrade dependencies.
c5ecba0 is described below
commit c5ecba0c1ab57f272d15ea9d2204b42d62ed2df0
Author: Jacob Barrett <jbarr...@pivotal.io>
AuthorDate: Wed Aug 18 14:34:44 2021 -0700
GEODE-9189: Upgrade dependencies.
Boost to 1.76.
ACE to 7.0.3.
GTest 1.11.0.
Benchmark 1.6.0.
SQLite to 3.36.0
Removed unused colored_printing, which depends on internals of gtest.
---
c-bindings/integration/CMakeLists.txt | 3 +-
c-bindings/integration/test/CMakeLists.txt | 1 -
c-bindings/integration/utilities/CMakeLists.txt | 25 ------------
.../integration/utilities/colored_printing.hpp | 31 ---------------
.../utilities/internal/colored_printing.cpp | 31 ---------------
.../utilities/internal/colored_printing.hpp | 45 ----------------------
cppcache/integration/benchmark/RegionBM.cpp | 3 +-
cppcache/src/ExpiryTaskManager.hpp | 1 +
cppcache/test/CacheableStringTests.cpp | 5 +--
dependencies/ACE/CMakeLists.txt | 4 +-
dependencies/benchmark/CMakeLists.txt | 4 +-
dependencies/boost/CMakeLists.txt | 4 +-
dependencies/gtest/CMakeLists.txt | 10 ++++-
dependencies/sqlite/CMakeLists.txt | 4 +-
14 files changed, 21 insertions(+), 150 deletions(-)
diff --git a/c-bindings/integration/CMakeLists.txt
b/c-bindings/integration/CMakeLists.txt
index 4abb931..255cca4 100644
--- a/c-bindings/integration/CMakeLists.txt
+++ b/c-bindings/integration/CMakeLists.txt
@@ -13,5 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-add_subdirectory(utilities)
-add_subdirectory(test)
\ No newline at end of file
+add_subdirectory(test)
diff --git a/c-bindings/integration/test/CMakeLists.txt
b/c-bindings/integration/test/CMakeLists.txt
index 199c73b..af66bea 100644
--- a/c-bindings/integration/test/CMakeLists.txt
+++ b/c-bindings/integration/test/CMakeLists.txt
@@ -36,7 +36,6 @@ target_include_directories(${PROJECT_NAME}
target_link_libraries(${PROJECT_NAME}
PUBLIC
apache-geode-c
- apache-geode-c-integration-utilities
integration-framework
testobject
ACE::ACE
diff --git a/c-bindings/integration/utilities/CMakeLists.txt
b/c-bindings/integration/utilities/CMakeLists.txt
deleted file mode 100644
index a7410c9..0000000
--- a/c-bindings/integration/utilities/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-project(apache-geode-c-integration-utilities)
-
-add_library(${PROJECT_NAME} OBJECT "internal/colored_printing.cpp")
-
-target_link_libraries(${PROJECT_NAME}
- PUBLIC
- GTest::gtest
-)
-
-add_clangformat(apache-geode-c-integration-utilities)
diff --git a/c-bindings/integration/utilities/colored_printing.hpp
b/c-bindings/integration/utilities/colored_printing.hpp
deleted file mode 100644
index a1e02cd..0000000
--- a/c-bindings/integration/utilities/colored_printing.hpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "utilities/internal/colored_printing.hpp"
-
-namespace util {
-/* Include this header.
-
- These instances will print that little colored box on the left column, just
- like GoogleTest does, followed by your formatted text in the color
specified.
- The instances are extern'd to reduce object bloat and compile time. You can
- find their definition and instantiation in the internal directory below.
-*/
-extern template void print_message<::testing::internal::COLOR_DEFAULT>(const
char* fmt...);
-extern template void print_message<::testing::internal::COLOR_GREEN>(const
char* fmt...);
-extern template void print_message<::testing::internal::COLOR_YELLOW>(const
char* fmt...);
-extern template void print_message<::testing::internal::COLOR_RED>(const char*
fmt...);
-} // namespace util
diff --git a/c-bindings/integration/utilities/internal/colored_printing.cpp
b/c-bindings/integration/utilities/internal/colored_printing.cpp
deleted file mode 100644
index aa0a441..0000000
--- a/c-bindings/integration/utilities/internal/colored_printing.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "colored_printing.hpp"
-
-namespace util {
-/* This is explicit template instantiation. This translation unit will compile
- these template instances here, and we can extern them everywhere they are
- in use to reduce object bloat and compile time.
- */
-template void print_message<::testing::internal::COLOR_DEFAULT>(
- const char* fmt...);
-template void print_message<::testing::internal::COLOR_GREEN>(
- const char* fmt...);
-template void print_message<::testing::internal::COLOR_YELLOW>(
- const char* fmt...);
-template void print_message<::testing::internal::COLOR_RED>(const char*
fmt...);
-} // namespace util
diff --git a/c-bindings/integration/utilities/internal/colored_printing.hpp
b/c-bindings/integration/utilities/internal/colored_printing.hpp
deleted file mode 100644
index 5f4ce8f..0000000
--- a/c-bindings/integration/utilities/internal/colored_printing.hpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <cstdarg>
-
-#include <gtest/gtest.h>
-
-/* DO NOT INCLUDE THIS HEADER DIRECTLY.
-
- Use the header of the same name in the directory above. That header contains
- extern template declarations of these templates to reduce object bloat and
- compile time.
-*/
-namespace testing {
- namespace internal {
- extern void ColoredPrintf(GTestColor color, const char* fmt, ...);
- }
-} // namespace testing
-
-namespace util {
-template <::testing::internal::GTestColor color>
-void print_message(const char* fmt...) {
- va_list args;
- va_start(args, fmt);
-
- testing::internal::ColoredPrintf(
- ::testing::Test::HasFatalFailure() ? testing::internal::COLOR_RED :
testing::internal::COLOR_GREEN
- , "[ ] ");
-
- testing::internal::ColoredPrintf(color, va_arg(args, char*), args);
-}
-} // namespace util
diff --git a/cppcache/integration/benchmark/RegionBM.cpp
b/cppcache/integration/benchmark/RegionBM.cpp
index 06877ef..7fef624 100644
--- a/cppcache/integration/benchmark/RegionBM.cpp
+++ b/cppcache/integration/benchmark/RegionBM.cpp
@@ -30,6 +30,7 @@
#ifdef WIN32
#pragma warning(disable : 4596)
#endif
+
#include <boost/log/core.hpp>
#include <boost/log/expressions.hpp>
#include <boost/log/trivial.hpp>
@@ -59,7 +60,7 @@ class RegionBM : public benchmark::Fixture {
void SetUp(benchmark::State&) override {
if (!cluster) {
cluster = std::unique_ptr<Cluster>(
- new Cluster(Name{name_}, LocatorCount{1}, ServerCount{1}));
+ new Cluster(::Name{name_}, LocatorCount{1}, ServerCount{1}));
cluster->getGfsh()
.create()
.region()
diff --git a/cppcache/src/ExpiryTaskManager.hpp
b/cppcache/src/ExpiryTaskManager.hpp
index a00ea6b..10d2c96 100644
--- a/cppcache/src/ExpiryTaskManager.hpp
+++ b/cppcache/src/ExpiryTaskManager.hpp
@@ -22,6 +22,7 @@
#include <chrono>
#include <condition_variable>
+#include <map>
#include <mutex>
#include <thread>
diff --git a/cppcache/test/CacheableStringTests.cpp
b/cppcache/test/CacheableStringTests.cpp
index d9624e8..0c330e6 100644
--- a/cppcache/test/CacheableStringTests.cpp
+++ b/cppcache/test/CacheableStringTests.cpp
@@ -15,20 +15,17 @@
* limitations under the License.
*/
-#include <stdint.h>
-
+#include <cstdint>
#include <limits>
#include <gtest/gtest.h>
-#include <geode/CacheFactory.hpp>
#include <geode/DataOutput.hpp>
#include "ByteArrayFixture.hpp"
#include "DataInputInternal.hpp"
#include "DataOutputInternal.hpp"
#include "SerializationRegistry.hpp"
-#include "gtest_extensions.h"
namespace {
diff --git a/dependencies/ACE/CMakeLists.txt b/dependencies/ACE/CMakeLists.txt
index ee2c042..56eddc0 100644
--- a/dependencies/ACE/CMakeLists.txt
+++ b/dependencies/ACE/CMakeLists.txt
@@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-project( ACE VERSION 7.0.0 LANGUAGES NONE )
+project( ACE VERSION 7.0.3 LANGUAGES NONE )
-set( SHA256 9dfdc31664bc2faf7832e50197203fe274c661a56f17b18af2b227ddb34174be )
+set( SHA256 96998d1e710b6d88416640caeb76915518c8d85d3f10c02079bf0dd4e57cf60a )
if ("SunOS" STREQUAL ${CMAKE_SYSTEM_NAME})
set( ACE_PLATFORM sunos5_sunc++ )
diff --git a/dependencies/benchmark/CMakeLists.txt
b/dependencies/benchmark/CMakeLists.txt
index 317bc38..abf4df2 100644
--- a/dependencies/benchmark/CMakeLists.txt
+++ b/dependencies/benchmark/CMakeLists.txt
@@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-project( benchmark VERSION 1.5.2 LANGUAGES NONE )
+project( benchmark VERSION 1.6.0 LANGUAGES NONE )
-set( SHA256 21e6e096c9a9a88076b46bd38c33660f565fa050ca427125f64c4a8bf60f336b )
+set( SHA256 3da225763533aa179af8438e994842be5ca72e4a7fed4d7976dc66c8c4502f58 )
set( DEPENDS GTest::gtest )
diff --git a/dependencies/boost/CMakeLists.txt
b/dependencies/boost/CMakeLists.txt
index 78e8068..c575a1b 100644
--- a/dependencies/boost/CMakeLists.txt
+++ b/dependencies/boost/CMakeLists.txt
@@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-project(boost VERSION 1.75.0 LANGUAGES NONE)
+project(boost VERSION 1.76.0 LANGUAGES NONE)
-set(SHA256 aeb26f80e80945e82ee93e5939baebdca47b9dee80a07d3144be1e1a6a66dd6a)
+set(SHA256 7bd7ddceec1a1dfdcbdb3e609b60d01739c38390a5f956385a12f3122049f0ca)
if (WIN32)
set(BOOTSTRAP_COMMAND ./bootstrap.bat)
diff --git a/dependencies/gtest/CMakeLists.txt
b/dependencies/gtest/CMakeLists.txt
index 65e6678..3d5c14f 100644
--- a/dependencies/gtest/CMakeLists.txt
+++ b/dependencies/gtest/CMakeLists.txt
@@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-project( gtest VERSION 1.10.0 LANGUAGES NONE )
+project( gtest VERSION 1.11.0 LANGUAGES NONE )
-set( SHA256 94c634d499558a76fa649edb13721dce6e98fb1e7018dfaeba3cd7a083945e91 )
+set( SHA256 353571c2440176ded91c2de6d6cd88ddd41401d14692ec1f99e35d013feda55a )
include(ExternalProject)
ExternalProject_Add( ${PROJECT_NAME}-extern
@@ -62,6 +62,12 @@ function(ADD_GTEST_LIBRARY)
${args_DEPENDENCIES}
)
+ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ target_compile_options(${target} INTERFACE
+ -Wno-used-but-marked-unused # GTest uses unused attribute incorrectly
+ )
+ endif()
+
add_library(GTest::${args_NAME} ALIAS ${target})
add_dependencies(${target} ${PROJECT_NAME}-extern)
diff --git a/dependencies/sqlite/CMakeLists.txt
b/dependencies/sqlite/CMakeLists.txt
index d383738..258dc1a 100644
--- a/dependencies/sqlite/CMakeLists.txt
+++ b/dependencies/sqlite/CMakeLists.txt
@@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-project( sqlite VERSION 3340100 LANGUAGES NONE )
+project( sqlite VERSION 3360000 LANGUAGES NONE )
-set( SHA256 e0b1c0345fe4338b936e17da8e1bd88366cd210e576834546977f040c12a8f68 )
+set( SHA256 999826fe4c871f18919fdb8ed7ec9dd8217180854dd1fe21eea96aed36186729 )
set( EXTERN ${PROJECT_NAME}-extern )
