Release new version 0.1.3

Author: devfabiosilva

CHANGELOG.md

@@ -1,8 +1,10 @@
 # Changelog
 WITSML 2.1 to BSON parser changelogs
 
-## [0.1.3] - 2024-10-29
-- Update BSON version 1.27.1 -> 1.28.1 ✔️
+## [0.1.3] - 2025-12-20
+- Update BSON version (MONGO C DRIVER) 1.27.1 -> 2.2.1 ✔️
+- BUG FIX: Implement correct memory cleanup (recycled) of previous parsed WITSML 2.1 object in cws_internal_soap_recycle() ✔️
+- Update Java bson org.mongodb dependency version to 5.6.2 ✔️
 
 ## [0.1.2] - 2024-05-23
 - Fixing readTextFree bug ✔️
@@ -20,6 +22,7 @@ WITSML 2.1 to BSON parser changelogs
 
 ## [master] - current
 
+[0.1.3]: https://github.com/devfabiosilva/witsml21parser/tree/v0.1.3
 [0.1.2]: https://github.com/devfabiosilva/witsml21parser/tree/v0.1.2
 [0.1.1]: https://github.com/devfabiosilva/witsml21parser/tree/v0.1.1
 [0.1.0]: https://github.com/devfabiosilva/witsml21parser/tree/v0.1.0

Java/library/pom.xml

@@ -17,7 +17,7 @@
         <dependency>
             <groupId>org.mongodb</groupId>
             <artifactId>bson</artifactId>
-            <version>4.9.0</version>
+            <version>5.6.2</version>
         </dependency>
     </dependencies>
     <properties>

Makefile

@@ -16,7 +16,7 @@ LIBANAME=cws
 LIBDIR=$(CURDIR)/lib
 
 MONGO_C_GIT=https://github.com/mongodb/mongo-c-driver.git
-MONGO_C_BRANCH=1.28.1
+MONGO_C_BRANCH=2.2.1
 MONGO_C_DIR=$(CURDIR)/third-party/mongo-c-driver
 
 FLAG_JNI=-Wno-stringop-truncation -DJNI_RUSAGE_CHILDREN -DCWS_$(ENDIAN)_ENDIAN -D$(STAT)
@@ -42,7 +42,7 @@ all: main
 
 cws_version.o:
 	@echo "Generating version ..."
-	@$(CC) -O2 $(CURDIR)/misc/versionBuilder.c $(CURDIR)/src/cws_utils.c $(CURDIR)/src/cws_bson_utils.c -I$(INCLUDEDIR) -o $(CURDIR)/misc/versionBuilder -L$(LIBDIR) -lbson-static-1.0 -Wall $(FLAG) -DVERGEN
+	@$(CC) -O2 $(CURDIR)/misc/versionBuilder.c $(CURDIR)/src/cws_utils.c $(CURDIR)/src/cws_bson_utils.c -I$(INCLUDEDIR) -o $(CURDIR)/misc/versionBuilder -L$(LIBDIR) -lbson-static-$(MONGO_C_BRANCH) -Wall $(FLAG) -DVERGEN
 	cd $(CURDIR)/misc/;./versionBuilder
 	$(LD) -o $(CURDIR)/src/version_bson.o version.bson
 
@@ -124,12 +124,12 @@ soapC_shared_debug_sanitize.o:
 
 main: soapC.o lib$(LIBANAME).a
 	@echo "Compiling ..."
-	@$(CC) -O2 -o $(TARG) main.c stdsoap2.c soapC.o soapServer.c -I$(INCLUDEDIR) -L$(LIBDIR) -lcws  -lpthread -lbson-static-1.0 -Wall $(FLAG)
+	@$(CC) -O2 -o $(TARG) main.c stdsoap2.c soapC.o soapServer.c -I$(INCLUDEDIR) -L$(LIBDIR) -lcws  -lpthread -lbson-static-$(MONGO_C_BRANCH) -Wall $(FLAG)
 	@echo "Finished"
 
 dbg: soapC_debug_sanitize.o lib$(LIBANAME)_debug.a
 	@echo "Compiling in debug mode ..."
-	@$(CC) -O2 -o $(TARG_DBG) main.c stdsoap2.c soapC_debug_sanitize.o soapServer.c -I$(INCLUDEDIR) -L$(LIBDIR) -l$(LIBANAME)_debug -lpthread -lbson-static-1.0 -Wall $(DEBUG_FLAG)
+	@$(CC) -O2 -o $(TARG_DBG) main.c stdsoap2.c soapC_debug_sanitize.o soapServer.c -I$(INCLUDEDIR) -L$(LIBDIR) -l$(LIBANAME)_debug -lpthread -lbson-static-$(MONGO_C_BRANCH) -Wall $(DEBUG_FLAG)
 	@echo "Finished in debug mode."
 
 ##JNI ONLY SOAP INTERNAL
@@ -379,7 +379,7 @@ pre_shared: soapC_shared.o soapC_shared_debug_sanitize.o
 .PHONY:
 jni: lib$(LIBANAME_JNI).a
 	@echo "Compiling $(LIBJNI)..."
-	@$(CC) -O2 -shared -fPIC -o $(LIBJNI) src/jni/parser.c stdsoap2.c soapC_shared.o soapServer.c -I$(INCLUDEDIR) -I$(JAVAINCLUDE) -I$(JAVAINCLUDE_LINUX)  -L$(LIBDIR) -lcws_jni -lpthread -lbson-shared-1.0 -Wall $(FLAG_JNI)
+	@$(CC) -O2 -shared -fPIC -o $(LIBJNI) src/jni/parser.c stdsoap2.c soapC_shared.o soapServer.c -I$(INCLUDEDIR) -I$(JAVAINCLUDE) -I$(JAVAINCLUDE_LINUX)  -L$(LIBDIR) -lcws_jni -lpthread -lbson-shared-$(MONGO_C_BRANCH) -Wall $(FLAG_JNI)
 	@echo "Striping $(LIBJNI) ..."
 	@$(STRIP) $(LIBJNI)
 	@echo "Disabling execstack ..."
@@ -410,7 +410,7 @@ ifneq ("$(wildcard $(MONGO_C_DIR))","")
 	@echo "Already cloned. Skip"
 else
 	@echo "Cloning branch $(MONGO_C_BRANCH) from $(MONGO_C_GIT)"
-	pwd; cd $(CURDIR)/third-party; pwd; git clone -b $(MONGO_C_BRANCH) $(MONGO_C_GIT); cd mongo-c-driver;mkdir compiled && cd compiled; cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_MONGOC=OFF -DCMAKE_INSTALL_PREFIX=$(MONGO_C_DIR)/compiled/out; make -j12;make install; pwd; cp out/lib/libbson-static-1.0.a $(LIBDIR) -v;cp -frv out/include/libbson-1.0/bson $(INCLUDEDIR);cd src/libbson/CMakeFiles/bson_shared.dir; pwd; ar rcs $(LIBDIR)/libbson-shared-1.0.a src/bson/*.o src/jsonsl/*.o __/common/*.o
+	pwd; cd $(CURDIR)/third-party; pwd; git clone -b $(MONGO_C_BRANCH) $(MONGO_C_GIT); cd mongo-c-driver;mkdir compiled && cd compiled; cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_MONGOC=OFF -DCMAKE_INSTALL_PREFIX=$(MONGO_C_DIR)/compiled/out; make -j12;make install; pwd; cp out/lib/libbson2.a $(LIBDIR)/libbson-static-$(MONGO_C_BRANCH).a -v;cp -frv out/include/bson-$(MONGO_C_BRANCH)/bson $(INCLUDEDIR);cd src/libbson/CMakeFiles/bson_shared.dir; pwd; ar rcs $(LIBDIR)/libbson-shared-$(MONGO_C_BRANCH).a src/bson/*.o src/jsonsl/*.o __/common/src/*.o
 endif
 
 remove_bson:
@@ -441,10 +441,10 @@ endif
 #TESTS
 pointers_assert:
 	@echo "Building C pointer assert (TEST)"
-	@$(CC) -c -O2 $(TEST_C_DIR)/pointers_assert.c -I$(INCLUDEDIR) -I$(TEST_INCLUDE_DIR) -I$(CURDIR) -L$(LIBDIR) -lpthread -lbson-static-1.0 -o $(TEST_C_DIR)/pointers_assert.o -Wall $(DEBUG_FLAG)
+	@$(CC) -c -O2 $(TEST_C_DIR)/pointers_assert.c -I$(INCLUDEDIR) -I$(TEST_INCLUDE_DIR) -I$(CURDIR) -L$(LIBDIR) -lpthread -lbson-static-$(MONGO_C_BRANCH) -o $(TEST_C_DIR)/pointers_assert.o -Wall $(DEBUG_FLAG)
 
 test: lib$(LIBANAME)_debug.a pointers_assert
 	@echo "Build C test (TEST) ..."
-	@$(CC) -O2 $(TEST_C_DIR)/main.c $(CURDIR)/src/ctest/asserts.c $(TEST_C_DIR)/pointers_assert.o stdsoap2.c soapC_debug_sanitize.o soapServer.c -I$(TEST_INCLUDE_DIR) -I$(INCLUDEDIR) -I$(CURDIR) -L$(LIBDIR) -l$(LIBANAME)_debug -lpthread -lbson-static-1.0 -o $(TEST_C_DIR)/$(TEST_C_EXEC_NAME) -Wall $(DEBUG_FLAG)
+	@$(CC) -O2 $(TEST_C_DIR)/main.c $(CURDIR)/src/ctest/asserts.c $(TEST_C_DIR)/pointers_assert.o stdsoap2.c soapC_debug_sanitize.o soapServer.c -I$(TEST_INCLUDE_DIR) -I$(INCLUDEDIR) -I$(CURDIR) -L$(LIBDIR) -l$(LIBANAME)_debug -lpthread -lbson-static-$(MONGO_C_BRANCH) -o $(TEST_C_DIR)/$(TEST_C_EXEC_NAME) -Wall $(DEBUG_FLAG)
 	@$(TEST_C_DIR)/./$(TEST_C_EXEC_NAME)
 

binding.gyp

@@ -6,7 +6,7 @@
       "include_dirs":[ "./include", "./" ],
       "library_dirs": ["./lib"],
       "libraries": [
-              "-Wl,--start-group ../lib/libcws_js.a ../lib/libbson-shared-1.0.a ../soapC_shared.o -Wl,--end-group"
+              "-Wl,--start-group ../lib/libcws_js.a ../lib/libbson-shared-2.2.1.a ../soapC_shared.o -Wl,--end-group"
           ],
       "defines": ["CWS_LITTLE_ENDIAN", "WITH_STATISTICS"],
       "cflags": ["-Wno-stringop-truncation", "-Wno-format-truncation"],

setup.py

@@ -11,7 +11,7 @@ def main():
         maintainer_email="fabioegel@gmail.com",
         ext_modules=[Extension("witsml21bson", ["src/python/module.c", "stdsoap2.c" ,"soapServer.c"],
             library_dirs=['lib'],
-            libraries=['cws_py', 'bson-shared-1.0'],
+            libraries=['cws_py', 'bson-shared-2.2.1'],
             extra_objects=["soapC_shared.o"],
             include_dirs=['include'],
             define_macros=[('CWS_LITTLE_ENDIAN', None), ('WITH_STATISTICS', None)]

src/cws_soap.c

@@ -79,6 +79,9 @@ void cws_internal_soap_recycle(struct soap *soap_internal)
     config->cws_soap_fault.XMLfaultdetail=NULL;
     config->cws_soap_fault.XMLfaultdetail_len=0;
   }
+
+  soap_destroy(soap_internal); /* delete deserialized objects */
+  soap_end(soap_internal);     /* delete heap and temp data */
 }
 
 void cws_internal_soap_free(struct soap **soap)

version.json

@@ -33,7 +33,7 @@
    "license": "See https://www.genivia.com/products.html"
   },
   "libbson": {
-   "version": "1.28.1",
+   "version": "2.2.1",
    "website": "https://github.com/mongodb/mongo-c-driver",
    "license": "Apache License 2.0"
   }