[incubator-heron] branch master updated: Nwang/update license in other files (#2895)

Tue, 08 May 2018 00:03:08 -0700 

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 5754033  Nwang/update license in other files (#2895)
5754033 is described below

commit 5754033e3e4241d734df4e8e2f0ef9249d3b088f
Author: Ning Wang <nw...@twitter.com>
AuthorDate: Tue May 8 00:02:43 2018 -0700

    Nwang/update license in other files (#2895)
    
    * Update license text in other files
    
    * whitespace
    
    * more files
---
 config/empty.cc                                    | 25 +++++++++++--------
 .../apache/heron/examples/eco/sample.properties    | 29 ++++++++++++----------
 .../apache/heron/examples/eco/sample.properties    | 29 ++++++++++++----------
 heron/proto/empty.cc                               | 25 +++++++++++--------
 scripts/compile/errors.sh                          | 23 +++++++++--------
 scripts/resources/idea/copyright/heron.xml         |  2 +-
 .../bazel/checkstyle/apache_coding_style.xml       | 29 ++++++++++++----------
 .../apache/bazel/checkstyle/heron_coding_style.xml | 29 ++++++++++++----------
 8 files changed, 106 insertions(+), 85 deletions(-)

diff --git a/config/empty.cc b/config/empty.cc
index 3305740..8c25c1e 100644
--- a/config/empty.cc
+++ b/config/empty.cc
@@ -1,17 +1,20 @@
-/*
- * Copyright 2015 Twitter, Inc.
- *
- * 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
+/**
+ * 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.
+ * 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.
  */
 
 // TODO(kramasamy): Can we get rid of this file?
diff --git 
a/eco-heron-examples/src/java/org/apache/heron/examples/eco/sample.properties 
b/eco-heron-examples/src/java/org/apache/heron/examples/eco/sample.properties
index 65a85c4..67da8b1 100644
--- 
a/eco-heron-examples/src/java/org/apache/heron/examples/eco/sample.properties
+++ 
b/eco-heron-examples/src/java/org/apache/heron/examples/eco/sample.properties
@@ -1,16 +1,19 @@
-# // Copyright 2018 Twitter. All rights reserved.
-# //
-# // 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
-# //
-# // 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.
+# 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.
 
 ecoPropertyOne=thisValueWasSetFromAPropertiesFile
 
diff --git 
a/eco-storm-examples/src/java/org/apache/heron/examples/eco/sample.properties 
b/eco-storm-examples/src/java/org/apache/heron/examples/eco/sample.properties
index 65a85c4..e2cd8ad 100644
--- 
a/eco-storm-examples/src/java/org/apache/heron/examples/eco/sample.properties
+++ 
b/eco-storm-examples/src/java/org/apache/heron/examples/eco/sample.properties
@@ -1,16 +1,19 @@
-# // Copyright 2018 Twitter. All rights reserved.
-# //
-# // 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
-# //
-# // 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.
+# 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.
 
 ecoPropertyOne=thisValueWasSetFromAPropertiesFile
 
diff --git a/heron/proto/empty.cc b/heron/proto/empty.cc
index 3305740..8c25c1e 100644
--- a/heron/proto/empty.cc
+++ b/heron/proto/empty.cc
@@ -1,17 +1,20 @@
-/*
- * Copyright 2015 Twitter, Inc.
- *
- * 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
+/**
+ * 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.
+ * 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.
  */
 
 // TODO(kramasamy): Can we get rid of this file?
diff --git a/scripts/compile/errors.sh b/scripts/compile/errors.sh
index a397e3b..fdc7582 100755
--- a/scripts/compile/errors.sh
+++ b/scripts/compile/errors.sh
@@ -103,19 +103,22 @@ sub MakeStdHeader
 
     my $header = <<EOF;
 /*
- * Copyright 2015 Twitter, Inc.
- *
- * 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
+ * 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.
+ * 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.
  */
 
 #ifndef $headerExclusionName
diff --git a/scripts/resources/idea/copyright/heron.xml 
b/scripts/resources/idea/copyright/heron.xml
index 413af1c..ba84d47 100644
--- a/scripts/resources/idea/copyright/heron.xml
+++ b/scripts/resources/idea/copyright/heron.xml
@@ -1,6 +1,6 @@
 <component name="CopyrightManager">
   <copyright>
     <option name="myName" value="heron" />
-    <option name="notice" value="// Copyright &amp;#36;today.year Twitter. All 
rights reserved.&#10;// &#10;// Licensed under the Apache License, Version 2.0 
(the &quot;License&quot;);&#10;// you may not use this file except in 
compliance with the License.&#10;// You may obtain a copy of the License 
at&#10;//&#10;// http://www.apache.org/licenses/LICENSE-2.0&#10;//&#10;// 
Unless required by applicable law or agreed to in writing, software&#10;// 
distributed under the License is distribut [...]
+    <option name="notice" value="// Licensed to the Apache Software Foundation 
(ASF) under one&#10;// or more contributor license agreements.  See the NOTICE 
file&#10;// distributed with this work for additional information&#10;// 
regarding copyright ownership.  The ASF licenses this file&#10;// to you under 
the Apache License, Version 2.0 (the&#10;// &quot;License&quot;); you may not 
use this file except in compliance&#10;// with the License.  You may obtain a 
copy of the License at&#10 [...]
   </copyright>
 </component>
\ No newline at end of file
diff --git a/tools/java/src/org/apache/bazel/checkstyle/apache_coding_style.xml 
b/tools/java/src/org/apache/bazel/checkstyle/apache_coding_style.xml
index b6d6d80..be66b38 100644
--- a/tools/java/src/org/apache/bazel/checkstyle/apache_coding_style.xml
+++ b/tools/java/src/org/apache/bazel/checkstyle/apache_coding_style.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0"?>
 <!--
 
=================================================================================================
-Copyright 2011 Twitter, Inc.
-_________________________________________________________________________________________________
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this work except in compliance with the License.
-You may obtain a copy of the License in the LICENSE file, or 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.
+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.
 
=================================================================================================
 -->
 
diff --git a/tools/java/src/org/apache/bazel/checkstyle/heron_coding_style.xml 
b/tools/java/src/org/apache/bazel/checkstyle/heron_coding_style.xml
index 07daa3b..0893e5c 100644
--- a/tools/java/src/org/apache/bazel/checkstyle/heron_coding_style.xml
+++ b/tools/java/src/org/apache/bazel/checkstyle/heron_coding_style.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0"?>
 <!--
 
=================================================================================================
-Copyright 2011 Twitter, Inc.
-_________________________________________________________________________________________________
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this work except in compliance with the License.
-You may obtain a copy of the License in the LICENSE file, or 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.
+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.
 
=================================================================================================
 -->
 

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

Reply via email to