diff --git a/pom.xml b/pom.xml index b0fb8a902..688af245a 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ org.springframework.data.build spring-data-parent - 1.4.0.BUILD-SNAPSHOT + 1.4.0.M1 ../spring-data-build/parent/pom.xml @@ -31,7 +31,7 @@ UTF-8 multi spring-data-cassandra - 1.8.0.BUILD-SNAPSHOT + 1.8.0.M1 1.2.0.1 1.0.5-dse 2.16 @@ -95,39 +95,6 @@ test - - - org.springframework - spring-context - ${spring} - - - org.springframework - spring-tx - ${spring} - - - org.springframework - spring-beans - ${spring} - - - org.springframework - spring-core - ${spring} - - - commons-logging - commons-logging - - - - - org.springframework - spring-expression - ${spring} - - org.slf4j @@ -230,7 +197,7 @@ spring-lib-release - http://repo.springsource.org/libs-release-local + http://repo.spring.io/libs-milestone diff --git a/spring-data-cassandra-distribution/pom.xml b/spring-data-cassandra-distribution/pom.xml index 72402004f..84ca20dbc 100644 --- a/spring-data-cassandra-distribution/pom.xml +++ b/spring-data-cassandra-distribution/pom.xml @@ -21,7 +21,6 @@ ${basedir}/.. SDCASS - 1.0.3 @@ -29,12 +28,10 @@ org.apache.maven.plugins maven-assembly-plugin - 2.3 org.codehaus.mojo wagon-maven-plugin - ${wagon.version} diff --git a/src/docbkx/index.xml b/src/docbkx/index.xml index 5892afb4f..93b25cbde 100644 --- a/src/docbkx/index.xml +++ b/src/docbkx/index.xml @@ -52,7 +52,7 @@ - + @@ -69,10 +69,10 @@ Appendix - + - + diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt new file mode 100644 index 000000000..ceb5d2642 --- /dev/null +++ b/src/main/resources/changelog.txt @@ -0,0 +1,42 @@ +Spring Data Cassandra Changelog +=============================== + +Changes in version 1.0.0.M1 (2014-03-31) +---------------------------------------- + +** Technical task + * [DATACASS-17] - Create Operations + * [DATACASS-18] - Update (Save) Operations + * [DATACASS-19] - Delete Operations + * [DATACASS-20] - Search Operations + * [DATACASS-21] - Include Basic Options for Cassandra Connectivity + * [DATACASS-39] - Better PreparedStatement Support + * [DATACASS-48] - Add ConsistencyLevel and RetryPolicy to Operations/Template + +** Bug + * [DATACASS-92] - Add support for missing DataTypes to DefaultCassandraRowValueProvider + * [DATACASS-105] - Missing CassandraPersistentProperty.getActualType() method in code. + +** Story + * [DATACASS-11] - Develop or Modify Mapping Subsystem for Beans + * [DATACASS-13] - Define Operations Interface and Implement with CassandraTemplate + * [DATACASS-14] - Define JavaConfig for spring-cassandra + * [DATACASS-15] - Define Basic XML Namespace for spring-cassandra + * [DATACASS-32] - Implement the TemplateAPI for CQL + * [DATACASS-38] - Cluster Connection Listener + * [DATACASS-42] - Update to latest spring-data-commons v.next + * [DATACASS-61] - Create Outline + * [DATACASS-69] - Add more queryAsynchronously methods to Operations Interface + * [DATACASS-80] - Rename classes in spring-cassandra & spring-data-cassandra + * [DATACASS-84] - Provide support for naming strategies + * [DATACASS-88] - Ensure license text appears in all source files with proper dates. + * [DATACASS-89] - Add overloaded methods to CqlOperations that use strongly typed Query objects + * [DATACASS-90] - Ensure all CqlOperations methods take QueryOptions where appropriate + * [DATACASS-93] - Enhance annotations to allow for force-quoting + * [DATACASS-94] - Add class AbstractCqlTemplateConfiguration + * [DATACASS-96] - Integrate CqlIdentifier + * [DATACASS-98] - Entity validation fails and throws a IndexOutOfBoundsException + * [DATACASS-99] - Make classes using prefixes "Default" & "Basic" uniform + * [DATACASS-100] - QueryOptions should only have ConsistencyLevel & RetryPolicy + * [DATACASS-104] - Remove requirement for @PrimaryKeyClass when using composite primary keys + * [DATACASS-107] - Support declarative query methods diff --git a/src/main/resources/license.txt b/src/main/resources/license.txt new file mode 100644 index 000000000..7584e2dfe --- /dev/null +++ b/src/main/resources/license.txt @@ -0,0 +1,216 @@ + 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. + +======================================================================= + +To the extent any open source subcomponents are licensed under the EPL and/or other +similar licenses that require the source code and/or modifications to +source code to be made available (as would be noted above), you may obtain a +copy of the source code corresponding to the binaries for such open source +components and modifications thereto, if any, (the "Source Files"), by +downloading the Source Files from http://www.springsource.org/download, +or by sending a request, with your name and address to: VMware, Inc., 3401 Hillview +Avenue, Palo Alto, CA 94304, United States of America or email info@vmware.com. All +such requests should clearly specify: OPEN SOURCE FILES REQUEST, Attention General +Counsel. VMware shall mail a copy of the Source Files to you on a CD or equivalent +physical medium. This offer to obtain a copy of the Source Files is valid for three +years from the date you acquired this Software product. \ No newline at end of file diff --git a/src/main/resources/notice.txt b/src/main/resources/notice.txt new file mode 100644 index 000000000..704042b4a --- /dev/null +++ b/src/main/resources/notice.txt @@ -0,0 +1,10 @@ +Spring Data Cassandra 1.0.0.M1 +Copyright (c) [2010-2014] Pivotal Software, Inc. + +This product is licensed to you under the Apache License, Version 2.0 (the "License"). +You may not use this product except in compliance with the License. + +This product may include a number of subcomponents with +separate copyright notices and license terms. Your use of the source +code for the these subcomponents is subject to the terms and +conditions of the subcomponent's license, as noted in the LICENSE file. \ No newline at end of file diff --git a/src/main/resources/readme.txt b/src/main/resources/readme.txt new file mode 100644 index 000000000..1a6d266f2 --- /dev/null +++ b/src/main/resources/readme.txt @@ -0,0 +1,17 @@ +Spring Data Cassandra 1.1.0.M1 +------------------------------ + +Spring Data Cassandra is released under the terms of the Apache Software License Version 2.0 (see license.txt). + + +DISTRIBUTION CONTENTS: + +The JARs are available in the 'dist' directory, and the source JARs are in the 'src' directory. + +The reference manual and javadoc are located in the 'docs' directory. + + +ADDITIONAL RESOURCES: + +Spring Data Homepage: http://projects.spring.io/spring-data +Spring Data Forum: http://forum.spring.io/forum/spring-projects/data/nosql