You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2017/06/26 16:12:55 UTC

[33/36] flex-typedefs git commit: legal-discuss recommended removing ASF headers from patches

legal-discuss recommended removing ASF headers from patches


Project: http://git-wip-us.apache.org/repos/asf/flex-typedefs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-typedefs/commit/fed0d3bf
Tree: http://git-wip-us.apache.org/repos/asf/flex-typedefs/tree/fed0d3bf
Diff: http://git-wip-us.apache.org/repos/asf/flex-typedefs/diff/fed0d3bf

Branch: refs/heads/master
Commit: fed0d3bf9a20875f4876102553d1e5998bd8f3c9
Parents: 6a88521
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 10 15:27:04 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 10 15:27:04 2017 -0700

----------------------------------------------------------------------
 google_maps/src/main/patch/google_maps.patch | 15 ---------------
 jquery/src/main/patch/jquery.patch           | 18 +-----------------
 js/src/main/patch/js.patch                   | 15 ---------------
 pom.xml                                      |  6 ++++++
 4 files changed, 7 insertions(+), 47 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/fed0d3bf/google_maps/src/main/patch/google_maps.patch
----------------------------------------------------------------------
diff --git a/google_maps/src/main/patch/google_maps.patch b/google_maps/src/main/patch/google_maps.patch
index 7738989..8061e47 100644
--- a/google_maps/src/main/patch/google_maps.patch
+++ b/google_maps/src/main/patch/google_maps.patch
@@ -1,19 +1,4 @@
 
-  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.
-
 Generated from Ant script
 diff --git a/google_maps/target/downloads/google_maps_api_v3_11.js b/google_maps/target/downloads/google_maps_api_v3_11.js
 index ac91685..5dbb628 100644

http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/fed0d3bf/jquery/src/main/patch/jquery.patch
----------------------------------------------------------------------
diff --git a/jquery/src/main/patch/jquery.patch b/jquery/src/main/patch/jquery.patch
index 690dc91..9091cd1 100644
--- a/jquery/src/main/patch/jquery.patch
+++ b/jquery/src/main/patch/jquery.patch
@@ -1,20 +1,4 @@
-
-  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.
-
-Generated from Ant script
+Generated from Ant script and manually updated type
 diff --git a/jquery/target/downloads/jquery-1.9.js b/jquery/target/downloads/jquery-1.9.js
 index d00166a..1d85908 100644
 --- a/jquery/target/downloads/jquery-1.9.js

http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/fed0d3bf/js/src/main/patch/js.patch
----------------------------------------------------------------------
diff --git a/js/src/main/patch/js.patch b/js/src/main/patch/js.patch
index 2f9b124..1f8d551 100644
--- a/js/src/main/patch/js.patch
+++ b/js/src/main/patch/js.patch
@@ -1,19 +1,4 @@
 
-  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.
-
 Generated from Ant script
 diff --git a/js/target/downloads/es3.js b/js/target/downloads/es3.js
 index 4396804..82032c8 100644

http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/fed0d3bf/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3e731fb..756bf24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,6 +120,12 @@
             </goals>
           </execution>
         </executions>
+        <configuration>
+            <excludes>
+                <!-- Patch files aren't supposed to have headers -->
+                <exclude>**/*.patch</exclude>
+            </excludes>
+        </configuration>
         <dependencies>
           <dependency>
             <groupId>org.apache.maven.doxia</groupId>