This is an automated email from the ASF dual-hosted git repository.
jamesthomas pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-openwhisk-release.git
The following commit(s) were added to refs/heads/master by this push:
new 67ecab6 Fixing references to incubator. (#292)
67ecab6 is described below
commit 67ecab6f010367f98607c11e8531b6ebaa5ecfcf
Author: James Thomas <[email protected]>
AuthorDate: Thu Aug 1 17:20:24 2019 +0100
Fixing references to incubator. (#292)
---
tools/config.json | 17 +++++++++--------
tools/download_source_code.sh | 2 +-
tools/package_source_code.sh | 2 +-
tools/verify_source_code.sh | 4 ++--
4 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/tools/config.json b/tools/config.json
index 49761d6..e5418a1 100644
--- a/tools/config.json
+++ b/tools/config.json
@@ -1,18 +1,19 @@
{
"publish_stage": true,
"update_doc": false,
- "stage_url": "https://dist.apache.org/repos/dist/dev/incubator/openwhisk";,
- "release_url":
"https://dist.apache.org/repos/dist/release/incubator/openwhisk";,
+ "stage_url": "https://dist.apache.org/repos/dist/dev/openwhisk";,
+ "release_url": "https://dist.apache.org/repos/dist/release/openwhisk";,
"versioning": {
- "version": "1.14.0-incubating",
- "pre_release_version": "rc2"
+ "version": "X.Y.Z",
+ "pre_release_version": "rc1"
},
"RepoList": [
- "openwhisk-runtime-nodejs"
+ "openwhisk-repo-name"
],
- "openwhisk_runtime_nodejs": {
- "hash": "14d2af8",
- "repository":
"https://github.com/apache/incubator-openwhisk-runtime-nodejs.git";,
+ "openwhisk_repo_name": {
+ "name": "Apache OpenWhisk Repo Name",
+ "hash": "<GIT COMMIT HASH>",
+ "repository": "https://github.com/apache/openwhisk-<REPO-NAME>.git",
"branch": "master"
}
}
diff --git a/tools/download_source_code.sh b/tools/download_source_code.sh
index 33edb28..c0f7d42 100755
--- a/tools/download_source_code.sh
+++ b/tools/download_source_code.sh
@@ -46,7 +46,7 @@ do
HASH=$(json_by_key "$CONFIG" $HASH_KEY)
REPO=$(json_by_key "$CONFIG" $REPO_KEY)
BRANCH=$(json_by_key "$CONFIG" $REPO_BRANCH)
- project_name="incubator-$repo_name"
+ project_name="$repo_name"
if [ "$HASH" != "null" ]; then
echo "The hash for $project_name is $HASH"
git_clone_repo $project_name $HASH $REPO $BRANCH
diff --git a/tools/package_source_code.sh b/tools/package_source_code.sh
index 900bee4..5084012 100755
--- a/tools/package_source_code.sh
+++ b/tools/package_source_code.sh
@@ -35,7 +35,7 @@ rsync -rtp --exclude gradle/wrapper/gradle-\*.jar --exclude
.bin --exclude .jshi
for repo in $(echo $repos | sed "s/,/ /g")
do
repo_name=$(echo "$repo" | sed -e 's/^"//' -e 's/"$//')
- project_name="incubator-$repo_name"
+ project_name="$repo_name"
rm -rf $OPENWHISK_CLEANED_SOURCE_DIR/$project_name/.git
cd $OPENWHISK_CLEANED_SOURCE_DIR
# Rename the directory by adding the version number
diff --git a/tools/verify_source_code.sh b/tools/verify_source_code.sh
index 9c7a880..09b30cb 100755
--- a/tools/verify_source_code.sh
+++ b/tools/verify_source_code.sh
@@ -26,14 +26,14 @@ PARENTDIR="$(dirname "$SCRIPTDIR")"
cd $OPENWHISK_SOURCE_DIR
cp $SCRIPTDIR/lib/pom.xml ./
# Comment out the rat check, since it has been applied in the release process
-# mvn clean apache-rat:check
+mvn clean apache-rat:check
echo "Check the existence of LICENSE and NOTICE."
for repo in $(echo $repos | sed "s/,/ /g")
do
repo_name=$(echo "$repo" | sed -e 's/^"//' -e 's/"$//')
- project_name="incubator-$repo_name"
+ project_name="$repo_name"
echo "Check the repository $project_name"
cd $OPENWHISK_SOURCE_DIR/$project_name && ls {LICENSE*,NOTICE*}
done
