Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
6eab9e1
Gracefully close the HTTP connection when querying server caps
philippeVerney Feb 4, 2025
74e5c6a
Discard ssl_stream from FETPAPI headers if Boost version > 1.67
philippeVerney Feb 4, 2025
eaf8736
Clean etp host string management thanks to c++17
philippeVerney Feb 20, 2025
2a28b29
Close and block untill WS session is closed (not only ETP session)
philippeVerney Feb 20, 2025
c07d603
Build fix : CS version does not point to the correct DLL name
philippeVerney Mar 26, 2025
76b23b0
Manage SSL short read
philippeVerney Mar 27, 2025
711bab5
Const correctness
philippeVerney Mar 27, 2025
f878d59
[SWIG] Share DataObjectRepository accros FESAPI and FETPAPI modules
philippeVerney Mar 27, 2025
11923e5
Typo
philippeVerney Apr 8, 2025
deb60e3
Add reading of properties in the python etp client example
philippeVerney Apr 8, 2025
ec89359
If the ETP server is supporting TLS, it MUST support v1.2 or greater
philippeVerney Apr 24, 2025
d9f4db8
Prefer IP4 than IP6 when both are available
philippeVerney Apr 29, 2025
ac83fc0
Clean duplicated on_handshake method
philippeVerney Jun 17, 2025
c57a227
Set SNI Hostname for WSS connection
philippeVerney Jun 20, 2025
8e0a2ea
Fix infinite loop when a disconnection occurs during DataArray reading.
philippeVerney Jun 24, 2025
66ac4b1
Now PutDataArray slabs in an async mode.
philippeVerney Jun 27, 2025
cd25ad3
Automatic ETP session resume when disconnection occurs outside of a t…
philippeVerney Jul 11, 2025
7c92257
Adopting latest Beast classes (tcp_stream and asio::ssl::stream)
philippeVerney Jul 15, 2025
29b8cfb
Improve documentation and port copyDataObjectsByValue with SWIG
philippeVerney Sep 15, 2025
f6340a3
Change WebSocket payload size type to uint64_t
philippeVerney Sep 18, 2025
666f95e
Remove unused msgId variables in FesapiHdfProxy
philippeVerney Sep 18, 2025
cc11886
Fix Avro build when building Macos wheel
philippeVerney Sep 18, 2025
79c1074
Now validate ETP URI before to get info from it in EtpHelpers
philippeVerney Sep 25, 2025
21c5293
Fix the FETPAPI DLL name to load in Java example
philippeVerney Oct 14, 2025
5f18443
Update GitHub Actions to latest versions
philippeVerney Oct 15, 2025
3a5d1ad
Replace boost::optional with std::optional and boost::any with std::v…
philippeVerney Nov 12, 2025
2463965
Bump to FESAPI 2.14.0.0
philippeVerney Nov 14, 2025
97bedb6
[Python] Cast SWIG arrays when using them as parameters
philippeVerney Nov 19, 2025
bd4e72d
In place construction when decoding std::optional
philippeVerney Nov 19, 2025
a349ab2
Do no more cerr closing messages by default
philippeVerney Nov 19, 2025
ed4995e
Drop dependency on date.h
philippeVerney Nov 24, 2025
a601e9e
Fix RESQML22 uri validation
philippeVerney Nov 26, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 42 additions & 36 deletions .github/workflows/github-actions.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: github-actions
on: [push, pull_request]
jobs:
windows-2019:
runs-on: windows-2019
windows-2022:
runs-on: windows-2022
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Boost install
run: |
(New-Object System.Net.WebClient).DownloadFile("https://archives.boost.io/release/1.87.0/binaries/boost_1_87_0-msvc-14.2-64.exe", "${{ runner.temp }}\boost.exe")
(New-Object System.Net.WebClient).DownloadFile("https://archives.boost.io/release/1.88.0/binaries/boost_1_88_0-msvc-14.2-64.exe", "${{ runner.temp }}\boost.exe")
Start-Process -Wait -FilePath "${{ runner.temp }}\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=${{ runner.temp }}\boost-install"
- name: AVRO install
run: |
Expand All @@ -19,23 +19,23 @@ jobs:
cd ${{ runner.temp }}
mkdir avro-cpp-build
cd avro-cpp-build
cmake -G"Visual Studio 16 2019" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DBoost_INCLUDE_DIR=${{ runner.temp }}\boost-install -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/avro-cpp-install ${{ runner.temp }}/avro-cpp-1.11.3
cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DBoost_INCLUDE_DIR=${{ runner.temp }}\boost-install -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/avro-cpp-install ${{ runner.temp }}/avro-cpp-1.11.3
cmake --build . --config Release --target avrocpp_s -j2
cmake --install .
- name: CMake build and install
run: |
cd ${{ github.workspace }}/..
mkdir build
cd build
cmake -G"Visual Studio 16 2019" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DBoost_INCLUDE_DIR=${{ runner.temp }}\boost-install -DAVRO_ROOT=${{ runner.temp }}/avro-cpp-install -DAVRO_USE_STATIC_LIBS=TRUE -DWITH_ETP_SSL=FALSE ${{ github.workspace }}
cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DBoost_INCLUDE_DIR=${{ runner.temp }}\boost-install -DAVRO_ROOT=${{ runner.temp }}/avro-cpp-install -DAVRO_USE_STATIC_LIBS=TRUE -DWITH_ETP_SSL=FALSE ${{ github.workspace }}
cmake --build . --config Release -j2
windows-2019-with-fesapi:
runs-on: windows-2019
windows-2022-with-fesapi:
runs-on: windows-2022
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Boost install
run: |
(New-Object System.Net.WebClient).DownloadFile("https://archives.boost.io/release/1.87.0/binaries/boost_1_87_0-msvc-14.2-64.exe", "${{ runner.temp }}\boost.exe")
(New-Object System.Net.WebClient).DownloadFile("https://archives.boost.io/release/1.88.0/binaries/boost_1_88_0-msvc-14.2-64.exe", "${{ runner.temp }}\boost.exe")
Start-Process -Wait -FilePath "${{ runner.temp }}\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=${{ runner.temp }}\boost-install"
- name: AVRO install
run: |
Expand All @@ -47,24 +47,24 @@ jobs:
cd ${{ runner.temp }}
mkdir avro-cpp-build
cd avro-cpp-build
cmake -G"Visual Studio 16 2019" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DBoost_INCLUDE_DIR=${{ runner.temp }}\boost-install -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/avro-cpp-install ${{ runner.temp }}/avro-cpp-1.11.3
cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DBoost_INCLUDE_DIR=${{ runner.temp }}\boost-install -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/avro-cpp-install ${{ runner.temp }}/avro-cpp-1.11.3
cmake --build . --config Release --target avrocpp_s -j2
cmake --install .
- name: FESAPI install
run: |
(New-Object System.Net.WebClient).DownloadFile("https://github.com/F2I-Consulting/fesapi/releases/download/v2.12.1.0/fesapi2_12_1_0-cpp-vs2019-x64.zip", "${{ runner.temp }}\fesapi.zip")
(New-Object System.Net.WebClient).DownloadFile("https://github.com/F2I-Consulting/fesapi/releases/download/v2.14.0.0/fesapi2_14_0_0-cpp-vs2019-x64.zip", "${{ runner.temp }}\fesapi.zip")
7z x ${{ runner.temp }}\fesapi.zip -o${{ runner.temp }}
- name: CMake build and install
run: |
cd ${{ github.workspace }}/..
mkdir build
cd build
cmake -G"Visual Studio 16 2019" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DBoost_INCLUDE_DIR=${{ runner.temp }}\boost-install -DAVRO_ROOT=${{ runner.temp }}/avro-cpp-install -DAVRO_USE_STATIC_LIBS=TRUE -DWITH_FESAPI=TRUE -DFESAPI_ROOT=${{ runner.temp }}/fesapi2_12_1_0-cpp-vs2019-x64 -DWITH_ETP_SSL=FALSE ${{ github.workspace }}
cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DBoost_INCLUDE_DIR=${{ runner.temp }}\boost-install -DAVRO_ROOT=${{ runner.temp }}/avro-cpp-install -DAVRO_USE_STATIC_LIBS=TRUE -DWITH_FESAPI=TRUE -DFESAPI_ROOT=${{ runner.temp }}/fesapi2_14_0_0-cpp-vs2019-x64 -DWITH_ETP_SSL=FALSE ${{ github.workspace }}
cmake --build . --config Release -j2
ubuntu-22:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: APT install
run: |
sudo apt update
Expand All @@ -91,8 +91,8 @@ jobs:
ubuntu-22-java11:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
- uses: actions/checkout@v5
- uses: actions/setup-java@v5
with:
distribution: 'temurin' # See 'Supported distributions' for available options
java-version: '11'
Expand Down Expand Up @@ -137,8 +137,8 @@ jobs:
CC: ${{ matrix.cc }}
CXX: ${{ matrix.cxx }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
- uses: actions/checkout@v5
- uses: actions/setup-java@v5
with:
distribution: 'temurin' # See 'Supported distributions' for available options
java-version: '11'
Expand All @@ -148,13 +148,16 @@ jobs:
sudo apt install -y ${{ matrix.xcc_pkg }} libhdf5-dev libminizip-dev libboost-all-dev
- name: FESAPI install
run: |
git clone --branch v2.12.1.0 --single-branch https://github.com/F2I-Consulting/fesapi.git ${{ runner.temp }}/fesapi-src
git clone --branch v2.14.0.0 --single-branch https://github.com/F2I-Consulting/fesapi.git ${{ runner.temp }}/fesapi-src
cd ${{ runner.temp }}
mkdir fesapi-build
cd fesapi-build
cmake -DMINIZIP_INCLUDE_DIR=/usr/include/minizip -DMINIZIP_LIBRARY_RELEASE=/usr/lib/x86_64-linux-gnu/libminizip.so.1.0.0 -DCMAKE_BUILD_TYPE=Release -DWITH_JAVA_WRAPPING=TRUE -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/fesapi-install -DCMAKE_C_COMPILER=${{ matrix.cc }} -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} ${{ runner.temp }}/fesapi-src
cmake --build . -j2
cmake --install .
mkdir -p ${{ runner.temp }}/fesapi-install/include/fesapi
cd ${{ runner.temp }}/fesapi-src/src
find . -name "*.h" -exec cp --parents \{\} ${{ runner.temp }}/fesapi-install/include/fesapi/ \;
- name: AVRO INSTALL
run: |
curl https://archive.apache.org/dist/avro/avro-1.11.3/cpp/avro-cpp-1.11.3.tar.gz -o ${{ runner.temp }}/avro-cpp-1.11.3.tar.gz
Expand All @@ -172,31 +175,31 @@ jobs:
cd ${{ github.workspace }}/..
mkdir build
cd build
cmake -DAVRO_ROOT=${{ runner.temp }}/avro-cpp-install -DAVRO_USE_STATIC_LIBS=TRUE -DWITH_FESAPI=TRUE -DFESAPI_ROOT=${{ runner.temp }}/fesapi-install -DFESAPI_JAR=${{ runner.temp }}/fesapi-install/lib/fesapiJava-2.12.1.0.jar -DWITH_JAVA_WRAPPING=TRUE ${{ github.workspace }} -DCMAKE_C_COMPILER=${{ matrix.cc }} -DCMAKE_CXX_COMPILER=${{ matrix.cxx }}
cmake -DAVRO_ROOT=${{ runner.temp }}/avro-cpp-install -DAVRO_USE_STATIC_LIBS=TRUE -DWITH_FESAPI=TRUE -DFESAPI_ROOT=${{ runner.temp }}/fesapi-install -DFESAPI_JAR=${{ runner.temp }}/fesapi-install/lib/fesapiJava-2.14.0.0.jar -DWITH_JAVA_WRAPPING=TRUE ${{ github.workspace }} -DCMAKE_C_COMPILER=${{ matrix.cc }} -DCMAKE_CXX_COMPILER=${{ matrix.cxx }}
cmake --build . --config Release -j2
build_wheels_windows:
name: Build wheels on windows-latest
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Stub `setup.py` check
# It will be generated during CMake run
# https://github.com/pypa/cibuildwheel/issues/1139
run: touch python/setup.py
- name: Build wheels
uses: pypa/cibuildwheel@v2.21.3
uses: pypa/cibuildwheel@v3.2.1
env:
CIBW_BUILD: cp38-win_amd64 cp39-win_amd64 cp310-win_amd64 cp311-win_amd64 cp312-win_amd64 cp313-win_amd64
CIBW_ARCHS: auto64
CIBW_BEFORE_ALL: >
%VCPKG_INSTALLATION_ROOT%\vcpkg install boost-uuid minizip hdf5[zlib] &&
cd ${{ runner.temp }} &&
powershell -Command "(New-Object System.Net.WebClient).DownloadFile('https://github.com/F2I-Consulting/fesapi/archive/refs/tags/v2.12.1.0.tar.gz', '${{ runner.temp }}\fesapi-2.12.1.0.tar.gz')" &&
7z x ${{ runner.temp }}\fesapi-2.12.1.0.tar.gz -o${{ runner.temp }} &&
7z x ${{ runner.temp }}\fesapi-2.12.1.0.tar -o${{ runner.temp }} &&
powershell -Command "(New-Object System.Net.WebClient).DownloadFile('https://github.com/F2I-Consulting/fesapi/archive/refs/tags/v2.14.0.0.tar.gz', '${{ runner.temp }}\fesapi-2.14.0.0.tar.gz')" &&
7z x ${{ runner.temp }}\fesapi-2.14.0.0.tar.gz -o${{ runner.temp }} &&
7z x ${{ runner.temp }}\fesapi-2.14.0.0.tar -o${{ runner.temp }} &&
mkdir fesapi-build &&
cd fesapi-build &&
cmake -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALLATION_ROOT%\scripts\buildsystems\vcpkg.cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/fesapi-install ${{ runner.temp }}\fesapi-2.12.1.0 &&
cmake -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALLATION_ROOT%\scripts\buildsystems\vcpkg.cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/fesapi-install ${{ runner.temp }}\fesapi-2.14.0.0 &&
cmake --build . --config Release -j2 &&
cmake --build . --config Release --target INSTALL &&
%VCPKG_INSTALLATION_ROOT%\vcpkg install openssl boost-beast avro-cpp &&
Expand All @@ -221,13 +224,14 @@ jobs:
name: Build wheels on ubuntu-latest
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Stub `setup.py` check
# It will be generated during CMake run
# https://github.com/pypa/cibuildwheel/issues/1139
run: touch python/setup.py
- name: Build wheels
uses: pypa/cibuildwheel@v2.21.3
# Above cibuildwheel@v2.22.0, GNU 14 is most likely used instead of GNU 12 or 13 which makes AVRO 1.11.3 not compiling
uses: pypa/cibuildwheel@v2.22.0
env:
CIBW_BUILD: cp38-manylinux_* cp39-manylinux_* cp310-manylinux_* cp311-manylinux_* cp312-manylinux_* cp313-manylinux_*
CIBW_ARCHS: auto64
Expand All @@ -239,11 +243,11 @@ jobs:
yum install -y epel-release &&
yum --enablerepo=epel install -y minizip1.2-devel hdf5-devel cmake3 &&
cd / &&
wget https://github.com/F2I-Consulting/fesapi/archive/refs/tags/v2.12.1.0.zip &&
unzip v2.12.1.0.zip &&
wget https://github.com/F2I-Consulting/fesapi/archive/refs/tags/v2.14.0.0.zip &&
unzip v2.14.0.0.zip &&
mkdir fesapi-build &&
cd fesapi-build &&
cmake3 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:STRING=/fesapi-install /fesapi-2.12.1.0 &&
cmake3 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:STRING=/fesapi-install /fesapi-2.14.0.0 &&
cmake3 --build . -j2 --config Release &&
cmake3 --install . &&
cd / &&
Expand Down Expand Up @@ -277,13 +281,13 @@ jobs:
name: Build wheels on macos-14
runs-on: macos-14
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Stub `setup.py` check
# It will be generated during CMake run
# https://github.com/pypa/cibuildwheel/issues/1139
run: touch python/setup.py
- name: Build wheels
uses: pypa/cibuildwheel@v2.21.3
uses: pypa/cibuildwheel@v3.2.1
env:
CIBW_BUILD: cp38-macosx_* cp39-macosx_* cp310-macosx_* cp311-macosx_* cp312-macosx_* cp313-macosx_*
CIBW_ARCHS: auto64
Expand Down Expand Up @@ -312,11 +316,11 @@ jobs:
cmake --build . -j2 --config Release &&
cmake --install . &&
cd ${{ github.workspace }}/.. &&
wget --no-verbose https://github.com/F2I-Consulting/fesapi/archive/refs/tags/v2.12.1.0.zip &&
unzip v2.12.1.0.zip &&
wget --no-verbose https://github.com/F2I-Consulting/fesapi/archive/refs/tags/v2.14.0.0.zip &&
unzip v2.14.0.0.zip &&
mkdir fesapi-build &&
cd fesapi-build &&
cmake -DCMAKE_BUILD_TYPE=Release -DBOOST_ROOT=${{ github.workspace }}/../boost-install -DMINIZIP_ROOT=${{ github.workspace }}/../minizip-install -DHDF5_ROOT=${{ github.workspace }}/../hdf5-install -DHDF5_USE_STATIC_LIBRARIES=TRUE -DCMAKE_INSTALL_PREFIX:STRING=${{ github.workspace }}/../fesapi-install ${{ github.workspace }}/../fesapi-2.12.1.0 &&
cmake -DCMAKE_BUILD_TYPE=Release -DBOOST_ROOT=${{ github.workspace }}/../boost-install -DMINIZIP_ROOT=${{ github.workspace }}/../minizip-install -DHDF5_ROOT=${{ github.workspace }}/../hdf5-install -DHDF5_USE_STATIC_LIBRARIES=TRUE -DCMAKE_INSTALL_PREFIX:STRING=${{ github.workspace }}/../fesapi-install ${{ github.workspace }}/../fesapi-2.14.0.0 &&
cmake --build . -j2 --config Release &&
cmake --install . &&
cd ${{ github.workspace }}/.. &&
Expand All @@ -329,6 +333,8 @@ jobs:
cd ${{ github.workspace }}/.. &&
wget --no-verbose https://archive.apache.org/dist/avro/avro-1.11.3/cpp/avro-cpp-1.11.3.tar.gz &&
tar xf avro-cpp-1.11.3.tar.gz &&
sed -i '' 's/cmake_minimum_required (VERSION 3.1)/cmake_minimum_required (VERSION 3.5)/' avro-cpp-1.11.3/CMakeLists.txt &&
sed -i '' 's/if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.0)/if (APPLE)/' avro-cpp-1.11.3/CMakeLists.txt &&
sed -i '' 's/install (TARGETS avrocpp avrocpp_s/install (TARGETS avrocpp_s/' avro-cpp-1.11.3/CMakeLists.txt &&
sed -i '' 's/install (TARGETS avrogencpp RUNTIME DESTINATION bin)//' avro-cpp-1.11.3/CMakeLists.txt &&
mkdir avro-build &&
Expand Down
13 changes: 2 additions & 11 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ set (FETPAPI_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})

# version mechanism
set (Fetpapi_VERSION_MAJOR 0)
set (Fetpapi_VERSION_MINOR 3)
set (Fetpapi_VERSION_PATCH 1)
set (Fetpapi_VERSION_MINOR 4)
set (Fetpapi_VERSION_PATCH 0)
set (Fetpapi_VERSION_TWEAK 0)

set (Fetpapi_VERSION ${Fetpapi_VERSION_MAJOR}.${Fetpapi_VERSION_MINOR}.${Fetpapi_VERSION_PATCH}.${Fetpapi_VERSION_TWEAK})
Expand Down Expand Up @@ -200,7 +200,6 @@ set (ALL_SOURCES_AND_HEADERS
${FETPAPI_HEADERS}
${FETPAPI_PROTOCOL_SOURCES}
${FETPAPI_PROTOCOL_HEADERS}
${FETPAPI_TOOLS_HEADERS}
${FETPAPI_FESAPI_SOURCES}
${FETPAPI_FESAPI_HEADERS}
${FETPAPI_SSL_SOURCES}
Expand All @@ -224,8 +223,6 @@ target_include_directories(${PROJECT_NAME} INTERFACE

# organizing sources and headers in the Visual Studio Project
if (WIN32)
source_group ("tools" FILES ${FETPAPI_TOOLS_HEADERS})

set (ETP_PREFIX "etp")
source_group ("${ETP_PREFIX}" FILES ${FETPAPI_SOURCES} ${FETPAPI_HEADERS})
source_group ("${ETP_PREFIX}\\ProtocolHandlers" FILES ${FETPAPI_PROTOCOL_SOURCES} ${FETPAPI_PROTOCOL_HEADERS})
Expand Down Expand Up @@ -307,12 +304,6 @@ INSTALL (
COMPONENT fetpapi_headers
)

INSTALL (
FILES ${FETPAPI_TOOLS_HEADERS}
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fetpapi/tools
COMPONENT fetpapi_headers
)

if (WITH_ETP_SSL)
INSTALL (
FILES ${FETPAPI_SSL_HEADERS}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
Download (build and install if necessary) third party libraries:
- BOOST : All versions from version 1.66 should be ok but you may experience some [min/max build issues](https://github.com/boostorg/beast/issues/1980) using version 1.72 or 1.73.
- AVRO : https://avro.apache.org/releases.html#Download (starting from version 1.9.0 [except 1.11.1](https://issues.apache.org/jira/browse/AVRO-3601), build it with the above boost library.)
- (OPTIONALLY) OpenSSL : version 1.1 is known to work.
- (OPTIONALLY) OpenSSL : version 3.4 is known to work.
- (OPTIONALLY) [FESAPI](https://github.com/F2I-Consulting/fesapi/releases) : All versions from version 2.7.0.0 should be ok but a minimal version of 2.11.0.0 is recommended to automatically recognize FESAPI CMake Variables using CMake find Module and build silently the EtpClient example.

# Configure the build
Expand Down
2 changes: 1 addition & 1 deletion cmake/FetpapiClientUsingFesapi.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Licensed to the Apache Software Foundation (ASF) under one
specific language governing permissions and limitations
under the License.
-----------------------------------------------------------------------*/
package com.f2i_consulting.fetpapi.client;
package com.f2i_consulting.example;

import java.util.Optional;
import java.util.UUID;
Expand Down
4 changes: 4 additions & 0 deletions cmake/fetpapiCsWithFesapi.csproj.template
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>F2iConsulting.Fetpapi</RootNamespace>
<AssemblyName>${CS_LIBRARY_NAME}</AssemblyName>
<!-- Minimal TargetFrameworkVersion according to SWIG
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-->
<!-- TargetFrameworkVersion which is ok for a lot of softwares and for Github Runner image -->
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down
4 changes: 4 additions & 0 deletions cmake/fetpapiCsWithoutFesapi.csproj.template
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>F2iConsulting.Fetpapi</RootNamespace>
<AssemblyName>${CS_LIBRARY_NAME}</AssemblyName>
<!-- Minimal TargetFrameworkVersion according to SWIG
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-->
<!-- TargetFrameworkVersion which is ok for a lot of softwares and for Github Runner image -->
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions cmake/pyproject.toml.in
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ readme = "README.md"
classifiers=[
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
'License :: OSI Approved :: Apache Software License',
'Operating System :: Microsoft :: Windows',
'Operating System :: POSIX :: Linux',
'Operating System :: MacOS',
Expand All @@ -29,9 +28,10 @@ classifiers=[
'Programming Language :: Python :: 3.12',
'Topic :: Software Development',
'Topic :: Software Development :: Libraries',
'Topic :: Software Development :: Libraries :: Application Frameworks ',
'Topic :: Software Development :: Libraries :: Application Frameworks',
'Topic :: File Formats',
]
license = {text = "Apache-2.0"}
keywords = [
"energistics",
"resqml",
Expand All @@ -43,7 +43,7 @@ keywords = [
]
requires-python = ">=3.8"
dependencies = [
'fesapi==2.12.1',
'fesapi==2.14.0',
]

[project.urls]
Expand Down
Loading
Loading