Spring/spring-data-cassandra
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.0.x' of https://github.com/spring-projects/spring-data-cassandra into 1.0.x

Browse Source 
Conflicts:
	pom.xml
	spring-cql/pom.xml
	spring-data-cassandra-distribution/pom.xml
	spring-data-cassandra/pom.xml
This commit is contained in:
David Webb
2014-08-07 18:33:56 -04:00
parent c06ad43097 afccd2d26e
commit a555aeeb13
7 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@@ -5,7 +5,7 @@
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-cassandra-parent</artifactId>
<version>1.0.1.BUILD-SNAPSHOT</version>
<version>1.0.3.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Spring Data Cassandra</name>
@@ -15,7 +15,7 @@
<parent>
<groupId>org.springframework.data.build</groupId>
<artifactId>spring-data-parent</artifactId>
<version>1.4.1.BUILD-SNAPSHOT</version>
<version>1.4.3.BUILD-SNAPSHOT</version>
<relativePath>../spring-data-build/parent/pom.xml</relativePath>
</parent>
@@ -28,7 +28,7 @@
<properties>
<project.type>multi</project.type>
<dist.id>spring-data-cassandra</dist.id>
<springdata.commons>1.8.1.BUILD-SNAPSHOT</springdata.commons>
<springdata.commons>1.8.3.BUILD-SNAPSHOT</springdata.commons>
<cassandra-unit.version>2.0.2.1</cassandra-unit.version>
<cassandra-driver-dse.version>2.0.2</cassandra-driver-dse.version>
<el.version>1.0</el.version>

2
spring-cql/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-cassandra-parent</artifactId>
<version>1.0.1.BUILD-SNAPSHOT</version>
<version>1.0.3.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
spring-data-cassandra-distribution/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-cassandra-parent</artifactId>
<version>1.0.1.BUILD-SNAPSHOT</version>
<version>1.0.3.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
spring-data-cassandra/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-cassandra-parent</artifactId>
<version>1.0.1.BUILD-SNAPSHOT</version>
<version>1.0.3.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

6
src/docbkx/index.xml
View File

@@ -47,7 +47,7 @@
<xi:include href="introduction/introduction.xml"/>
<xi:include href="introduction/requirements.xml"/>
<xi:include href="introduction/getting-started.xml"/>
<xi:include href="https://raw.github.com/spring-projects/spring-data-commons/1.8.0.RELEASE/src/docbkx/repositories.xml">
<xi:include href="https://raw.github.com/spring-projects/spring-data-commons/1.8.2.RELEASE/src/docbkx/repositories.xml">
<xi:fallback href="../../../spring-data-commons/src/docbkx/repositories.xml" />
</xi:include>
</part>
@@ -64,10 +64,10 @@
<part id="appendix">
<title>Appendix</title>
<xi:include href="https://raw.github.com/spring-projects/spring-data-commons/1.8.0.RELEASE/src/docbkx/repository-namespace-reference.xml">
<xi:include href="https://raw.github.com/spring-projects/spring-data-commons/1.8.2.RELEASE/src/docbkx/repository-namespace-reference.xml">
<xi:fallback href="../../../spring-data-commons/src/docbkx/repository-namespace-reference.xml" />
</xi:include>
<xi:include href="https://raw.github.com/spring-projects/spring-data-commons/1.8.0.RELEASE/src/docbkx/repository-query-keywords-reference.xml">
<xi:include href="https://raw.github.com/spring-projects/spring-data-commons/1.8.2.RELEASE/src/docbkx/repository-query-keywords-reference.xml">
<xi:fallback href="../../../spring-data-commons/src/docbkx/repository-query-keywords-reference.xml" />
</xi:include>
</part>

21
src/main/resources/changelog.txt
View File

@@ -1,6 +1,27 @@
Spring Data Cassandra Changelog
===============================
Changes in version 1.0.2.RELEASE (2014-07-28)
---------------------------------------------
* DATACASS-143 - Release 1.0.2.
Changes in version 1.1.0.M1 (2014-07-10)
----------------------------------------
* DATACASS-140 - Release 1.1 M1.
* DATACASS-135 - Reference documentation build broken.
* DATACASS-134 - Add plugin repository to pom.xml to make sure Bundlor can be resolved.
* DATACASS-117 - @Query annotation does not support named parameters.
Changes in version 1.0.1.RELEASE (2014-06-30)
---------------------------------------------
* DATACASS-138 - Release 1.0.1.
* DATACASS-137 - Add new ConsistencyLevels to CqlTemplate.
* DATACASS-135 - Reference documentation build broken.
* DATACASS-134 - Add plugin repository to pom.xml to make sure Bundlor can be resolved.
Changes in version 1.0.0.RELEASE (2014-05-20)
---------------------------------------------
* DATACASS-133 - Binding Dates fails with DSE 2.0.1 Driver.

2
src/main/resources/notice.txt
View File

@@ -1,4 +1,4 @@
Spring Data Cassandra 1.0 GA
Spring Data Cassandra 1.0.2
Copyright (c) [2010-2014] Pivotal Software, Inc.
This product is licensed to you under the Apache License, Version 2.0 (the "License").