diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000000000..fd6a0ae25 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,84 @@ +pipeline { + agent none + + triggers { + pollSCM 'H/10 * * * *' + upstream(upstreamProjects: "spring-data-commons/master", threshold: hudson.model.Result.SUCCESS) + } + + options { + disableConcurrentBuilds() + } + + stages { + stage("Test") { + parallel { + stage("test: baseline") { + agent { + docker { + image 'adoptopenjdk/openjdk8:latest' + args '-v $HOME/.m2:/root/.m2' + } + } + steps { + sh "./mvnw clean dependency:list test -Dsort -B" + } + } + } + } + stage('Release to artifactory') { + when { + branch 'issue/*' + } + agent { + docker { + image 'adoptopenjdk/openjdk8:latest' + args '-v $HOME/.m2:/root/.m2' + } + } + + environment { + ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c') + } + + steps { + sh "USERNAME=${ARTIFACTORY_USR} PASSWORD=${ARTIFACTORY_PSW} DOC_USERNAME=${DOC_USR} DOC_PASSWORD=${DOC_PSW} ./mvnw -Pci,snapshot -Dmaven.test.skip=true clean deploy -B" + } + } + stage('Release to artifactory with docs') { + when { + branch 'master' + } + agent { + docker { + image 'adoptopenjdk/openjdk8:latest' + args '-v $HOME/.m2:/root/.m2' + } + } + + environment { + ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c') + } + + steps { + sh "USERNAME=${ARTIFACTORY_USR} PASSWORD=${ARTIFACTORY_PSW} DOC_USERNAME=${DOC_USR} DOC_PASSWORD=${DOC_PSW} ./mvnw -Pci,snapshot -Dmaven.test.skip=true clean deploy -B" + } + } + } + + post { + changed { + script { + slackSend( + color: (currentBuild.currentResult == 'SUCCESS') ? 'good' : 'danger', + channel: '#spring-data-dev', + message: "${currentBuild.fullDisplayName} - `${currentBuild.currentResult}`\n${env.BUILD_URL}") + emailext( + subject: "[${currentBuild.fullDisplayName}] ${currentBuild.currentResult}", + mimeType: 'text/html', + recipientProviders: [[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']], + body: "${currentBuild.fullDisplayName} is reported as ${currentBuild.currentResult}") + } + } + } +} diff --git a/README.md b/README.adoc similarity index 51% rename from README.md rename to README.adoc index 044efffd1..99583df35 100644 --- a/README.md +++ b/README.adoc @@ -1,47 +1,51 @@ -[![Spring Data for Apache Cassandra](https://spring.io/badges/spring-data-cassandra/ga.svg)](https://projects.spring.io/spring-data-cassandra/#quick-start) -[![Spring Data for Apache Cassandra](https://spring.io/badges/spring-data-cassandra/snapshot.svg)](https://projects.spring.io/spring-data-cassandra/#quick-start) +image:https://spring.io/badges/spring-data-cassandra/ga.svg[Spring Data for Apache Cassandra,link=https://projects.spring.io/spring-data-cassandra/#quick-start] +image:https://spring.io/badges/spring-data-cassandra/snapshot.svg[Spring Data for Apache Cassandra,link=https://projects.spring.io/spring-data-cassandra/#quick-start] -# Spring Data for Apache Cassandra +image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-cassandra%2Fmaster&subject=Moore%20(master)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-cassandra/] +image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-cassandra%2F2.1.x&subject=Lovelace%20(2.1.x)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-cassandra/] +image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-cassandra%2F1.5.x&subject=Ingalls%20(1.5.x)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-cassandra/] -The primary goal of the [Spring Data](https://projects.spring.io/spring-data) project is to make it easier to build Spring-powered applications that use new data access technologies such as non-relational databases, map-reduce frameworks, and cloud based data services. += Spring Data for Apache Cassandra + +The primary goal of the https://projects.spring.io/spring-data[Spring Data] project is to make it easier to build Spring-powered applications that use new data access technologies such as non-relational databases, map-reduce frameworks, and cloud based data services. The Spring Data for Apache Cassandra project aims to provide a familiar and consistent Spring-based programming model for new datastores while retaining store-specific features and capabilities. The Spring Data for Apache Cassandra project provides integration with the Apache Cassandra database. Key functional areas of Spring Data for Apache Cassandra are a CQL abstraction, a POJO centric model for interacting with an Apache Cassandra tables and easily writing a repository style data access layer. - -## Getting Help +== Getting Help For a comprehensive treatment of all the Spring Data for Apache Cassandra features, please refer to: -* the [User Guide](https://docs.spring.io/spring-data/cassandra/docs/current/reference/html/) -* the [JavaDocs](https://docs.spring.io/spring-data/cassandra/docs/current/api/) have extensive comments in them as well. -* the home page of [Spring Data for Apache Cassandra](https://projects.spring.io/spring-data-cassandra) contains links to articles and other resources. -* for more detailed questions, use [Spring Data for Apache Cassandra on Stackoverflow](https://stackoverflow.com/questions/tagged/spring-data-cassandra). +* the https://docs.spring.io/spring-data/cassandra/docs/current/reference/html/[User Guide] +* the https://docs.spring.io/spring-data/cassandra/docs/current/api/[JavaDocs] have extensive comments in them as well. +* the home page of https://projects.spring.io/spring-data-cassandra[Spring Data for Apache Cassandra] contains links to articles and other resources. +* for more detailed questions, use https://stackoverflow.com/questions/tagged/spring-data-cassandra[Spring Data for Apache Cassandra on Stackoverflow]. -If you are new to Spring as well as to Spring Data, look for information about [Spring projects](https://projects.spring.io/). +If you are new to Spring as well as to Spring Data, look for information about https://projects.spring.io/[Spring projects]. - -## Quick Start +== Quick Start Prerequisites: * Java 6 -* [DataStax Java Driver for Apache Cassandra 3.x](https://docs.datastax.com/en/developer/driver-matrix/doc/javaDrivers.html) +* https://docs.datastax.com/en/developer/driver-matrix/doc/javaDrivers.html[DataStax Java Driver for Apache Cassandra 3.x] * Apache Cassandra 1.x, 2.x or 3.x -### Maven configuration +=== Maven configuration Add the Maven dependency: -```xml +[source,xml] +---- org.springframework.data spring-data-cassandra ${version}.RELEASE -``` +---- If you would rather like the latest snapshots of the upcoming major version, use our Maven snapshot repository and declare the appropriate dependency version. -```xml +[source,xml] +---- org.springframework.data spring-data-cassandra @@ -53,38 +57,39 @@ If you would rather like the latest snapshots of the upcoming major version, use Spring Snapshot Repository https://repo.spring.io/libs-snapshot -``` +---- -### CassandraTemplate +=== CassandraTemplate `CassandraTemplate` is the central support class for Cassandra database operations. It provides: * Increased productivity by handling common Cassandra operations properly. Includes integrated object mapping between CQL Tables and POJOs. -* Exception translation into Spring's [technology agnostic DAO exception hierarchy](https://docs.spring.io/spring/docs/current/spring-framework-reference/html/dao.html#dao-exceptions). +* Exception translation into Spring's https://docs.spring.io/spring/docs/current/spring-framework-reference/html/dao.html#dao-exceptions[technology agnostic DAO exception hierarchy]. * Feature rich object mapping integrated with Spring’s Conversion Service. * Annotation-based mapping metadata but extensible to support other metadata formats. +=== Spring Data repositories -### Spring Data repositories - -To simplify the creation of data repositories Spring Data for Apache Cassandra provides a generic repository programming model. It will automatically create a repository proxy for you that adds implementations of finder methods you specify on an interface. +To simplify the creation of data repositories Spring Data for Apache Cassandra provides a generic repository programming model. It will automatically create a repository proxy for you that adds implementations of finder methods you specify on an interface. For example, given a `Person` class with first and last name properties, a `PersonRepository` interface that can query for `Person` by last name and when the first name matches a like expression is shown below: -```java +[source,java] +---- public interface PersonRepository extends CrudRepository { List findByLastname(String lastname); List findByFirstnameLike(String firstname); } -``` +---- The queries issued on execution will be derived from the method name. Extending `CrudRepository` causes CRUD methods being pulled into the interface so that you can easily save and find single entities and collections of them. You can have Spring automatically create a proxy for the interface by using the following JavaConfig: -```java +[source,java] +---- @Configuration @EnableCassandraRepositories class ApplicationConfig extends AbstractCassandraConfiguration { @@ -99,11 +104,12 @@ class ApplicationConfig extends AbstractCassandraConfiguration { return "springdata"; } } -``` +---- This sets up a connection to a local Apache Cassandra instance and enables the detection of Spring Data repositories (through `@EnableCassandraRepositories`). The same configuration would look like this in XML: -```xml +[source,xml] +---- @@ -111,11 +117,12 @@ This sets up a connection to a local Apache Cassandra instance and enables the d -``` +---- This will find the repository interface and register a proxy object in the container. You can use it as shown below: -```java +[source,java] +---- @Service public class MyService { @@ -139,41 +146,41 @@ public class MyService { List firstNameResults = repository.findByFirstnameLike("Oli*"); } } -``` +---- -## What's included +== What's included Spring Data for Apache Cassandra consists of two modules: - + * Spring CQL * Spring Data for Apache Cassandra You can choose among several approaches to form the basis for your Cassandra database access. Spring’s support for Apache Cassandra comes in different flavors. Once you start using one of these approaches, you can still mix and match to include a feature from a different approach. -### Spring CQL +=== Spring CQL Spring CQL takes care of all the low-level details that can make Cassandra and CQL such a tedious API to develop with. `CqlTemplate` is the classic Spring CQL approach and the most popular. This "lowest level" approach and all others use a `CqlTemplate` under the covers including schema generation support. -### Spring Data Cassandra +=== Spring Data Cassandra Spring Data for Apache Cassandra adds object mapping, schema generation and repository support to the feature set. `CassandraTemplate` wraps a `CqlTemplate` to provide result to object mapping and the use of `SELECT`, `INSERT`, `UPDATE` and `DELETE` methods instead of writing CQL statements. This approach provides better documentation and ease of use. Schema generation support supports fast bootstrapping by using mapped objects to create tables and user types. -## Contributing to Spring Data +== Contributing to Spring Data Here are some ways for you to get involved in the community: -* Get involved with the Spring community on Stackoverflow and help out on the [spring-data-cassandra](https://stackoverflow.com/questions/tagged/spring-data-cassandra) tag by responding to questions and joining the debate. -* Create [JIRA](https://jira.spring.io/browse/DATACASS) tickets for bugs and new features and comment and vote on the ones that you are interested in. -* Github is for social coding: if you want to write code, we encourage contributions through pull requests from [forks of this repository](https://help.github.com/forking/). If you want to contribute code this way, please reference a JIRA ticket as well covering the specific issue you are addressing. -* Watch for upcoming articles on Spring by [subscribing](https://spring.io/blog) to spring.io. +* Get involved with the Spring community on Stackoverflow and help out on the https://stackoverflow.com/questions/tagged/spring-data-cassandra[spring-data-cassandra] tag by responding to questions and joining the debate. +* Create https://jira.spring.io/browse/DATACASS[JIRA] tickets for bugs and new features and comment and vote on the ones that you are interested in. +* Github is for social coding: if you want to write code, we encourage contributions through pull requests from https://help.github.com/forking/[forks of this repository]. If you want to contribute code this way, please reference a JIRA ticket as well covering the specific issue you are addressing. +* Watch for upcoming articles on Spring by https://spring.io/blog[subscribing] to spring.io. -Before we accept a non-trivial patch or pull request we will need you to [sign the Contributor License Agreement](https://cla.pivotal.io/sign/spring). Signing the contributor’s agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do. If you forget to do so, you'll be reminded when you submit a pull request. Active contributors might be asked to join the core team, and given the ability to merge pull requests. +Before we accept a non-trivial patch or pull request we will need you to https://cla.pivotal.io/sign/spring[sign the Contributor License Agreement]. Signing the contributor’s agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do. If you forget to do so, you'll be reminded when you submit a pull request. Active contributors might be asked to join the core team, and given the ability to merge pull requests. -## Initial Contributors +== Initial Contributors Spring Data for Apache Cassandra was initially created and supported by the following companies and individuals: @@ -181,5 +188,45 @@ companies and individuals: * David Webb * Matthew Adams * John McPeek -* [Prowave Consulting](http://www.prowaveconsulting.com) - David Webb -* [SciSpike](http://www.scispike.com) - Matthew Adams +* http://www.prowaveconsulting.com[Prowave Consulting] - David Webb +* http://www.scispike.com[SciSpike] - Matthew Adams + +== Running CI tasks locally + +Since this pipeline is purely Docker-based, it's easy to: + +* Debug what went wrong on your local machine. +* Test out a a tweak to your `test.sh` script before sending it out. +* Experiment against a new image before submitting your pull request. + +All of these use cases are great reasons to essentially run what the CI server does on your local machine. + +IMPORTANT: To do this you must have Docker installed on your machine. + +1. `docker run -it --mount type=bind,source="$(pwd)",target=/spring-data-cassandra-github adoptopenjdk/openjdk8:latest /bin/bash` ++ +This will launch the Docker image and mount your source code at `spring-data-cassandra-github`. ++ +2. `cd spring-data-cassandra-github` ++ +Next, run your tests from inside the container: ++ +3. `./mvnw clean dependency:list test -Dsort` (or whatever profile you need to test out) + +Since the container is binding to your source, you can make edits from your IDE and continue to run build jobs. + +If you need to test the `build.sh` script, do this: + +1. `docker run -it --mount type=bind,source="$(pwd)",target=/spring-data-cassandra-github adoptopenjdk/openjdk8:latest /bin/bash` ++ +This will launch the Docker image and mount your source code at `spring-data-cassandra-github`. ++ +2. `cd spring-data-cassandra-github` ++ +Next, try to package everything up from inside the container: ++ +3. `./mvnw -Pci,snapshot -Dmaven.test.skip=true clean deploy` + +IMPORTANT: This will attempt to deploy to artifactory, but without credentials, it will fail, leaving you simply with a built artifact. + +NOTE: Docker containers can eat up disk space fast! From time to time, run `docker system prune` to clean out old images. diff --git a/ci/README.adoc b/ci/README.adoc deleted file mode 100644 index 9cd3f3b7c..000000000 --- a/ci/README.adoc +++ /dev/null @@ -1,39 +0,0 @@ -== Running CI tasks locally - -Since Concourse is built on top of Docker, it's easy to: - -* Debug what went wrong on your local machine. -* Test out a a tweak to your `test.sh` script before sending it out. -* Experiment against a new image before submitting your pull request. - -All of these use cases are great reasons to essentially run what Concourse does on your local machine. - -IMPORTANT: To do this you must have Docker installed on your machine. - -1. `docker run -it --mount type=bind,source="$(pwd)",target=/spring-data-cassandra-github openjdk:8-jdk /bin/bash` -+ -This will launch the Docker image and mount your source code at `spring-data-cassandra-github`. -+ -Next, run the `test.sh` script from inside the container: -+ -2. `PROFILE=none spring-data-cassandra-github/ci/test.sh` - -Since the container is binding to your source, you can make edits from your IDE and continue to run build jobs. - -If you need to test the `build.sh` script, then do this: - -1. `mkdir /tmp/spring-data-cassandra-artifactory` -2. `docker run -it --mount type=bind,source="$(pwd)",target=/spring-data-cassandra-github --mount type=bind,source="/tmp/spring-data-cassandra-artifactory",target=/spring-data-cassandra-artifactory openjdk:8-jdk /bin/bash` -+ -This will launch the Docker image and mount your source code at `spring-data-cassandra-github` and the temporary -artifactory output directory at `spring-data-cassandra-artifactory`. -+ -Next, run the `build.sh` script from inside the container: -+ -3. `spring-data-cassandra-github/ci/build.sh` - -IMPORTANT: `build.sh` doesn't actually push to Artifactory so don't worry about accidentally deploying anything. -It just deploys to a local folder. That way, the `artifactory-resource` later in the pipeline can pick up these artifacts -and deliver them to artifactory. - -NOTE: Docker containers can eat up disk space fast! From time to time, run `docker system prune` to clean out old images. \ No newline at end of file diff --git a/ci/build.sh b/ci/build.sh deleted file mode 100755 index 61c78f2b6..000000000 --- a/ci/build.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -set -euo pipefail - -[[ -d $PWD/maven && ! -d $HOME/.m2 ]] && ln -s $PWD/maven $HOME/.m2 - -spring_data_cassandra_artifactory=$(pwd)/spring-data-cassandra-artifactory - -rm -rf $HOME/.m2/repository/org/springframework/data 2> /dev/null || : - -cd spring-data-cassandra-github - -./mvnw deploy \ - -Dmaven.test.skip=true \ - -DaltDeploymentRepository=distribution::default::file://${spring_data_cassandra_artifactory} diff --git a/ci/build.yml b/ci/build.yml deleted file mode 100644 index 5e945b1a6..000000000 --- a/ci/build.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -platform: linux - -image_resource: - type: docker-image - source: - repository: openjdk - tag: 8-jdk - -inputs: -- name: spring-data-cassandra-github - -outputs: -- name: spring-data-cassandra-artifactory - -caches: -- path: maven - -run: - path: spring-data-cassandra-github/ci/build.sh diff --git a/ci/test.sh b/ci/test.sh deleted file mode 100755 index 744d2ed45..000000000 --- a/ci/test.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -set -euo pipefail - -[[ -d $PWD/maven && ! -d $HOME/.m2 ]] && ln -s $PWD/maven $HOME/.m2 - -rm -rf $HOME/.m2/repository/org/springframework/data 2> /dev/null || : - -cd spring-data-cassandra-github - -./mvnw clean dependency:list test -P${PROFILE} -Dsort diff --git a/ci/test.yml b/ci/test.yml deleted file mode 100644 index 4bebfb216..000000000 --- a/ci/test.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -platform: linux - -image_resource: - type: docker-image - source: - repository: openjdk - tag: 8-jdk - -inputs: -- name: spring-data-cassandra-github - -outputs: -- name: spring-data-cassandra-artifactory - -caches: -- path: maven - -run: - path: spring-data-cassandra-github/ci/test.sh diff --git a/pom.xml b/pom.xml index 5f708cdaf..3ccec778b 100644 --- a/pom.xml +++ b/pom.xml @@ -291,6 +291,46 @@ + + snapshot + + + + + org.jfrog.buildinfo + artifactory-maven-plugin + 2.6.1 + false + + + build-info + + publish + + + + {{BUILD_URL}} + + + spring-data-cassandra + spring-data-cassandra + false + *:*:*:*@zip + + + https://repo.spring.io + {{USERNAME}} + {{PASSWORD}} + libs-snapshot-local + libs-snapshot-local + + + + + + + + release