You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by se...@apache.org on 2022/08/03 08:47:53 UTC
[openwhisk-runtime-go] branch master updated: Upgrade gradle version (#172)
This is an automated email from the ASF dual-hosted git repository.
seonghyun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-go.git
The following commit(s) were added to refs/heads/master by this push:
new b6577be Upgrade gradle version (#172)
b6577be is described below
commit b6577be30be4b06e327e3817337e7318459e2b30
Author: ningyougang <41...@qq.com>
AuthorDate: Wed Aug 3 16:47:50 2022 +0800
Upgrade gradle version (#172)
* Use jcenter together
* Solve issue: note: module requires Go 1.18
* Upgrade gradle to 6.9.1
* Fix junit issue
* Fix test case error
---
build.gradle | 1 +
golang1.17/Dockerfile | 2 +-
gradle/wrapper/gradle-wrapper.properties | 2 +-
gradlew | 4 ++--
gradlew.bat | 4 ++--
openwhisk/runHandler.go | 2 +-
tests/build.gradle | 9 ++++++---
7 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/build.gradle b/build.gradle
index 26f542d..1c0c6e0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,6 +18,7 @@
buildscript {
repositories {
jcenter()
+ mavenCentral()
}
dependencies {
classpath "cz.alenkacz:gradle-scalafmt:${gradle.scalafmt.version}"
diff --git a/golang1.17/Dockerfile b/golang1.17/Dockerfile
index 9deecda..d16866f 100644
--- a/golang1.17/Dockerfile
+++ b/golang1.17/Dockerfile
@@ -38,7 +38,7 @@ RUN echo "deb http://deb.debian.org/debian buster-backports main contrib non-fre
librdkafka-dev=0.11.6-1.1 &&\
# Cleanup apt data, we do not need them later on.
apt-get clean && rm -rf /var/lib/apt/lists/* &&\
- go get -u github.com/go-delve/delve/cmd/dlv@v1.8.1 &&\
+ go install github.com/go-delve/delve/cmd/dlv@v1.8.1 &&\
mkdir /action
WORKDIR /action
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d475d27..235e07d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -18,4 +18,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
diff --git a/gradlew b/gradlew
index d4ee78f..8e25e6c 100755
--- a/gradlew
+++ b/gradlew
@@ -7,7 +7,7 @@
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
@@ -44,7 +44,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
diff --git a/gradlew.bat b/gradlew.bat
index ad0ff10..9618d8d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -5,7 +5,7 @@
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
-@rem http://www.apache.org/licenses/LICENSE-2.0
+@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@@ -30,7 +30,7 @@ set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
diff --git a/openwhisk/runHandler.go b/openwhisk/runHandler.go
index 3a16781..ea8bc5d 100644
--- a/openwhisk/runHandler.go
+++ b/openwhisk/runHandler.go
@@ -84,7 +84,7 @@ func (ap *ActionProxy) runHandler(w http.ResponseWriter, r *http.Request) {
var objmap map[string]*json.RawMessage
err = json.Unmarshal(response, &objmap)
if err != nil {
- sendError(w, http.StatusBadGateway, "The action did not return a dictionary.")
+ sendError(w, http.StatusBadGateway, "The action did not return a dictionary or array.")
return
}
diff --git a/tests/build.gradle b/tests/build.gradle
index 09adf17..b718fb8 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -34,9 +34,12 @@ tasks.withType(Test) {
}
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 "junit:junit:4.11"
+ implementation "org.scala-lang:scala-library:${gradle.scala.version}"
+ implementation "org.scalatest:scalatest_${gradle.scala.depVersion}:3.0.8"
+ implementation "org.apache.openwhisk:openwhisk-common:${gradle.openwhisk.version}"
+ implementation "org.apache.openwhisk:openwhisk-tests:${gradle.openwhisk.version}:tests"
+ implementation "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}"