You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by am...@apache.org on 2015/05/19 09:54:23 UTC
[1/8] incubator-lens git commit: LENS-371 : Fix issues in LICENSE and
NOTICE (amareshwari)
Repository: incubator-lens
Updated Branches:
refs/heads/master ab22a24b5 -> bc892f5ba
LENS-371 : Fix issues in LICENSE and NOTICE (amareshwari)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/5b2afbb3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/5b2afbb3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/5b2afbb3
Branch: refs/heads/master
Commit: 5b2afbb3424a81338543b5c7df699e6f00517f01
Parents: 992f815
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Tue Apr 21 09:33:52 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Tue Apr 21 09:34:53 2015 +0530
----------------------------------------------------------------------
NOTICE | 9 --
bin-dist-files/LICENSE | 8 +
bin-dist-files/NOTICE | 8 -
lens-ml-dist/LICENSE | 201 ++++++++++++++++++++++++
lens-ml-dist/LICENSE.txt | 201 ------------------------
lens-ml-lib/LICENSE | 201 ++++++++++++++++++++++++
src/site/datalayout.pptx | Bin 95671 -> 0 bytes
src/site/diagrams.pptx | Bin 99574 -> 0 bytes
src/site/resources/images/deployment.png | Bin 49493 -> 86471 bytes
src/site/resources/images/querystate.png | Bin 59582 -> 109543 bytes
src/site/resources/images/serverdesign.png | Bin 64082 -> 88209 bytes
11 files changed, 410 insertions(+), 218 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5b2afbb3/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index b196dc3..3351512 100644
--- a/NOTICE
+++ b/NOTICE
@@ -5,12 +5,3 @@ Copyright 2014-2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-
-This product includes jquery.flot.js (http://www.flotcharts.org/)
-
-This product includes moment.js(http://momentjs.com/)
-
-This product includes sql.js, codemirror.min.js, codemirror.min.css (http://codemirror.net/)
-
-This product includes stupidtable.min.js (http://joequery.github.io/Stupid-Table-Plugin/)
-
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5b2afbb3/bin-dist-files/LICENSE
----------------------------------------------------------------------
diff --git a/bin-dist-files/LICENSE b/bin-dist-files/LICENSE
index f097f81..5d593ad 100644
--- a/bin-dist-files/LICENSE
+++ b/bin-dist-files/LICENSE
@@ -624,3 +624,11 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+For aopalliance library
+
+All the source code provided by AOP Alliance is Public Domain.
+
+
+For org.tukaani:xz library
+
+The Java implementation of XZ has been put into the public domain.
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5b2afbb3/bin-dist-files/NOTICE
----------------------------------------------------------------------
diff --git a/bin-dist-files/NOTICE b/bin-dist-files/NOTICE
index 831ae64..1fbb09c 100644
--- a/bin-dist-files/NOTICE
+++ b/bin-dist-files/NOTICE
@@ -6,14 +6,6 @@ This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-This product includes jquery.flot.js (http://www.flotcharts.org/)
-
-This product includes moment.js(http://momentjs.com/)
-
-This product includes sql.js, codemirror.min.js, codemirror.min.css (http://codemirror.net/)
-
-This product includes stupidtable.min.js (http://joequery.github.io/Stupid-Table-Plugin/)
-
This product includes javax.mail library. The details on how to obtain the library is available at
https://glassfish.java.net/javaee5/mail/
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5b2afbb3/lens-ml-dist/LICENSE
----------------------------------------------------------------------
diff --git a/lens-ml-dist/LICENSE b/lens-ml-dist/LICENSE
new file mode 100644
index 0000000..261eeb9
--- /dev/null
+++ b/lens-ml-dist/LICENSE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5b2afbb3/lens-ml-dist/LICENSE.txt
----------------------------------------------------------------------
diff --git a/lens-ml-dist/LICENSE.txt b/lens-ml-dist/LICENSE.txt
deleted file mode 100644
index 261eeb9..0000000
--- a/lens-ml-dist/LICENSE.txt
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5b2afbb3/lens-ml-lib/LICENSE
----------------------------------------------------------------------
diff --git a/lens-ml-lib/LICENSE b/lens-ml-lib/LICENSE
new file mode 100644
index 0000000..261eeb9
--- /dev/null
+++ b/lens-ml-lib/LICENSE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5b2afbb3/src/site/datalayout.pptx
----------------------------------------------------------------------
diff --git a/src/site/datalayout.pptx b/src/site/datalayout.pptx
deleted file mode 100644
index 4ce429a..0000000
Binary files a/src/site/datalayout.pptx and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5b2afbb3/src/site/diagrams.pptx
----------------------------------------------------------------------
diff --git a/src/site/diagrams.pptx b/src/site/diagrams.pptx
deleted file mode 100644
index 3769dec..0000000
Binary files a/src/site/diagrams.pptx and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5b2afbb3/src/site/resources/images/deployment.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/deployment.png b/src/site/resources/images/deployment.png
index 9e24733..b39cdfe 100644
Binary files a/src/site/resources/images/deployment.png and b/src/site/resources/images/deployment.png differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5b2afbb3/src/site/resources/images/querystate.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/querystate.png b/src/site/resources/images/querystate.png
index bcadc93..47062bf 100644
Binary files a/src/site/resources/images/querystate.png and b/src/site/resources/images/querystate.png differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5b2afbb3/src/site/resources/images/serverdesign.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/serverdesign.png b/src/site/resources/images/serverdesign.png
index bf49b55..2ec6d62 100644
Binary files a/src/site/resources/images/serverdesign.png and b/src/site/resources/images/serverdesign.png differ
[7/8] incubator-lens git commit: [maven-release-plugin] prepare for
next development iteration
Posted by am...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/db73c5e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/db73c5e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/db73c5e9
Branch: refs/heads/master
Commit: db73c5e97de88a2d8560d293ed0fd0738acecc9b
Parents: fdd19b9
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Mon Apr 27 16:23:54 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Mon Apr 27 16:23:54 2015 +0530
----------------------------------------------------------------------
checkstyle/pom.xml | 6 +-----
lens-api/pom.xml | 2 +-
lens-cli/pom.xml | 2 +-
lens-client/pom.xml | 2 +-
lens-cube/pom.xml | 2 +-
lens-dist/pom.xml | 2 +-
lens-driver-hive/pom.xml | 2 +-
lens-driver-jdbc/pom.xml | 2 +-
lens-examples/pom.xml | 2 +-
lens-ml-dist/pom.xml | 2 +-
lens-ml-lib/pom.xml | 2 +-
lens-query-lib/pom.xml | 2 +-
lens-regression/pom.xml | 2 +-
lens-server-api/pom.xml | 2 +-
lens-server/pom.xml | 2 +-
lens-storage-db/pom.xml | 2 +-
pom.xml | 8 ++++----
17 files changed, 20 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/db73c5e9/checkstyle/pom.xml
----------------------------------------------------------------------
diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
index 86ab927..d5d256f 100644
--- a/checkstyle/pom.xml
+++ b/checkstyle/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
<name>Lens Checkstyle Rules</name>
- <version>2.1.0-beta-incubating</version>
+ <version>2.1.1-beta-incubating-SNAPSHOT</version>
<build>
<plugins>
@@ -49,8 +49,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>apache-lens-2.1.0-beta-incubating</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/db73c5e9/lens-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-api/pom.xml b/lens-api/pom.xml
index c69119e..7c337a1 100644
--- a/lens-api/pom.xml
+++ b/lens-api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating</version>
+ <version>2.1.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/db73c5e9/lens-cli/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cli/pom.xml b/lens-cli/pom.xml
index 071986e..241bdd4 100644
--- a/lens-cli/pom.xml
+++ b/lens-cli/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating</version>
+ <version>2.1.1-beta-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/db73c5e9/lens-client/pom.xml
----------------------------------------------------------------------
diff --git a/lens-client/pom.xml b/lens-client/pom.xml
index f6e1ae1..32e3e09 100644
--- a/lens-client/pom.xml
+++ b/lens-client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating</version>
+ <version>2.1.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-client</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/db73c5e9/lens-cube/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cube/pom.xml b/lens-cube/pom.xml
index 346301c..cb8d4fa 100644
--- a/lens-cube/pom.xml
+++ b/lens-cube/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating</version>
+ <version>2.1.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-cube</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/db73c5e9/lens-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-dist/pom.xml b/lens-dist/pom.xml
index d47c8f0..eaf5fe6 100644
--- a/lens-dist/pom.xml
+++ b/lens-dist/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating</version>
+ <version>2.1.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/db73c5e9/lens-driver-hive/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-hive/pom.xml b/lens-driver-hive/pom.xml
index b23b136..eb61ecc 100644
--- a/lens-driver-hive/pom.xml
+++ b/lens-driver-hive/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating</version>
+ <version>2.1.1-beta-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/db73c5e9/lens-driver-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/pom.xml b/lens-driver-jdbc/pom.xml
index eaddaef..997ec79 100644
--- a/lens-driver-jdbc/pom.xml
+++ b/lens-driver-jdbc/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating</version>
+ <version>2.1.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-driver-jdbc</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/db73c5e9/lens-examples/pom.xml
----------------------------------------------------------------------
diff --git a/lens-examples/pom.xml b/lens-examples/pom.xml
index 31c9f42..120715f 100644
--- a/lens-examples/pom.xml
+++ b/lens-examples/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating</version>
+ <version>2.1.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/db73c5e9/lens-ml-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-dist/pom.xml b/lens-ml-dist/pom.xml
index 97459b4..46188aa 100644
--- a/lens-ml-dist/pom.xml
+++ b/lens-ml-dist/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating</version>
+ <version>2.1.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-ml-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/db73c5e9/lens-ml-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-lib/pom.xml b/lens-ml-lib/pom.xml
index 267cedb..5ae68de 100644
--- a/lens-ml-lib/pom.xml
+++ b/lens-ml-lib/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating</version>
+ <version>2.1.1-beta-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/db73c5e9/lens-query-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-query-lib/pom.xml b/lens-query-lib/pom.xml
index 46c5b53..4753e7b 100644
--- a/lens-query-lib/pom.xml
+++ b/lens-query-lib/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating</version>
+ <version>2.1.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-query-lib</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/db73c5e9/lens-regression/pom.xml
----------------------------------------------------------------------
diff --git a/lens-regression/pom.xml b/lens-regression/pom.xml
index b5d34bf..8a1c013 100644
--- a/lens-regression/pom.xml
+++ b/lens-regression/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating</version>
+ <version>2.1.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-regression</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/db73c5e9/lens-server-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server-api/pom.xml b/lens-server-api/pom.xml
index 392d883..cc12330 100644
--- a/lens-server-api/pom.xml
+++ b/lens-server-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating</version>
+ <version>2.1.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-server-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/db73c5e9/lens-server/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server/pom.xml b/lens-server/pom.xml
index 3228930..5472d34 100644
--- a/lens-server/pom.xml
+++ b/lens-server/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating</version>
+ <version>2.1.1-beta-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/db73c5e9/lens-storage-db/pom.xml
----------------------------------------------------------------------
diff --git a/lens-storage-db/pom.xml b/lens-storage-db/pom.xml
index 2b41bd0..e3c24ab 100644
--- a/lens-storage-db/pom.xml
+++ b/lens-storage-db/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating</version>
+ <version>2.1.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-storage-db</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/db73c5e9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 58185b1..fd79b63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>apache-lens</artifactId>
- <version>2.1.0-beta-incubating</version>
+ <version>2.1.1-beta-incubating-SNAPSHOT</version>
<name>Lens</name>
<packaging>pom</packaging>
<description>Unified Analytics Platform</description>
@@ -284,7 +284,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-lens.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-lens.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf/incubator-lens.git</url>
- <tag>apache-lens-2.1.0-beta-incubating</tag>
+ <tag>HEAD</tag>
</scm>
<reporting>
@@ -550,7 +550,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.1.0-beta-incubating</version>
+ <version>2.1.1-beta-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
<executions>
@@ -1212,7 +1212,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.1.0-beta-incubating</version>
+ <version>2.1.1-beta-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
<executions>
[2/8] incubator-lens git commit: LENS-463 : Fix
TestQueryEndEmailNotifier intermittent failure (Rajat Khandelwal via
amareshwari)
Posted by am...@apache.org.
LENS-463 : Fix TestQueryEndEmailNotifier intermittent failure (Rajat Khandelwal via amareshwari)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/9d474389
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/9d474389
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/9d474389
Branch: refs/heads/master
Commit: 9d47438995230c88e50912579875f20b4d3e30bc
Parents: 5b2afbb
Author: Rajat Khandelwal <pr...@apache.org>
Authored: Tue Apr 21 21:24:50 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Tue Apr 21 21:28:01 2015 +0530
----------------------------------------------------------------------
.../server/query/TestQueryEndEmailNotifier.java | 36 +++++++++++---------
1 file changed, 19 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9d474389/lens-server/src/test/java/org/apache/lens/server/query/TestQueryEndEmailNotifier.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryEndEmailNotifier.java b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryEndEmailNotifier.java
index ca1b10b..6a24f8f 100644
--- a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryEndEmailNotifier.java
+++ b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryEndEmailNotifier.java
@@ -18,7 +18,10 @@
*/
package org.apache.lens.server.query;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import javax.ws.rs.client.Entity;
import javax.ws.rs.client.WebTarget;
@@ -27,7 +30,9 @@ import javax.ws.rs.core.MediaType;
import org.apache.lens.api.LensConf;
import org.apache.lens.api.LensSessionHandle;
-import org.apache.lens.api.query.*;
+import org.apache.lens.api.query.LensQuery;
+import org.apache.lens.api.query.QueryHandle;
+import org.apache.lens.api.query.QueryStatus;
import org.apache.lens.api.query.QueryStatus.Status;
import org.apache.lens.server.LensJerseyTest;
import org.apache.lens.server.LensServices;
@@ -58,7 +63,7 @@ public class TestQueryEndEmailNotifier extends LensJerseyTest {
/** The Constant LOG. */
public static final Log LOG = LogFactory.getLog(TestQueryEndEmailNotifier.class);
-
+ private static final int NUM_ITERS = 30;
/** The query service. */
QueryExecutionServiceImpl queryService;
@@ -184,6 +189,7 @@ public class TestQueryEndEmailNotifier extends LensJerseyTest {
Assert.assertEquals(ctx.getStatus().getStatus(), expectedStatus);
return handle;
}
+
/**
* Test launch fail.
*
@@ -196,9 +202,9 @@ public class TestQueryEndEmailNotifier extends LensJerseyTest {
// launch failure
QueryHandle handle = launchAndWaitForQuery(conf, "select ID from non_exist_table", QueryStatus.Status.FAILED);
List<WiserMessage> messages = new ArrayList<WiserMessage>();
- for (int i = 0; i < 20; i++) {
+ for (int i = 0; i < NUM_ITERS; i++) {
messages = wiser.getMessages();
- if (messages.size() > 0) {
+ if (messages.size() >= 4) {
break;
}
Thread.sleep(10000);
@@ -206,17 +212,15 @@ public class TestQueryEndEmailNotifier extends LensJerseyTest {
Assert.assertEquals(messages.size(), 4);
Assert.assertTrue(messages.get(0).toString().contains(handle.toString()));
- Assert.assertEquals(messages.size(), 4);
- Assert.assertTrue(messages.get(0).toString().contains(handle.toString()));
Assert.assertTrue(messages.get(0).toString().contains("Launching query failed"));
Assert.assertTrue(messages.get(0).toString().contains("Reason"));
// rewriter failure
handle = launchAndWaitForQuery(conf, "cube select ID from nonexist", QueryStatus.Status.FAILED);
messages = new ArrayList<WiserMessage>();
- for (int i = 0; i < 20; i++) {
+ for (int i = 0; i < NUM_ITERS; i++) {
messages = wiser.getMessages();
- if (messages.size() > 4) {
+ if (messages.size() >= 8) {
break;
}
Thread.sleep(10000);
@@ -235,9 +239,9 @@ public class TestQueryEndEmailNotifier extends LensJerseyTest {
handle = launchAndWaitForQuery(conf, "select ID, IDSTR from " + TEST_TABLE,
QueryStatus.Status.FAILED);
messages = new ArrayList<WiserMessage>();
- for (int i = 0; i < 20; i++) {
+ for (int i = 0; i < NUM_ITERS; i++) {
messages = wiser.getMessages();
- if (messages.size() > 8) {
+ if (messages.size() >= 12) {
break;
}
Thread.sleep(10000);
@@ -256,9 +260,9 @@ public class TestQueryEndEmailNotifier extends LensJerseyTest {
conf.addProperty("mapred.map.output.compression.codec", "nonexisting");
handle = launchAndWaitForQuery(conf, "select count(ID) from " + TEST_TABLE, QueryStatus.Status.FAILED);
messages = new ArrayList<WiserMessage>();
- for (int i = 0; i < 20; i++) {
+ for (int i = 0; i < NUM_ITERS; i++) {
messages = wiser.getMessages();
- if (messages.size() > 12) {
+ if (messages.size() >= 16) {
break;
}
Thread.sleep(10000);
@@ -275,19 +279,17 @@ public class TestQueryEndEmailNotifier extends LensJerseyTest {
conf.addProperty(LensConfConstants.QUERY_PERSISTENT_RESULT_INDRIVER, "true");
handle = launchAndWaitForQuery(conf, "select ID, IDSTR from " + TEST_TABLE, QueryStatus.Status.SUCCESSFUL);
messages = new ArrayList<WiserMessage>();
- for (int i = 0; i < 20; i++) {
+ for (int i = 0; i < NUM_ITERS; i++) {
messages = wiser.getMessages();
- if (messages.size() > 16) {
+ if (messages.size() >= 20) {
break;
}
Thread.sleep(10000);
}
-
Assert.assertEquals(messages.size(), 20);
Assert.assertTrue(messages.get(16).toString().contains(handle.toString()));
Assert.assertTrue(messages.get(16).toString().contains("Query SUCCESSFUL"));
Assert.assertTrue(messages.get(16).toString().contains("Result available at"));
-
wiser.stop();
}
}
[4/8] incubator-lens git commit: LENS-522 : Fix
ConcurrentModificationException in FieldValidator (amareshwari)
Posted by am...@apache.org.
LENS-522 : Fix ConcurrentModificationException in FieldValidator (amareshwari)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/81302fad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/81302fad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/81302fad
Branch: refs/heads/master
Commit: 81302fad5cc904a747214a4ccb6addeb930f7897
Parents: 52d6df6
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Thu Apr 23 15:39:00 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Thu Apr 23 15:39:29 2015 +0530
----------------------------------------------------------------------
.../apache/lens/cube/metadata/DerivedCube.java | 22 +++++++++++---------
1 file changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/81302fad/lens-cube/src/main/java/org/apache/lens/cube/metadata/DerivedCube.java
----------------------------------------------------------------------
diff --git a/lens-cube/src/main/java/org/apache/lens/cube/metadata/DerivedCube.java b/lens-cube/src/main/java/org/apache/lens/cube/metadata/DerivedCube.java
index ab5dbec..e7012f7 100644
--- a/lens-cube/src/main/java/org/apache/lens/cube/metadata/DerivedCube.java
+++ b/lens-cube/src/main/java/org/apache/lens/cube/metadata/DerivedCube.java
@@ -62,24 +62,26 @@ public class DerivedCube extends AbstractCubeTable implements CubeInterface {
this.parent = parent;
}
- private Set<CubeMeasure> cachedMeasures;
- private Set<CubeDimAttribute> cachedDims;
+ private Set<CubeMeasure> cachedMeasures = new HashSet<CubeMeasure>();
+ private Set<CubeDimAttribute> cachedDims = new HashSet<CubeDimAttribute>();
public Set<CubeMeasure> getMeasures() {
- if (cachedMeasures == null) {
- cachedMeasures = new HashSet<CubeMeasure>();
- for (String msr : measures) {
- cachedMeasures.add(parent.getMeasureByName(msr));
+ synchronized (measures) {
+ if (cachedMeasures.isEmpty()) {
+ for (String msr : measures) {
+ cachedMeasures.add(parent.getMeasureByName(msr));
+ }
}
}
return cachedMeasures;
}
public Set<CubeDimAttribute> getDimAttributes() {
- if (cachedDims == null) {
- cachedDims = new HashSet<CubeDimAttribute>();
- for (String dim : dimensions) {
- cachedDims.add(parent.getDimAttributeByName(dim));
+ synchronized (dimensions) {
+ if (cachedDims.isEmpty()) {
+ for (String dim : dimensions) {
+ cachedDims.add(parent.getDimAttributeByName(dim));
+ }
}
}
return cachedDims;
[3/8] incubator-lens git commit: LENS-505 : Update release
documentation for 2.1 (amareshwari)
Posted by am...@apache.org.
LENS-505 : Update release documentation for 2.1 (amareshwari)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/52d6df6d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/52d6df6d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/52d6df6d
Branch: refs/heads/master
Commit: 52d6df6d5e16da375a55943bd00bdc6b63f34926
Parents: 9d47438
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Tue Apr 21 21:26:28 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Tue Apr 21 21:28:12 2015 +0530
----------------------------------------------------------------------
src/site/apt/releases/download.apt | 2 +-
src/site/apt/releases/release-history.apt | 30 +++++++++++++++++++++++++-
2 files changed, 30 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/52d6df6d/src/site/apt/releases/download.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/releases/download.apt b/src/site/apt/releases/download.apt
index b18b3e5..2c99186 100644
--- a/src/site/apt/releases/download.apt
+++ b/src/site/apt/releases/download.apt
@@ -20,7 +20,7 @@
Download
The latest release of Apache Lens can be
- {{{http://www.apache.org/dyn/closer.cgi/incubator/lens/2.0-beta-incubating}downloaded from the ASF}}.
+ {{{http://www.apache.org/dyn/closer.cgi/incubator/lens/2.1-beta-incubating}downloaded from the ASF}}.
Older releases may be found {{{http://archive.apache.org/dist/incubator/lens} in the archives}}.
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/52d6df6d/src/site/apt/releases/release-history.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/releases/release-history.apt b/src/site/apt/releases/release-history.apt
index 959ef82..82625c7 100644
--- a/src/site/apt/releases/release-history.apt
+++ b/src/site/apt/releases/release-history.apt
@@ -23,6 +23,8 @@ All Apache Lens releases
*--+--+---+--+--+--+--+
|Release version|Major features|Release documentation|Release Notes|Download|Incompatibilities|More Info |
*--+--+---+--+--+--+--+
+|2.1.0-beta-incubating| Estimate api, Partition timeline, DB resources, Timers on REST api| {{{../versions/2.1.0-beta-incubating/index.html} 2.1.x-incubating docs}} | {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315923&version=12328991} 2.1 release notes}}| {{{http://archive.apache.org/dist/incubator/lens/2.1-beta-incubating/} Download}} | {{{#a2.1.x_from_2.0.x} 2.1.x-incompatibilities}} | - |
+*--+--+---+--+--+--+--+
|2.0.1-beta-incubating| First release in Apache| {{{../versions/2.0.1-beta-incubating/index.html} 2.0.x-incubating docs}} | {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315923&version=12328990} 2.0 release notes}}| {{{http://archive.apache.org/dist/incubator/lens/2.0-beta-incubating/} Download}} | - | - |
*--+--+---+--+--+--+--+
@@ -30,4 +32,30 @@ All Apache Lens releases
Binary distribution of the release does not include dependency org.acplt:oncrpc:jar:1.0.7, as its licensing (LGPL) is
not in compliance with Apache licensing which is required for ganglia metrics reporting. If user is interested in
- ganglia metrics reporting, the jar needs to be downloaded and used.
\ No newline at end of file
+ ganglia metrics reporting, the jar needs to be downloaded and used.
+
+* Incompatibilities
+
+** 2.1.x from 2.0.x
+
+ * LENS-437 : Removed counts and weights from QueryPlan. The values are no longer available. If any usecase requires
+ these values, it requires a feature addition.
+
+ * LENS-338 : REST api path changed from /facts/\{factName\}/storages/\{storage\}/partitions to
+ /facts/\{factName\}/storages/\{storage\}/partition and /dimtables/\{dimTableName\}/storages/\{storage\}/partitions to
+ /dimtables/\{dimTableName\}/storages/\{storage\}/partition for adding single partition. If single partition is
+ getting registered with old path, they need to change to use new path.
+
+ * LENS-281 : Lens server understands data(partition) availability through partition timeline instead of querying
+ metastore. When server is brought up for the first time after this feature, partition timeline will built. If it needs
+ to be updated again, table properties on storage table need to be modified by setting
+ cube.storagetable.partition.timeline.cache.present to false. All add and drop partitions should go through Lens server
+ to keep timeline updated.
+
+ * LENS-327 : Adds "QueryCost estimate(AbstractQueryContext qctx) throws LensException;" in LensDriver interface;
+ ESTIMATE is added in SubmitOp enum. If there is a driver implementation, the new api needs to be implemented.
+
+ * LENS-441 : GET on /cubes/\{cubeName\}/facts returns StringList instead of List<XFactTable>. For getting the
+ XFactTable corresponding to the name returned in StringList, user need to use GET on /facts/\{factName\}.
+
+ * LENS-275 : Session not found error code is 410, instead of 404
\ No newline at end of file
[5/8] incubator-lens git commit: LENS-525 : Remove static jars and
disable tests which require them (amareshwari)
Posted by am...@apache.org.
LENS-525 : Remove static jars and disable tests which require them (amareshwari)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/51ca965c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/51ca965c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/51ca965c
Branch: refs/heads/master
Commit: 51ca965c6ca604a723294a440e50543d44436351
Parents: 81302fa
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Mon Apr 27 14:32:18 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Mon Apr 27 14:33:01 2015 +0530
----------------------------------------------------------------------
.../driver/jdbc/TestColumnarSQLRewriter.java | 5 +--
lens-driver-jdbc/testdata/serde.jar | Bin 733 -> 0 bytes
lens-driver-jdbc/testdata/test.jar | Bin 726 -> 0 bytes
lens-driver-jdbc/testdata/test2.jar | Bin 700 -> 0 bytes
lens-ml-lib/testjars/serde.jar | Bin 1369 -> 0 bytes
lens-ml-lib/testjars/test.jar | Bin 697 -> 0 bytes
.../org/apache/lens/server/LensJerseyTest.java | 4 +--
.../org/apache/lens/server/LensTestUtil.java | 2 +-
.../lens/server/query/TestQueryService.java | 4 +--
.../session/TestDatabaseResourceService.java | 35 ++++++++++---------
.../server/session/TestSessionClassLoaders.java | 27 +++++++-------
lens-server/testdata/serde.jar | Bin 1033 -> 0 bytes
lens-server/testdata/test.jar | Bin 726 -> 0 bytes
lens-server/testdata/test2.jar | Bin 700 -> 0 bytes
14 files changed, 40 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/51ca965c/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestColumnarSQLRewriter.java
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestColumnarSQLRewriter.java b/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestColumnarSQLRewriter.java
index dc1ecba..5471ba2 100644
--- a/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestColumnarSQLRewriter.java
+++ b/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestColumnarSQLRewriter.java
@@ -776,8 +776,9 @@ public class TestColumnarSQLRewriter {
*
* @throws Exception the exception
*/
- @Test
- public void testReplaceDBName() throws Exception {
+ // Disabling the test for LENS-350
+ //@Test
+ private void testReplaceDBName() throws Exception {
File jarDir = new File("testdata");
File testJarFile = new File(jarDir, "test.jar");
File serdeJarFile = new File(jarDir, "serde.jar");
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/51ca965c/lens-driver-jdbc/testdata/serde.jar
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/testdata/serde.jar b/lens-driver-jdbc/testdata/serde.jar
deleted file mode 100644
index b4c0500..0000000
Binary files a/lens-driver-jdbc/testdata/serde.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/51ca965c/lens-driver-jdbc/testdata/test.jar
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/testdata/test.jar b/lens-driver-jdbc/testdata/test.jar
deleted file mode 100644
index bd0aa60..0000000
Binary files a/lens-driver-jdbc/testdata/test.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/51ca965c/lens-driver-jdbc/testdata/test2.jar
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/testdata/test2.jar b/lens-driver-jdbc/testdata/test2.jar
deleted file mode 100644
index 8f54d8d..0000000
Binary files a/lens-driver-jdbc/testdata/test2.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/51ca965c/lens-ml-lib/testjars/serde.jar
----------------------------------------------------------------------
diff --git a/lens-ml-lib/testjars/serde.jar b/lens-ml-lib/testjars/serde.jar
deleted file mode 100644
index ec86e49..0000000
Binary files a/lens-ml-lib/testjars/serde.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/51ca965c/lens-ml-lib/testjars/test.jar
----------------------------------------------------------------------
diff --git a/lens-ml-lib/testjars/test.jar b/lens-ml-lib/testjars/test.jar
deleted file mode 100644
index 1644d8c..0000000
Binary files a/lens-ml-lib/testjars/test.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/51ca965c/lens-server/src/test/java/org/apache/lens/server/LensJerseyTest.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/LensJerseyTest.java b/lens-server/src/test/java/org/apache/lens/server/LensJerseyTest.java
index 7913845..4b0d392 100644
--- a/lens-server/src/test/java/org/apache/lens/server/LensJerseyTest.java
+++ b/lens-server/src/test/java/org/apache/lens/server/LensJerseyTest.java
@@ -116,8 +116,8 @@ public abstract class LensJerseyTest extends JerseyTest {
hiveConf.setIntVar(HiveConf.ConfVars.HIVE_SERVER2_THRIFT_CLIENT_CONNECTION_RETRY_LIMIT, 3);
hiveConf.setIntVar(HiveConf.ConfVars.HIVE_SERVER2_THRIFT_CLIENT_RETRY_LIMIT, 3);
- LensTestUtil.createTestDatabaseResources(new String[]{LensTestUtil.DB_WITH_JARS, LensTestUtil.DB_WITH_JARS_2},
- hiveConf);
+ // LensTestUtil.createTestDatabaseResources(new String[]{LensTestUtil.DB_WITH_JARS, LensTestUtil.DB_WITH_JARS_2},
+ // hiveConf);
LensServices.get().init(LensServerConf.getHiveConf());
LensServices.get().start();
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/51ca965c/lens-server/src/test/java/org/apache/lens/server/LensTestUtil.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/LensTestUtil.java b/lens-server/src/test/java/org/apache/lens/server/LensTestUtil.java
index 5658d47..beb4532 100644
--- a/lens-server/src/test/java/org/apache/lens/server/LensTestUtil.java
+++ b/lens-server/src/test/java/org/apache/lens/server/LensTestUtil.java
@@ -236,7 +236,7 @@ public final class LensTestUtil {
Hive.get().dropTable(tableName);
}
- public static void createTestDatabaseResources(String[] testDatabases, HiveConf conf) throws Exception {
+ private static void createTestDatabaseResources(String[] testDatabases, HiveConf conf) throws Exception {
File resDir = new File("target/resources");
if (!resDir.exists()) {
resDir.mkdir();
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/51ca965c/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
index ed4749f..ae49e82 100644
--- a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
+++ b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
@@ -1373,8 +1373,8 @@ public class TestQueryService extends LensJerseyTest {
* Check if DB static jars get passed to Hive driver
* @throws Exception
*/
- @Test
- public void testHiveDriverGetsDBJars() throws Exception {
+ //@Test
+ private void testHiveDriverGetsDBJars() throws Exception {
// Set DB to a db with static jars
HiveSessionService sessionService = LensServices.get().getService(SessionService.NAME);
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/51ca965c/lens-server/src/test/java/org/apache/lens/server/session/TestDatabaseResourceService.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/session/TestDatabaseResourceService.java b/lens-server/src/test/java/org/apache/lens/server/session/TestDatabaseResourceService.java
index 0c24c02..6acd5e5 100644
--- a/lens-server/src/test/java/org/apache/lens/server/session/TestDatabaseResourceService.java
+++ b/lens-server/src/test/java/org/apache/lens/server/session/TestDatabaseResourceService.java
@@ -24,7 +24,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.apache.lens.server.LensTestUtil;
import org.apache.lens.server.api.LensConfConstants;
import org.apache.commons.logging.Log;
@@ -34,10 +33,8 @@ import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.ql.metadata.Hive;
import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+// Disabling all tests for LENS-350
public class TestDatabaseResourceService {
private static final String DB_PFX = TestDatabaseResourceService.class.getSimpleName();
public static final Log LOG = LogFactory.getLog(TestDatabaseResourceService.class);
@@ -52,9 +49,13 @@ public class TestDatabaseResourceService {
private final HiveConf conf = new HiveConf(TestDatabaseResourceService.class);
private DatabaseResourceService dbResService;
- @BeforeClass
- public void setup() throws Exception {
- LensTestUtil.createTestDatabaseResources(testDatabases, conf);
+ public void testDisabled() {
+ // to avoid checkstyle
+ }
+
+ //@BeforeClass
+ private void setup() throws Exception {
+ // LensTestUtil.createTestDatabaseResources(testDatabases, conf);
// Start resource service.
conf.set(LensConfConstants.DATABASE_RESOURCE_DIR, "target/resources");
dbResService = new DatabaseResourceService(DatabaseResourceService.NAME);
@@ -62,16 +63,16 @@ public class TestDatabaseResourceService {
dbResService.start();
}
- @AfterClass
- public void tearDown() throws Exception {
+ //@AfterClass
+ private void tearDown() throws Exception {
Hive hive = Hive.get(conf);
for (String db : testDatabases) {
hive.dropDatabase(db, true, true);
}
}
- @Test
- public void testClassLoaderCreated() throws Exception {
+ //@Test
+ private void testClassLoaderCreated() throws Exception {
ClassLoader db1Loader = dbResService.getClassLoader(DB1);
ClassLoader db2Loader = dbResService.getClassLoader(DB2);
@@ -93,8 +94,8 @@ public class TestDatabaseResourceService {
return false;
}
- @Test
- public void testJarsLoaded() throws Exception {
+ //@Test
+ private void testJarsLoaded() throws Exception {
// Verify that each db's classloader contains corresponding jar
Assert.assertTrue(isJarLoaded(dbResService.getClassLoader(DB1), DB1), DB1 + " jar should be loaded");
Assert.assertTrue(isJarLoaded(dbResService.getClassLoader(DB2), DB2), DB2 + " jar should be loaded");
@@ -104,8 +105,8 @@ public class TestDatabaseResourceService {
Assert.assertFalse(isJarLoaded(dbResService.getClassLoader(DB1), DB2));
}
- @Test
- public void testJarOrder() throws Exception {
+ //@Test
+ private void testJarOrder() throws Exception {
Collection<LensSessionImpl.ResourceEntry> actualOrder = dbResService.getResourcesForDatabase(DB1);
List<String> actualOrderList = new ArrayList<String>();
@@ -126,8 +127,8 @@ public class TestDatabaseResourceService {
}
}
- @Test
- public void verifyClassLoader() throws Exception {
+ //@Test
+ private void verifyClassLoader() throws Exception {
// Should fail now since current classloader doesn't have jar loaded
try {
Class clz = Class.forName("ClassLoaderTestClass", true, getClass().getClassLoader());
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/51ca965c/lens-server/src/test/java/org/apache/lens/server/session/TestSessionClassLoaders.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/session/TestSessionClassLoaders.java b/lens-server/src/test/java/org/apache/lens/server/session/TestSessionClassLoaders.java
index 7dd4486..e93f63f 100644
--- a/lens-server/src/test/java/org/apache/lens/server/session/TestSessionClassLoaders.java
+++ b/lens-server/src/test/java/org/apache/lens/server/session/TestSessionClassLoaders.java
@@ -25,7 +25,6 @@ import java.util.HashMap;
import org.apache.lens.api.LensSessionHandle;
import org.apache.lens.server.LensServerConf;
-import org.apache.lens.server.LensTestUtil;
import org.apache.lens.server.api.LensConfConstants;
import org.apache.lens.server.user.UserConfigLoaderFactory;
@@ -36,10 +35,8 @@ import org.apache.hadoop.hive.ql.metadata.Hive;
import org.apache.hive.service.cli.CLIService;
import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+// Disabling all tests for LENS-350
public class TestSessionClassLoaders {
private static final Log LOG = LogFactory.getLog(TestSessionClassLoaders.class);
@@ -48,8 +45,12 @@ public class TestSessionClassLoaders {
private static final String DB1 = TestSessionClassLoaders.class.getSimpleName() + "_db1";
- @BeforeClass
- public void setup() throws Exception {
+ public void testDisabled() {
+ // to avoid checkstyle
+ }
+
+ //@BeforeClass
+ private void setup() throws Exception {
/**
* Test Setup -
* Static test.jar containing ClassLoaderTestClass.class attached to DB1
@@ -57,7 +58,7 @@ public class TestSessionClassLoaders {
* test2.jar containing ClassLoaderTestClass2.class added to session via addResource
*/
// Create test databases and tables
- LensTestUtil.createTestDatabaseResources(new String[]{DB1}, conf);
+ //LensTestUtil.createTestDatabaseResources(new String[]{DB1}, conf);
conf.setVar(HiveConf.ConfVars.HIVE_SESSION_IMPL_CLASSNAME, LensSessionImpl.class.getName());
conf.set(LensConfConstants.DATABASE_RESOURCE_DIR, "target/resources");
@@ -75,8 +76,8 @@ public class TestSessionClassLoaders {
}
- @AfterClass
- public void tearDown() throws Exception {
+ //@AfterClass
+ private void tearDown() throws Exception {
Hive hive = Hive.get(conf);
hive.dropDatabase(DB1, true, true);
}
@@ -86,8 +87,8 @@ public class TestSessionClassLoaders {
* Check that DB specific classlaoders are available
* @throws Exception
*/
- @Test
- public void testSessionClassLoader() throws Exception {
+ //@Test
+ private void testSessionClassLoader() throws Exception {
LensSessionHandle sessionHandle = sessionService.openSession("foo", "bar", new HashMap<String, String>());
LensSessionImpl session = sessionService.getSession(sessionHandle);
session.setDbResService(sessionService.getDatabaseResourceService());
@@ -148,8 +149,8 @@ public class TestSessionClassLoaders {
* Check that any added resources to the session are available after database is switched
* @throws Exception
*/
- @Test
- public void testClassLoaderMergeAfterAddResources() throws Exception {
+ //@Test
+ private void testClassLoaderMergeAfterAddResources() throws Exception {
LensSessionHandle sessionHandle = sessionService.openSession("foo", "bar", new HashMap<String, String>());
LensSessionImpl session = sessionService.getSession(sessionHandle);
session.setDbResService(sessionService.getDatabaseResourceService());
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/51ca965c/lens-server/testdata/serde.jar
----------------------------------------------------------------------
diff --git a/lens-server/testdata/serde.jar b/lens-server/testdata/serde.jar
deleted file mode 100644
index 01e6d7c..0000000
Binary files a/lens-server/testdata/serde.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/51ca965c/lens-server/testdata/test.jar
----------------------------------------------------------------------
diff --git a/lens-server/testdata/test.jar b/lens-server/testdata/test.jar
deleted file mode 100644
index a5baa57..0000000
Binary files a/lens-server/testdata/test.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/51ca965c/lens-server/testdata/test2.jar
----------------------------------------------------------------------
diff --git a/lens-server/testdata/test2.jar b/lens-server/testdata/test2.jar
deleted file mode 100644
index 8f54d8d..0000000
Binary files a/lens-server/testdata/test2.jar and /dev/null differ
[6/8] incubator-lens git commit: [maven-release-plugin] prepare
release apache-lens-2.1.0-beta-incubating
Posted by am...@apache.org.
[maven-release-plugin] prepare release apache-lens-2.1.0-beta-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/fdd19b9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/fdd19b9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/fdd19b9c
Branch: refs/heads/master
Commit: fdd19b9c2b17e329465cbde62dbce6f8be435cec
Parents: 51ca965
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Mon Apr 27 16:23:18 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Mon Apr 27 16:23:18 2015 +0530
----------------------------------------------------------------------
checkstyle/pom.xml | 9 ++++++---
lens-api/pom.xml | 5 ++---
lens-cli/pom.xml | 5 ++---
lens-client/pom.xml | 5 ++---
lens-cube/pom.xml | 5 ++---
lens-dist/pom.xml | 5 ++---
lens-driver-hive/pom.xml | 5 ++---
lens-driver-jdbc/pom.xml | 5 ++---
lens-examples/pom.xml | 5 ++---
lens-ml-dist/pom.xml | 2 +-
lens-ml-lib/pom.xml | 5 ++---
lens-query-lib/pom.xml | 5 ++---
lens-regression/pom.xml | 5 ++---
lens-server-api/pom.xml | 5 ++---
lens-server/pom.xml | 5 ++---
lens-storage-db/pom.xml | 5 ++---
pom.xml | 11 +++++------
17 files changed, 40 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fdd19b9c/checkstyle/pom.xml
----------------------------------------------------------------------
diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
index ee1aaa4..86ab927 100644
--- a/checkstyle/pom.xml
+++ b/checkstyle/pom.xml
@@ -17,8 +17,7 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -30,7 +29,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
<name>Lens Checkstyle Rules</name>
- <version>2.1.0-beta-incubating-SNAPSHOT</version>
+ <version>2.1.0-beta-incubating</version>
<build>
<plugins>
@@ -50,4 +49,8 @@
</plugin>
</plugins>
</build>
+
+ <scm>
+ <tag>apache-lens-2.1.0-beta-incubating</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fdd19b9c/lens-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-api/pom.xml b/lens-api/pom.xml
index dba7fd9..c69119e 100644
--- a/lens-api/pom.xml
+++ b/lens-api/pom.xml
@@ -19,14 +19,13 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Lens API</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating-SNAPSHOT</version>
+ <version>2.1.0-beta-incubating</version>
</parent>
<artifactId>lens-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fdd19b9c/lens-cli/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cli/pom.xml b/lens-cli/pom.xml
index fc2ad64..071986e 100644
--- a/lens-cli/pom.xml
+++ b/lens-cli/pom.xml
@@ -19,15 +19,14 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Lens CLI</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating-SNAPSHOT</version>
+ <version>2.1.0-beta-incubating</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fdd19b9c/lens-client/pom.xml
----------------------------------------------------------------------
diff --git a/lens-client/pom.xml b/lens-client/pom.xml
index 4675797..f6e1ae1 100644
--- a/lens-client/pom.xml
+++ b/lens-client/pom.xml
@@ -19,13 +19,12 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating-SNAPSHOT</version>
+ <version>2.1.0-beta-incubating</version>
</parent>
<artifactId>lens-client</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fdd19b9c/lens-cube/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cube/pom.xml b/lens-cube/pom.xml
index 2723e3f..346301c 100644
--- a/lens-cube/pom.xml
+++ b/lens-cube/pom.xml
@@ -19,15 +19,14 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Lens Cube</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating-SNAPSHOT</version>
+ <version>2.1.0-beta-incubating</version>
</parent>
<artifactId>lens-cube</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fdd19b9c/lens-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-dist/pom.xml b/lens-dist/pom.xml
index adbd6be..d47c8f0 100644
--- a/lens-dist/pom.xml
+++ b/lens-dist/pom.xml
@@ -19,15 +19,14 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Lens Distribution</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating-SNAPSHOT</version>
+ <version>2.1.0-beta-incubating</version>
</parent>
<artifactId>lens-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fdd19b9c/lens-driver-hive/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-hive/pom.xml b/lens-driver-hive/pom.xml
index 080c8f5..b23b136 100644
--- a/lens-driver-hive/pom.xml
+++ b/lens-driver-hive/pom.xml
@@ -19,15 +19,14 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Lens Hive Driver</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating-SNAPSHOT</version>
+ <version>2.1.0-beta-incubating</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fdd19b9c/lens-driver-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/pom.xml b/lens-driver-jdbc/pom.xml
index 09fe318..eaddaef 100644
--- a/lens-driver-jdbc/pom.xml
+++ b/lens-driver-jdbc/pom.xml
@@ -19,14 +19,13 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Lens Driver for JDBC</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating-SNAPSHOT</version>
+ <version>2.1.0-beta-incubating</version>
</parent>
<artifactId>lens-driver-jdbc</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fdd19b9c/lens-examples/pom.xml
----------------------------------------------------------------------
diff --git a/lens-examples/pom.xml b/lens-examples/pom.xml
index 2ab646c..31c9f42 100644
--- a/lens-examples/pom.xml
+++ b/lens-examples/pom.xml
@@ -19,14 +19,13 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Lens Examples</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating-SNAPSHOT</version>
+ <version>2.1.0-beta-incubating</version>
</parent>
<artifactId>lens-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fdd19b9c/lens-ml-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-dist/pom.xml b/lens-ml-dist/pom.xml
index 7b6f760..97459b4 100644
--- a/lens-ml-dist/pom.xml
+++ b/lens-ml-dist/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating-SNAPSHOT</version>
+ <version>2.1.0-beta-incubating</version>
</parent>
<artifactId>lens-ml-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fdd19b9c/lens-ml-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-lib/pom.xml b/lens-ml-lib/pom.xml
index 45a127e..267cedb 100644
--- a/lens-ml-lib/pom.xml
+++ b/lens-ml-lib/pom.xml
@@ -19,15 +19,14 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Lens ML Lib</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating-SNAPSHOT</version>
+ <version>2.1.0-beta-incubating</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fdd19b9c/lens-query-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-query-lib/pom.xml b/lens-query-lib/pom.xml
index cc7564f..46c5b53 100644
--- a/lens-query-lib/pom.xml
+++ b/lens-query-lib/pom.xml
@@ -19,15 +19,14 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Lens Query Library</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating-SNAPSHOT</version>
+ <version>2.1.0-beta-incubating</version>
</parent>
<artifactId>lens-query-lib</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fdd19b9c/lens-regression/pom.xml
----------------------------------------------------------------------
diff --git a/lens-regression/pom.xml b/lens-regression/pom.xml
index 07441bc..b5d34bf 100644
--- a/lens-regression/pom.xml
+++ b/lens-regression/pom.xml
@@ -19,14 +19,13 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Lens Regression</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating-SNAPSHOT</version>
+ <version>2.1.0-beta-incubating</version>
</parent>
<artifactId>lens-regression</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fdd19b9c/lens-server-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server-api/pom.xml b/lens-server-api/pom.xml
index aa2ef59..392d883 100644
--- a/lens-server-api/pom.xml
+++ b/lens-server-api/pom.xml
@@ -19,13 +19,12 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating-SNAPSHOT</version>
+ <version>2.1.0-beta-incubating</version>
</parent>
<artifactId>lens-server-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fdd19b9c/lens-server/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server/pom.xml b/lens-server/pom.xml
index d7752d7..3228930 100644
--- a/lens-server/pom.xml
+++ b/lens-server/pom.xml
@@ -19,15 +19,14 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Lens Server</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating-SNAPSHOT</version>
+ <version>2.1.0-beta-incubating</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fdd19b9c/lens-storage-db/pom.xml
----------------------------------------------------------------------
diff --git a/lens-storage-db/pom.xml b/lens-storage-db/pom.xml
index 3411fa2..2b41bd0 100644
--- a/lens-storage-db/pom.xml
+++ b/lens-storage-db/pom.xml
@@ -19,15 +19,14 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Lens DB storage</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.1.0-beta-incubating-SNAPSHOT</version>
+ <version>2.1.0-beta-incubating</version>
</parent>
<artifactId>lens-storage-db</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fdd19b9c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 66f7824..58185b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,8 +19,7 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -110,7 +109,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>apache-lens</artifactId>
- <version>2.1.0-beta-incubating-SNAPSHOT</version>
+ <version>2.1.0-beta-incubating</version>
<name>Lens</name>
<packaging>pom</packaging>
<description>Unified Analytics Platform</description>
@@ -285,7 +284,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-lens.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-lens.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf/incubator-lens.git</url>
- <tag>HEAD</tag>
+ <tag>apache-lens-2.1.0-beta-incubating</tag>
</scm>
<reporting>
@@ -551,7 +550,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.1.0-beta-incubating-SNAPSHOT</version>
+ <version>2.1.0-beta-incubating</version>
</dependency>
</dependencies>
<executions>
@@ -1213,7 +1212,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.1.0-beta-incubating-SNAPSHOT</version>
+ <version>2.1.0-beta-incubating</version>
</dependency>
</dependencies>
<executions>
[8/8] incubator-lens git commit: Reverse merge from release branch to
master
Posted by am...@apache.org.
Reverse merge from release branch to master
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/bc892f5b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/bc892f5b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/bc892f5b
Branch: refs/heads/master
Commit: bc892f5bab85d174d94aa4a99c6f823678cea9dc
Parents: ab22a24 db73c5e
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Tue May 19 13:22:54 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Tue May 19 13:22:54 2015 +0530
----------------------------------------------------------------------
----------------------------------------------------------------------