Skip to content

Commit

Permalink
upgrade to 1.4.1 and update changelog
Browse files Browse the repository at this point in the history
Former-commit-id: 8b9aaac
  • Loading branch information
stevehu committed Aug 30, 2017
1 parent 0562fe1 commit 0364bc9
Show file tree
Hide file tree
Showing 29 changed files with 61 additions and 54 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@

### Changed

## 1.4.1 - 2017-08-30
### Added

### Changed
- fixes #29 Upgrade to newer version for Undertow and Jackson
- Upgrade to light-4j 1.4.1

## 1.4.0 - 2017-08-22
### Added

Expand Down
2 changes: 1 addition & 1 deletion cdc-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.networknt</groupId>
<artifactId>light-eventuate-4j</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion cdc-mysql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.networknt</groupId>
<artifactId>light-eventuate-4j</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion cdc-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:8-jre-alpine

ADD /target/cdc-server-1.4.0.jar server.jar
ADD /target/cdc-server-1.4.1.jar server.jar
CMD ["/bin/sh","-c","java -Dlight-4j-config-dir=/config -Dlogback.configurationFile=/config/logback.xml -cp /server.jar com.networknt.server.Server"]
2 changes: 1 addition & 1 deletion cdc-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.networknt</groupId>
<artifactId>light-eventuate-4j</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion cdc-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.networknt</groupId>
<artifactId>light-eventuate-4j</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion docker/command/config/server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ enableTwoWayTls: false
truststoreName: tls/server.truststore

# Unique service identifier. Used in service registration and discovery etc.
serviceId: com.networknt.eventuate-command-1.4.0
serviceId: com.networknt.eventuate-command-1.4.1

# Flag to enable service registration. Only be true if running as standalone Java jar.
enableRegistry: false
2 changes: 1 addition & 1 deletion docs/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ googleAnalytics = ""
provider = "GitHub"
repo_url = "https://github.com/networknt/light-eventuate-4j"

version = "1.4.0"
version = "1.4.1"
logo = "images/logo.png"
favicon = ""

Expand Down
8 changes: 4 additions & 4 deletions docs/content/tutorial/eventuate-dev.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,14 @@ You can start it manually by following these steps.

```
cd ~/networknt/light-eventuate-4j/cdc-server
java -jar target/cdc-server-1.4.0.jar
java -jar target/cdc-server-1.4.1.jar
```

or

```
cd ~/networknt/light-eventuate-4j/cdc-server
java -cp target/cdc-server-1.4.0.jar com.networknt.server.Server
java -cp target/cdc-server-1.4.1.jar com.networknt.server.Server
```

or
Expand Down Expand Up @@ -202,7 +202,7 @@ services and their dependencies are located at ~/networknt/light-eventuate-4j/do

```$xslt
cd ~/networknt/light-eventuate-4j/hybrid-command
java -cp ~/networknt/light-eventuate-4j/docker/command/service/*:target/hybrid-command-1.4.0.jar com.networknt.server.Server
java -cp ~/networknt/light-eventuate-4j/docker/command/service/*:target/hybrid-command-1.4.1.jar com.networknt.server.Server
```


Expand All @@ -216,7 +216,7 @@ To start the query server manually.

```$xslt
cd ~/networknt/light-eventuate-4j/hybrid-query
java -cp ~/networknt/light-eventuate-4j/docker/query/service/*:target/hybrid-query-1.4.0.jar com.networknt.server.Server
java -cp ~/networknt/light-eventuate-4j/docker/query/service/*:target/hybrid-query-1.4.1.jar com.networknt.server.Server
```

Expand Down
16 changes: 8 additions & 8 deletions docs/content/tutorial/todo-list.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ Now let's update rest-command module to wire the logic.

First we need to update dependencies for this project by adding the following.
```xml
<version.light-eventuate-4j>1.4.0</version.light-eventuate-4j>
<version.light-eventuate-4j>1.4.1</version.light-eventuate-4j>


<dependency>
Expand Down Expand Up @@ -405,7 +405,7 @@ Now let's update rest-query module to wire the logic.

First we need to update dependencies for this project by adding the following.
```xml
<version.light-eventuate-4j>1.4.0</version.light-eventuate-4j>
<version.light-eventuate-4j>1.4.1</version.light-eventuate-4j>


<dependency>
Expand Down Expand Up @@ -927,7 +927,7 @@ Now let's change the dependencies to add light-eventuate-4j modules and todo-lis
modules.

```xml
<version.light-eventuate-4j>1.4.0</version.light-eventuate-4j>
<version.light-eventuate-4j>1.4.1</version.light-eventuate-4j>

```

Expand Down Expand Up @@ -1477,7 +1477,7 @@ Now let's change the dependencies to add light-eventuate-4j modules and todo-lis
modules.

```xml
<version.light-eventuate-4j>1.4.0</version.light-eventuate-4j>
<version.light-eventuate-4j>1.4.1</version.light-eventuate-4j>

```

Expand Down Expand Up @@ -1826,7 +1826,7 @@ cd ~/networknt/light-eventuate-4j/hybrid-command
mvn clean install
java -cp ~/networknt/light-docker/eventuate/hybrid-command/service/*:target/hybrid-command-1.4.0.jar com.networknt.server.Server
java -cp ~/networknt/light-docker/eventuate/hybrid-command/service/*:target/hybrid-command-1.4.1.jar com.networknt.server.Server
```

Expand All @@ -1850,7 +1850,7 @@ cd ~/networknt/light-eventuate-4j/hybrid-query
mvn clean install
java -cp ~/networknt/light-docker/eventuate/hybrid-query/service/*:target/hybrid-query-1.4.0.jar com.networknt.server.Server
java -cp ~/networknt/light-docker/eventuate/hybrid-query/service/*:target/hybrid-query-1.4.1.jar com.networknt.server.Server
```

Expand Down Expand Up @@ -1958,7 +1958,7 @@ cd ~/networknt/light-docker/eventuate/hybrid-command/service
cp ~/networknt/light-example-4j/eventuate/todo-list/common/target/todo-common-0.1.0.jar .
cp ~/networknt/light-example-4j/eventuate/todo-list/command/target/todo-command-0.1.0.jar .
cp ~/networknt/light-example-4j/eventuate/todo-list/hybrid-command/target/hybrid-command-0.1.0.jar .
cp ~/networknt/light-eventuate-4j/hybrid-command/target/hybrid-command-1.4.0.jar .
cp ~/networknt/light-eventuate-4j/hybrid-command/target/hybrid-command-1.4.1.jar .
```

For hybrid query:
Expand All @@ -1969,7 +1969,7 @@ cp ~/networknt/light-example-4j/eventuate/todo-list/common/target/todo-common-0.
cp ~/networknt/light-example-4j/eventuate/todo-list/command/target/todo-command-0.1.0.jar .
cp ~/networknt/light-example-4j/eventuate/todo-list/query/target/todo-query-0.1.0.jar .
cp ~/networknt/light-example-4j/eventuate/todo-list/hybrid-query/target/hybrid-query-0.1.0.jar .
cp ~/networknt/light-eventuate-4j/hybrid-query/target/hybrid-query-1.4.0.jar .
cp ~/networknt/light-eventuate-4j/hybrid-query/target/hybrid-query-1.4.1.jar .
```

Expand Down
2 changes: 1 addition & 1 deletion eventuate-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.networknt</groupId>
<artifactId>light-eventuate-4j</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion eventuate-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.networknt</groupId>
<artifactId>light-eventuate-4j</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion eventuate-event/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.networknt</groupId>
<artifactId>light-eventuate-4j</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion eventuate-jdbc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.networknt</groupId>
<artifactId>light-eventuate-4j</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion eventuate-kafka/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.networknt</groupId>
<artifactId>light-eventuate-4j</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion eventuate-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.networknt</groupId>
<artifactId>light-eventuate-4j</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion hybrid-command/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:8-jre-alpine
EXPOSE 8083
ADD /target/eventuate-command-1.4.0.jar server.jar
ADD /target/eventuate-command-1.4.1.jar server.jar
CMD ["/bin/sh","-c","java -Dlight-4j-config-dir=/config -Dlogback.configurationFile=/config/logback.xml -cp /server.jar:/service/* com.networknt.server.Server"]
8 changes: 4 additions & 4 deletions hybrid-command/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,26 @@ If you only have one service jar file, then your can include the jar file into t
class path as below.

```
java -cp ../cdcservice/target/eventuate-cdcservice-1.4.0.jar:target/eventuate-command-1.4.0.jar com.networknt.server.Server
java -cp ../cdcservice/target/eventuate-cdcservice-1.4.1.jar:target/eventuate-command-1.4.1.jar com.networknt.server.Server
```

for windows:

```
java -cp ../cdcservice/target/eventuate-cdcservice-1.4.0.jar;target/eventuate-command-1.4.0.jar com.networknt.server.Server
java -cp ../cdcservice/target/eventuate-cdcservice-1.4.1.jar;target/eventuate-command-1.4.1.jar com.networknt.server.Server
```

If you have multiple service jar files, you'd better create a directory and include
that directory into the classpath when starting the server.

```
java -cp ./service/*:target/eventuate-command-1.4.0.jar com.networknt.server.Server
java -cp ./service/*:target/eventuate-command-1.4.1.jar com.networknt.server.Server
```

for windows:

```
java -cp ./service/*;target/eventuate-command-1.4.0.jar com.networknt.server.Server
java -cp ./service/*;target/eventuate-command-1.4.1.jar com.networknt.server.Server
```

## Test
Expand Down
10 changes: 5 additions & 5 deletions hybrid-command/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.networknt</groupId>
<artifactId>light-eventuate-4j</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
<relativePath>..</relativePath>
</parent>

Expand All @@ -15,9 +15,9 @@
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.light-4j>1.4.0</version.light-4j>
<version.light-hybrid-4j>1.4.0</version.light-hybrid-4j>
<version.jackson>2.8.7</version.jackson>
<version.light-4j>1.4.1</version.light-4j>
<version.light-hybrid-4j>1.4.1</version.light-hybrid-4j>
<version.jackson>2.8.10</version.jackson>
<version.slf4j>1.7.25</version.slf4j>
<version.jose4j>0.5.5</version.jose4j>
<version.antlr4>4.7</version.antlr4>
Expand All @@ -28,7 +28,7 @@
<version.logback>1.2.3</version.logback>
<version.junit>4.12</version.junit>
<version.mockito>2.1.0-RC.1</version.mockito>
<version.undertow>1.4.11.Final</version.undertow>
<version.undertow>1.4.19.Final</version.undertow>
<version.fastscanner>2.0.8</version.fastscanner>
<version.json-schema-validator>0.1.7</version.json-schema-validator>
<version.hikaricp>2.5.1</version.hikaricp>
Expand Down
2 changes: 1 addition & 1 deletion hybrid-command/src/main/resources/config/server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ enableTwoWayTls: false
truststoreName: tls/server.truststore

# Unique service identifier. Used in service registration and discovery etc.
serviceId: com.networknt.eventuate-command-1.4.0
serviceId: com.networknt.eventuate-command-1.4.1

# Flag to enable service registration. Only be true if running as standalone Java jar.
enableRegistry: false
2 changes: 1 addition & 1 deletion hybrid-query/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

FROM openjdk:8-jre-alpine
EXPOSE 8082
ADD /target/eventuate-query-1.4.0.jar server.jar
ADD /target/eventuate-query-1.4.1.jar server.jar
CMD ["/bin/sh","-c","java -Dlight-4j-config-dir=/config -Dlogback.configurationFile=/config/logback.xml -cp /server.jar:/service/* com.networknt.server.Server"]
8 changes: 4 additions & 4 deletions hybrid-query/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,26 @@ If you only have one service jar file, then your can include the jar file into t
class path as below.

```
java -cp ../cdcservice/target/eventuate-cdcservice-1.4.0.jar:target/eventuate-query-1.4.0.jar com.networknt.server.Server
java -cp ../cdcservice/target/eventuate-cdcservice-1.4.1.jar:target/eventuate-query-1.4.1.jar com.networknt.server.Server
```

for windows:

```
java -cp ../cdcservice/target/eventuate-cdcservice-1.4.0.jar;target/eventuate-query-1.4.0.jar com.networknt.server.Server
java -cp ../cdcservice/target/eventuate-cdcservice-1.4.1.jar;target/eventuate-query-1.4.1.jar com.networknt.server.Server
```

If you have multiple service jar files, you'd better create a directory and include
that directory into the classpath when starting the server.

```
java -cp ./service/*:target/eventuate-query-1.4.0.jar com.networknt.server.Server
java -cp ./service/*:target/eventuate-query-1.4.1.jar com.networknt.server.Server
```

for windows:

```
java -cp ./service/*;target/eventuate-query-1.4.0.jar com.networknt.server.Server
java -cp ./service/*;target/eventuate-query-1.4.1.jar com.networknt.server.Server
```
## Test

Expand Down
10 changes: 5 additions & 5 deletions hybrid-query/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.networknt</groupId>
<artifactId>light-eventuate-4j</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
<relativePath>..</relativePath>
</parent>

Expand All @@ -16,9 +16,9 @@
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.light-4j>1.4.0</version.light-4j>
<version.light-hybrid-4j>1.4.0</version.light-hybrid-4j>
<version.jackson>2.8.7</version.jackson>
<version.light-4j>1.4.1</version.light-4j>
<version.light-hybrid-4j>1.4.1</version.light-hybrid-4j>
<version.jackson>2.8.10</version.jackson>
<version.slf4j>1.7.25</version.slf4j>
<version.jose4j>0.5.5</version.jose4j>
<version.antlr4>4.7</version.antlr4>
Expand All @@ -29,7 +29,7 @@
<version.logback>1.2.3</version.logback>
<version.junit>4.12</version.junit>
<version.mockito>2.1.0-RC.1</version.mockito>
<version.undertow>1.4.11.Final</version.undertow>
<version.undertow>1.4.19.Final</version.undertow>
<version.jsonpath>2.2.0</version.jsonpath>
<version.fastscanner>2.0.8</version.fastscanner>
<version.json-schema-validator>0.1.7</version.json-schema-validator>
Expand Down
2 changes: 1 addition & 1 deletion hybrid-query/src/main/resources/config/server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ enableTwoWayTls: false
truststoreName: tls/server.truststore

# Unique service identifier. Used in service registration and discovery etc.
serviceId: com.networknt.eventuate-query-1.4.0
serviceId: com.networknt.eventuate-query-1.4.1

# Flag to enable service registration. Only be true if running as standalone Java jar.
enableRegistry: false
Loading

0 comments on commit 0364bc9

Please sign in to comment.