DATACMNS-1536 - Inline all CI commands.

Jenkinsfile

@@ -20,7 +20,7 @@ pipeline {
                         }
                     }
                     steps {
-                        sh "PROFILE=none ci/test.sh"
+                        sh "./mvnw clean dependency:list test -Dsort -B"
                     }
                 }
             }
@@ -41,7 +41,7 @@ pipeline {
             }
 
             steps {
-                sh "USERNAME=${ARTIFACTORY_USR} PASSWORD=${ARTIFACTORY_PSW} DOC_USERNAME=${DOC_USR} DOC_PASSWORD=${DOC_PSW} PROFILE=ci,snapshot ci/build.sh"
+                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') {
@@ -61,7 +61,7 @@ pipeline {
             }
 
             steps {
-                sh "USERNAME=${ARTIFACTORY_USR} PASSWORD=${ARTIFACTORY_PSW} DOC_USERNAME=${DOC_USR} DOC_PASSWORD=${DOC_PSW} PROFILE=ci,snapshot ci/build.sh"
+                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"
             }
         }
     }

ci/README.adoc

@@ -1,39 +0,0 @@
-== 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-commons-github adoptopenjdk/openjdk8:latest /bin/bash`
-+
-This will launch the Docker image and mount your source code at `spring-data-commons-github`.
-+
-2. `cd spring-data-commons-github`
-+
-Next, run the `test.sh` script from inside the container:
-+
-3. `PROFILE=none ci/test.sh` (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-commons-github adoptopenjdk/openjdk8:latest /bin/bash`
-+
-This will launch the Docker image and mount your source code at `spring-data-commons-github`.
-+
-2. `cd spring-data-commons-github`
-+
-Next, run the `build.sh` script from inside the container:
-+
-3. `ci/build.sh`
-
-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.

ci/build.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-./mvnw -P${PROFILE} -Dmaven.test.skip=true clean deploy -B

ci/test.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-./mvnw -P${PROFILE} clean dependency:list test -Dsort -B

readme.adoc

@@ -0,0 +1,88 @@
+= Spring Data Commons
+
+https://projects.spring.io/spring-data/[Spring Data Commons] is part of the umbrella Spring Data project that provides shared infrastructure across the Spring Data projects. It contains technology neutral repository interfaces as well as a metadata model for persisting Java classes.
+
+image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-commons%2Fmaster&subject=Moore%20(master)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-commons/]
+image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-commons%2F2.1.x&subject=Lovelace%20(2.1.x)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-commons/]
+image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-commons%2F1.13.x&subject=Ingalls%20(1.13.x)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-commons/]
+
+== Features
+
+* Powerful Repository and custom object-mapping abstractions
+* Support for cross-store persistence
+* Dynamic query generation from query method names
+* Implementation domain base classes providing basic properties
+* Support for transparent auditing (created, last changed)
+* Possibility to integrate custom repository code
+* Easy Spring integration with custom namespace
+
+== Building the project
+
+=== Prerequisites
+
+* Maven 3
+* Java 8 (the project produces Java 6 compatible bytecode but partially integrates with Java 8)
+[source]
+----
+$ git clone https://github.com/spring-projects/spring-data-commons.git
+$ cd spring-data-commons
+$ mvn clean install
+----
+
+== Getting Help
+
+This README as well as the https://docs.spring.io/spring-data/data-commons/docs/current/reference/html/[reference documentation] are the best places to start learning about Spring Data Commons.
+
+The main project https://projects.spring.io/spring-data/[website] contains links to basic project information such as source code, JavaDocs, Issue tracking, etc.
+
+For more detailed questions, please refer to https://stackoverflow.com/questions/tagged/spring-data[spring-data on stackoverflow]. If you are new to Spring as well as to Spring Data, look for information about https://spring.io/projects[Spring projects].
+
+== Contributing to Spring Data Commons
+
+Here are some ways for you to get involved in the community:
+
+* Create https://jira.spring.io/browse/DATACMNS[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.atom[subscribing] to springframework.org
+
+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.
+
+== 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-commons-github adoptopenjdk/openjdk8:latest /bin/bash`
++
+This will launch the Docker image and mount your source code at `spring-data-commons-github`.
++
+2. `cd spring-data-commons-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-commons-github adoptopenjdk/openjdk8:latest /bin/bash`
++
+This will launch the Docker image and mount your source code at `spring-data-commons-github`.
++
+2. `cd spring-data-commons-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.

readme.md

@@ -1,48 +0,0 @@
-# Spring Data Commons
-
-[Spring Data Commons](https://projects.spring.io/spring-data/) is part of the umbrella Spring Data project that provides shared infrastructure across the Spring Data projects. It contains technology neutral repository interfaces as well as a metadata model for persisting Java classes.
-
-[![Build Status](https://jenkins.spring.io/buildStatus/icon?job=spring-data-commons%2Fmaster&subject=Moore%20(master))](https://jenkins.spring.io/view/SpringData/job/spring-data-commons/)
-[![Build Status](https://jenkins.spring.io/buildStatus/icon?job=spring-data-commons%2F2.1.x&subject=Lovelace%20(2.1.x))](https://jenkins.spring.io/view/SpringData/job/spring-data-commons/)
-[![Build Status](https://jenkins.spring.io/buildStatus/icon?job=spring-data-commons%2F1.13.x&subject=Ingalls%20(1.13.x))](https://jenkins.spring.io/view/SpringData/job/spring-data-commons/)
-
-## Features
-
-* Powerful Repository and custom object-mapping abstractions
-* Support for cross-store persistence
-* Dynamic query generation from query method names
-* Implementation domain base classes providing basic properties
-* Support for transparent auditing (created, last changed)
-* Possibility to integrate custom repository code
-* Easy Spring integration with custom namespace
-
-## Building the project
-
-### Prerequisites
-
-- Maven 3
-- Java 8 (the project produces Java 6 compatible bytecode but partially integrates with Java 8)
-
-```
-$ git clone https://github.com/spring-projects/spring-data-commons.git
-$ cd spring-data-commons
-$ mvn clean install
-```
-
-## Getting Help
-
-This README as well as the [reference documentation](https://docs.spring.io/spring-data/data-commons/docs/current/reference/html/) are the best places to start learning about Spring Data Commons.
-
-The main project [website](https://projects.spring.io/spring-data/) contains links to basic project information such as source code, JavaDocs, Issue tracking, etc.
-
-For more detailed questions, please refer to [spring-data on stackoverflow](https://stackoverflow.com/questions/tagged/spring-data). If you are new to Spring as well as to Spring Data, look for information about [Spring projects](https://spring.io/projects). 
-
-## Contributing to Spring Data Commons
-
-Here are some ways for you to get involved in the community:
-
-* Create [JIRA](https://jira.spring.io/browse/DATACMNS) 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.atom) to springframework.org
-
-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.