openwhisk-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mrutkow...@apache.org
Subject [incubator-openwhisk-package-template] branch master updated: Update to ASF license; adjust README. (#12)
Date Thu, 17 Aug 2017 14:41:07 GMT
This is an automated email from the ASF dual-hosted git repository.

mrutkowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-package-template.git


The following commit(s) were added to refs/heads/master by this push:
     new bd9ffba  Update to ASF license; adjust README. (#12)
bd9ffba is described below

commit bd9ffba070cfd771acb220cc437c0ee9882121ad
Author: Matt Rutkowski <mrutkows@us.ibm.com>
AuthorDate: Thu Aug 17 09:41:05 2017 -0500

    Update to ASF license; adjust README. (#12)
    
    @csantanapr there looks to be a problem actually installing the package template using
wsk command; having nothing to do with scancode updates from this PR.  I need to merge this
and we should address the install error on another issue.
---
 README.md                     | 18 ++++++++----------
 tests/src/TemplateTests.scala | 13 +++++++------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index bf41257..8f9d4e9 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
-#Openwhisk Package Template
-==========================
+# Openwhisk Package Template
+
+[![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
 [![Build Status](https://travis-ci.org/openwhisk/openwhisk-package-template.svg?branch=master)](https://travis-ci.org/openwhisk/openwhisk-package-template)
+
 This package is a template for Openwhisk Packages, it can be used to build, test and integrate
new packages.
 
 ```
@@ -26,7 +28,7 @@ openwhisk-package-template/
 └── uninstall.sh
 ```
 
-##How to install and uninstall this package ?
+## How to install and uninstall this package?
 Install the package using `./install.sh  $EDGE_HOST $AUTH_KEY $WSK_CLI`
 where :
 - **$EDGE_HOST** is where openwhisk is deployed
@@ -35,7 +37,7 @@ where :
 
 This will create a new package called **packageTemplate** as well as a hello world action.
 
-To uninstall the package, please use `./uninstall.sh  $EDGE_HOST $AUTH_KEY $WSK_CLI` 
+To uninstall the package, please use `./uninstall.sh  $EDGE_HOST $AUTH_KEY $WSK_CLI`
 
 ##Testing
 You can test your package using the test cases you provided within tests/src, it is highly
recommended to use Scala in writing test cases. To execute the test cases locally ( local
deployment of Openwhisk), please copy your test files into `openwhisk/tests/src/packages`
and then by using gradle within Openwhisk `gradle :tests:test` this will execute all test
files of openwhisk, to execute a specific test class you can use `gradle :tests:test --tests
"packages.CLASS_NAME`
@@ -55,7 +57,7 @@ List here Feed actions ...
 
 ###Actions
 ####Hello World
-This action is a simple hello world,  
+This action is a simple hello world,
 ######Parameters
 | **Parameter** | **Type** | **Required** | **Description**| **Options** | **Default** |
**Example** |
 | ------------- | ---- | -------- | ------------ | ------- | ------- |------- |
@@ -78,8 +80,4 @@ Output:
 Please refer to [CONTRIBUTING.md](CONTRIBUTING.md)
 
 ## License
-Copyright 2015-2016 IBM Corporation
-
-Licensed under the [Apache License, Version 2.0 (the "License")](http://www.apache.org/licenses/LICENSE-2.0.html).
-
-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.
+See [LICENSE.txt](https://github.com/apache/incubator-openwhisk-package-template/blob/master/LICENSE.txt)
diff --git a/tests/src/TemplateTests.scala b/tests/src/TemplateTests.scala
index 66909a6..6591f66 100644
--- a/tests/src/TemplateTests.scala
+++ b/tests/src/TemplateTests.scala
@@ -1,11 +1,12 @@
 /*
- * Copyright 2015-2016 IBM Corporation
+ * 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 at
  *
- * Licensed 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
+ *     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,

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <commits@openwhisk.apache.org>'].

Mime
View raw message