Updated Branches: refs/heads/master b250ead1c -> 5d374f26b
Fixes to the Rat report. Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/a79178a8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/a79178a8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/a79178a8 Branch: refs/heads/master Commit: a79178a8a43b34f1d7ac4e7e1083bac57601e51e Parents: f9c7a6b Author: Aaron McCurry <[email protected]> Authored: Sun Sep 8 09:50:11 2013 -0400 Committer: Aaron McCurry <[email protected]> Committed: Sun Sep 8 09:50:11 2013 -0400 ---------------------------------------------------------------------- ...031155_change_blur_queries_uuid_to_string.rb | 17 +++++++ ...4130250_increase_size_of_query_times_json.rb | 17 +++++++ contrib/blur-console/blur-admin/db/schema.rb | 17 +++++++ resources/NOTICE.template | 8 --- resources/license-mappings.xml | 51 -------------------- 5 files changed, 51 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a79178a8/contrib/blur-console/blur-admin/db/migrate/20130829031155_change_blur_queries_uuid_to_string.rb ---------------------------------------------------------------------- diff --git a/contrib/blur-console/blur-admin/db/migrate/20130829031155_change_blur_queries_uuid_to_string.rb b/contrib/blur-console/blur-admin/db/migrate/20130829031155_change_blur_queries_uuid_to_string.rb index ed3577f..985e8ad 100644 --- a/contrib/blur-console/blur-admin/db/migrate/20130829031155_change_blur_queries_uuid_to_string.rb +++ b/contrib/blur-console/blur-admin/db/migrate/20130829031155_change_blur_queries_uuid_to_string.rb @@ -1,3 +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. + class ChangeBlurQueriesUuidToString < ActiveRecord::Migration def up change_column :blur_queries, :uuid, :string http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a79178a8/contrib/blur-console/blur-admin/db/migrate/20130904130250_increase_size_of_query_times_json.rb ---------------------------------------------------------------------- diff --git a/contrib/blur-console/blur-admin/db/migrate/20130904130250_increase_size_of_query_times_json.rb b/contrib/blur-console/blur-admin/db/migrate/20130904130250_increase_size_of_query_times_json.rb index 5658ed1..bc253cb 100644 --- a/contrib/blur-console/blur-admin/db/migrate/20130904130250_increase_size_of_query_times_json.rb +++ b/contrib/blur-console/blur-admin/db/migrate/20130904130250_increase_size_of_query_times_json.rb @@ -1,3 +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. + class IncreaseSizeOfQueryTimesJson < ActiveRecord::Migration def up change_column :blur_queries, :times, :text http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a79178a8/contrib/blur-console/blur-admin/db/schema.rb ---------------------------------------------------------------------- diff --git a/contrib/blur-console/blur-admin/db/schema.rb b/contrib/blur-console/blur-admin/db/schema.rb index 2051fa7..88a4b9c 100644 --- a/contrib/blur-console/blur-admin/db/schema.rb +++ b/contrib/blur-console/blur-admin/db/schema.rb @@ -1,3 +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. + # encoding: UTF-8 # This file is auto-generated from the current state of the database. Instead # of editing this file, please use the migrations feature of Active Record to http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a79178a8/resources/NOTICE.template ---------------------------------------------------------------------- diff --git a/resources/NOTICE.template b/resources/NOTICE.template deleted file mode 100644 index e9a11b8..0000000 --- a/resources/NOTICE.template +++ /dev/null @@ -1,8 +0,0 @@ -Apache Blur -Copyright 2012-2013 The Apache Software Foundation - -This product includes software developed by The Apache Software -Foundation (http://www.apache.org/). - -This project includes: -#GENERATED_NOTICES# \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a79178a8/resources/license-mappings.xml ---------------------------------------------------------------------- diff --git a/resources/license-mappings.xml b/resources/license-mappings.xml deleted file mode 100644 index 0eeb260..0000000 --- a/resources/license-mappings.xml +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<license-lookup - xmlns="https://source.jasig.org/schemas/maven-notice-plugin/license-lookup"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="https://source.jasig.org/schemas/maven-notice-plugin/license-lookup https://source.jasig.org/schemas/maven-notice-plugin/license-lookup/license-lookup-v1.0.xsd";> - <artifact> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <license>Apache License, Version 2.0</license> - </artifact> - <artifact> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> - <license>Apache License, Version 2.0</license> - </artifact> - <artifact> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - <license>Apache License, Version 2.0</license> - </artifact> - <artifact> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - <license>Apache License, Version 2.0</license> - </artifact> - <artifact> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler</artifactId> - <license>Apache License, Version 2.0</license> - </artifact> - <artifact> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - <license>Apache License, Version 2.0</license> - </artifact> - <artifact> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <license>Apache License, Version 2.0</license> - </artifact> - <artifact> - <groupId>jakarta-regexp</groupId> - <artifactId>jakarta-regexp</artifactId> - <license>Apache License, Version 2.0</license> - </artifact> - <artifact> - <groupId>oro</groupId> - <artifactId>oro</artifactId> - <license>Apache License, Version 2.0</license> - </artifact> -</license-lookup>
