This is an automated email from the ASF dual-hosted git repository. echobravo 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 c36abe5 GEODE-5968: Fixing license issues (#390) c36abe5 is described below commit c36abe5803b30dade41155b8a9bae04c81542929 Author: Ernie Burghardt <eburgha...@pivotal.io> AuthorDate: Thu Nov 1 18:22:52 2018 -0600 GEODE-5968: Fixing license issues (#390) * Updated protocol version to current. * Fix referenced Geode version * Corrected license and reference issues --- .ratignore | 2 + clicache/src/native_shared_ptr.hpp | 19 ++++- cppcache/src/Version.cpp | 2 +- docs/api/unix_index.html | 3 +- docs/api/win_index.html | 4 +- templates/security/CMakeLists.txt.forInstall | 101 +++++++++++++-------------- 6 files changed, 72 insertions(+), 59 deletions(-) diff --git a/.ratignore b/.ratignore index 7da9249..c3db593 100644 --- a/.ratignore +++ b/.ratignore @@ -1,7 +1,9 @@ # text files .*\.clang-format$ .*\.clang-tidy$ +.*\.cpackignore$ .*\.gitignore$ +.*\.lcovrc$ .*\.ratignore$ .*md$ .*json$ diff --git a/clicache/src/native_shared_ptr.hpp b/clicache/src/native_shared_ptr.hpp index ed1f539..c488b9c 100644 --- a/clicache/src/native_shared_ptr.hpp +++ b/clicache/src/native_shared_ptr.hpp @@ -1,4 +1,21 @@ -#pragma once +/* + * 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. + */ + + #pragma once #include "begin_native.hpp" diff --git a/cppcache/src/Version.cpp b/cppcache/src/Version.cpp index 9d3feac..cfba6b2 100644 --- a/cppcache/src/Version.cpp +++ b/cppcache/src/Version.cpp @@ -22,7 +22,7 @@ namespace apache { namespace geode { namespace client { -int8_t Version::m_ordinal = 45; // Geode 1.0.0 +int8_t Version::m_ordinal = 95; // Geode 1.8.0 } // namespace client } // namespace geode diff --git a/docs/api/unix_index.html b/docs/api/unix_index.html index 464ba6e..9b1d6f1 100755 --- a/docs/api/unix_index.html +++ b/docs/api/unix_index.html @@ -32,8 +32,7 @@ limitations under the License. Apache Geode Native Client Documentation</H1> </b></FONT> <p> -Access documentation at <a href="http://docs-gemfire-nativeclient-develop.cfapps.io" target="_blank"><b>Pivotal GemFire Native Client Documentation</b></a>. -NOTE: this is a temporary location until we are ready to host the docs at geode.apache.org. +Access documentation at <a href="http://geode.apache.org/docs/" target="_blank"><b>Apache Geode Native Documentation</b></a>. </p> <hr color="#cc0000" width="75%" size="2" align="left"> diff --git a/docs/api/win_index.html b/docs/api/win_index.html index d01f19d..28e82ba 100755 --- a/docs/api/win_index.html +++ b/docs/api/win_index.html @@ -31,9 +31,7 @@ limitations under the License. <FONT size=6><b> Apache Geode Native Client Documentation</H1> </b></FONT> -<p> -Access documentation at <a href="http://docs-gemfire-nativeclient-develop.cfapps.io" target="_blank"><b>Pivotal GemFire Native Client Documentation</b></a>. -NOTE: this is a temporary location until we are ready to host the docs at geode.apache.org. +<p>Access documentation at <a href="http://geode.apache.org/docs/" target="_blank"><b>Apache Geode Native Documentation</b></a>. </p> <hr color="#cc0000" width="75%" size="2" align="left"> diff --git a/templates/security/CMakeLists.txt.forInstall b/templates/security/CMakeLists.txt.forInstall index 8369d4e..166524e 100644 --- a/templates/security/CMakeLists.txt.forInstall +++ b/templates/security/CMakeLists.txt.forInstall @@ -1,54 +1,51 @@ -#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 +# 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 +# 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. - -cmake_minimum_required(VERSION 3.4) project(templates.security) - - find_package(OpenSSL 1.0.2 REQUIRED) - - file(GLOB_RECURSE SOURCES "*.cpp") - - add_library(securityImpl SHARED ${SOURCES}) - - include(GenerateExportHeader) generate_export_header( - securityImpl) - - target_include_directories( - securityImpl PUBLIC - $<BUILD_INTERFACE : ${CMAKE_CURRENT_BINARY_DIR}>) - - include_directories(${NATIVECLIENT_INCLUDE_DIR}) - - if (${WIN32}) set(GEODE_NATIVE_CACHE - "${NATIVECLIENT_LIBRARIES}/" - "apache-geode${CMAKE_IMPORT_" - "LIBRARY_SUFFIX}") else() - get_filename_component( - GEODE_NATIVE_CACHE - "${NATIVECLIENT_LIBRARIES}/" - "${CMAKE_SHARED_LIBRARY_PREFIX}apache-" - "geode${CMAKE_SHARED_LIBRARY_" - "SUFFIX}" ABSOLUTE) endif() - - target_link_libraries(securityImpl PUBLIC ${ - GEODE_NATIVE_CACHE} OpenSSL::Crypto - OpenSSL::SSL) - - install(TARGETS securityImpl RUNTIME - DESTINATION ${ - GEODE_NATIVE_HOME} / - bin LIBRARY DESTINATION ${ - GEODE_NATIVE_HOME} / - lib) +# 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. + +cmake_minimum_required(VERSION 3.4) +project(templates.security) + +find_package(OpenSSL 1.0.2 REQUIRED) + +file(GLOB_RECURSE SOURCES "*.cpp") + +add_library(securityImpl SHARED ${SOURCES}) + +include(GenerateExportHeader) +generate_export_header(securityImpl) + +target_include_directories(securityImpl + PUBLIC + $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>) + +include_directories(${NATIVECLIENT_INCLUDE_DIR}) + +if (${WIN32}) + set(GEODE_NATIVE_CACHE "${NATIVECLIENT_LIBRARIES}/apache-geode${CMAKE_IMPORT_LIBRARY_SUFFIX}") +else () + get_filename_component(GEODE_NATIVE_CACHE "${NATIVECLIENT_LIBRARIES}/${CMAKE_SHARED_LIBRARY_PREFIX}apache-geode${CMAKE_SHARED_LIBRARY_SUFFIX}" ABSOLUTE) +endif() + +target_link_libraries(securityImpl + PUBLIC + ${GEODE_NATIVE_CACHE} + OpenSSL::Crypto + OpenSSL::SSL +) + +install(TARGETS securityImpl + RUNTIME DESTINATION ${GEODE_NATIVE_HOME}/bin + LIBRARY DESTINATION ${GEODE_NATIVE_HOME}/lib +)