You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by je...@apache.org on 2018/05/25 11:20:22 UTC

[incubator-openwhisk] branch master updated: Revert "Add ASF license to optional XML files and last gradle file." (#3705)

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
     new 441fc71  Revert "Add ASF license to optional XML files and last gradle file." (#3705)
441fc71 is described below

commit 441fc7165b86e7a1d6ed86c54887f10fb40596b9
Author: Christian Bickel <gi...@cbickel.de>
AuthorDate: Fri May 25 13:20:06 2018 +0200

    Revert "Add ASF license to optional XML files and last gradle file." (#3705)
    
    This reverts commit 2cc22272635d23e4e94dd739fbca71f354043c42.
---
 common/scala/src/main/resources/logback.xml             |  6 +-----
 tests/dat/actions/unicode/build.gradle                  | 17 -----------------
 .../src/gatling/resources/conf/logback.xml              |  4 ----
 tests/src/test/resources/logback-test.xml               |  6 +-----
 4 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/common/scala/src/main/resources/logback.xml b/common/scala/src/main/resources/logback.xml
index a9e7c95..1a10343 100644
--- a/common/scala/src/main/resources/logback.xml
+++ b/common/scala/src/main/resources/logback.xml
@@ -1,7 +1,3 @@
-<!--
-# Licensed to the Apache Software Foundation (ASF) under one or more contributor
-# license agreements; and to You under the Apache License, Version 2.0.
--->
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
   <jmxConfigurator></jmxConfigurator>
@@ -20,4 +16,4 @@
   <root level="${logback.log.level:-INFO}">
     <appender-ref ref="console" />
   </root>
-</configuration>
+</configuration>
\ No newline at end of file
diff --git a/tests/dat/actions/unicode/build.gradle b/tests/dat/actions/unicode/build.gradle
index 71833aa..2839d50 100644
--- a/tests/dat/actions/unicode/build.gradle
+++ b/tests/dat/actions/unicode/build.gradle
@@ -1,20 +1,3 @@
-/*
- * 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.
- */
-
 apply plugin: 'java'
 
 version = '1.0'
diff --git a/tests/performance/gatling_tests/src/gatling/resources/conf/logback.xml b/tests/performance/gatling_tests/src/gatling/resources/conf/logback.xml
index b19b23b..62bd2b2 100644
--- a/tests/performance/gatling_tests/src/gatling/resources/conf/logback.xml
+++ b/tests/performance/gatling_tests/src/gatling/resources/conf/logback.xml
@@ -1,7 +1,3 @@
-<!--
-# Licensed to the Apache Software Foundation (ASF) under one or more contributor
-# license agreements; and to You under the Apache License, Version 2.0.
--->
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
diff --git a/tests/src/test/resources/logback-test.xml b/tests/src/test/resources/logback-test.xml
index 8f9e95a..ae31af6 100644
--- a/tests/src/test/resources/logback-test.xml
+++ b/tests/src/test/resources/logback-test.xml
@@ -1,7 +1,3 @@
-<!--
-# Licensed to the Apache Software Foundation (ASF) under one or more contributor
-# license agreements; and to You under the Apache License, Version 2.0.
--->
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <jmxConfigurator></jmxConfigurator>
@@ -22,4 +18,4 @@
     <root level="${logback.log.level:-INFO}">
         <appender-ref ref="console" />
     </root>
-</configuration>
+</configuration>
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
jeremiaswerner@apache.org.