diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11ed260d..dd05de67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,10 @@
# KAR: A Runtime for the Hybrid Cloud
+# KAR 1.0.6 - 2021-07-30
++ Restructure of Java SDK internals and new maven artifact names
++ Add Prometheus metrics endpoint to sidecar
+
# KAR 1.0.5 - 2021-07-22
+ Use factory to create JsonObjectBuilder and JsonArrayBuilder instances (#126)
+ Update to kind 0.11.1 (#125)
diff --git a/ci/testJavaLocal.sh b/ci/testJavaLocal.sh
index becbbaf9..df56c656 100755
--- a/ci/testJavaLocal.sh
+++ b/ci/testJavaLocal.sh
@@ -55,25 +55,21 @@ run $PID kar run -app java-hello java -jar target/kar-hello-client-jar-with-depe
#################
-## TEMPORARY -- UNTIL WE RELEASE NEW VERSION WITH CHANGED STRUCTURE
-
-echo "TODO: Skipping test against released Java-SDK"
-
-# echo "Building Java Dining Philsopophers against released Java-SDK"
-# cd $ROOTDIR/examples/actors-dp-java
-# mvn clean package
+echo "Building Java Dining Philsopophers against released Java-SDK"
+cd $ROOTDIR/examples/actors-dp-java
+mvn clean package
-# echo "Launching Java DP Server"
-# kar run -v info -app dp -actors Cafe,Fork,Philosopher,Table mvn liberty:run &
-# PID=$!
+echo "Launching Java DP Server"
+kar run -v info -app dp -actors Cafe,Fork,Philosopher,Table mvn liberty:run &
+PID=$!
-# # Sleep 10 seconds to given liberty time to come up
-# sleep 10
+# Sleep 10 seconds to given liberty time to come up
+sleep 10
-# echo "Building and launching test harness"
-# cd $ROOTDIR/examples/actors-dp-js
-# npm install --prod
-# run $PID kar run -app dp node tester.js
+echo "Building and launching test harness"
+cd $ROOTDIR/examples/actors-dp-js
+npm install --prod
+run $PID kar run -app dp node tester.js
#################
diff --git a/examples/actors-dp-java/pom.xml b/examples/actors-dp-java/pom.xml
index abc20136..203dba0a 100644
--- a/examples/actors-dp-java/pom.xml
+++ b/examples/actors-dp-java/pom.xml
@@ -10,7 +10,7 @@
war
- 1.0.6-SNAPSHOT
+ 1.0.6
11
3.2.1
UTF-8
diff --git a/examples/actors-dp-js/package-lock.json b/examples/actors-dp-js/package-lock.json
index 11c2c852..121b2c69 100644
--- a/examples/actors-dp-js/package-lock.json
+++ b/examples/actors-dp-js/package-lock.json
@@ -1614,9 +1614,9 @@
}
},
"kar-sdk": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/kar-sdk/-/kar-sdk-1.0.5.tgz",
- "integrity": "sha512-Skzo/cag+uho6kg3z5raC9DX3gU+tk6GRyZRjuGqb2QnXKuecTZMnANskuyva0jvHuhf0JQb45wOW9U+jQ/f2g==",
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/kar-sdk/-/kar-sdk-1.0.6.tgz",
+ "integrity": "sha512-IgbE+k5NUwmEpH4RkQiLjkbYwqkkzjkd+Wuk4Gn1WW3qKhn9x/nZzUp9iGYCk8ZWZbIdxd+M3rKVbu5iAUhcaw==",
"requires": {
"express": "^4.17.1",
"fetch-retry": "^3.1.0",
diff --git a/examples/actors-dp-js/package.json b/examples/actors-dp-js/package.json
index dcda7789..51d1ff95 100644
--- a/examples/actors-dp-js/package.json
+++ b/examples/actors-dp-js/package.json
@@ -6,7 +6,7 @@
},
"dependencies": {
"express": "^4.17.1",
- "kar-sdk": "^1.0.5",
+ "kar-sdk": "^1.0.6",
"uuid": "^8.3.0"
},
"devDependencies": {
diff --git a/examples/actors-events/package-lock.json b/examples/actors-events/package-lock.json
index 7a1fca3b..5dbcca71 100644
--- a/examples/actors-events/package-lock.json
+++ b/examples/actors-events/package-lock.json
@@ -1680,9 +1680,9 @@
}
},
"kar-sdk": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/kar-sdk/-/kar-sdk-1.0.5.tgz",
- "integrity": "sha512-Skzo/cag+uho6kg3z5raC9DX3gU+tk6GRyZRjuGqb2QnXKuecTZMnANskuyva0jvHuhf0JQb45wOW9U+jQ/f2g==",
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/kar-sdk/-/kar-sdk-1.0.6.tgz",
+ "integrity": "sha512-IgbE+k5NUwmEpH4RkQiLjkbYwqkkzjkd+Wuk4Gn1WW3qKhn9x/nZzUp9iGYCk8ZWZbIdxd+M3rKVbu5iAUhcaw==",
"requires": {
"express": "^4.17.1",
"fetch-retry": "^3.1.0",
diff --git a/examples/actors-events/package.json b/examples/actors-events/package.json
index e28dd9dd..2554c89a 100644
--- a/examples/actors-events/package.json
+++ b/examples/actors-events/package.json
@@ -7,7 +7,7 @@
"dependencies": {
"cloudevents": "^4.0.0",
"express": "^4.17.1",
- "kar-sdk": "^1.0.5"
+ "kar-sdk": "^1.0.6"
},
"devDependencies": {
"mocha": "^7.1.1",
diff --git a/examples/actors-ykt/package-lock.json b/examples/actors-ykt/package-lock.json
index b27bd7d8..3aa89898 100644
--- a/examples/actors-ykt/package-lock.json
+++ b/examples/actors-ykt/package-lock.json
@@ -1680,9 +1680,9 @@
}
},
"kar-sdk": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/kar-sdk/-/kar-sdk-1.0.5.tgz",
- "integrity": "sha512-Skzo/cag+uho6kg3z5raC9DX3gU+tk6GRyZRjuGqb2QnXKuecTZMnANskuyva0jvHuhf0JQb45wOW9U+jQ/f2g==",
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/kar-sdk/-/kar-sdk-1.0.6.tgz",
+ "integrity": "sha512-IgbE+k5NUwmEpH4RkQiLjkbYwqkkzjkd+Wuk4Gn1WW3qKhn9x/nZzUp9iGYCk8ZWZbIdxd+M3rKVbu5iAUhcaw==",
"requires": {
"express": "^4.17.1",
"fetch-retry": "^3.1.0",
diff --git a/examples/actors-ykt/package.json b/examples/actors-ykt/package.json
index 38cb36a4..c5bdaf73 100644
--- a/examples/actors-ykt/package.json
+++ b/examples/actors-ykt/package.json
@@ -7,7 +7,7 @@
"dependencies": {
"cloudevents": "^4.0.0",
"express": "^4.17.1",
- "kar-sdk": "^1.0.5"
+ "kar-sdk": "^1.0.6"
},
"devDependencies": {
"mocha": "^7.1.1",
diff --git a/examples/camel-k/package-lock.json b/examples/camel-k/package-lock.json
index caff2a1a..e8d3bf35 100644
--- a/examples/camel-k/package-lock.json
+++ b/examples/camel-k/package-lock.json
@@ -1680,9 +1680,9 @@
}
},
"kar-sdk": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/kar-sdk/-/kar-sdk-1.0.5.tgz",
- "integrity": "sha512-Skzo/cag+uho6kg3z5raC9DX3gU+tk6GRyZRjuGqb2QnXKuecTZMnANskuyva0jvHuhf0JQb45wOW9U+jQ/f2g==",
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/kar-sdk/-/kar-sdk-1.0.6.tgz",
+ "integrity": "sha512-IgbE+k5NUwmEpH4RkQiLjkbYwqkkzjkd+Wuk4Gn1WW3qKhn9x/nZzUp9iGYCk8ZWZbIdxd+M3rKVbu5iAUhcaw==",
"requires": {
"express": "^4.17.1",
"fetch-retry": "^3.1.0",
diff --git a/examples/camel-k/package.json b/examples/camel-k/package.json
index d90a8de8..4aea129d 100644
--- a/examples/camel-k/package.json
+++ b/examples/camel-k/package.json
@@ -7,7 +7,7 @@
"dependencies": {
"cloudevents": "^4.0.0",
"express": "^4.17.1",
- "kar-sdk": "^1.0.5"
+ "kar-sdk": "^1.0.6"
},
"devDependencies": {
"mocha": "^7.1.1",
diff --git a/examples/misc/actor-timeout-java/pom.xml b/examples/misc/actor-timeout-java/pom.xml
index ae203fb8..6dec64e3 100644
--- a/examples/misc/actor-timeout-java/pom.xml
+++ b/examples/misc/actor-timeout-java/pom.xml
@@ -10,7 +10,7 @@
war
- 1.0.6-SNAPSHOT
+ 1.0.6
3.2.1
UTF-8
UTF-8
diff --git a/examples/misc/actor-timeout-js/package-lock.json b/examples/misc/actor-timeout-js/package-lock.json
index dd3858d4..3b9a8ef4 100644
--- a/examples/misc/actor-timeout-js/package-lock.json
+++ b/examples/misc/actor-timeout-js/package-lock.json
@@ -1614,9 +1614,9 @@
}
},
"kar-sdk": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/kar-sdk/-/kar-sdk-1.0.5.tgz",
- "integrity": "sha512-Skzo/cag+uho6kg3z5raC9DX3gU+tk6GRyZRjuGqb2QnXKuecTZMnANskuyva0jvHuhf0JQb45wOW9U+jQ/f2g==",
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/kar-sdk/-/kar-sdk-1.0.6.tgz",
+ "integrity": "sha512-IgbE+k5NUwmEpH4RkQiLjkbYwqkkzjkd+Wuk4Gn1WW3qKhn9x/nZzUp9iGYCk8ZWZbIdxd+M3rKVbu5iAUhcaw==",
"requires": {
"express": "^4.17.1",
"fetch-retry": "^3.1.0",
diff --git a/examples/misc/actor-timeout-js/package.json b/examples/misc/actor-timeout-js/package.json
index 2894c7cf..48f79999 100644
--- a/examples/misc/actor-timeout-js/package.json
+++ b/examples/misc/actor-timeout-js/package.json
@@ -6,7 +6,7 @@
},
"dependencies": {
"express": "^4.17.1",
- "kar-sdk": "^1.0.5"
+ "kar-sdk": "^1.0.6"
},
"devDependencies": {
"mocha": "^7.1.1",
diff --git a/examples/misc/fault-tolerance/package-lock.json b/examples/misc/fault-tolerance/package-lock.json
index 6179e818..724d46ef 100644
--- a/examples/misc/fault-tolerance/package-lock.json
+++ b/examples/misc/fault-tolerance/package-lock.json
@@ -1615,9 +1615,9 @@
}
},
"kar-sdk": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/kar-sdk/-/kar-sdk-1.0.5.tgz",
- "integrity": "sha512-Skzo/cag+uho6kg3z5raC9DX3gU+tk6GRyZRjuGqb2QnXKuecTZMnANskuyva0jvHuhf0JQb45wOW9U+jQ/f2g==",
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/kar-sdk/-/kar-sdk-1.0.6.tgz",
+ "integrity": "sha512-IgbE+k5NUwmEpH4RkQiLjkbYwqkkzjkd+Wuk4Gn1WW3qKhn9x/nZzUp9iGYCk8ZWZbIdxd+M3rKVbu5iAUhcaw==",
"requires": {
"express": "^4.17.1",
"fetch-retry": "^3.1.0",
diff --git a/examples/misc/fault-tolerance/package.json b/examples/misc/fault-tolerance/package.json
index c956228e..8d0fc575 100644
--- a/examples/misc/fault-tolerance/package.json
+++ b/examples/misc/fault-tolerance/package.json
@@ -6,7 +6,7 @@
},
"dependencies": {
"express": "^4.17.1",
- "kar-sdk": "^1.0.5",
+ "kar-sdk": "^1.0.6",
"node-fetch": "^2.6.0"
},
"devDependencies": {
diff --git a/examples/misc/service-timeout-java/server-back/pom.xml b/examples/misc/service-timeout-java/server-back/pom.xml
index 57c9901a..fd2398a0 100644
--- a/examples/misc/service-timeout-java/server-back/pom.xml
+++ b/examples/misc/service-timeout-java/server-back/pom.xml
@@ -10,7 +10,7 @@
war
- 1.0.6-SNAPSHOT
+ 1.0.6
3.2.1
UTF-8
UTF-8
diff --git a/examples/misc/service-timeout-java/server-front/pom.xml b/examples/misc/service-timeout-java/server-front/pom.xml
index edf54c48..eff73ac2 100644
--- a/examples/misc/service-timeout-java/server-front/pom.xml
+++ b/examples/misc/service-timeout-java/server-front/pom.xml
@@ -10,7 +10,7 @@
war
- 1.0.6-SNAPSHOT
+ 1.0.6
UTF-8
UTF-8
false
diff --git a/examples/misc/service-timeout-java/server-middle/pom.xml b/examples/misc/service-timeout-java/server-middle/pom.xml
index 33397414..fbce887b 100644
--- a/examples/misc/service-timeout-java/server-middle/pom.xml
+++ b/examples/misc/service-timeout-java/server-middle/pom.xml
@@ -10,7 +10,7 @@
war
- 1.0.6-SNAPSHOT
+ 1.0.6
UTF-8
UTF-8
false
diff --git a/examples/service-hello-js/package-lock.json b/examples/service-hello-js/package-lock.json
index e88c52a0..2470526c 100644
--- a/examples/service-hello-js/package-lock.json
+++ b/examples/service-hello-js/package-lock.json
@@ -1614,9 +1614,9 @@
}
},
"kar-sdk": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/kar-sdk/-/kar-sdk-1.0.5.tgz",
- "integrity": "sha512-Skzo/cag+uho6kg3z5raC9DX3gU+tk6GRyZRjuGqb2QnXKuecTZMnANskuyva0jvHuhf0JQb45wOW9U+jQ/f2g==",
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/kar-sdk/-/kar-sdk-1.0.6.tgz",
+ "integrity": "sha512-IgbE+k5NUwmEpH4RkQiLjkbYwqkkzjkd+Wuk4Gn1WW3qKhn9x/nZzUp9iGYCk8ZWZbIdxd+M3rKVbu5iAUhcaw==",
"requires": {
"express": "^4.17.1",
"fetch-retry": "^3.1.0",
diff --git a/examples/service-hello-js/package.json b/examples/service-hello-js/package.json
index 2d1498db..8a8668e4 100644
--- a/examples/service-hello-js/package.json
+++ b/examples/service-hello-js/package.json
@@ -7,7 +7,7 @@
"dependencies": {
"express": "^4.17.1",
"fetch-retry": "^3.1.0",
- "kar-sdk": "^1.0.5",
+ "kar-sdk": "^1.0.6",
"node-fetch": "^2.6.0"
},
"devDependencies": {
diff --git a/examples/unit-tests/package-lock.json b/examples/unit-tests/package-lock.json
index ee70ca79..a5d36f36 100644
--- a/examples/unit-tests/package-lock.json
+++ b/examples/unit-tests/package-lock.json
@@ -1700,9 +1700,9 @@
}
},
"kar-sdk": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/kar-sdk/-/kar-sdk-1.0.5.tgz",
- "integrity": "sha512-Skzo/cag+uho6kg3z5raC9DX3gU+tk6GRyZRjuGqb2QnXKuecTZMnANskuyva0jvHuhf0JQb45wOW9U+jQ/f2g==",
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/kar-sdk/-/kar-sdk-1.0.6.tgz",
+ "integrity": "sha512-IgbE+k5NUwmEpH4RkQiLjkbYwqkkzjkd+Wuk4Gn1WW3qKhn9x/nZzUp9iGYCk8ZWZbIdxd+M3rKVbu5iAUhcaw==",
"requires": {
"express": "^4.17.1",
"fetch-retry": "^3.1.0",
diff --git a/examples/unit-tests/package.json b/examples/unit-tests/package.json
index d35bb797..74d4b250 100644
--- a/examples/unit-tests/package.json
+++ b/examples/unit-tests/package.json
@@ -8,7 +8,7 @@
"axios": "^0.21.1",
"cloudevents": "^4.0.0",
"express": "^4.17.1",
- "kar-sdk": "^1.0.5"
+ "kar-sdk": "^1.0.6"
},
"devDependencies": {
"mocha": "^7.1.1",
diff --git a/scripts/helm/kar/Chart.yaml b/scripts/helm/kar/Chart.yaml
index b340f47e..875d69d8 100644
--- a/scripts/helm/kar/Chart.yaml
+++ b/scripts/helm/kar/Chart.yaml
@@ -18,8 +18,8 @@ apiVersion: v2
name: kar
description: Kubernetes Application Runtime (KAR)
type: application
-version: 1.0.5
-appVersion: 1.0.5
+version: 1.0.6
+appVersion: 1.0.6
dependencies:
- name: kar-kafka
condition: kafka.internal
diff --git a/scripts/helm/kar/values.yaml b/scripts/helm/kar/values.yaml
index 135baa2e..8f6c1c6a 100644
--- a/scripts/helm/kar/values.yaml
+++ b/scripts/helm/kar/values.yaml
@@ -32,7 +32,7 @@ redis:
password: 'mustOverrideIfInternalIsFalse'
kar:
- version: 1.0.5
+ version: 1.0.6
injector:
replicaCount: 1
imageName: 'quay.io/ibm/kar-injector'
diff --git a/sdk-java/kar-runtime-core/pom.xml b/sdk-java/kar-runtime-core/pom.xml
index 004c6ebd..5e962623 100644
--- a/sdk-java/kar-runtime-core/pom.xml
+++ b/sdk-java/kar-runtime-core/pom.xml
@@ -6,7 +6,7 @@
com.ibm.research.kar
kar-java
- 1.0.6-SNAPSHOT
+ 1.0.6
kar-runtime-core
diff --git a/sdk-java/kar-runtime-liberty/pom.xml b/sdk-java/kar-runtime-liberty/pom.xml
index dd6d7533..35646f6f 100644
--- a/sdk-java/kar-runtime-liberty/pom.xml
+++ b/sdk-java/kar-runtime-liberty/pom.xml
@@ -6,7 +6,7 @@
com.ibm.research.kar
kar-java
- 1.0.6-SNAPSHOT
+ 1.0.6
kar-runtime-liberty
diff --git a/sdk-java/kar-runtime-quarkus/pom.xml b/sdk-java/kar-runtime-quarkus/pom.xml
index 552f9293..6b05bed5 100644
--- a/sdk-java/kar-runtime-quarkus/pom.xml
+++ b/sdk-java/kar-runtime-quarkus/pom.xml
@@ -6,7 +6,7 @@
com.ibm.research.kar
kar-java
- 1.0.6-SNAPSHOT
+ 1.0.6
kar-runtime-quarkus
diff --git a/sdk-java/pom.xml b/sdk-java/pom.xml
index 5468a06c..7cf9f655 100644
--- a/sdk-java/pom.xml
+++ b/sdk-java/pom.xml
@@ -8,7 +8,7 @@
com.ibm.research.kar
kar-java
- 1.0.6-SNAPSHOT
+ 1.0.6
kar-java
pom
diff --git a/sdk-js/package-lock.json b/sdk-js/package-lock.json
index ad5bb4d8..349d0067 100644
--- a/sdk-js/package-lock.json
+++ b/sdk-js/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "kar-sdk",
- "version": "1.0.5",
+ "version": "1.0.6",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/sdk-js/package.json b/sdk-js/package.json
index 65435c17..49b37a4a 100644
--- a/sdk-js/package.json
+++ b/sdk-js/package.json
@@ -2,7 +2,7 @@
"name": "kar-sdk",
"main": "index.js",
"types": "index.d.ts",
- "version": "1.0.5",
+ "version": "1.0.6",
"description": "KAR SDK for JavaScript and TypeScript",
"homepage": "https://github.com/IBM/kar",
"scripts": {