You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@madlib.apache.org by ri...@apache.org on 2016/08/26 17:35:32 UTC
[3/4] incubator-madlib git commit: Build: Add missing license headers
and update pom.xml
Build: Add missing license headers and update pom.xml
Closes #66
Project: http://git-wip-us.apache.org/repos/asf/incubator-madlib/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-madlib/commit/8f4bae81
Tree: http://git-wip-us.apache.org/repos/asf/incubator-madlib/tree/8f4bae81
Diff: http://git-wip-us.apache.org/repos/asf/incubator-madlib/diff/8f4bae81
Branch: refs/heads/master
Commit: 8f4bae819719059571982f3ebaabd3936e0e01cf
Parents: 7b26c81
Author: Orhan Kislal <ok...@pivotal.io>
Authored: Fri Aug 19 11:56:43 2016 -0700
Committer: Rahul Iyer <ri...@apache.org>
Committed: Fri Aug 26 10:24:30 2016 -0700
----------------------------------------------------------------------
pom.xml | 30 +++++++++-----------
src/madpack/changelist_1.8_1.9.1.yaml | 21 +++++++++++++-
src/modules/utilities/path.cpp | 17 +++++++++++
src/modules/utilities/path.hpp | 17 +++++++++++
src/modules/utilities/utilities.hpp | 19 +++++++++++--
src/ports/hawq/2.0/CMakeLists.txt | 19 +++++++++++++
src/ports/hawq/cmake/FindHAWQ_2_0.cmake | 19 +++++++++++++
src/ports/postgres/9.5/CMakeLists.txt | 19 +++++++++++++
src/ports/postgres/9.6/CMakeLists.txt | 19 +++++++++++++
.../postgres/cmake/FindPostgreSQL_9_5.cmake | 19 +++++++++++++
.../postgres/cmake/FindPostgreSQL_9_6.cmake | 19 +++++++++++++
11 files changed, 198 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/8f4bae81/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2466182..20d2e0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -668,24 +668,20 @@
<exclude>src/utils/memory.hpp</exclude>
<exclude>src/utils/Reference.hpp</exclude>
<exclude>src/utils/shapeToExtents.hpp</exclude>
-
- <!-- The following files are simple enough to not require license headers. -->
<exclude>src/madpack/changelist.yaml</exclude>
- <exclude>src/madpack/changelist_1.0_1.9.yaml</exclude>
- <exclude>src/madpack/changelist_1.1_1.9.yaml</exclude>
- <exclude>src/madpack/changelist_1.2_1.9.yaml</exclude>
- <exclude>src/madpack/changelist_1.3_1.9.yaml</exclude>
- <exclude>src/madpack/changelist_1.4.1_1.9.yaml</exclude>
- <exclude>src/madpack/changelist_1.4_1.9.yaml</exclude>
- <exclude>src/madpack/changelist_1.5_1.9.yaml</exclude>
- <exclude>src/madpack/changelist_1.6.0S_1.9.yaml</exclude>
- <exclude>src/madpack/changelist_1.6_1.9.yaml</exclude>
- <exclude>src/madpack/changelist_1.7_1.9.yaml</exclude>
- <exclude>src/madpack/changelist_1.7.1_1.9.yaml</exclude>
- <exclude>src/ports/hawq/2.0/CMakeLists.txt</exclude>
- <exclude>src/ports/hawq/2.0/config/CMakeLists.txt</exclude>
- <exclude>src/ports/hawq/2.0/config/Modules.yml</exclude>
- <exclude>src/ports/hawq/cmake/FindHAWQ_2_0.cmake</exclude>
+
+ <!-- The following files are renamed with every release -->
+ <exclude>src/madpack/changelist_1.0_*.yaml</exclude>
+ <exclude>src/madpack/changelist_1.1_*.yaml</exclude>
+ <exclude>src/madpack/changelist_1.2_*.yaml</exclude>
+ <exclude>src/madpack/changelist_1.3_*.yaml</exclude>
+ <exclude>src/madpack/changelist_1.4.1_*.yaml</exclude>
+ <exclude>src/madpack/changelist_1.4_*.yaml</exclude>
+ <exclude>src/madpack/changelist_1.5_*.yaml</exclude>
+ <exclude>src/madpack/changelist_1.6.0S_*.yaml</exclude>
+ <exclude>src/madpack/changelist_1.6_*.yaml</exclude>
+ <exclude>src/madpack/changelist_1.7_*.yaml</exclude>
+ <exclude>src/madpack/changelist_1.7.1_*.yaml</exclude>
<!-- Finally we exclude a few file types (based on extension) for which comments are
tough to maintain. Note that this is a combination of files licensed to ASF and
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/8f4bae81/src/madpack/changelist_1.8_1.9.1.yaml
----------------------------------------------------------------------
diff --git a/src/madpack/changelist_1.8_1.9.1.yaml b/src/madpack/changelist_1.8_1.9.1.yaml
index 9f2b457..2a50cdb 100644
--- a/src/madpack/changelist_1.8_1.9.1.yaml
+++ b/src/madpack/changelist_1.8_1.9.1.yaml
@@ -1,4 +1,23 @@
-# Changelist for MADlib version 1.8 to 1.9
+# ------------------------------------------------------------------------------
+# 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.
+# ------------------------------------------------------------------------------
+
+# Changelist for MADlib version 1.8 to 1.9.1
# This file contains all changes that were introduced in a new version of
# MADlib. This changelist is used by the upgrade script to detect what objects
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/8f4bae81/src/modules/utilities/path.cpp
----------------------------------------------------------------------
diff --git a/src/modules/utilities/path.cpp b/src/modules/utilities/path.cpp
index 459d361..33d1c8e 100644
--- a/src/modules/utilities/path.cpp
+++ b/src/modules/utilities/path.cpp
@@ -1,4 +1,21 @@
/* ----------------------------------------------------------------------- *//**
+ * 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.
+ *
* @file path.cpp
*
*//* ----------------------------------------------------------------------- */
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/8f4bae81/src/modules/utilities/path.hpp
----------------------------------------------------------------------
diff --git a/src/modules/utilities/path.hpp b/src/modules/utilities/path.hpp
index 5196e51..a7a7138 100644
--- a/src/modules/utilities/path.hpp
+++ b/src/modules/utilities/path.hpp
@@ -1,4 +1,21 @@
/* ----------------------------------------------------------------------- *//**
+ * 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.
+ *
* @file path.hpp
*
*//* ----------------------------------------------------------------------- */
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/8f4bae81/src/modules/utilities/utilities.hpp
----------------------------------------------------------------------
diff --git a/src/modules/utilities/utilities.hpp b/src/modules/utilities/utilities.hpp
index a4a16de..cccec8b 100644
--- a/src/modules/utilities/utilities.hpp
+++ b/src/modules/utilities/utilities.hpp
@@ -1,4 +1,20 @@
-/* -----------------------------------------------------------------------------
+/* ----------------------------------------------------------------------- *//**
+ * 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.
*
* @file utilities.hpp
*
@@ -7,4 +23,3 @@
* -------------------------------------------------------------------------- */
#include "path.hpp"
-
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/8f4bae81/src/ports/hawq/2.0/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/ports/hawq/2.0/CMakeLists.txt b/src/ports/hawq/2.0/CMakeLists.txt
index 2c2b8f6..0a2eb24 100644
--- a/src/ports/hawq/2.0/CMakeLists.txt
+++ b/src/ports/hawq/2.0/CMakeLists.txt
@@ -1 +1,20 @@
+# ------------------------------------------------------------------------------
+# 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.
+# ------------------------------------------------------------------------------
+
add_current_hawq_version()
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/8f4bae81/src/ports/hawq/cmake/FindHAWQ_2_0.cmake
----------------------------------------------------------------------
diff --git a/src/ports/hawq/cmake/FindHAWQ_2_0.cmake b/src/ports/hawq/cmake/FindHAWQ_2_0.cmake
index 7c3e61b..0cdbf63 100644
--- a/src/ports/hawq/cmake/FindHAWQ_2_0.cmake
+++ b/src/ports/hawq/cmake/FindHAWQ_2_0.cmake
@@ -1,2 +1,21 @@
+# ------------------------------------------------------------------------------
+# 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(_FIND_PACKAGE_FILE "${CMAKE_CURRENT_LIST_FILE}")
include("${CMAKE_CURRENT_LIST_DIR}/FindHAWQ.cmake")
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/8f4bae81/src/ports/postgres/9.5/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/ports/postgres/9.5/CMakeLists.txt b/src/ports/postgres/9.5/CMakeLists.txt
index f8b48fe..9c46780 100644
--- a/src/ports/postgres/9.5/CMakeLists.txt
+++ b/src/ports/postgres/9.5/CMakeLists.txt
@@ -1,2 +1,21 @@
+# ------------------------------------------------------------------------------
+# 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.
+# ------------------------------------------------------------------------------
+
add_current_postgresql_version()
add_extension_support()
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/8f4bae81/src/ports/postgres/9.6/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/ports/postgres/9.6/CMakeLists.txt b/src/ports/postgres/9.6/CMakeLists.txt
index f8b48fe..9c46780 100644
--- a/src/ports/postgres/9.6/CMakeLists.txt
+++ b/src/ports/postgres/9.6/CMakeLists.txt
@@ -1,2 +1,21 @@
+# ------------------------------------------------------------------------------
+# 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.
+# ------------------------------------------------------------------------------
+
add_current_postgresql_version()
add_extension_support()
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/8f4bae81/src/ports/postgres/cmake/FindPostgreSQL_9_5.cmake
----------------------------------------------------------------------
diff --git a/src/ports/postgres/cmake/FindPostgreSQL_9_5.cmake b/src/ports/postgres/cmake/FindPostgreSQL_9_5.cmake
index 05bbd42..43ba0e4 100644
--- a/src/ports/postgres/cmake/FindPostgreSQL_9_5.cmake
+++ b/src/ports/postgres/cmake/FindPostgreSQL_9_5.cmake
@@ -1,2 +1,21 @@
+# ------------------------------------------------------------------------------
+# 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(_FIND_PACKAGE_FILE "${CMAKE_CURRENT_LIST_FILE}")
include("${CMAKE_CURRENT_LIST_DIR}/FindPostgreSQL.cmake")
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/8f4bae81/src/ports/postgres/cmake/FindPostgreSQL_9_6.cmake
----------------------------------------------------------------------
diff --git a/src/ports/postgres/cmake/FindPostgreSQL_9_6.cmake b/src/ports/postgres/cmake/FindPostgreSQL_9_6.cmake
index 05bbd42..43ba0e4 100644
--- a/src/ports/postgres/cmake/FindPostgreSQL_9_6.cmake
+++ b/src/ports/postgres/cmake/FindPostgreSQL_9_6.cmake
@@ -1,2 +1,21 @@
+# ------------------------------------------------------------------------------
+# 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(_FIND_PACKAGE_FILE "${CMAKE_CURRENT_LIST_FILE}")
include("${CMAKE_CURRENT_LIST_DIR}/FindPostgreSQL.cmake")