Skip to content

Commit

Permalink
Merge branch 'release/0.6.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
pmlopes committed Dec 17, 2018
2 parents 42bc556 + e1f6f04 commit 99fb6c8
Show file tree
Hide file tree
Showing 222 changed files with 5,573 additions and 2,045 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ target
sandbox
node_modules
package-lock.json
site
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ matrix:
- env: JDK='GraalVM 1.0.0'
install: . ./install-jdk.sh --url https://github.com/oracle/graal/releases/download/vm-1.0.0-rc9/graalvm-ce-1.0.0-rc9-linux-amd64.tar.gz
# OpenJ9
- env: JDK='OpenJ9 13'
install: . ./install-jdk.sh --url https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11-jdk_x64_linux_openj9_11.0.1_13.tar.gz
- env: JDK='OpenJ9'
install: . ./install-jdk.sh --url "https://api.adoptopenjdk.net/v2/binary/releases/openjdk11?openjdk_impl=openj9&os=linux&type=jdk&release=latest&heap_size=normal&arch=x64"
allow_failures:
# # Non LTS releases are OK to fail
# - env: JDK='OpenJDK 9'
# - env: JDK='OpenJDK 10'
- env: JDK='OpenJ9 13'
- env: JDK='OpenJ9'

script:
- echo PATH = ${PATH}
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [0.6.1] - 2018-12-17
- upgrade vertx to 3.6.2
- Fixed issue loading JMVCI when missing compiler jar
- fixed typpo locating the process id
- add a package flag to build a docker image
- new website and docs

## [0.6.0] - 2018-11-29
- Upgraded to Vert.x 3.6.0
- Code gen extracted to own module

## [0.5.6] - 2018-10-07
- Added a package command to package either fat jar or a JVMCI fat jar.
- Fix issue preventing GraalJS running on OpenJ9
Expand Down
19 changes: 2 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,27 +54,12 @@ suite.test("my_test_case", function (context) {
suite.run();
```

Profit!

## JDK11

If you don't want to run on GraalVM JDK but prefer [OpenJDK11](https://adoptopenjdk.net/index.html?variant=openjdk11&jvmVariant=hotspot),
or even [OpenJ9](https://adoptopenjdk.net/?variant=openjdk11&jvmVariant=openj9) all you need to do is **prefix**
any `NPM` / `Maven` command with the variable `JVMCI=1`, e.g.:

```bash
JVMCI=1 npm install
JVMCI=1 npm start
npm start
```

This will assume you're running on plain JDK11, if you don't want to type the variable all the time or set it to your
environment, you can add it to your `package.json` as:

```json
{
"jvmci": true
}
```
Profit!

## Documentation

Expand Down
4 changes: 2 additions & 2 deletions codegen/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<parent>
<groupId>io.reactiverse</groupId>
<artifactId>es4x-parent</artifactId>
<version>0.6.0</version>
<version>0.6.1</version>
<relativePath>..</relativePath>
</parent>

<modelVersion>4.0.0</modelVersion>

<artifactId>es4x-codegen</artifactId>
<version>0.6.0</version>
<version>0.6.1</version>

<properties>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion docs/@reactiverse/reactive-pg-client/assets/js/search.js

Large diffs are not rendered by default.

Loading

0 comments on commit 99fb6c8

Please sign in to comment.