This is an automated email from the ASF dual-hosted git repository.
rabbah 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 ecfcb5c Update all files using Mini license header to use full ASF
header (#96)
ecfcb5c is described below
commit ecfcb5c4d28006e09e9bf0727f2d770fbf6c162e
Author: Matt Rutkowski <[email protected]>
AuthorDate: Mon Jun 17 19:02:20 2019 -0500
Update all files using Mini license header to use full ASF header (#96)
---
.scalafmt.conf | 18 ++++++++++++++++--
.travis.yml | 18 ++++++++++++++++--
.../swift-main-zip/HelloSwift4/Sources/main.swift | 18 ++++++++++++++++--
gradle/wrapper/gradle-wrapper.properties | 18 ++++++++++++++++--
tests/dat/build.sh | 18 ++++++++++++++++--
tests/src/test/resources/application.conf | 18 ++++++++++++++++--
.../src/test/scala/runtime/sdk/SwiftSDKTests.scala | 22 +++++++++++++---------
7 files changed, 109 insertions(+), 21 deletions(-)
diff --git a/.scalafmt.conf b/.scalafmt.conf
index 7084efe..cc0159a 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,5 +1,19 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
-# license agreements; and to You under the Apache License, Version 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 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
+#
+# 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 CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
style = intellij
danglingParentheses = false
diff --git a/.travis.yml b/.travis.yml
index b92ee9d..8bad98b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,19 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
-# license agreements; and to You under the Apache License, Version 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 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
+#
+# 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 CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
sudo: required
group: deprecated-2017Q3
diff --git a/examples/swift-main-zip/HelloSwift4/Sources/main.swift
b/examples/swift-main-zip/HelloSwift4/Sources/main.swift
index 2bd6836..6237c80 100644
--- a/examples/swift-main-zip/HelloSwift4/Sources/main.swift
+++ b/examples/swift-main-zip/HelloSwift4/Sources/main.swift
@@ -1,5 +1,19 @@
-// Licensed to the Apache Software Foundation (ASF) under one or more
contributor
-// license agreements; and to You under the Apache License, Version 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 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
+#
+# 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 CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
func main(args: [String:Any]) -> [String:Any] {
if let name = args["name"] as? String {
diff --git a/gradle/wrapper/gradle-wrapper.properties
b/gradle/wrapper/gradle-wrapper.properties
index d7cc33f..b99c31f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,19 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
-# license agreements; and to You under the Apache License, Version 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 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
+#
+# 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 CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
diff --git a/tests/dat/build.sh b/tests/dat/build.sh
index 9511cbc..8ece524 100755
--- a/tests/dat/build.sh
+++ b/tests/dat/build.sh
@@ -1,6 +1,20 @@
#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
-# license agreements; and to You under the Apache License, Version 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 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
+#
+# 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 CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
set -e
diff --git a/tests/src/test/resources/application.conf
b/tests/src/test/resources/application.conf
index 759f063..c448e38 100644
--- a/tests/src/test/resources/application.conf
+++ b/tests/src/test/resources/application.conf
@@ -1,5 +1,19 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
-# license agreements; and to You under the Apache License, Version 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 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
+#
+# 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 CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
whisk.spi {
SimpleSpi = whisk.spi.SimpleSpiImpl
diff --git a/tests/src/test/scala/runtime/sdk/SwiftSDKTests.scala
b/tests/src/test/scala/runtime/sdk/SwiftSDKTests.scala
index 5ddd6c5..c5c41c6 100644
--- a/tests/src/test/scala/runtime/sdk/SwiftSDKTests.scala
+++ b/tests/src/test/scala/runtime/sdk/SwiftSDKTests.scala
@@ -19,13 +19,13 @@ package runtime.sdk
import java.io.File
-import scala.concurrent.duration.DurationInt
-import scala.language.postfixOps
import common._
+import org.apache.openwhisk.core.entity.{Annotations}
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
+import scala.concurrent.duration.DurationInt
+import scala.language.postfixOps
import spray.json._
-import org.apache.openwhisk.core.entity.WhiskAction.provideApiKeyAnnotationName
import spray.json.DefaultJsonProtocol.StringJsonFormat
@RunWith(classOf[JUnitRunner])
@@ -56,7 +56,7 @@ abstract class SwiftSDKTests extends TestHelpers with
WskTestHelpers with WskAct
name = actionName,
artifact = file,
kind = Some(actionKind),
- annotations = Map(provideApiKeyAnnotationName -> JsTrue))
+ annotations = Map(Annotations.ProvideApiKeyAnnotationName -> JsTrue))
}
// invoke the action
var params = Map("dummy" -> JsString("dummy"))
@@ -87,7 +87,7 @@ abstract class SwiftSDKTests extends TestHelpers with
WskTestHelpers with WskAct
name = actionName,
file,
kind = Some(actionKind),
- annotations = Map(provideApiKeyAnnotationName -> JsTrue))
+ annotations = Map(Annotations.ProvideApiKeyAnnotationName -> JsTrue))
}
// invoke the action
@@ -132,7 +132,7 @@ abstract class SwiftSDKTests extends TestHelpers with
WskTestHelpers with WskAct
name = actionName,
file,
kind = Some(actionKind),
- annotations = Map(provideApiKeyAnnotationName -> JsTrue))
+ annotations = Map(Annotations.ProvideApiKeyAnnotationName -> JsTrue))
}
// invoke the action
@@ -171,7 +171,7 @@ abstract class SwiftSDKTests extends TestHelpers with
WskTestHelpers with WskAct
name = actionName,
file,
kind = Some(actionKind),
- annotations = Map(provideApiKeyAnnotationName -> JsTrue))
+ annotations = Map(Annotations.ProvideApiKeyAnnotationName -> JsTrue))
}
}
@@ -198,7 +198,11 @@ abstract class SwiftSDKTests extends TestHelpers with
WskTestHelpers with WskAct
// create a dummy action and trigger for the rule
assetHelper.withCleaner(wsk.action, ruleActionName) { (action, name) =>
val dummyFile = Some(new File(actionTypeDir, "hello.swift").toString())
- action.create(name, dummyFile, kind = Some(actionKind), annotations =
Map(provideApiKeyAnnotationName -> JsTrue))
+ action.create(
+ name,
+ dummyFile,
+ kind = Some(actionKind),
+ annotations = Map(Annotations.ProvideApiKeyAnnotationName -> JsTrue))
}
assetHelper.withCleaner(wsk.trigger, ruleTriggerName) { (trigger, name) =>
@@ -215,7 +219,7 @@ abstract class SwiftSDKTests extends TestHelpers with
WskTestHelpers with WskAct
name,
createRuleFile,
kind = Some(actionKind),
- annotations = Map(provideApiKeyAnnotationName -> JsTrue))
+ annotations = Map(Annotations.ProvideApiKeyAnnotationName -> JsTrue))
}
// invoke the create rule action
