This is an automated email from the ASF dual-hosted git repository.
pdesai pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-openwhisk-runtime-swift.git
The following commit(s) were added to refs/heads/master by this push:
new 13987d5 Update .md and .sh files to pass scancode with latest .cfg
(#51)
13987d5 is described below
commit 13987d51e9056309ca16607fa287c57e290a39d6
Author: Matt Rutkowski <[email protected]>
AuthorDate: Tue May 1 21:15:40 2018 -0500
Update .md and .sh files to pass scancode with latest .cfg (#51)
* Update .md and .sh files to pass scancode with latest .cfg
* Update .md and .sh files to pass scancode with latest .cfg
---
CONTRIBUTING.md | 23 ++++++++++++-----------
README.md | 10 ++--------
gradle/README.md | 12 ++++++------
tools/build/compile.sh | 2 +-
tools/travis/build.sh | 2 +-
tools/travis/deploy.sh | 4 +---
6 files changed, 23 insertions(+), 30 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c29a74e..df6e905 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,22 +1,23 @@
-[](http://www.apache.org/licenses/LICENSE-2.0)
<!--
#
-# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
-# license agreements. See the NOTICE file distributed with this work for
additional
+# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+# license agreements. See the NOTICE file distributed with this work for
additional
# information regarding copyright ownership. The ASF licenses this file to you
-# under the Apache License, Version 2.0 (the # "License"); you may not use
this
-# file except in compliance with the License. You may obtain a copy of the
License
+# under the Apache License, Version 2.0 (the # "License"); 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
#
-# Unless required by applicable law or agreed to in writing, software
distributed
-# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# Unless required by applicable law or agreed to in writing, software
distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
# CONDITIONS OF ANY KIND, either express or implied. See the License for the
# specific language governing permissions and limitations under the License.
#
-->
+[](http://www.apache.org/licenses/LICENSE-2.0)
+
# Contributing to Apache OpenWhisk
Anyone can contribute to the OpenWhisk project and we welcome your
contributions.
@@ -36,18 +37,18 @@ Instructions on how to do this can be found here:
[http://www.apache.org/licenses/#clas](http://www.apache.org/licenses/#clas)
Once submitted, you will receive a confirmation email from the Apache Software
Foundation (ASF) and be added to
-the following list: http://people.apache.org/unlistedclas.html.
+the following list: http://people.apache.org/unlistedclas.html.
Project committers will use this list to verify pull requests (PRs) come from
contributors that have signed a CLA.
-We look forward to your contributions!
+We look forward to your contributions!
## Raising issues
-Please raise any bug reports or enhancement requests on the respective project
repository's GitHub issue tracker. Be sure to search the
+Please raise any bug reports or enhancement requests on the respective project
repository's GitHub issue tracker. Be sure to search the
list to see if your issue has already been raised.
-A good bug report is one that make it easy for us to understand what you were
trying to do and what went wrong.
+A good bug report is one that make it easy for us to understand what you were
trying to do and what went wrong.
Provide as much context as possible so we can try to recreate the issue.
A good enhancement request comes with an explanation of what you are trying to
do and how that enhancement would help you.
diff --git a/README.md b/README.md
index 2075e72..636759c 100644
--- a/README.md
+++ b/README.md
@@ -17,9 +17,10 @@
-->
# Apache OpenWhisk runtimes for swift
-
+[](http://www.apache.org/licenses/LICENSE-2.0)
[](https://travis-ci.org/apache/incubator-openwhisk-runtime-swift)
+
## Changelogs
- [Swift 3.1.1 CHANGELOG.md](core/swift3.1.1Action/CHANGELOG.md)
- [Swift 4.1 CHANGELOG.md](core/swift41Action/CHANGELOG.md)
@@ -397,10 +398,3 @@ Then create the action using your the image from dockerhub
wsk action update myAction myAction.swift --docker
$user_prefix/action-swift-v4.1
```
The `$user_prefix` is usually your dockerhub user id.
-
-
-
-# License
-[Apache 2.0](LICENSE.txt)
-
-
diff --git a/gradle/README.md b/gradle/README.md
index 5b83fdb..23cce13 100644
--- a/gradle/README.md
+++ b/gradle/README.md
@@ -1,16 +1,16 @@
<!--
#
-# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
-# license agreements. See the NOTICE file distributed with this work for
additional
+# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+# license agreements. See the NOTICE file distributed with this work for
additional
# information regarding copyright ownership. The ASF licenses this file to you
-# under the Apache License, Version 2.0 (the # "License"); you may not use
this
-# file except in compliance with the License. You may obtain a copy of the
License
+# under the Apache License, Version 2.0 (the # "License"); 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
#
-# Unless required by applicable law or agreed to in writing, software
distributed
-# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# Unless required by applicable law or agreed to in writing, software
distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
# CONDITIONS OF ANY KIND, either express or implied. See the License for the
# specific language governing permissions and limitations under the License.
#
diff --git a/tools/build/compile.sh b/tools/build/compile.sh
index 2bc6dd0..00783d5 100755
--- a/tools/build/compile.sh
+++ b/tools/build/compile.sh
@@ -85,4 +85,4 @@ echo 'Creating archive $1.zip...'
mkdir -p /owexec/$OUTPUT_DIR
zip \"/owexec/$OUTPUT_DIR/$1.zip\" .build/release/Action
-"
\ No newline at end of file
+"
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
index 88d3558..f6d5b34 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -31,7 +31,7 @@ IMAGE_PREFIX="testing"
# run scancode using the ASF Release configuration
cd $UTILDIR
-scancode/scanCode.py --config scancode/ASF-Release.cfg $ROOTDIR
+scancode/scanCode.py --config scancode/ASF-Release-v2.cfg $ROOTDIR
# Build OpenWhisk
cd $WHISKDIR
diff --git a/tools/travis/deploy.sh b/tools/travis/deploy.sh
index c0fbd9d..713866f 100755
--- a/tools/travis/deploy.sh
+++ b/tools/travis/deploy.sh
@@ -51,7 +51,5 @@ WHISK_APIHOST="172.17.0.1"
WHISK_AUTH=`cat ${WHISKDIR}/ansible/files/auth.guest`
WHISK_CLI="${WHISKDIR}/bin/wsk -i"
-${WHISK_CLI} property set --apihost ${WHISK_APIHOST} --auth ${WHISK_AUTH}
+${WHISK_CLI} property set --apihost ${WHISK_APIHOST} --auth ${WHISK_AUTH}
${WHISK_CLI} property get
-
-
--
To stop receiving notification emails like this one, please contact
[email protected].
