From 65452315411dc840fcfaba8bc002328777a8c084 Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Tue, 21 Feb 2023 10:43:35 +1100 Subject: [PATCH] Bump version to 6.0.0-dev --- CHANGELOG.md | 4 ++++ INSTALL.md | 42 +++++++++++++++++++++--------------------- README.md | 6 ++++-- doc/api.md | 2 +- package.json | 2 +- src/njsModule.h | 6 +++--- 6 files changed, 34 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a6038f2..99e0bfac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## node-oracledb [v6.0.0](https://github.com/oracle/node-oracledb/compare/v5.5.0...v6.0.0) (DD MON YYYY) + +**This release is under development and information may be incomplete** + ## node-oracledb [v5.5.0](https://github.com/oracle/node-oracledb/compare/v5.4.0...v5.5.0) (7 Sep 2022) - Token-based Authentication changes: diff --git a/INSTALL.md b/INSTALL.md index e5429628..644233d0 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,4 +1,4 @@ -# Installing node-oracledb Version 5.5.0 +# Installing node-oracledb Version 6.0.0-dev *Copyright (c) 2015, 2022, Oracle and/or its affiliates.* @@ -101,9 +101,9 @@ Alternatively, follow these instructions: - If a pre-built binary is not available, you will need to build from source code. Reivew the [prerequisites](#github) and add - `https://github.com/oracle/node-oracledb/releases/download/v5.5.0/oracledb-src-5.5.0.tgz` + `https://github.com/oracle/node-oracledb/releases/download/v6.0.0-dev/oracledb-src-6.0.0-dev.tgz` to your `package.json` dependencies or run `npm install - https://github.com/oracle/node-oracledb/releases/download/v5.5.0/oracledb-src-5.5.0.tgz`. + https://github.com/oracle/node-oracledb/releases/download/v6.0.0-dev/oracledb-src-6.0.0-dev.tgz`. - Add Oracle Client libraries version 21, 19, 18, 12, or 11.2 to your operating system library search path such as `PATH` on Windows or `LD_LIBRARY_PATH` on @@ -1123,19 +1123,19 @@ export CC=gcc ``` Locate the [GitHub tag][40] of the desired node-oracledb version, for -example `v5.5.0`, and use the `npm` package manager (which is +example `v6.0.0-dev`, and use the `npm` package manager (which is included in Node.js) to install it. If you have the `git` utility, you can install with: ``` -npm install oracle/node-oracledb.git#v5.5.0 +npm install oracle/node-oracledb.git#v6.0.0-dev ``` Otherwise install using: ``` -npm install https://github.com/oracle/node-oracledb/releases/download/v5.5.0/oracledb-src-5.5.0.tgz +npm install https://github.com/oracle/node-oracledb/releases/download/v6.0.0-dev/oracledb-src-6.0.0-dev.tgz ``` #### 3.5.4 Install the free Oracle Instant Client 'Basic' ZIP file @@ -1243,19 +1243,19 @@ export MAKE=gmake ``` Locate the [GitHub tag][40] of the desired node-oracledb version, for -example `v5.5.0`, and use the `npm` package manager (which is +example `v6.0.0-dev`, and use the `npm` package manager (which is included in Node.js) to install it. If you have the `git` utility, you can install with: ``` -npm install oracle/node-oracledb.git#v5.5.0 +npm install oracle/node-oracledb.git#v6.0.0-dev ``` Otherwise install using: ``` -npm install https://github.com/oracle/node-oracledb/releases/download/v5.5.0/oracledb-src-5.5.0.tgz +npm install https://github.com/oracle/node-oracledb/releases/download/v6.0.0-dev/oracledb-src-6.0.0-dev.tgz ``` If this fails due to an invalid `cp -a` option, you can download the @@ -1407,7 +1407,7 @@ npm install oracle/node-oracledb#main ``` To install from a tag, replace `main` with the tag name like: -`oracle/node-oracledb#v5.5.0`. +`oracle/node-oracledb#v6.0.0-dev`. #### 3.7.3 Installing from a source package @@ -1416,14 +1416,14 @@ dependency like: ``` "dependencies": { - "oracledb": "https://github.com/oracle/node-oracledb/releases/download/v5.5.0/oracledb-src-5.5.0.tgz" + "oracledb": "https://github.com/oracle/node-oracledb/releases/download/v6.0.0-dev/oracledb-src-6.0.0-dev.tgz" }, ``` Or install with: ``` -npm install https://github.com/oracle/node-oracledb/releases/download/v5.5.0/oracledb-src-5.5.0.tgz +npm install https://github.com/oracle/node-oracledb/releases/download/v6.0.0-dev/oracledb-src-6.0.0-dev.tgz ``` #### 3.7.4 Installing from Oracle's repository @@ -1459,10 +1459,10 @@ within your company, or it can be used directly from the file system to install node-oracledb. - Download -[`oracledb-src-5.5.0.tgz`](https://github.com/oracle/node-oracledb/releases/download/v5.5.0/oracledb-src-5.5.0.tgz) +[`oracledb-src-6.0.0-dev.tgz`](https://github.com/oracle/node-oracledb/releases/download/v6.0.0-dev/oracledb-src-6.0.0-dev.tgz) from GitHub. -- Extract the file: `tar -xzf oracledb-src-5.5.0.tgz` +- Extract the file: `tar -xzf oracledb-src-6.0.0-dev.tgz` - Change directory: `cd package` @@ -1477,7 +1477,7 @@ from GitHub. architectures. - Run: `npm run buildpackage` - The package `oracledb-5.5.0.tgz` is created. + The package `oracledb-6.0.0-dev.tgz` is created. This package can be shared or self-hosted, see [Hosting your own node-oracledb Packages](#selfhost). @@ -1486,12 +1486,12 @@ Packages](#selfhost). On a machine with access, download the node-oracledb package from [npm][4], for example from -[`https://registry.npmjs.com/oracledb/-/oracledb-5.5.0.tgz`](https://registry.npmjs.com/oracledb/-/oracledb-5.5.0.tgz) +[`https://registry.npmjs.com/oracledb/-/oracledb-6.0.0-dev.tgz`](https://registry.npmjs.com/oracledb/-/oracledb-6.0.0-dev.tgz) This can be transferred to the desired machine and installed, for example with: ``` -npm install your_dir_path/oracledb-5.5.0.tgz +npm install your_dir_path/oracledb-6.0.0-dev.tgz ``` If you are using an architecture that does not have pre-supplied binaries then @@ -1549,17 +1549,17 @@ If you see `MSVCR80.dll` then you need the VS 2005 Redistributable. You can host node-oracledb packages locally. Download the node-oracledb package from npm, for example from -[`https://registry.npmjs.com/oracledb/-/oracledb-5.5.0.tgz`](https://registry.npmjs.com/oracledb/-/oracledb-5.5.0.tgz) +[`https://registry.npmjs.com/oracledb/-/oracledb-6.0.0-dev.tgz`](https://registry.npmjs.com/oracledb/-/oracledb-6.0.0-dev.tgz) Alternatively, if you want to build your own binaries and node-oracledb package, see [Creating a node-oracledb package from source code](#compilepackage). If you make the package accessible on your local web server, for example at -www.example.com/oracledb-5.5.0.tgz, then your `package.json` would contain: +www.example.com/oracledb-6.0.0-dev.tgz, then your `package.json` would contain: ``` . . . "dependencies": { - "oracledb": "https://www.example.com/oracledb-5.5.0.tgz" + "oracledb": "https://www.example.com/oracledb-6.0.0-dev.tgz" }, . . . ``` @@ -1567,7 +1567,7 @@ www.example.com/oracledb-5.5.0.tgz, then your `package.json` would contain: Or you would install with: ``` -npm install https://www.example.com/oracledb-5.5.0.tgz +npm install https://www.example.com/oracledb-6.0.0-dev.tgz ``` ### 3.10 Using node-oracledb in Docker diff --git a/README.md b/README.md index b497273d..f46c787a 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,12 @@ -# node-oracledb version 5.5.0 +# node-oracledb version 6.0.0-dev + +**This release is under development and information may be incomplete** The node-oracledb add-on for Node.js powers high performance Oracle Database applications. Applications can be written in TypeScript, or directly in JavaScript. -Use node-oracledb 5.5.0 to connect Node.js 14, or later, to Oracle Database. +Use node-oracledb 6.0.0-dev to connect Node.js 14, or later, to Oracle Database. Older versions of node-oracledb may work with older versions of Node.js. Node-oracledb supports basic and advanced features of Oracle Database diff --git a/doc/api.md b/doc/api.md index 4b734164..ee8b32db 100644 --- a/doc/api.md +++ b/doc/api.md @@ -1,4 +1,4 @@ -# node-oracledb 5.5.0 Documentation for the Oracle Database Node.js Add-on +# node-oracledb 6.0.0-dev Documentation for the Oracle Database Node.js Add-on *Copyright (c) 2015, 2022, Oracle and/or its affiliates.* diff --git a/package.json b/package.json index fc171273..85c4653d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "oracledb", - "version": "5.5.0", + "version": "6.0.0-dev", "description": "A Node.js module for Oracle Database access from JavaScript and TypeScript", "license": "Apache-2.0", "homepage": "http://oracle.github.io/node-oracledb/", diff --git a/src/njsModule.h b/src/njsModule.h index 7efcf014..da110077 100644 --- a/src/njsModule.h +++ b/src/njsModule.h @@ -39,10 +39,10 @@ // Keep the version in sync with package.json. // The suffix should be something like "-dev" or "-beta.1". // For production, use: #define NJS_NODE_ORACLEDB_SUFFIX "" -#define NJS_NODE_ORACLEDB_MAJOR 5 -#define NJS_NODE_ORACLEDB_MINOR 5 +#define NJS_NODE_ORACLEDB_MAJOR 6 +#define NJS_NODE_ORACLEDB_MINOR 0 #define NJS_NODE_ORACLEDB_PATCH 0 -#define NJS_NODE_ORACLEDB_SUFFIX "" +#define NJS_NODE_ORACLEDB_SUFFIX "-dev" // define stringified version and driver name #define NJS_STR_HELPER(x) #x