Skip to content

Commit 06e51b8

Browse files
devfabiosilvadevfabiosilva
committed
Release 0.1.3 version
1 parent 366ed76 commit 06e51b8

File tree

7 files changed

+21
-15
lines changed

7 files changed

+21
-15
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Changelog
22
WITSML 1.3.1.x | 1.4.1.x to BSON parser changelogs
33

4+
## [0.1.3] - 2025-12-20
5+
- Update libbson 1.28.1 -> 2.2.1 ✔️
6+
- Update Java bson org.mongodb dependency version to 5.6.2 ✔️
7+
48
## [0.1.2] - 2024-10-28
59
- Update gSoap 2.8.129 -> 2.8.135 ✔️
610
- Update libbson 1.27.1 -> 1.28.1 ✔️
@@ -16,6 +20,8 @@ WITSML 1.3.1.x | 1.4.1.x to BSON parser changelogs
1620

1721
## [master] - current
1822

23+
[0.1.3]: https://github.com/devfabiosilva/witsml21parser/tree/v0.1.3
24+
[0.1.2]: https://github.com/devfabiosilva/witsml21parser/tree/v0.1.2
1925
[0.1.1]: https://github.com/devfabiosilva/witsml21parser/tree/v0.1.1
2026
[0.1.0]: https://github.com/devfabiosilva/witsml21parser/tree/v0.1.0
2127
[master]: https://github.com/devfabiosilva/witsmlparser/tree/master

‎Java/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
</dependency>
1717
<dependency>
1818
<groupId>org.mongodb</groupId>
19-
<artifactId>mongodb-driver-sync</artifactId>
20-
<version>4.8.2</version>
19+
<artifactId>bson</artifactId>
20+
<version>5.6.2</version>
2121
</dependency>
2222
<dependency>
2323
<groupId>junit</groupId>

‎Java/src/test/java/org/jwitsmlparser14x/JWitsmlParserLoaderTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ public void testGetBinaryBsonVersion() throws Exception {
130130
public void testGetBsonVersion() throws Exception {
131131
BSONObject version = jWitsmlParserLoader.getBsonVersion();
132132
assertNotNull(version);
133-
assertEquals(navigate(version, "version"), "0.1.2");
134-
assertEquals(navigate(version, "dependencies", "libbson", "version"), "1.28.1");
133+
assertEquals(navigate(version, "version"), "0.1.3");
134+
assertEquals(navigate(version, "dependencies", "libbson", "version"), "2.2.1");
135135
assertEquals(navigate(version, "dependencies", "gSoap", "version"), "2.8.135");
136136
}
137137

‎Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ LIBANAME=cws
2020
LIBDIR=$(CURDIR)/lib
2121

2222
MONGO_C_GIT=https://github.com/mongodb/mongo-c-driver.git
23-
MONGO_C_BRANCH=1.28.1
23+
MONGO_C_BRANCH=2.2.1
2424
MONGO_C_DIR=$(CURDIR)/third-party/mongo-c-driver
2525

2626
LIBANAME_JNI=$(LIBANAME)_jni
@@ -48,7 +48,7 @@ all: main
4848

4949
cws_version.o:
5050
@echo "Generating version ..."
51-
@$(CC) -O2 $(CURDIR)/misc/versionBuilder.c $(CURDIR)/util/cws_utils.c $(CURDIR)/util/cws_bson_utils.c -I$(INCLUDEDIR) -o $(CURDIR)/misc/versionBuilder -L$(LIBDIR) -lbson-static-1.0 -Wall $(FLAG) -DVERGEN
51+
@$(CC) -O2 $(CURDIR)/misc/versionBuilder.c $(CURDIR)/util/cws_utils.c $(CURDIR)/util/cws_bson_utils.c -I$(INCLUDEDIR) -o $(CURDIR)/misc/versionBuilder -L$(LIBDIR) -lbson-static-$(MONGO_C_BRANCH) -Wall $(FLAG) -DVERGEN
5252
cd $(CURDIR)/misc/;./versionBuilder
5353
$(LD) -o $(CURDIR)/util/cws_version.o version.bson
5454

@@ -278,7 +278,7 @@ endif
278278
main: read1411ServerLib.o write1411ServerLib.o update1411ServerLib.o delete1411ServerLib.o lib$(LIBANAME).a
279279
#main: write1411ServerLib.o update1411ServerLib.o delete1411ServerLib.o lib$(LIBANAME).a
280280
@echo "Compiling ..."
281-
@$(CC) -O2 -o $(TARG) main.c $(PARSE_1411_READ_DIR)/read1411ServerLib.o $(PARSE_1411_WRITE_DIR)/write1411ServerLib.o $(PARSE_1411_UPDATE_DIR)/update1411ServerLib.o $(PARSE_1411_DELETE_DIR)/delete1411ServerLib.o stdsoap2.c -I$(INCLUDEDIR) -L$(LIBDIR) -l$(LIBANAME) -lbson-static-1.0 $(FLAG)
281+
@$(CC) -O2 -o $(TARG) main.c $(PARSE_1411_READ_DIR)/read1411ServerLib.o $(PARSE_1411_WRITE_DIR)/write1411ServerLib.o $(PARSE_1411_UPDATE_DIR)/update1411ServerLib.o $(PARSE_1411_DELETE_DIR)/delete1411ServerLib.o stdsoap2.c -I$(INCLUDEDIR) -L$(LIBDIR) -l$(LIBANAME) -lbson-static-$(MONGO_C_BRANCH) $(FLAG)
282282
@echo "Finished"
283283

284284
###
@@ -321,7 +321,7 @@ endif
321321

322322
dbg: read1411ServerLib_debug.o write1411ServerLib_debug.o update1411ServerLib_debug.o delete1411ServerLib_debug.o lib$(LIBANAME)_debug.a
323323
@echo "Compiling in debug mode ..."
324-
@$(CC) -O2 -o $(TARG_DBG) main.c $(PARSE_1411_READ_DIR)/read1411ServerLib_debug.o $(PARSE_1411_WRITE_DIR)/write1411ServerLib_debug.o $(PARSE_1411_UPDATE_DIR)/update1411ServerLib_debug.o $(PARSE_1411_DELETE_DIR)/delete1411ServerLib_debug.o stdsoap2.c -I$(INCLUDEDIR) -L$(LIBDIR) -l$(LIBANAME)_debug -lbson-static-1.0 $(DEBUG_FLAG)
324+
@$(CC) -O2 -o $(TARG_DBG) main.c $(PARSE_1411_READ_DIR)/read1411ServerLib_debug.o $(PARSE_1411_WRITE_DIR)/write1411ServerLib_debug.o $(PARSE_1411_UPDATE_DIR)/update1411ServerLib_debug.o $(PARSE_1411_DELETE_DIR)/delete1411ServerLib_debug.o stdsoap2.c -I$(INCLUDEDIR) -L$(LIBDIR) -l$(LIBANAME)_debug -lbson-static-$(MONGO_C_BRANCH) $(DEBUG_FLAG)
325325
@echo "Finished in debug mode."
326326

327327
#//////////////////////////////
@@ -716,7 +716,7 @@ pre_shared: read1411ServerLib_shared.o read1411ServerLib_shared_debug.o write141
716716
#jni: lib$(LIBANAME_JNI).a
717717
jni: lib$(LIBANAME_JNI).a
718718
@echo "Compiling $(LIBJNI)..."
719-
@$(CC) -O2 -shared -fPIC -o $(LIBJNI) jni/parser.c stdsoap2.c $(CURDIR)/parser/w1411/delete/delete1411ServerLib_shared.o $(CURDIR)/parser/w1411/read/read1411ServerLib_shared.o $(CURDIR)/parser/w1411/update/update1411ServerLib_shared.o $(CURDIR)/parser/w1411/write/write1411ServerLib_shared.o -I$(INCLUDEDIR) -I$(JAVAINCLUDE) -I$(JAVAINCLUDE_LINUX) -L$(LIBDIR) -lcws_jni -lpthread -lbson-shared-1.0 -Wall $(FLAG_JNI)
719+
@$(CC) -O2 -shared -fPIC -o $(LIBJNI) jni/parser.c stdsoap2.c $(CURDIR)/parser/w1411/delete/delete1411ServerLib_shared.o $(CURDIR)/parser/w1411/read/read1411ServerLib_shared.o $(CURDIR)/parser/w1411/update/update1411ServerLib_shared.o $(CURDIR)/parser/w1411/write/write1411ServerLib_shared.o -I$(INCLUDEDIR) -I$(JAVAINCLUDE) -I$(JAVAINCLUDE_LINUX) -L$(LIBDIR) -lcws_jni -lpthread -lbson-shared-$(MONGO_C_BRANCH) -Wall $(FLAG_JNI)
720720
#@$(CC) -O2 -shared -fPIC -o $(LIBJNI) jni/parser.c -I$(INCLUDEDIR) -I$(JAVAINCLUDE) -I$(JAVAINCLUDE_LINUX) -L$(LIBDIR)
721721
@echo "Striping $(LIBJNI) ..."
722722
@$(STRIP) $(LIBJNI)
@@ -749,7 +749,7 @@ ifneq ("$(wildcard $(MONGO_C_DIR))","")
749749
@echo "Already cloned. Skip"
750750
else
751751
@echo "Cloning branch $(MONGO_C_BRANCH) from $(MONGO_C_GIT)"
752-
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
752+
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
753753
endif
754754

755755
remove_bson:

‎binding.gyp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"include_dirs":[ "./include", "./" ],
77
"library_dirs": ["./lib"],
88
"libraries": [
9-
"-Wl,--start-group ../lib/libcws_js.a ../lib/libbson-shared-1.0.a ../parser/w1411/delete/delete1411ServerLib_shared.o ../parser/w1411/read/read1411ServerLib_shared.o ../parser/w1411/update/update1411ServerLib_shared.o ../parser/w1411/write/write1411ServerLib_shared.o -Wl,--end-group"
9+
"-Wl,--start-group ../lib/libcws_js.a ../lib/libbson-shared-2.2.1.a ../parser/w1411/delete/delete1411ServerLib_shared.o ../parser/w1411/read/read1411ServerLib_shared.o ../parser/w1411/update/update1411ServerLib_shared.o ../parser/w1411/write/write1411ServerLib_shared.o -Wl,--end-group"
1010
],
1111
"defines": ["CWS_LITTLE_ENDIAN", "WITH_STATISTICS", "WITH_NONAMESPACES"],
1212
"cflags": ["-Wno-stringop-truncation", "-Wno-format-truncation"],

‎setup.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
def main():
44

55
setup(name="witsml14xbson",
6-
version="0.1.2",
6+
version="0.1.3",
77
description="WITSML 1.4.x - 1.3.x BSON parser module for Python 3 using C library setup",
88
author="Fábio Pereira da Silva",
99
author_email="fabioegel@gmail.com",
1010
url="https://github.com/devfabiosilva/witsml14xbson",
1111
maintainer_email="fabioegel@gmail.com",
1212
ext_modules=[Extension("witsml14xbson", ["python/module.c", "stdsoap2.c"],
1313
library_dirs=['lib'],
14-
libraries=['cws_py', 'bson-shared-1.0'],
14+
libraries=['cws_py', 'bson-shared-2.2.1'],
1515
extra_objects=[
1616
"parser/w1411/delete/delete1411ServerLib_shared.o", "parser/w1411/read/read1411ServerLib_shared.o",
1717
"parser/w1411/update/update1411ServerLib_shared.o", "parser/w1411/write/write1411ServerLib_shared.o"

‎version.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "0.1.2",
2+
"version": "0.1.3",
33
"witsmlVersion": "1.3.x.x,1.4.x.x",
44
"website": "https://github.com/devfabiosilva/witsmlparser",
55
"license": "MIT",
@@ -16,7 +16,7 @@
1616
"license": "See https://www.genivia.com/products.html"
1717
},
1818
"libbson": {
19-
"version": "1.28.1",
19+
"version": "2.2.1",
2020
"website": "https://github.com/mongodb/mongo-c-driver",
2121
"license": "Apache License 2.0"
2222
}

0 commit comments

Comments
 (0)