Skip to content

Commit

Permalink
Merge pull request #86 from tryggingamidstodin/use-java-bridge
Browse files Browse the repository at this point in the history
Use java bridge
  • Loading branch information
jakobrun authored May 2, 2024
2 parents 9ca49fd + d45df5e commit 10548ae
Show file tree
Hide file tree
Showing 47 changed files with 1,430 additions and 2,266 deletions.
65 changes: 34 additions & 31 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

on:
workflow_dispatch:
push:
Expand All @@ -11,33 +10,37 @@ jobs:
runs-on: ubuntu-latest
environment: CI
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v3
with:
node-version: 18
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'adopt'
- name: npm install
run: |
echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
npm ci
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
shell: bash
- name: build
run: |
npm run build-all
shell: bash
- name: test
run: |
npm run test
shell: bash
- name: publish npm module
if: github.ref == 'refs/heads/master'
run: |
npm publish
shell: bash

- uses: actions/checkout@v2
- uses: actions/setup-node@v3
with:
node-version: 18
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'adopt'
- name: npm install
run: |
echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
npm ci
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
shell: bash
- name: build
run: |
npm run build-all
shell: bash
- name: test
run: |
npm run test
shell: bash
- name: publish npm module
if: github.ref == 'refs/heads/master'
run: |
npm publish
shell: bash
- name: publish release candidate to npm
if: github.ref == 'refs/heads/rc'
run: |
npm publish --tag rc
shell: bash
2 changes: 2 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
dist/integration-test
dist/unit-test
63 changes: 46 additions & 17 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,50 +1,79 @@
# Changelog

All notable changes to this project will be documented in this file. Please note that this changelog was added in version 4.0 so documentation on versions prior to that are incomplete.

## [5.0.0] - 2024-04-18

### Changed

- The java dependency was replaced with java-bridge.
- main was moved from dist/lib/jt400.js to dist/index.js
- Q promises replaced with native promises
- The full java object is no longer exposed when reading a message file

## [4.3.0] - 2021-08-01

### Added
- Options parameter added to the query function. Trimming values is now configurable, but still defaults to true. Issue [#22](https://github.com/tryggingamidstodin/node-jt400/issues/22).

- Options parameter added to the query function. Trimming values is now configurable, but still defaults to true. Issue [#22](https://github.com/tryggingamidstodin/node-jt400/issues/22).

## [4.2.0] - 2021-07-30

### Added
- Support for BLOB column (not only clob). See [#66](https://github.com/tryggingamidstodin/node-jt400/pull/66)

- Support for BLOB column (not only clob). See [#66](https://github.com/tryggingamidstodin/node-jt400/pull/66)

## [4.1.0] - 2021-03-12

### Added
- asIterable function added for async iterable support. See [#60](https://github.com/tryggingamidstodin/node-jt400/pull/60).
- new types and interfaces added.

- asIterable function added for async iterable support. See [#60](https://github.com/tryggingamidstodin/node-jt400/pull/60).
- new types and interfaces added.

## [4.0.0] - 2019-10-15

### Added
- All errors wrapped in [oops-error](https://github.com/tryggingamidstodin/oops-error).
- Created CHANGELOG.md.

- All errors wrapped in [oops-error](https://github.com/tryggingamidstodin/oops-error).
- Created CHANGELOG.md.

### Changed
- Removed System.err logs in Java code.
- deprecated message for .pgm changed

- Removed System.err logs in Java code.
- deprecated message for .pgm changed

## [3.1.3] - 2019-07-10

### Added
- ccsid option for program calls. See [#39](https://github.com/tryggingamidstodin/node-jt400/pull/39).

- ccsid option for program calls. See [#39](https://github.com/tryggingamidstodin/node-jt400/pull/39).

### Changed
- ccsid defaults to ccsid from as400 system.

- ccsid defaults to ccsid from as400 system.

## [3.0.0] - 2018-11-30

### Added
- defineProgram function.
- Default timeout on program calls set to 3 sec to avoid programs halting.
- Optional timeout parameter set to program calls.

- defineProgram function.
- Default timeout on program calls set to 3 sec to avoid programs halting.
- Optional timeout parameter set to program calls.

### Changed
- Function .pgm was deprecated in favour of defineProgram.

- Function .pgm was deprecated in favour of defineProgram.

## [2.0.0] - 2018-10-8
### Added

### Added

### Changed
- Only supports node verison 8 and higher.

- Only supports node verison 8 and higher.

## [1.5.4] - 2017-10-24

### Added
- Support for CLOB data type

- Support for CLOB data type
Loading

0 comments on commit 10548ae

Please sign in to comment.