Repository: falcon Updated Branches: refs/heads/0.10 dc4129598 -> 130548620
FALCON-2108 Fix licensing issues for Falcon release Author: Srikanth Sundarrajan <[email protected]> Reviewers: "Amareshwari <[email protected]>" Closes #257 from sriksun/0.10 Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/13054862 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/13054862 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/13054862 Branch: refs/heads/0.10 Commit: 1305486202f8d3d8cdef9b9921686aaca8717b72 Parents: dc41295 Author: Srikanth Sundarrajan <[email protected]> Authored: Fri Aug 5 09:28:23 2016 -0700 Committer: bvellanki <[email protected]> Committed: Fri Aug 5 09:28:23 2016 -0700 ---------------------------------------------------------------------- LICENSE.txt | 20 ++++- NOTICE.txt | 7 ++ docs/license/animate-LICENSE.txt | 21 +++++ docs/license/cabin-font-LICENSE.txt | 95 ++++++++++++++++++++ docs/license/ngMask-LICENSE.txt | 13 +++ docs/license/ngTagsInput-LICENSE.txt | 20 +++++ docs/license/normalize-LICENSE.txt | 22 +++++ falcon-ui/app/css/img/user.svg | 16 ++++ falcon-ui/app/css/styles/autocomplete-tags.less | 20 ++++- falcon-ui/app/js/lib/popover.js | 20 ++++- falcon-ui/app/test/e2e/protractor.js | 20 ++++- falcon-ui/karma.conf.js | 18 ++++ pom.xml | 1 + scheduler/pom.xml | 12 +++ 14 files changed, 300 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/13054862/LICENSE.txt ---------------------------------------------------------------------- diff --git a/LICENSE.txt b/LICENSE.txt index 80f8aa2..f61385f 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -238,8 +238,24 @@ MIT license. For details, see docs/license/angular-ui-router-LICENSE.txt This product bundles jasmine 2.0.2 which is available under a MIT license. For details, see docs/license/jasmine-LICENSE.txt - This product bundles entypo icons which is available under a CC BY-SA license and Font is available under SIL license. For details, see docs/license/entypo-icons-LICENSE.txt and -docs/license/entypo-font-LICENSE.txt +docs/license/entypo-font-LICENSE.txt. (Entypo pictograms by Daniel +Bruce - www.entypo.com) + +This product bundles Cabin webfont [regular, italic & bold] under SIL +license. For details see docs/license/cabin-font-LICENSE.txt. +(www.impallari.com & www.ikern.com) + +This product bundles normalize v3.0.1 which is available under +MIT license. For details see docs/license/normalize-LICENSE.txt + +This product bundles animate v3.2.5 which is available under +MIT license For details see docs/license/animate-LICENSE.txt + +This product bundles ngTagsInput v2.3.0 which is available under +MIT license. For details see docs/license/ngTagsInput-LICENSE.txt + +This product bundles ngMask v3.1.1 which is available under +MIT license. For details see docs/license/ngMask-LICENSE.txt http://git-wip-us.apache.org/repos/asf/falcon/blob/13054862/NOTICE.txt ---------------------------------------------------------------------- diff --git a/NOTICE.txt b/NOTICE.txt index de9847f..7521153 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -4,3 +4,10 @@ Copyright 2011-2016 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). + +***************** +CC BY-SA 3.0 +***************** + +The following binary components are provided under CC BY-SA 3.0 + entypo-icon (Entypo pictograms by Daniel Bruce - www.entypo.com) http://git-wip-us.apache.org/repos/asf/falcon/blob/13054862/docs/license/animate-LICENSE.txt ---------------------------------------------------------------------- diff --git a/docs/license/animate-LICENSE.txt b/docs/license/animate-LICENSE.txt new file mode 100644 index 0000000..76ba6f5 --- /dev/null +++ b/docs/license/animate-LICENSE.txt @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2015 Daniel Eden + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. http://git-wip-us.apache.org/repos/asf/falcon/blob/13054862/docs/license/cabin-font-LICENSE.txt ---------------------------------------------------------------------- diff --git a/docs/license/cabin-font-LICENSE.txt b/docs/license/cabin-font-LICENSE.txt new file mode 100644 index 0000000..03b1c52 --- /dev/null +++ b/docs/license/cabin-font-LICENSE.txt @@ -0,0 +1,95 @@ +Copyright (c) 2011, Pablo Impallari (www.impallari.com|[email protected]), +Copyright (c) 2011, Igino Marini. (www.ikern.com|[email protected]), +with Reserved Font Name Cabin. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. http://git-wip-us.apache.org/repos/asf/falcon/blob/13054862/docs/license/ngMask-LICENSE.txt ---------------------------------------------------------------------- diff --git a/docs/license/ngMask-LICENSE.txt b/docs/license/ngMask-LICENSE.txt new file mode 100644 index 0000000..8fb8ea2 --- /dev/null +++ b/docs/license/ngMask-LICENSE.txt @@ -0,0 +1,13 @@ +Copyright (c) 2014, Carlos André Oliveira <[email protected]> + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. http://git-wip-us.apache.org/repos/asf/falcon/blob/13054862/docs/license/ngTagsInput-LICENSE.txt ---------------------------------------------------------------------- diff --git a/docs/license/ngTagsInput-LICENSE.txt b/docs/license/ngTagsInput-LICENSE.txt new file mode 100644 index 0000000..2e766e3 --- /dev/null +++ b/docs/license/ngTagsInput-LICENSE.txt @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2013 Michael Benford + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. http://git-wip-us.apache.org/repos/asf/falcon/blob/13054862/docs/license/normalize-LICENSE.txt ---------------------------------------------------------------------- diff --git a/docs/license/normalize-LICENSE.txt b/docs/license/normalize-LICENSE.txt new file mode 100644 index 0000000..a9dc817 --- /dev/null +++ b/docs/license/normalize-LICENSE.txt @@ -0,0 +1,22 @@ +The MIT License + +Copyright © Nicolas Gallagher and Jonathan Neal + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + http://git-wip-us.apache.org/repos/asf/falcon/blob/13054862/falcon-ui/app/css/img/user.svg ---------------------------------------------------------------------- diff --git a/falcon-ui/app/css/img/user.svg b/falcon-ui/app/css/img/user.svg index 60ac6c5..fb534c2 100644 --- a/falcon-ui/app/css/img/user.svg +++ b/falcon-ui/app/css/img/user.svg @@ -1,4 +1,20 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + 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. + --> <!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> <svg version="1.1" id="User" xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px" http://git-wip-us.apache.org/repos/asf/falcon/blob/13054862/falcon-ui/app/css/styles/autocomplete-tags.less ---------------------------------------------------------------------- diff --git a/falcon-ui/app/css/styles/autocomplete-tags.less b/falcon-ui/app/css/styles/autocomplete-tags.less index c2f5dc2..4c6fc96 100644 --- a/falcon-ui/app/css/styles/autocomplete-tags.less +++ b/falcon-ui/app/css/styles/autocomplete-tags.less @@ -1,3 +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. + */ + .top-buffer{ padding-top:20px; } @@ -67,4 +85,4 @@ } .suggestions-list:focus{ outline:none; -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/falcon/blob/13054862/falcon-ui/app/js/lib/popover.js ---------------------------------------------------------------------- diff --git a/falcon-ui/app/js/lib/popover.js b/falcon-ui/app/js/lib/popover.js index e26c870..57814df 100644 --- a/falcon-ui/app/js/lib/popover.js +++ b/falcon-ui/app/js/lib/popover.js @@ -1,3 +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. + */ + (function(window, angular, undefined){ 'use strict'; @@ -460,4 +478,4 @@ }; } ]); -})(window, window.angular); \ No newline at end of file +})(window, window.angular); http://git-wip-us.apache.org/repos/asf/falcon/blob/13054862/falcon-ui/app/test/e2e/protractor.js ---------------------------------------------------------------------- diff --git a/falcon-ui/app/test/e2e/protractor.js b/falcon-ui/app/test/e2e/protractor.js index 37d6e65..6c2d97e 100644 --- a/falcon-ui/app/test/e2e/protractor.js +++ b/falcon-ui/app/test/e2e/protractor.js @@ -1,7 +1,25 @@ +/** + * 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. + */ + exports.config = { chromeDriver: '../../../node_modules/protractor/selenium/chromedriver', jasmineNodeOpts: { showColors: true } -}; \ No newline at end of file +}; http://git-wip-us.apache.org/repos/asf/falcon/blob/13054862/falcon-ui/karma.conf.js ---------------------------------------------------------------------- diff --git a/falcon-ui/karma.conf.js b/falcon-ui/karma.conf.js index 11189e8..776249f 100644 --- a/falcon-ui/karma.conf.js +++ b/falcon-ui/karma.conf.js @@ -1,3 +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. + */ + // Karma configuration // Generated on Wed Sep 24 2014 21:15:41 GMT-0500 (CDT) http://git-wip-us.apache.org/repos/asf/falcon/blob/13054862/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d460669..8e836da 100644 --- a/pom.xml +++ b/pom.xml @@ -108,6 +108,7 @@ <jersey.version>1.9</jersey.version> <jackson.version>2.2.3</jackson.version> <quartz.version>2.2.1</quartz.version> + <c3p0.version>0.9.5.2</c3p0.version> <joda.version>2.8.2</joda.version> <mockito.version>1.9.5</mockito.version> <openjpa.version>2.4.0</openjpa.version> http://git-wip-us.apache.org/repos/asf/falcon/blob/13054862/scheduler/pom.xml ---------------------------------------------------------------------- diff --git a/scheduler/pom.xml b/scheduler/pom.xml index b0e0903..62dd290 100644 --- a/scheduler/pom.xml +++ b/scheduler/pom.xml @@ -75,6 +75,18 @@ <groupId>org.quartz-scheduler</groupId> <artifactId>quartz</artifactId> <version>${quartz.version}</version> + <exclusions> + <exclusion> + <groupId>c3p0</groupId> + <artifactId>c3p0</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>com.mchange</groupId> + <artifactId>c3p0</artifactId> + <version>${c3p0.version}</version> </dependency> <dependency>
