You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by dg...@apache.org on 2021/08/12 18:05:36 UTC
[openwhisk-package-alarms] branch master updated: update NodeJS
minor version; fix akka version problems (#231)
This is an automated email from the ASF dual-hosted git repository.
dgrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-package-alarms.git
The following commit(s) were added to refs/heads/master by this push:
new 84d7e54 update NodeJS minor version; fix akka version problems (#231)
84d7e54 is described below
commit 84d7e5436afeb3457c28f64ca01d9a4063a8c26d
Author: David Grove <dg...@users.noreply.github.com>
AuthorDate: Thu Aug 12 14:04:58 2021 -0400
update NodeJS minor version; fix akka version problems (#231)
---
CHANGELOG.md | 4 ++--
Dockerfile | 2 +-
settings.gradle | 4 ++++
tests/build.gradle | 6 ++++++
4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5322967..2d937ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,8 +20,8 @@
# Changelog
## Next
-
-* NodeJS version: 10.24.0
+* Switch from Node.js 10 to Node.js 14 (#229)
+* Bump up cron to 1.8.2 (#223)
## 2.2.0
diff --git a/Dockerfile b/Dockerfile
index bf8b665..c6e97b7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@
# limitations under the License.
#
-FROM node:14.16.1
+FROM node:14.17.2
# only package.json
ADD package.json /
diff --git a/settings.gradle b/settings.gradle
index f076e07..cddf43b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -25,5 +25,9 @@ gradle.ext.openwhisk = [
gradle.ext.scala = [
version: '2.12.8',
+ depVersion : '2.12',
compileFlags: ['-feature', '-unchecked', '-deprecation', '-Xfatal-warnings', '-Ywarn-unused-import']
]
+
+gradle.ext.akka = [version : '2.6.12']
+gradle.ext.akka_http = [version : '10.2.4']
diff --git a/tests/build.gradle b/tests/build.gradle
index 1e96da9..0d9f7d6 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -42,6 +42,12 @@ dependencies {
compile "org.scala-lang:scala-library:${gradle.scala.version}"
compile "org.apache.openwhisk:openwhisk-tests:${gradle.openwhisk.version}:tests"
compile "org.apache.openwhisk:openwhisk-tests:${gradle.openwhisk.version}:test-sources"
+ implementation group: 'com.typesafe.akka', name: "akka-http2-support_${gradle.scala.depVersion}", version: "${gradle.akka_http.version}"
+ implementation group: 'com.typesafe.akka', name: "akka-http-xml_${gradle.scala.depVersion}", version: "${gradle.akka_http.version}"
+ implementation group: 'com.typesafe.akka', name: "akka-discovery_${gradle.scala.depVersion}", version: "${gradle.akka.version}"
+ implementation group: 'com.typesafe.akka', name: "akka-protobuf_${gradle.scala.depVersion}", version: "${gradle.akka.version}"
+ implementation group: 'com.typesafe.akka', name: "akka-remote_${gradle.scala.depVersion}", version: "${gradle.akka.version}"
+ implementation group: 'com.typesafe.akka', name: "akka-cluster_${gradle.scala.depVersion}", version: "${gradle.akka.version}"
}
tasks.withType(ScalaCompile) {