diff --git a/README.adoc b/README.adoc index eb8ea3ab..97f3eb6e 100644 --- a/README.adoc +++ b/README.adoc @@ -9,44 +9,33 @@ Edit the files in the src/main/asciidoc/ directory instead. :repo: spring-cloud-release-tools :branch: master -image::https://circleci.com/gh/{org}/{repo}/tree/{branch}.svg?style=svg["CircleCI", link="https://circleci.com/gh/{org}/{repo}/tree/{branch}"] -image::https://codecov.io/gh/{org}/{repo}/branch/{branch}/graph/badge.svg["codecov", link="https://codecov.io/gh/{org}/{repo}"] - -:github-tag: master -:org: spring-cloud -:repo: spring-cloud-release-tools -:github-repo: {org}/{repo} -:github-raw: https://raw.github.com/{github-repo}/{github-tag} -:github-code: https://github.com/{github-repo}/tree/{github-tag} -:toc: left -:toclevels: 8 -:nofooter: +image::https://circleci.com/gh/{org}/{repo}/tree/{branch}.svg?style=svg["CircleCI",link="https://circleci.com/gh/{org}/{repo}/tree/{branch}"] +image::https://codecov.io/gh/{org}/{repo}/branch/{branch}/graph/badge.svg["codecov",link="https://codecov.io/gh/{org}/{repo}"] == Spring Cloud Release Tools -Spring Cloud projects reuse the same pattern of building and deploying the applications. That's -why this tool makes it easy to automate the release / dependency update process of our applications. +Spring Cloud projects reuse the same pattern of building and deploying the applications. +That's why this tool makes it easy to automate the release / dependency update process of our applications. === What does it do? ==== Single project -For a single project +For a single project, by default if you opt in to all tasks -- Clones the Spring Cloud Release project and picks all versions (Boot + Cloud projects) +- Clones the BOM project and picks all versions - Modifies the project versions with values from a BOM (e.g. for Spring Cloud it's Spring Cloud Release) - * throws an exception when we bump versions to release and there's a SNAPSHOT version referenced in the POM +* throws an exception when we bump versions to release and there's a SNAPSHOT version referenced in the POM - Performs the build and checks if the `docs` modules have properly created the documentation - * throws an exception when in the `docs` module there's an unresolved tag in any HTML file +* throws an exception when in the `docs` module there's an unresolved tag in any HTML file - Commits changed poms (ONLY FOR NON-SNAPSHOT VERSIONS) - Creates a tag for the release / milestone (ONLY FOR NON-SNAPSHOT VERSIONS) - Runs the deployment of the artifacts -- Publishes the docs (to `spring-cloud-static` for non-snapshots, to `gh-pages` for snapshots) +- Publishes the docs (for Spring Cloud to `spring-cloud-static` for non-snapshots, to `gh-pages` for snapshots) - Reverts back to snapshots, bumps the version by a patch (`1.0.1.RELEASE` -> `1.0.2.BUILD-SNAPSHOT`) (ONLY FOR RELEASE VERSIONS) - Closes the milestone on Github (e.g. `v1.0.1.RELEASE`) (ONLY FOR NON-SNAPSHOT VERSIONS) -IMPORTANT: Starting with version that does Sagan integration, you MUST pass the OAuth token, -otherwise the application will fail to start +IMPORTANT: Starting with version that does Sagan integration, you MUST pass the OAuth token, otherwise the application will fail to start After project release @@ -57,11 +46,13 @@ After project release - Updates project information in Sagan (https://spring.io) (ONLY FOR SNAPSHOT / RELEASE VERSIONS) - For `GA`/ `SR` release will create an issue in Spring Guides under https://github.com/spring-guides/getting-started-guides/issues/ - For `GA`/ `SR` release will create an issue in start.spring.io under https://github.com/spring-io/start.spring.io/issues/ -- For `GA`/ `SR` release will update the links under https://github.com/spring-cloud/spring-cloud-static/tree/gh-pages/current +- For `GA`/ `SR` release will update the documentation links (for Spring Cloud https://github.com/spring-cloud/spring-cloud-static/tree/gh-pages/current) - Will update the release train project page (for Spring Cloud it will be `https://github.com/spring-projects/spring-cloud`) ==== Meta-release +All the tasks are opt in, so if you do opt in for everything you'll get: + - Uses the fixed versions to clone and check out each project (e.g. `spring-cloud-sleuth: 2.1.0.RELEASE`) - From the version analyzes the branch and checks it out. E.g. ** for `spring-cloud-release`'s `Finchley.RELEASE` version will resolve either `Finchley` branch or will fallback to `master` if there's no `Finchley` branch. @@ -72,13 +63,141 @@ After project release - Will clone provided test samples and will update all versions to the latest ones - Will clone the release train wiki and update it with the latest release versions (for Spring Cloud it will be `https://github.com/spring-projects/spring-cloud.wiki.git`) -IMPORTANT: For the meta-releaser to work we assume that the path to the -custom configuration file for each project is always `config/releaser.yml`. +IMPORTANT: For the meta-releaser to work we assume that the path to the custom configuration file for each project is always `config/releaser.yml`. + +NOTE: If you want to run some projects in parallel you have to set the `releaser.meta-release.release-groups` property to state which projects should be released in parallel. Example: + +```properties +releaser.meta-release.release-groups[0]=projectA,projectB,projectC +``` + +If in the list of projects you have `projectA,projectB,projectC,projectD,projectE`, then `projectA,projectB,projectC` will be released in parallel and then `projectD` and `projectE` sequentially. + +=== How can I extend it? + +The project consists of the following main modules + +* `releaser-core` - with the core logic for doing releases +* `relaser-spring` - with the Spring setup of tasks and a flow execution +* `projects` +** where each project has their configuration properties and additional tasks + +You can create your own project's module and + +* if you want to completely rewrite the flow of the release, just set `releaser.flow.default-enabled` to `false` and create the whole flow from scratch +* if you want to modify the current flow, you can add new tasks by just creating a bean of a given type that extends the `ReleaserTask` and set its order accordingly. + +Example of creating a new `ReleaseReleaserTask` called `BuildCustomStuffTask`: + +```java +package releaser.my_project; + +//... + +import releaser.internal.Releaser; +import releaser.internal.spring.Arguments; +import releaser.internal.spring.ExecutionResult; +import releaser.internal.tasks.ReleaseReleaserTask; + +@Component +public class BuildCustomStuffTask implements ReleaseReleaserTask { + + /** + * Order of this task. The higher value, the lower order. + */ + public static final int ORDER = 45; + + @Override + public String name() { + return "build_custom_stuff"; + } + + @Override + public String shortName() { + return "bcf"; + } + + @Override + public String header() { + return "BUILDING CUSTOM STUFF"; + } + + @Override + public String description() { + return "Builds custom stuff"; + } + + @Override + public ExecutionResult runTask(Arguments args) { + // do some custom stuff basing on the arguments + return ExecutionResult.success(); + } + + @Override + public int getOrder() { + return BuildCustomStuffTask.ORDER; + } + +} +``` + +Each release or post release task can implement one of the following interfaces + +* `ReleaserTask` - marker interface for all release tasks +* `ReleaseReleaserTask` - if a task is part of the main release process. That means that if it breaks, the whole release process should stop at once. +* `PostReleaseReleaserTask` - marker interface for a post release task. If a post release task fails - the build continues but will be unstable. +* `SingleProjectReleaserTask` - a release task for a single project. +* `ProjectPostReleaseReleaserTask` - a post release task for a single project. +* `DryRunReleaseReleaserTask` - a release task that should be executed during dry run mode. +* `TrainPostReleaseReleaserTask` - a post release task that should be executed after the whole release train. +* `CompositeReleaserTask` - a task that delegates work to other tasks. + +In addition, your project can provide the following beans: + +* `CustomBomParser` - if you need to perform some additional BOM parsing. E.g. Spring Cloud adds `spring-boot` and `spring-cloud-build` versions when parsing the BOM project. +* `CustomProjectDocumentationUpdater` - if you need to perform some custom logic when updating the project's documentation. +* `CustomGithubIssues` - if you need to perform additional logic when dealing with Github issues. + +To run the project you should create your main class preferably under the `releaser` package and extend the `ReleaserCommandLineRunner` class. + +```java +package releaser; + +import releaser.internal.options.Parser; +import releaser.internal.spring.ExecutionResultHandler; +import releaser.internal.spring.SpringReleaser; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.WebApplicationType; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ReleaserApplication extends ReleaserCommandLineRunner { + + public ReleaserApplication(SpringReleaser releaser, + ExecutionResultHandler executionResultHandler, Parser parser) { + super(releaser, executionResultHandler, parser); + } + + public static void main(String[] args) { + SpringApplication application = new SpringApplication(ReleaserApplication.class); + application.setWebApplicationType(WebApplicationType.NONE); + application.run(args); + } + +} +``` + +You can also extend the way the projects and tasks are parsed, flows are executed and the result is analyzed together with the printed report. To do that you should implement the following interfaces as beans: + +* `SpringReleaser` - performs the release, given the provided options +* `FlowRunner` - knows how to execute a release and post release flow +* `ExecutionResultHandler` - handles the result of the release === What should I do first? -Members of the Spring Cloud Team typically use this tool as follows. They first -clone the releaser locally and build the jar manually +Members of the Spring Cloud Team typically use this tool as follows. +They first clone the releaser locally and build the jar manually [source,bash] ---- @@ -87,8 +206,8 @@ $ cd spring-cloud-release-tools $ ./mvnw clean install ---- -IMPORTANT: You must set the value of the OAuth token. You can do it either via -the command line `--releaser.git.oauth-token=...` or put it as an env variable in `.bashrc` +IMPORTANT: You must set the value of the OAuth token. +You can do it either via the command line `--releaser.git.oauth-token=...` or put it as an env variable in `.bashrc` or `.zshrc` e.g. `export RELEASER_GIT_OAUTH_TOKEN=...` === How to run it (interactive mode) @@ -100,13 +219,13 @@ Go to your project (e.g. Spring Cloud Sleuth) $ git clone git@github.com:spring-cloud/spring-cloud-sleuth.git $ cd spring-cloud-sleuth $ # example of running the releaser agains Dalston.SR1 tag with 1.0.0.BUILD-SNAPSHOT version of the releaser -$ java -jar ~/repo/spring-cloud-release-tools/spring-cloud-release-tools-spring/target/spring-cloud-release-tools-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser +$ java -jar ~/repo/spring-cloud-release-tools/projects/spring-cloud/target/spring-cloud-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser ---- -The application will start running from your working directory. Running this code -follows the convention that you have the OAuth token environment variable set. It also assumes -that you might have some custom configuration in `config/releaser.yml` file. This setting is optional - if -you don't have that file, nothing will happen. +The application will start running from your working directory. +Running this code follows the convention that you have the OAuth token environment variable set. +It also assumes that you might have some custom configuration in `config/releaser.yml` file. +This setting is optional - if you don't have that file, nothing will happen. TIP: It is important that you clone the repository you are going to release using SSH in order for the `releaser` to be able to push tags and commit changes automatically. @@ -136,8 +255,10 @@ You can execute given tasks by providing a comma separated list of tasks - e.g. You can press 'q' to quit ---- -Just pick a number and continue! Pick either a full release or single steps. You can also pick -ranges or multiple steps. You can also provide the range only with the starting step +Just pick a number and continue! +Pick either a full release or single steps. +You can also pick ranges or multiple steps. +You can also provide the range only with the starting step - that you will execute all steps starting from the given one. TIP: Read before picking a number cause it might have changed between tool releases ;) @@ -152,7 +273,7 @@ flag. $ git clone git@github.com:spring-cloud/spring-cloud-sleuth.git $ cd spring-cloud-sleuth $ # example of running the releaser agains Dalston.SR1 tag with 1.0.0.BUILD-SNAPSHOT version of the releaser -$ java -jar ~/repo/spring-cloud-release-tools/spring-cloud-release-tools-spring/target/spring-cloud-release-tools-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser -h +$ java -jar ~/repo/spring-cloud-release-tools/releaser-spring/target/releaser-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser -h ---- You will see a help screen looking like more or less like this @@ -213,9 +334,11 @@ Range 'docs' -> 'push' java -jar releaser.jar -r o-p ---- -The Releaser can use two sets of options. The configuration options like `releaser.pom.branch` -and the task switches. For the tasks you can use either the full names or short switches. For example - providing range of tasks via switches `o-p` is equivalent to full name `docs-push`. +The Releaser can use two sets of options. +The configuration options like `releaser.pom.branch` +and the task switches. +For the tasks you can use either the full names or short switches. +For example providing range of tasks via switches `o-p` is equivalent to full name `docs-push`. A couple of examples: @@ -225,52 +348,49 @@ A couple of examples: $ git clone git@github.com:spring-cloud/spring-cloud-sleuth.git $ cd spring-cloud-sleuth $ # example of running the releaser agains Dalston.SR1 tag with 1.0.0.BUILD-SNAPSHOT version of the releaser -$ java -jar ~/repo/spring-cloud-release-tools/spring-cloud-release-tools-spring/target/spring-cloud-release-tools-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser --full-release +$ java -jar ~/repo/spring-cloud-release-tools/releaser-spring/target/releaser-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser --full-release ---- .Doing the full release in non interactive mode (automatic release) [source,bash] ---- -$ java -jar ~/repo/spring-cloud-release-tools/spring-cloud-release-tools-spring/target/spring-cloud-release-tools-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser --full-release --interactive=false +$ java -jar ~/repo/spring-cloud-release-tools/releaser-spring/target/releaser-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser --full-release --interactive=false ---- .Updating pom, closing milestone & createTemplates in interactive mode [source,bash] ---- -$ java -jar ~/repo/spring-cloud-release-tools/spring-cloud-release-tools-spring/target/spring-cloud-release-tools-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser -u -m -t +$ java -jar ~/repo/spring-cloud-release-tools/releaser-spring/target/releaser-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser -u -m -t ---- .Running all tasks starting from 'push' (automatic) [source,bash] ---- -$ java -jar ~/repo/spring-cloud-release-tools/spring-cloud-release-tools-spring/target/spring-cloud-release-tools-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser -a push -i=false +$ java -jar ~/repo/spring-cloud-release-tools/releaser-spring/target/releaser-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser -a push -i=false ---- .Running tasks from 'docs' (inclusive) to 'push' (inclusive) (automatic) [source,bash] ---- -$ java -jar ~/repo/spring-cloud-release-tools/spring-cloud-release-tools-spring/target/spring-cloud-release-tools-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser -r d-p -i=false +$ java -jar ~/repo/spring-cloud-release-tools/releaser-spring/target/releaser-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser -r d-p -i=false ---- .Running single task 'closeMilestone' (automatic) [source,bash] ---- -$ java -jar ~/repo/spring-cloud-release-tools/spring-cloud-release-tools-spring/target/spring-cloud-release-tools-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser --closeMilestone -i=false +$ java -jar ~/repo/spring-cloud-release-tools/releaser-spring/target/releaser-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser --closeMilestone -i=false ---- === How to run meta-release (automatic-mode) All you have to do is run the jar with the releaser and pass the -`-x=true` option to turn on meta-release and a list of fixed versions -in the `--"releaser.fixed-versions[project-name]=project-version" format +`-x=true` option to turn on meta-release and a list of fixed versions in the `--"releaser.fixed-versions[project-name]=project-version" format ``` -$ java -jar spring-cloud-release-tools-spring/target/spring-cloud-release-tools-spring-1.0.0.BUILD-SNAPSHOT.jar --spring.config.name=releaser -x=true --"releaser.fixed-versions[spring-cloud-sleuth]=2.0.1.BUILD-SNAPSHOT" +$ java -jar projects/spring-cloud/target/spring-cloud-1.0.0.BUILD-SNAPSHOT.jar --spring.config.name=releaser -x=true --"releaser.fixed-versions[spring-cloud-sleuth]=2.0.1.BUILD-SNAPSHOT" ``` -IMPORTANT: For the meta release the `startFrom` or `taskNames` take into consideration -the project names, not task names. E.g. you can start from `spring-cloud-netflix` project, -or build only tasks with names `spring-cloud-build,spring-cloud-sleuth`. +IMPORTANT: For the meta release the `startFrom` or `taskNames` take into consideration the project names, not task names. E.g. you can start from `spring-cloud-netflix` project, or build only tasks with names `spring-cloud-build,spring-cloud-sleuth`. === Project options @@ -287,24 +407,25 @@ Below you can find a table with all the releaser options. |releaser.bash.system-properties | | Additional system properties that should be passed to the build / deploy commands. If present in other commands "{{systemProps}}" will be substituted with this property. |releaser.bash.wait-time-in-minutes | 20 | Max wait time in minutes for the process to finish. |releaser.fixed-versions | | Project name to its version - overrides all versions retrieved from a release train repository like Spring Cloud Release. +|releaser.flow.default-enabled | true | Should the default flow of jobs be preserved. If set to {@code false} will not register any jobs as beans, and it will be up to you to set the whole configuration of jobs. |releaser.git.all-test-sample-urls | | Project to urls mapping. For each project will clone the test project and will update its versions. |releaser.git.clone-destination-dir | | Where should the release train repo get cloned to. If {@code null} defaults to a temporary directory. -|releaser.git.documentation-branch | gh-pages | Branch to check out for the documentation project. -|releaser.git.documentation-url | https://github.com/spring-cloud/spring-cloud-static | URL to the documentation Git repository. +|releaser.git.documentation-branch | | Branch to check out for the documentation project. +|releaser.git.documentation-url | | URL to the documentation Git repository. |releaser.git.fetch-versions-from-git | true | If {@code true} then should fill the map of versions from Git. If {@code false} then picks fixed versions. |releaser.git.number-of-checked-milestones | 50 | In order not to iterate endlessly over milestones we introduce a threshold of milestones that we will go through to find the matching milestone. |releaser.git.oauth-token | | GitHub OAuth token to be used to interact with GitHub repo. |releaser.git.password | | Optional Git password. If not passed keys will be used for authentication. -|releaser.git.release-train-bom-url | https://github.com/spring-cloud/spring-cloud-release | URL to a release train repository. -|releaser.git.release-train-docs-branch | master | Branch to check out for the release train docs. -|releaser.git.release-train-docs-url | https://github.com/spring-cloud-samples/scripts | URL to the release train documentation. -|releaser.git.release-train-wiki-page-prefix | Spring-Cloud | Page prefix for the release train wiki. E.g. for [Spring-Cloud-Finchley-Release-Notes] it would be [Spring-Cloud]. -|releaser.git.release-train-wiki-url | https://github.com/spring-projects/spring-cloud.wiki | URL to the release train wiki. +|releaser.git.release-train-bom-url | | URL to a release train repository. +|releaser.git.release-train-docs-branch | | Branch to check out for the release train docs. +|releaser.git.release-train-docs-url | | URL to the release train documentation. +|releaser.git.release-train-wiki-page-prefix | | Page prefix for the release train wiki. E.g. for [Spring-Cloud-Finchley-Release-Notes] it would be [Spring-Cloud]. +|releaser.git.release-train-wiki-url | | URL to the release train wiki. |releaser.git.run-updated-samples | false | If set to {@code false}, will not update the test samples. -|releaser.git.spring-project-branch | gh-pages | Branch to check out for the release train project. -|releaser.git.spring-project-url | https://github.com/spring-projects/spring-cloud | URL to the release train project page repository. -|releaser.git.test-samples-branch | master | Branch to check out for the test samples. -|releaser.git.test-samples-project-url | https://github.com/spring-cloud/spring-cloud-core-tests | URL to test samples. +|releaser.git.spring-project-branch | | Branch to check out for the release train project. +|releaser.git.spring-project-url | | URL to the release train project page repository. +|releaser.git.test-samples-branch | | Branch to check out for the test samples. +|releaser.git.test-samples-project-url | | URL to test samples. |releaser.git.update-all-test-samples | false | If set to {@code false}, will not clone and update the samples for all projects. |releaser.git.update-documentation-repo | false | If {@code false}, will not update the documentation repository. |releaser.git.update-github-milestones | false | If set to {@code false}, will not update Github milestones. @@ -317,10 +438,10 @@ Below you can find a table with all the releaser options. |releaser.gradle.build-command | ./gradlew clean build publishToMavenLocal --console=plain -PnextVersion={{nextVersion}} -PoldVersion={{oldVersion}} -PcurrentVersion={{version}} {{systemProps}} | Command to be executed to build the project If present "{{version}}" will be replaced by the provided version. "{{nextVersion}}" with the bumped snapshot version and "{{oldVersion}}" with the version before version updating. |releaser.gradle.deploy-command | ./gradlew publish --console=plain -PnextVersion={{nextVersion}} -PoldVersion={{oldVersion}} -PcurrentVersion={{version}} {{systemProps}} | Command to be executed to deploy a built project. |releaser.gradle.deploy-guides-command | ./gradlew clean build deployGuides --console=plain -PnextVersion={{nextVersion}} -PoldVersion={{oldVersion}} -PcurrentVersion={{version}} {{systemProps}} | Command to be executed to build and deploy guides project only. -|releaser.gradle.generate-release-train-docs-command | echo 'TODO' | Command to be executed to generate release train documentation. +|releaser.gradle.generate-release-train-docs-command | ./gradlew generateReleaseTrainDocs --console=plain -PnextVersion={{nextVersion}} -PoldVersion={{oldVersion}} -PcurrentVersion={{version}} {{systemProps}} | Command to be executed to generate release train documentation. |releaser.gradle.gradle-props-substitution | | A mapping that should be applied to {@code gradle.properties} in order to perform a substitution of properties. The mapping is from a property inside {@code gradle.properties} to the projects name. Example. In {@code gradle.properties} you have {@code verifierVersion=1.0.0} . You want this property to get updated with the value of {@code spring-cloud-contract} version. Then it's enough to do the mapping like this for this Releaser's property: {@code verifierVersion=spring-cloud-contract}. |releaser.gradle.ignored-gradle-regex | | List of regular expressions of ignored gradle props. Defaults to test projects and samples. -|releaser.gradle.publish-docs-commands | [echo 'TODO'] | Command to be executed to publish documentation. If present "{{version}}" will be replaced by the provided version. +|releaser.gradle.publish-docs-commands | [./gradlew publishDocs --console=plain -PnextVersion={{nextVersion}} -PoldVersion={{oldVersion}} -PcurrentVersion={{version}} {{systemProps}}] | Command to be executed to publish documentation. If present "{{version}}" will be replaced by the provided version. |releaser.gradle.system-properties | | Additional system properties that should be passed to the build / deploy commands. If present in other commands "{{systemProps}}" will be substituted with this property. |releaser.gradle.wait-time-in-minutes | 20 | Max wait time in minutes for the process to finish. |releaser.maven.build-command | ./mvnw clean install -B -Pdocs {{systemProps}} | Command to be executed to build the project. If present "{{version}}" will be replaced by the provided version. "{{nextVersion}}" with the bumped snapshot version and "{{oldVersion}}" with the version before version updating. @@ -331,57 +452,59 @@ Below you can find a table with all the releaser options. |releaser.maven.system-properties | | Additional system properties that should be passed to the build / deploy commands. If present in other commands "{{systemProps}}" will be substituted with this property. |releaser.maven.wait-time-in-minutes | 20 | Max wait time in minutes for the process to finish. |releaser.meta-release.enabled | false | Are we releasing the whole suite of apps or only one? -|releaser.meta-release.git-org-url | https://github.com/spring-cloud | The URL of the Git organization. We'll append each project's name to it. +|releaser.meta-release.git-org-url | | The URL of the Git organization. We'll append each project's name to it. |releaser.meta-release.projects-to-skip | | Names of projects to skip deployment for meta-release. +|releaser.meta-release.release-group-thread-count | 4 | Number of threads per release group. E.g. for thread count of 4 if there are 6 projects in a release group, 4 of them will be executed in parallel and 2 will wait for their turn. +|releaser.meta-release.release-group-timeout-in-minutes | 180 | Timeout in minutes during which we're waiting for a single composite task per a project to be executed. That means that if set to e.g. 180 then a release process for a single project should take at most 180 minutes. +|releaser.meta-release.release-groups | | If provided, allows to provide groups of projects that can be ran in parallel. E.g. {@code --releaser.meta-release.release-groups[0]=projectA,projectB,projectC} {@code --releaser.meta-release.release-groups[1]=projectD,projectE} {@code --releaser.meta-release.release-groups[2]=projectF,projectG} The order is still provided by the list of versions passed to the releaser. Basing on that order, and this value we are able to build a flow with projects. |releaser.meta-release.release-train-dependency-names | | All the names of dependencies that should be updated with the release train project version. -|releaser.meta-release.release-train-project-name | spring-cloud-release | Name of the release train project. -|releaser.pom.bom-version-pattern | ^(spring-cloud-.*)\.version$ | The pattern to match a version property in a BOM. +|releaser.meta-release.release-train-project-name | | Name of the release train project. +|releaser.pom.bom-version-pattern | | The pattern to match a version property in a BOM. Remember to catch the dependency name in a group. E.g. "^(spring-cloud-.*)\\.version$". |releaser.pom.branch | master | Which branch of release train BOM should be checked out. Defaults to {@code master}. -|releaser.pom.ignored-pom-regex | | List of regular expressions of ignored poms. Defaults to test projects and samples. -|releaser.pom.pom-with-boot-starter-parent | spring-cloud-starter-parent/pom.xml | Subfolder of the pom that contains the {@code spring-boot-starer-parent} dependency. -|releaser.pom.this-train-bom | spring-cloud-dependencies/pom.xml | Subfolder of the pom that contains the versions for the release train. +|releaser.pom.ignored-pom-regex | ^.*\.git/.*$ | List of regular expressions of ignored poms. Defaults to test projects and samples. +|releaser.pom.pom-with-boot-starter-parent | | Subfolder of the pom that contains the {@code spring-boot-starer-parent} dependency. +|releaser.pom.this-train-bom | | Subfolder of the pom that contains the versions for the release train. |releaser.post-release-tasks-only | false | If set to {@code true} will run only post release tasks. |releaser.sagan.base-url | https://spring.io | URL to the Sagan API. |releaser.sagan.boot-section-file-name | sagan-boot.adoc | Name of the ascii doc file with boot part of this project's Sagan project page. Linked with {@link this#docsAdocsFile}. |releaser.sagan.docs-adocs-file | docs/src/main/asciidoc | Folder with asciidoctor files for docs. |releaser.sagan.index-section-file-name | sagan-index.adoc | Name of the ascii doc file with core part of this project's Sagan project page. Linked with {@link this#docsAdocsFile}. |releaser.sagan.update-sagan | false | If set to {@code false} will not update Sagan. -|releaser.template.template-folder | cloud | Folder in which blog, email etc. templates are stored. +|releaser.skip-post-release-tasks | false | If set to {@code true} will not run post release tasks. +|releaser.template.enabled | false | Should template generation be enabled. +|releaser.template.template-folder | | Folder in which blog, email etc. templates are stored. |releaser.versions.all-versions-file-url | https://raw.githubusercontent.com/spring-io/start.spring.io/master/start-site/src/main/resources/application.yml | Url to a file containing all the versions. Defaults to YAML from start.spring.io. -|releaser.versions.bom-name | spring-cloud | Name in the YAML from initilizr for BOM mappings. +|releaser.versions.bom-name | | Name in the YAML from initilizr for BOM mappings. |releaser.working-dir | | By default Releaser assumes running the program from the current working directory. If you want to change this behaviour - just change this value. |=== TIP: You can pass the options either via system properties or via application arguments. -Example for system properties: `java -Dreleaser.pom.branch=Camden.SR6 -jar target/spring-cloud-release-tools-spring-1.0.0.M1.jar` -Example for application arguments: `java -jar target/spring-cloud-release-tools-spring-1.0.0.M1.jar --releaser.pom.branch=Camden.SR6` +Example for system properties: `java -Dreleaser.pom.branch=Camden.SR6 -jar target/releaser-spring-1.0.0.M1.jar` +Example for application arguments: `java -jar target/releaser-spring-1.0.0.M1.jar --releaser.pom.branch=Camden.SR6` -IMPORTANT: For the GA release to be successful, it's important that if the `build` / `deploy` command - run a script (e.g. `scripts/foo.sh`) then inside `foo.sh` if you call a Maven build `./mvnw clean install` - then *remember to pass all arguments of the script there too*. E.g. `./mvnw clean install ${@}`. That's because - the releaser will pass any system properties to the `build` / `deploy` command, such as system properties - with keys and we need them to be passed inside the command executed by the releaser. +IMPORTANT: For the GA release to be successful, it's important that if the `build` / `deploy` command run a script (e.g. `scripts/foo.sh`) then inside `foo.sh` if you call a Maven build `./mvnw clean install` +then *remember to pass all arguments of the script there too*. +E.g. `./mvnw clean install ${@}`. +That's because the releaser will pass any system properties to the `build` / `deploy` command, such as system properties with keys and we need them to be passed inside the command executed by the releaser. === Examples ==== Keeping configuration in the project -If your project has some custom configuration (e.g. Spring Cloud Contract needs a script to be executed -to build the project and properly merge the docs) then you can put a file named e.g. `releaser.yml` under `config` +If your project has some custom configuration (e.g. Spring Cloud Contract needs a script to be executed to build the project and properly merge the docs) then you can put a file named e.g. `releaser.yml` under `config` folder and run your application like this: [source,bash] ---- -$ wget https://repo.spring.io/libs-milestone/org/springframework/cloud/internal/spring-cloud-release-tools-spring/1.0.0.M1/spring-cloud-release-tools-spring-1.0.0.M1.jar -O ../spring-cloud-release-tools-spring-1.0.0.M1.jar -$ java -jar target/spring-cloud-release-tools-spring-1.0.0.M1.jar --spring.config.name=releaser +$ wget https://repo.spring.io/libs-milestone/org/springframework/cloud/internal/releaser-spring/1.0.0.M1/releaser-spring-1.0.0.M1.jar -O ../releaser-spring-1.0.0.M1.jar +$ java -jar target/releaser-spring-1.0.0.M1.jar --spring.config.name=releaser ---- -TIP: Notice that we're downloading the jar to a parent folder, not to `target`. That's because `target` get cleaned -during the build process +TIP: Notice that we're downloading the jar to a parent folder, not to `target`. +That's because `target` get cleaned during the build process -IMPORTANT: For the meta-releaser to work we assume that the path to the -configuration file is always `config/releaser.yml`. +IMPORTANT: For the meta-releaser to work we assume that the path to the configuration file is always `config/releaser.yml`. ==== Specifying A Branch @@ -390,39 +513,47 @@ If you would like to use another branch you can specify it using the `releaser.p [source,bash] ---- -$ java -jar spring-cloud-release-tools-spring-1.0.0.M1.jar --releaser.pom.branch=Camden.SR6 +$ java -jar releaser-spring-1.0.0.M1.jar --releaser.pom.branch=Camden.SR6 ---- ==== Using Environment Variables In some cases it might be easier to specify environment variables instead of passing parameters to -`releaser`. For example, you might want to use environment variables if you are going to be -releasing multiple projects, this keeps you from having to specify the same parameters for -each release +`releaser`. +For example, you might want to use environment variables if you are going to be releasing multiple projects, this keeps you from having to specify the same parameters for each release [source,bash] ---- $ export RELEASER_POM_BRANCH=Dalston.RELEASE $ export RELEASER_GIT_OAUTH_TOKEN=... -$ wget https://repo.spring.io/libs-milestone/org/springframework/cloud/internal/spring-cloud-release-tools-spring/1.0.0.M1/spring-cloud-release-tools-spring-1.0.0.M1.jar -O spring-cloud-release-tools-spring-1.0.0.M1.jar -$ java -jar target/spring-cloud-release-tools-spring-1.0.0.M1.jar --releaser.working-dir=/path/to/project/root +$ wget https://repo.spring.io/libs-milestone/org/springframework/cloud/internal/releaser-spring/1.0.0.M1/releaser-spring-1.0.0.M1.jar -O releaser-spring-1.0.0.M1.jar +$ java -jar target/releaser-spring-1.0.0.M1.jar --releaser.working-dir=/path/to/project/root ---- === Releasing through Jenkins -NOTE: Whenever a release process is broken, Jenkins marks it with a red ball and breaks the build. Whenever a post-release action went wrong but the release is successful, Jenkins marks the build with a yellow ball and marks the build as unstable. +NOTE: Whenever a release process is broken, Jenkins marks it with a red ball and breaks the build. +Whenever a post-release action went wrong but the release is successful, Jenkins marks the build with a yellow ball and marks the build as unstable. ==== Releasing a Single Project -Let us assume that we are to release `spring-cloud-build` project. We need to do the following steps: +Let us assume that we are to release `spring-cloud-build` project. +We need to do the following steps: + +. Create a branch (for example, `springCloudBuildRelease`) in a project that contains a BOM (for example, https://github.com/spring-cloud/spring-cloud-release/[spring-cloud-release]). +The following example shows how to do so: -. Create a branch (for example, `springCloudBuildRelease`) in a project that contains a BOM (for example, https://github.com/spring-cloud/spring-cloud-release/[spring-cloud-release]). The following example shows how to do so: ```bash $ git clone git@github.com:spring-cloud/spring-cloud-release.git $ cd spring-cloud-release $ git checkout -b springCloudBuildRelease ``` -. Update *all* versions as if you were doing a release train. We need to update the project's versions, Boot version, and dependencies versions, too. Let us assume that we will eventually be doing a release train for the `Hoxton.M1` release, Spring Boot to the latest available one, and `spring-cloud-commons` to `1.2.3.BUILD-SNAPSHOT`. The following example shows how to do so: + +. Update *all* versions as if you were doing a release train. +We need to update the project's versions, Boot version, and dependencies versions, too. +Let us assume that we will eventually be doing a release train for the `Hoxton.M1` release, Spring Boot to the latest available one, and `spring-cloud-commons` to `1.2.3.BUILD-SNAPSHOT`. +The following example shows how to do so: + ```bash // setting the release train value $ ./mvnw versions:set -DnewVersion=Hoxton.M1 -DgenerateBackupPoms=false -DprocessAllModules=true @@ -436,27 +567,32 @@ $ git diff // commit and push the branch $ git add . && git commit -m "Updating project for Spring Cloud Build release" && git push origin springCloudBuildRelease ``` + IMPORTANT: If you're doing a e.g. `M1` release, remember to not have any snapshot versions in this branch. Since the project is prepared, go to Jenkins and select the https://jenkins.spring.io/view/Spring%20Cloud/view/Releaser/[Releaser view], which the following image shows: image::{github-raw}/docs/src/main/asciidoc/images/releasers.png[Releaser view] -. Pick the proper releaser project (for example, `spring-cloud-build-releaser`). The following image shows the settings for this example: +. Pick the proper releaser project (for example, `spring-cloud-build-releaser`). +The following image shows the settings for this example: image::{github-raw}/docs/src/main/asciidoc/images/scBuildReleaser.png[Spring Cloud Build Releaser - build with parameters] -. Next, click `Build with parameters`. The following image shows the UI for doing so: +. Next, click `Build with parameters`. +The following image shows the UI for doing so: image::{github-raw}/docs/src/main/asciidoc/images/runningScBuildReleaser.png[Updated `RELEASER_POM_BRANCH`] -Pick from which branch you would like the project (for example, `spring-cloud-build` - defaults to `master`) to be built and update the `RELEASER_POM_BRANCH` to point to the checked-out branch of Spring Cloud Release (for example, `springCloudBuildRelease`). You can pick whether you want to perform only post-release tasks or the whole release. +Pick from which branch you would like the project (for example, `spring-cloud-build` - defaults to `master`) to be built and update the `RELEASER_POM_BRANCH` to point to the checked-out branch of Spring Cloud Release (for example, `springCloudBuildRelease`). +You can pick whether you want to perform only post-release tasks or the whole release. . Finally, click `Build`. You are done! -As a post action, do not forget to remove the branch. The following example shows how to do so: +As a post action, do not forget to remove the branch. +The following example shows how to do so: ```bash // to synchronize any deleted branches (don't run this if you want leave any deleted branches that were deleted in the origin) @@ -467,19 +603,31 @@ $ git push origin --delete springCloudBuildRelease ==== Releasing a Release Train -We call a release train a `meta-release`. In order to perform one, you need to: +We call a release train a `meta-release`. +In order to perform one, you need to: + +. In your project (which must contain a BOM, such as `spring-cloud-release`) you have to have a branch, where you store properties with versions of your projects. +For example, the branch name can be https://github.com/spring-cloud/spring-cloud-release/tree/jenkins-releaser-config[jenkins-releaser-config]). +The folloiwng example shows how to do so: -. In your project (which must contain a BOM, such as `spring-cloud-release`) you have to have a branch, where you store properties with versions of your projects. For example, the branch name can be https://github.com/spring-cloud/spring-cloud-release/tree/jenkins-releaser-config[jenkins-releaser-config]). The folloiwng example shows how to do so: ```bash $ git clone git@github.com:spring-cloud/spring-cloud-release.git $ cd spring-cloud-release $ git checkout jenkins-releaser-config ``` -. Create a file that contains all properties for a given release train. The name of the release train should be lowercase, and dots should be converted to underscores. For example, for the `Greenwich.SR2` release train we need to have a file named `greenwich_sr2.properties`. The following example shows how to do so: + +. Create a file that contains all properties for a given release train. +The name of the release train should be lowercase, and dots should be converted to underscores. +For example, for the `Greenwich.SR2` release train we need to have a file named `greenwich_sr2.properties`. +The following example shows how to do so: + ```bash $ touch greenwich_sr2.properties ``` -. We need to update the file with all versions for the release train. The properties file contains an *ordered* list of `releaser.fixed-versions[project-name]=project-version` entries, as the following listing shows: + +. We need to update the file with all versions for the release train. +The properties file contains an *ordered* list of `releaser.fixed-versions[project-name]=project-version` entries, as the following listing shows: + ```bash $ echo "releaser.fixed-versions[spring-boot]=2.1.5.RELEASE releaser.fixed-versions[spring-cloud-build]=2.1.5.RELEASE @@ -518,7 +666,8 @@ image::{github-raw}/docs/src/main/asciidoc/images/springCloudMetaRelease.png[Spr image::{github-raw}/docs/src/main/asciidoc/images/runningSpringCloudMetaReleaser.png[Spring Cloud Meta Releaser view] -You have quite a few options to pick, but the most important one is to set the value of the `RELEASE_VERSION` to the given release train version (for example, `Greenwich.SR2`). Continue updating the rest of the fields if necessary and read the field descriptions and this documentation for more information. +You have quite a few options to pick, but the most important one is to set the value of the `RELEASE_VERSION` to the given release train version (for example, `Greenwich.SR2`). +Continue updating the rest of the fields if necessary and read the field descriptions and this documentation for more information. . Finally, click `Build`. @@ -648,10 +797,11 @@ The generated eclipse projects can be imported by selecting `import existing pro from the `file` menu. -IMPORTANT: There are 2 different versions of language level used in Spring Cloud Sleuth. Java 1.7 is used for main sources and -Java 1.8 is used for tests. When importing your project to an IDE please activate the `ide` Maven profile to turn on -Java 1.8 for both main and test sources. Of course remember that you MUST NOT use Java 1.8 features in the main sources. If you do -so your app will break during the Maven build. +IMPORTANT: There are 2 different versions of language level used in Spring Cloud Sleuth. +Java 1.7 is used for main sources and Java 1.8 is used for tests. +When importing your project to an IDE please activate the `ide` Maven profile to turn on Java 1.8 for both main and test sources. +Of course remember that you MUST NOT use Java 1.8 features in the main sources. +If you do so your app will break during the Maven build. == Contributing diff --git a/docs/pom.xml b/docs/pom.xml index 3a6918ba..b2edc116 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,10 +4,10 @@ 4.0.0 org.springframework.cloud.internal - spring-cloud-release-tools-parent + releaser-parent 1.0.0.BUILD-SNAPSHOT - spring-cloud-release-tools-docs + releaser-docs pom spring-cloud-release-tools @@ -23,12 +23,12 @@ ${project.groupId} - spring-cloud-release-tools-core + releaser-core ${project.version} ${project.groupId} - spring-cloud-release-tools-spring + releaser-spring ${project.version} diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index 7b6ae310..fbaba1f3 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -3,8 +3,8 @@ :repo: spring-cloud-release-tools :branch: master -image::https://circleci.com/gh/{org}/{repo}/tree/{branch}.svg?style=svg["CircleCI", link="https://circleci.com/gh/{org}/{repo}/tree/{branch}"] -image::https://codecov.io/gh/{org}/{repo}/branch/{branch}/graph/badge.svg["codecov", link="https://codecov.io/gh/{org}/{repo}"] +image::https://circleci.com/gh/{org}/{repo}/tree/{branch}.svg?style=svg["CircleCI",link="https://circleci.com/gh/{org}/{repo}/tree/{branch}"] +image::https://codecov.io/gh/{org}/{repo}/branch/{branch}/graph/badge.svg["codecov",link="https://codecov.io/gh/{org}/{repo}"] include::spring-cloud-release-tools.adoc[] @@ -12,10 +12,11 @@ include::spring-cloud-release-tools.adoc[] include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/building.adoc[] -IMPORTANT: There are 2 different versions of language level used in Spring Cloud Sleuth. Java 1.7 is used for main sources and -Java 1.8 is used for tests. When importing your project to an IDE please activate the `ide` Maven profile to turn on -Java 1.8 for both main and test sources. Of course remember that you MUST NOT use Java 1.8 features in the main sources. If you do -so your app will break during the Maven build. +IMPORTANT: There are 2 different versions of language level used in Spring Cloud Sleuth. +Java 1.7 is used for main sources and Java 1.8 is used for tests. +When importing your project to an IDE please activate the `ide` Maven profile to turn on Java 1.8 for both main and test sources. +Of course remember that you MUST NOT use Java 1.8 features in the main sources. +If you do so your app will break during the Maven build. == Contributing diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index 798e7cb8..e6859e9e 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -9,24 +9,25 @@ |releaser.bash.system-properties | | Additional system properties that should be passed to the build / deploy commands. If present in other commands "{{systemProps}}" will be substituted with this property. |releaser.bash.wait-time-in-minutes | 20 | Max wait time in minutes for the process to finish. |releaser.fixed-versions | | Project name to its version - overrides all versions retrieved from a release train repository like Spring Cloud Release. +|releaser.flow.default-enabled | true | Should the default flow of jobs be preserved. If set to {@code false} will not register any jobs as beans, and it will be up to you to set the whole configuration of jobs. |releaser.git.all-test-sample-urls | | Project to urls mapping. For each project will clone the test project and will update its versions. |releaser.git.clone-destination-dir | | Where should the release train repo get cloned to. If {@code null} defaults to a temporary directory. -|releaser.git.documentation-branch | gh-pages | Branch to check out for the documentation project. -|releaser.git.documentation-url | https://github.com/spring-cloud/spring-cloud-static | URL to the documentation Git repository. +|releaser.git.documentation-branch | | Branch to check out for the documentation project. +|releaser.git.documentation-url | | URL to the documentation Git repository. |releaser.git.fetch-versions-from-git | true | If {@code true} then should fill the map of versions from Git. If {@code false} then picks fixed versions. |releaser.git.number-of-checked-milestones | 50 | In order not to iterate endlessly over milestones we introduce a threshold of milestones that we will go through to find the matching milestone. |releaser.git.oauth-token | | GitHub OAuth token to be used to interact with GitHub repo. |releaser.git.password | | Optional Git password. If not passed keys will be used for authentication. -|releaser.git.release-train-bom-url | https://github.com/spring-cloud/spring-cloud-release | URL to a release train repository. -|releaser.git.release-train-docs-branch | master | Branch to check out for the release train docs. -|releaser.git.release-train-docs-url | https://github.com/spring-cloud-samples/scripts | URL to the release train documentation. -|releaser.git.release-train-wiki-page-prefix | Spring-Cloud | Page prefix for the release train wiki. E.g. for [Spring-Cloud-Finchley-Release-Notes] it would be [Spring-Cloud]. -|releaser.git.release-train-wiki-url | https://github.com/spring-projects/spring-cloud.wiki | URL to the release train wiki. +|releaser.git.release-train-bom-url | | URL to a release train repository. +|releaser.git.release-train-docs-branch | | Branch to check out for the release train docs. +|releaser.git.release-train-docs-url | | URL to the release train documentation. +|releaser.git.release-train-wiki-page-prefix | | Page prefix for the release train wiki. E.g. for [Spring-Cloud-Finchley-Release-Notes] it would be [Spring-Cloud]. +|releaser.git.release-train-wiki-url | | URL to the release train wiki. |releaser.git.run-updated-samples | false | If set to {@code false}, will not update the test samples. -|releaser.git.spring-project-branch | gh-pages | Branch to check out for the release train project. -|releaser.git.spring-project-url | https://github.com/spring-projects/spring-cloud | URL to the release train project page repository. -|releaser.git.test-samples-branch | master | Branch to check out for the test samples. -|releaser.git.test-samples-project-url | https://github.com/spring-cloud/spring-cloud-core-tests | URL to test samples. +|releaser.git.spring-project-branch | | Branch to check out for the release train project. +|releaser.git.spring-project-url | | URL to the release train project page repository. +|releaser.git.test-samples-branch | | Branch to check out for the test samples. +|releaser.git.test-samples-project-url | | URL to test samples. |releaser.git.update-all-test-samples | false | If set to {@code false}, will not clone and update the samples for all projects. |releaser.git.update-documentation-repo | false | If {@code false}, will not update the documentation repository. |releaser.git.update-github-milestones | false | If set to {@code false}, will not update Github milestones. @@ -39,10 +40,10 @@ |releaser.gradle.build-command | ./gradlew clean build publishToMavenLocal --console=plain -PnextVersion={{nextVersion}} -PoldVersion={{oldVersion}} -PcurrentVersion={{version}} {{systemProps}} | Command to be executed to build the project If present "{{version}}" will be replaced by the provided version. "{{nextVersion}}" with the bumped snapshot version and "{{oldVersion}}" with the version before version updating. |releaser.gradle.deploy-command | ./gradlew publish --console=plain -PnextVersion={{nextVersion}} -PoldVersion={{oldVersion}} -PcurrentVersion={{version}} {{systemProps}} | Command to be executed to deploy a built project. |releaser.gradle.deploy-guides-command | ./gradlew clean build deployGuides --console=plain -PnextVersion={{nextVersion}} -PoldVersion={{oldVersion}} -PcurrentVersion={{version}} {{systemProps}} | Command to be executed to build and deploy guides project only. -|releaser.gradle.generate-release-train-docs-command | echo 'TODO' | Command to be executed to generate release train documentation. +|releaser.gradle.generate-release-train-docs-command | ./gradlew generateReleaseTrainDocs --console=plain -PnextVersion={{nextVersion}} -PoldVersion={{oldVersion}} -PcurrentVersion={{version}} {{systemProps}} | Command to be executed to generate release train documentation. |releaser.gradle.gradle-props-substitution | | A mapping that should be applied to {@code gradle.properties} in order to perform a substitution of properties. The mapping is from a property inside {@code gradle.properties} to the projects name. Example. In {@code gradle.properties} you have {@code verifierVersion=1.0.0} . You want this property to get updated with the value of {@code spring-cloud-contract} version. Then it's enough to do the mapping like this for this Releaser's property: {@code verifierVersion=spring-cloud-contract}. |releaser.gradle.ignored-gradle-regex | | List of regular expressions of ignored gradle props. Defaults to test projects and samples. -|releaser.gradle.publish-docs-commands | [echo 'TODO'] | Command to be executed to publish documentation. If present "{{version}}" will be replaced by the provided version. +|releaser.gradle.publish-docs-commands | [./gradlew publishDocs --console=plain -PnextVersion={{nextVersion}} -PoldVersion={{oldVersion}} -PcurrentVersion={{version}} {{systemProps}}] | Command to be executed to publish documentation. If present "{{version}}" will be replaced by the provided version. |releaser.gradle.system-properties | | Additional system properties that should be passed to the build / deploy commands. If present in other commands "{{systemProps}}" will be substituted with this property. |releaser.gradle.wait-time-in-minutes | 20 | Max wait time in minutes for the process to finish. |releaser.maven.build-command | ./mvnw clean install -B -Pdocs {{systemProps}} | Command to be executed to build the project. If present "{{version}}" will be replaced by the provided version. "{{nextVersion}}" with the bumped snapshot version and "{{oldVersion}}" with the version before version updating. @@ -53,24 +54,29 @@ |releaser.maven.system-properties | | Additional system properties that should be passed to the build / deploy commands. If present in other commands "{{systemProps}}" will be substituted with this property. |releaser.maven.wait-time-in-minutes | 20 | Max wait time in minutes for the process to finish. |releaser.meta-release.enabled | false | Are we releasing the whole suite of apps or only one? -|releaser.meta-release.git-org-url | https://github.com/spring-cloud | The URL of the Git organization. We'll append each project's name to it. +|releaser.meta-release.git-org-url | | The URL of the Git organization. We'll append each project's name to it. |releaser.meta-release.projects-to-skip | | Names of projects to skip deployment for meta-release. +|releaser.meta-release.release-group-thread-count | 4 | Number of threads per release group. E.g. for thread count of 4 if there are 6 projects in a release group, 4 of them will be executed in parallel and 2 will wait for their turn. +|releaser.meta-release.release-group-timeout-in-minutes | 180 | Timeout in minutes during which we're waiting for a single composite task per a project to be executed. That means that if set to e.g. 180 then a release process for a single project should take at most 180 minutes. +|releaser.meta-release.release-groups | | If provided, allows to provide groups of projects that can be ran in parallel. E.g. {@code --releaser.meta-release.release-groups[0]=projectA,projectB,projectC} {@code --releaser.meta-release.release-groups[1]=projectD,projectE} {@code --releaser.meta-release.release-groups[2]=projectF,projectG} The order is still provided by the list of versions passed to the releaser. Basing on that order, and this value we are able to build a flow with projects. |releaser.meta-release.release-train-dependency-names | | All the names of dependencies that should be updated with the release train project version. -|releaser.meta-release.release-train-project-name | spring-cloud-release | Name of the release train project. -|releaser.pom.bom-version-pattern | ^(spring-cloud-.*)\.version$ | The pattern to match a version property in a BOM. +|releaser.meta-release.release-train-project-name | | Name of the release train project. +|releaser.pom.bom-version-pattern | | The pattern to match a version property in a BOM. Remember to catch the dependency name in a group. E.g. "^(spring-cloud-.*)\\.version$". |releaser.pom.branch | master | Which branch of release train BOM should be checked out. Defaults to {@code master}. -|releaser.pom.ignored-pom-regex | | List of regular expressions of ignored poms. Defaults to test projects and samples. -|releaser.pom.pom-with-boot-starter-parent | spring-cloud-starter-parent/pom.xml | Subfolder of the pom that contains the {@code spring-boot-starer-parent} dependency. -|releaser.pom.this-train-bom | spring-cloud-dependencies/pom.xml | Subfolder of the pom that contains the versions for the release train. +|releaser.pom.ignored-pom-regex | ^.*\.git/.*$ | List of regular expressions of ignored poms. Defaults to test projects and samples. +|releaser.pom.pom-with-boot-starter-parent | | Subfolder of the pom that contains the {@code spring-boot-starer-parent} dependency. +|releaser.pom.this-train-bom | | Subfolder of the pom that contains the versions for the release train. |releaser.post-release-tasks-only | false | If set to {@code true} will run only post release tasks. |releaser.sagan.base-url | https://spring.io | URL to the Sagan API. |releaser.sagan.boot-section-file-name | sagan-boot.adoc | Name of the ascii doc file with boot part of this project's Sagan project page. Linked with {@link this#docsAdocsFile}. |releaser.sagan.docs-adocs-file | docs/src/main/asciidoc | Folder with asciidoctor files for docs. |releaser.sagan.index-section-file-name | sagan-index.adoc | Name of the ascii doc file with core part of this project's Sagan project page. Linked with {@link this#docsAdocsFile}. |releaser.sagan.update-sagan | false | If set to {@code false} will not update Sagan. -|releaser.template.template-folder | cloud | Folder in which blog, email etc. templates are stored. +|releaser.skip-post-release-tasks | false | If set to {@code true} will not run post release tasks. +|releaser.template.enabled | false | Should template generation be enabled. +|releaser.template.template-folder | | Folder in which blog, email etc. templates are stored. |releaser.versions.all-versions-file-url | https://raw.githubusercontent.com/spring-io/start.spring.io/master/start-site/src/main/resources/application.yml | Url to a file containing all the versions. Defaults to YAML from start.spring.io. -|releaser.versions.bom-name | spring-cloud | Name in the YAML from initilizr for BOM mappings. +|releaser.versions.bom-name | | Name in the YAML from initilizr for BOM mappings. |releaser.working-dir | | By default Releaser assumes running the program from the current working directory. If you want to change this behaviour - just change this value. |=== diff --git a/docs/src/main/asciidoc/spring-cloud-release-tools.adoc b/docs/src/main/asciidoc/spring-cloud-release-tools.adoc index 76464d63..2639c80b 100644 --- a/docs/src/main/asciidoc/spring-cloud-release-tools.adoc +++ b/docs/src/main/asciidoc/spring-cloud-release-tools.adoc @@ -1,38 +1,27 @@ -:github-tag: master -:org: spring-cloud -:repo: spring-cloud-release-tools -:github-repo: {org}/{repo} -:github-raw: https://raw.github.com/{github-repo}/{github-tag} -:github-code: https://github.com/{github-repo}/tree/{github-tag} -:toc: left -:toclevels: 8 -:nofooter: - == Spring Cloud Release Tools -Spring Cloud projects reuse the same pattern of building and deploying the applications. That's -why this tool makes it easy to automate the release / dependency update process of our applications. +Spring Cloud projects reuse the same pattern of building and deploying the applications. +That's why this tool makes it easy to automate the release / dependency update process of our applications. === What does it do? ==== Single project -For a single project +For a single project, by default if you opt in to all tasks -- Clones the Spring Cloud Release project and picks all versions (Boot + Cloud projects) +- Clones the BOM project and picks all versions - Modifies the project versions with values from a BOM (e.g. for Spring Cloud it's Spring Cloud Release) - * throws an exception when we bump versions to release and there's a SNAPSHOT version referenced in the POM +* throws an exception when we bump versions to release and there's a SNAPSHOT version referenced in the POM - Performs the build and checks if the `docs` modules have properly created the documentation - * throws an exception when in the `docs` module there's an unresolved tag in any HTML file +* throws an exception when in the `docs` module there's an unresolved tag in any HTML file - Commits changed poms (ONLY FOR NON-SNAPSHOT VERSIONS) - Creates a tag for the release / milestone (ONLY FOR NON-SNAPSHOT VERSIONS) - Runs the deployment of the artifacts -- Publishes the docs (to `spring-cloud-static` for non-snapshots, to `gh-pages` for snapshots) +- Publishes the docs (for Spring Cloud to `spring-cloud-static` for non-snapshots, to `gh-pages` for snapshots) - Reverts back to snapshots, bumps the version by a patch (`1.0.1.RELEASE` -> `1.0.2.BUILD-SNAPSHOT`) (ONLY FOR RELEASE VERSIONS) - Closes the milestone on Github (e.g. `v1.0.1.RELEASE`) (ONLY FOR NON-SNAPSHOT VERSIONS) -IMPORTANT: Starting with version that does Sagan integration, you MUST pass the OAuth token, -otherwise the application will fail to start +IMPORTANT: Starting with version that does Sagan integration, you MUST pass the OAuth token, otherwise the application will fail to start After project release @@ -43,11 +32,13 @@ After project release - Updates project information in Sagan (https://spring.io) (ONLY FOR SNAPSHOT / RELEASE VERSIONS) - For `GA`/ `SR` release will create an issue in Spring Guides under https://github.com/spring-guides/getting-started-guides/issues/ - For `GA`/ `SR` release will create an issue in start.spring.io under https://github.com/spring-io/start.spring.io/issues/ -- For `GA`/ `SR` release will update the links under https://github.com/spring-cloud/spring-cloud-static/tree/gh-pages/current +- For `GA`/ `SR` release will update the documentation links (for Spring Cloud https://github.com/spring-cloud/spring-cloud-static/tree/gh-pages/current) - Will update the release train project page (for Spring Cloud it will be `https://github.com/spring-projects/spring-cloud`) ==== Meta-release +All the tasks are opt in, so if you do opt in for everything you'll get: + - Uses the fixed versions to clone and check out each project (e.g. `spring-cloud-sleuth: 2.1.0.RELEASE`) - From the version analyzes the branch and checks it out. E.g. ** for `spring-cloud-release`'s `Finchley.RELEASE` version will resolve either `Finchley` branch or will fallback to `master` if there's no `Finchley` branch. @@ -58,13 +49,141 @@ After project release - Will clone provided test samples and will update all versions to the latest ones - Will clone the release train wiki and update it with the latest release versions (for Spring Cloud it will be `https://github.com/spring-projects/spring-cloud.wiki.git`) -IMPORTANT: For the meta-releaser to work we assume that the path to the -custom configuration file for each project is always `config/releaser.yml`. +IMPORTANT: For the meta-releaser to work we assume that the path to the custom configuration file for each project is always `config/releaser.yml`. + +NOTE: If you want to run some projects in parallel you have to set the `releaser.meta-release.release-groups` property to state which projects should be released in parallel. Example: + +```properties +releaser.meta-release.release-groups[0]=projectA,projectB,projectC +``` + +If in the list of projects you have `projectA,projectB,projectC,projectD,projectE`, then `projectA,projectB,projectC` will be released in parallel and then `projectD` and `projectE` sequentially. + +=== How can I extend it? + +The project consists of the following main modules + +* `releaser-core` - with the core logic for doing releases +* `relaser-spring` - with the Spring setup of tasks and a flow execution +* `projects` +** where each project has their configuration properties and additional tasks + +You can create your own project's module and + +* if you want to completely rewrite the flow of the release, just set `releaser.flow.default-enabled` to `false` and create the whole flow from scratch +* if you want to modify the current flow, you can add new tasks by just creating a bean of a given type that extends the `ReleaserTask` and set its order accordingly. + +Example of creating a new `ReleaseReleaserTask` called `BuildCustomStuffTask`: + +```java +package releaser.my_project; + +//... + +import releaser.internal.Releaser; +import releaser.internal.spring.Arguments; +import releaser.internal.spring.ExecutionResult; +import releaser.internal.tasks.ReleaseReleaserTask; + +@Component +public class BuildCustomStuffTask implements ReleaseReleaserTask { + + /** + * Order of this task. The higher value, the lower order. + */ + public static final int ORDER = 45; + + @Override + public String name() { + return "build_custom_stuff"; + } + + @Override + public String shortName() { + return "bcf"; + } + + @Override + public String header() { + return "BUILDING CUSTOM STUFF"; + } + + @Override + public String description() { + return "Builds custom stuff"; + } + + @Override + public ExecutionResult runTask(Arguments args) { + // do some custom stuff basing on the arguments + return ExecutionResult.success(); + } + + @Override + public int getOrder() { + return BuildCustomStuffTask.ORDER; + } + +} +``` + +Each release or post release task can implement one of the following interfaces + +* `ReleaserTask` - marker interface for all release tasks +* `ReleaseReleaserTask` - if a task is part of the main release process. That means that if it breaks, the whole release process should stop at once. +* `PostReleaseReleaserTask` - marker interface for a post release task. If a post release task fails - the build continues but will be unstable. +* `SingleProjectReleaserTask` - a release task for a single project. +* `ProjectPostReleaseReleaserTask` - a post release task for a single project. +* `DryRunReleaseReleaserTask` - a release task that should be executed during dry run mode. +* `TrainPostReleaseReleaserTask` - a post release task that should be executed after the whole release train. +* `CompositeReleaserTask` - a task that delegates work to other tasks. + +In addition, your project can provide the following beans: + +* `CustomBomParser` - if you need to perform some additional BOM parsing. E.g. Spring Cloud adds `spring-boot` and `spring-cloud-build` versions when parsing the BOM project. +* `CustomProjectDocumentationUpdater` - if you need to perform some custom logic when updating the project's documentation. +* `CustomGithubIssues` - if you need to perform additional logic when dealing with Github issues. + +To run the project you should create your main class preferably under the `releaser` package and extend the `ReleaserCommandLineRunner` class. + +```java +package releaser; + +import releaser.internal.options.Parser; +import releaser.internal.spring.ExecutionResultHandler; +import releaser.internal.spring.SpringReleaser; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.WebApplicationType; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ReleaserApplication extends ReleaserCommandLineRunner { + + public ReleaserApplication(SpringReleaser releaser, + ExecutionResultHandler executionResultHandler, Parser parser) { + super(releaser, executionResultHandler, parser); + } + + public static void main(String[] args) { + SpringApplication application = new SpringApplication(ReleaserApplication.class); + application.setWebApplicationType(WebApplicationType.NONE); + application.run(args); + } + +} +``` + +You can also extend the way the projects and tasks are parsed, flows are executed and the result is analyzed together with the printed report. To do that you should implement the following interfaces as beans: + +* `SpringReleaser` - performs the release, given the provided options +* `FlowRunner` - knows how to execute a release and post release flow +* `ExecutionResultHandler` - handles the result of the release === What should I do first? -Members of the Spring Cloud Team typically use this tool as follows. They first -clone the releaser locally and build the jar manually +Members of the Spring Cloud Team typically use this tool as follows. +They first clone the releaser locally and build the jar manually [source,bash] ---- @@ -73,8 +192,8 @@ $ cd spring-cloud-release-tools $ ./mvnw clean install ---- -IMPORTANT: You must set the value of the OAuth token. You can do it either via -the command line `--releaser.git.oauth-token=...` or put it as an env variable in `.bashrc` +IMPORTANT: You must set the value of the OAuth token. +You can do it either via the command line `--releaser.git.oauth-token=...` or put it as an env variable in `.bashrc` or `.zshrc` e.g. `export RELEASER_GIT_OAUTH_TOKEN=...` === How to run it (interactive mode) @@ -86,13 +205,13 @@ Go to your project (e.g. Spring Cloud Sleuth) $ git clone git@github.com:spring-cloud/spring-cloud-sleuth.git $ cd spring-cloud-sleuth $ # example of running the releaser agains Dalston.SR1 tag with 1.0.0.BUILD-SNAPSHOT version of the releaser -$ java -jar ~/repo/spring-cloud-release-tools/spring-cloud-release-tools-spring/target/spring-cloud-release-tools-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser +$ java -jar ~/repo/spring-cloud-release-tools/projects/spring-cloud/target/spring-cloud-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser ---- -The application will start running from your working directory. Running this code -follows the convention that you have the OAuth token environment variable set. It also assumes -that you might have some custom configuration in `config/releaser.yml` file. This setting is optional - if -you don't have that file, nothing will happen. +The application will start running from your working directory. +Running this code follows the convention that you have the OAuth token environment variable set. +It also assumes that you might have some custom configuration in `config/releaser.yml` file. +This setting is optional - if you don't have that file, nothing will happen. TIP: It is important that you clone the repository you are going to release using SSH in order for the `releaser` to be able to push tags and commit changes automatically. @@ -122,8 +241,10 @@ You can execute given tasks by providing a comma separated list of tasks - e.g. You can press 'q' to quit ---- -Just pick a number and continue! Pick either a full release or single steps. You can also pick -ranges or multiple steps. You can also provide the range only with the starting step +Just pick a number and continue! +Pick either a full release or single steps. +You can also pick ranges or multiple steps. +You can also provide the range only with the starting step - that you will execute all steps starting from the given one. TIP: Read before picking a number cause it might have changed between tool releases ;) @@ -138,7 +259,7 @@ flag. $ git clone git@github.com:spring-cloud/spring-cloud-sleuth.git $ cd spring-cloud-sleuth $ # example of running the releaser agains Dalston.SR1 tag with 1.0.0.BUILD-SNAPSHOT version of the releaser -$ java -jar ~/repo/spring-cloud-release-tools/spring-cloud-release-tools-spring/target/spring-cloud-release-tools-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser -h +$ java -jar ~/repo/spring-cloud-release-tools/releaser-spring/target/releaser-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser -h ---- You will see a help screen looking like more or less like this @@ -199,9 +320,11 @@ Range 'docs' -> 'push' java -jar releaser.jar -r o-p ---- -The Releaser can use two sets of options. The configuration options like `releaser.pom.branch` -and the task switches. For the tasks you can use either the full names or short switches. For example - providing range of tasks via switches `o-p` is equivalent to full name `docs-push`. +The Releaser can use two sets of options. +The configuration options like `releaser.pom.branch` +and the task switches. +For the tasks you can use either the full names or short switches. +For example providing range of tasks via switches `o-p` is equivalent to full name `docs-push`. A couple of examples: @@ -211,52 +334,49 @@ A couple of examples: $ git clone git@github.com:spring-cloud/spring-cloud-sleuth.git $ cd spring-cloud-sleuth $ # example of running the releaser agains Dalston.SR1 tag with 1.0.0.BUILD-SNAPSHOT version of the releaser -$ java -jar ~/repo/spring-cloud-release-tools/spring-cloud-release-tools-spring/target/spring-cloud-release-tools-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser --full-release +$ java -jar ~/repo/spring-cloud-release-tools/releaser-spring/target/releaser-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser --full-release ---- .Doing the full release in non interactive mode (automatic release) [source,bash] ---- -$ java -jar ~/repo/spring-cloud-release-tools/spring-cloud-release-tools-spring/target/spring-cloud-release-tools-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser --full-release --interactive=false +$ java -jar ~/repo/spring-cloud-release-tools/releaser-spring/target/releaser-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser --full-release --interactive=false ---- .Updating pom, closing milestone & createTemplates in interactive mode [source,bash] ---- -$ java -jar ~/repo/spring-cloud-release-tools/spring-cloud-release-tools-spring/target/spring-cloud-release-tools-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser -u -m -t +$ java -jar ~/repo/spring-cloud-release-tools/releaser-spring/target/releaser-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser -u -m -t ---- .Running all tasks starting from 'push' (automatic) [source,bash] ---- -$ java -jar ~/repo/spring-cloud-release-tools/spring-cloud-release-tools-spring/target/spring-cloud-release-tools-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser -a push -i=false +$ java -jar ~/repo/spring-cloud-release-tools/releaser-spring/target/releaser-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser -a push -i=false ---- .Running tasks from 'docs' (inclusive) to 'push' (inclusive) (automatic) [source,bash] ---- -$ java -jar ~/repo/spring-cloud-release-tools/spring-cloud-release-tools-spring/target/spring-cloud-release-tools-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser -r d-p -i=false +$ java -jar ~/repo/spring-cloud-release-tools/releaser-spring/target/releaser-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser -r d-p -i=false ---- .Running single task 'closeMilestone' (automatic) [source,bash] ---- -$ java -jar ~/repo/spring-cloud-release-tools/spring-cloud-release-tools-spring/target/spring-cloud-release-tools-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser --closeMilestone -i=false +$ java -jar ~/repo/spring-cloud-release-tools/releaser-spring/target/releaser-spring-1.0.0.BUILD-SNAPSHOT.jar --releaser.pom.branch=vDalston.SR1 --spring.config.name=releaser --closeMilestone -i=false ---- === How to run meta-release (automatic-mode) All you have to do is run the jar with the releaser and pass the -`-x=true` option to turn on meta-release and a list of fixed versions -in the `--"releaser.fixed-versions[project-name]=project-version" format +`-x=true` option to turn on meta-release and a list of fixed versions in the `--"releaser.fixed-versions[project-name]=project-version" format ``` -$ java -jar spring-cloud-release-tools-spring/target/spring-cloud-release-tools-spring-1.0.0.BUILD-SNAPSHOT.jar --spring.config.name=releaser -x=true --"releaser.fixed-versions[spring-cloud-sleuth]=2.0.1.BUILD-SNAPSHOT" +$ java -jar projects/spring-cloud/target/spring-cloud-1.0.0.BUILD-SNAPSHOT.jar --spring.config.name=releaser -x=true --"releaser.fixed-versions[spring-cloud-sleuth]=2.0.1.BUILD-SNAPSHOT" ``` -IMPORTANT: For the meta release the `startFrom` or `taskNames` take into consideration -the project names, not task names. E.g. you can start from `spring-cloud-netflix` project, -or build only tasks with names `spring-cloud-build,spring-cloud-sleuth`. +IMPORTANT: For the meta release the `startFrom` or `taskNames` take into consideration the project names, not task names. E.g. you can start from `spring-cloud-netflix` project, or build only tasks with names `spring-cloud-build,spring-cloud-sleuth`. === Project options @@ -265,34 +385,31 @@ Below you can find a table with all the releaser options. include::_configprops.adoc[] TIP: You can pass the options either via system properties or via application arguments. -Example for system properties: `java -Dreleaser.pom.branch=Camden.SR6 -jar target/spring-cloud-release-tools-spring-1.0.0.M1.jar` -Example for application arguments: `java -jar target/spring-cloud-release-tools-spring-1.0.0.M1.jar --releaser.pom.branch=Camden.SR6` +Example for system properties: `java -Dreleaser.pom.branch=Camden.SR6 -jar target/releaser-spring-1.0.0.M1.jar` +Example for application arguments: `java -jar target/releaser-spring-1.0.0.M1.jar --releaser.pom.branch=Camden.SR6` -IMPORTANT: For the GA release to be successful, it's important that if the `build` / `deploy` command - run a script (e.g. `scripts/foo.sh`) then inside `foo.sh` if you call a Maven build `./mvnw clean install` - then *remember to pass all arguments of the script there too*. E.g. `./mvnw clean install ${@}`. That's because - the releaser will pass any system properties to the `build` / `deploy` command, such as system properties - with keys and we need them to be passed inside the command executed by the releaser. +IMPORTANT: For the GA release to be successful, it's important that if the `build` / `deploy` command run a script (e.g. `scripts/foo.sh`) then inside `foo.sh` if you call a Maven build `./mvnw clean install` +then *remember to pass all arguments of the script there too*. +E.g. `./mvnw clean install ${@}`. +That's because the releaser will pass any system properties to the `build` / `deploy` command, such as system properties with keys and we need them to be passed inside the command executed by the releaser. === Examples ==== Keeping configuration in the project -If your project has some custom configuration (e.g. Spring Cloud Contract needs a script to be executed -to build the project and properly merge the docs) then you can put a file named e.g. `releaser.yml` under `config` +If your project has some custom configuration (e.g. Spring Cloud Contract needs a script to be executed to build the project and properly merge the docs) then you can put a file named e.g. `releaser.yml` under `config` folder and run your application like this: [source,bash] ---- -$ wget https://repo.spring.io/libs-milestone/org/springframework/cloud/internal/spring-cloud-release-tools-spring/1.0.0.M1/spring-cloud-release-tools-spring-1.0.0.M1.jar -O ../spring-cloud-release-tools-spring-1.0.0.M1.jar -$ java -jar target/spring-cloud-release-tools-spring-1.0.0.M1.jar --spring.config.name=releaser +$ wget https://repo.spring.io/libs-milestone/org/springframework/cloud/internal/releaser-spring/1.0.0.M1/releaser-spring-1.0.0.M1.jar -O ../releaser-spring-1.0.0.M1.jar +$ java -jar target/releaser-spring-1.0.0.M1.jar --spring.config.name=releaser ---- -TIP: Notice that we're downloading the jar to a parent folder, not to `target`. That's because `target` get cleaned -during the build process +TIP: Notice that we're downloading the jar to a parent folder, not to `target`. +That's because `target` get cleaned during the build process -IMPORTANT: For the meta-releaser to work we assume that the path to the -configuration file is always `config/releaser.yml`. +IMPORTANT: For the meta-releaser to work we assume that the path to the configuration file is always `config/releaser.yml`. ==== Specifying A Branch @@ -301,39 +418,47 @@ If you would like to use another branch you can specify it using the `releaser.p [source,bash] ---- -$ java -jar spring-cloud-release-tools-spring-1.0.0.M1.jar --releaser.pom.branch=Camden.SR6 +$ java -jar releaser-spring-1.0.0.M1.jar --releaser.pom.branch=Camden.SR6 ---- ==== Using Environment Variables In some cases it might be easier to specify environment variables instead of passing parameters to -`releaser`. For example, you might want to use environment variables if you are going to be -releasing multiple projects, this keeps you from having to specify the same parameters for -each release +`releaser`. +For example, you might want to use environment variables if you are going to be releasing multiple projects, this keeps you from having to specify the same parameters for each release [source,bash] ---- $ export RELEASER_POM_BRANCH=Dalston.RELEASE $ export RELEASER_GIT_OAUTH_TOKEN=... -$ wget https://repo.spring.io/libs-milestone/org/springframework/cloud/internal/spring-cloud-release-tools-spring/1.0.0.M1/spring-cloud-release-tools-spring-1.0.0.M1.jar -O spring-cloud-release-tools-spring-1.0.0.M1.jar -$ java -jar target/spring-cloud-release-tools-spring-1.0.0.M1.jar --releaser.working-dir=/path/to/project/root +$ wget https://repo.spring.io/libs-milestone/org/springframework/cloud/internal/releaser-spring/1.0.0.M1/releaser-spring-1.0.0.M1.jar -O releaser-spring-1.0.0.M1.jar +$ java -jar target/releaser-spring-1.0.0.M1.jar --releaser.working-dir=/path/to/project/root ---- === Releasing through Jenkins -NOTE: Whenever a release process is broken, Jenkins marks it with a red ball and breaks the build. Whenever a post-release action went wrong but the release is successful, Jenkins marks the build with a yellow ball and marks the build as unstable. +NOTE: Whenever a release process is broken, Jenkins marks it with a red ball and breaks the build. +Whenever a post-release action went wrong but the release is successful, Jenkins marks the build with a yellow ball and marks the build as unstable. ==== Releasing a Single Project -Let us assume that we are to release `spring-cloud-build` project. We need to do the following steps: +Let us assume that we are to release `spring-cloud-build` project. +We need to do the following steps: + +. Create a branch (for example, `springCloudBuildRelease`) in a project that contains a BOM (for example, https://github.com/spring-cloud/spring-cloud-release/[spring-cloud-release]). +The following example shows how to do so: -. Create a branch (for example, `springCloudBuildRelease`) in a project that contains a BOM (for example, https://github.com/spring-cloud/spring-cloud-release/[spring-cloud-release]). The following example shows how to do so: ```bash $ git clone git@github.com:spring-cloud/spring-cloud-release.git $ cd spring-cloud-release $ git checkout -b springCloudBuildRelease ``` -. Update *all* versions as if you were doing a release train. We need to update the project's versions, Boot version, and dependencies versions, too. Let us assume that we will eventually be doing a release train for the `Hoxton.M1` release, Spring Boot to the latest available one, and `spring-cloud-commons` to `1.2.3.BUILD-SNAPSHOT`. The following example shows how to do so: + +. Update *all* versions as if you were doing a release train. +We need to update the project's versions, Boot version, and dependencies versions, too. +Let us assume that we will eventually be doing a release train for the `Hoxton.M1` release, Spring Boot to the latest available one, and `spring-cloud-commons` to `1.2.3.BUILD-SNAPSHOT`. +The following example shows how to do so: + ```bash // setting the release train value $ ./mvnw versions:set -DnewVersion=Hoxton.M1 -DgenerateBackupPoms=false -DprocessAllModules=true @@ -347,27 +472,32 @@ $ git diff // commit and push the branch $ git add . && git commit -m "Updating project for Spring Cloud Build release" && git push origin springCloudBuildRelease ``` + IMPORTANT: If you're doing a e.g. `M1` release, remember to not have any snapshot versions in this branch. Since the project is prepared, go to Jenkins and select the https://jenkins.spring.io/view/Spring%20Cloud/view/Releaser/[Releaser view], which the following image shows: image::{github-raw}/docs/src/main/asciidoc/images/releasers.png[Releaser view] -. Pick the proper releaser project (for example, `spring-cloud-build-releaser`). The following image shows the settings for this example: +. Pick the proper releaser project (for example, `spring-cloud-build-releaser`). +The following image shows the settings for this example: image::{github-raw}/docs/src/main/asciidoc/images/scBuildReleaser.png[Spring Cloud Build Releaser - build with parameters] -. Next, click `Build with parameters`. The following image shows the UI for doing so: +. Next, click `Build with parameters`. +The following image shows the UI for doing so: image::{github-raw}/docs/src/main/asciidoc/images/runningScBuildReleaser.png[Updated `RELEASER_POM_BRANCH`] -Pick from which branch you would like the project (for example, `spring-cloud-build` - defaults to `master`) to be built and update the `RELEASER_POM_BRANCH` to point to the checked-out branch of Spring Cloud Release (for example, `springCloudBuildRelease`). You can pick whether you want to perform only post-release tasks or the whole release. +Pick from which branch you would like the project (for example, `spring-cloud-build` - defaults to `master`) to be built and update the `RELEASER_POM_BRANCH` to point to the checked-out branch of Spring Cloud Release (for example, `springCloudBuildRelease`). +You can pick whether you want to perform only post-release tasks or the whole release. . Finally, click `Build`. You are done! -As a post action, do not forget to remove the branch. The following example shows how to do so: +As a post action, do not forget to remove the branch. +The following example shows how to do so: ```bash // to synchronize any deleted branches (don't run this if you want leave any deleted branches that were deleted in the origin) @@ -378,19 +508,31 @@ $ git push origin --delete springCloudBuildRelease ==== Releasing a Release Train -We call a release train a `meta-release`. In order to perform one, you need to: +We call a release train a `meta-release`. +In order to perform one, you need to: + +. In your project (which must contain a BOM, such as `spring-cloud-release`) you have to have a branch, where you store properties with versions of your projects. +For example, the branch name can be https://github.com/spring-cloud/spring-cloud-release/tree/jenkins-releaser-config[jenkins-releaser-config]). +The folloiwng example shows how to do so: -. In your project (which must contain a BOM, such as `spring-cloud-release`) you have to have a branch, where you store properties with versions of your projects. For example, the branch name can be https://github.com/spring-cloud/spring-cloud-release/tree/jenkins-releaser-config[jenkins-releaser-config]). The folloiwng example shows how to do so: ```bash $ git clone git@github.com:spring-cloud/spring-cloud-release.git $ cd spring-cloud-release $ git checkout jenkins-releaser-config ``` -. Create a file that contains all properties for a given release train. The name of the release train should be lowercase, and dots should be converted to underscores. For example, for the `Greenwich.SR2` release train we need to have a file named `greenwich_sr2.properties`. The following example shows how to do so: + +. Create a file that contains all properties for a given release train. +The name of the release train should be lowercase, and dots should be converted to underscores. +For example, for the `Greenwich.SR2` release train we need to have a file named `greenwich_sr2.properties`. +The following example shows how to do so: + ```bash $ touch greenwich_sr2.properties ``` -. We need to update the file with all versions for the release train. The properties file contains an *ordered* list of `releaser.fixed-versions[project-name]=project-version` entries, as the following listing shows: + +. We need to update the file with all versions for the release train. +The properties file contains an *ordered* list of `releaser.fixed-versions[project-name]=project-version` entries, as the following listing shows: + ```bash $ echo "releaser.fixed-versions[spring-boot]=2.1.5.RELEASE releaser.fixed-versions[spring-cloud-build]=2.1.5.RELEASE @@ -429,7 +571,8 @@ image::{github-raw}/docs/src/main/asciidoc/images/springCloudMetaRelease.png[Spr image::{github-raw}/docs/src/main/asciidoc/images/runningSpringCloudMetaReleaser.png[Spring Cloud Meta Releaser view] -You have quite a few options to pick, but the most important one is to set the value of the `RELEASE_VERSION` to the given release train version (for example, `Greenwich.SR2`). Continue updating the rest of the fields if necessary and read the field descriptions and this documentation for more information. +You have quite a few options to pick, but the most important one is to set the value of the `RELEASE_VERSION` to the given release train version (for example, `Greenwich.SR2`). +Continue updating the rest of the fields if necessary and read the field descriptions and this documentation for more information. . Finally, click `Build`. diff --git a/pom.xml b/pom.xml index bf5e65dd..b2a21fe4 100644 --- a/pom.xml +++ b/pom.xml @@ -5,28 +5,46 @@ 4.0.0 org.springframework.cloud.internal - spring-cloud-release-tools-parent + releaser-parent 1.0.0.BUILD-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 2.2.0.BUILD-SNAPSHOT + 2.2.1.RELEASE - spring-cloud-release-tools-core - spring-cloud-release-tools-spring + releaser-core + releaser-spring + releaser-test spring-cloud-info + projects docs + UTF-8 + 1.8 + Hoxton.BUILD-SNAPSHOT 1.0 + 0.0.9 + 5.4.1.Final + 5.1.3.201810200350-r + + 2.2.1 + 2.3 + 4.0.6 + 0.8.0.BUILD-SNAPSHOT + 3.1.6 + 1.0.0.BUILD-SNAPSHOT + 1.0.4 + 5.0.3 + 1.0.2 diff --git a/projects/pom.xml b/projects/pom.xml new file mode 100644 index 00000000..7a46f4a5 --- /dev/null +++ b/projects/pom.xml @@ -0,0 +1,24 @@ + + + 4.0.0 + + releaser-projects + 1.0.0.BUILD-SNAPSHOT + pom + + + org.springframework.cloud.internal + releaser-parent + 1.0.0.BUILD-SNAPSHOT + .. + + + + spring-cloud + spring-cloud-stream + reactor + + + diff --git a/spring-cloud-release-tools-core/.jdk8 b/projects/reactor/.jdk8 similarity index 100% rename from spring-cloud-release-tools-core/.jdk8 rename to projects/reactor/.jdk8 diff --git a/projects/reactor/pom.xml b/projects/reactor/pom.xml new file mode 100644 index 00000000..f181053f --- /dev/null +++ b/projects/reactor/pom.xml @@ -0,0 +1,96 @@ + + + 4.0.0 + + reactor + jar + + + org.springframework.cloud.internal + releaser-projects + 1.0.0.BUILD-SNAPSHOT + .. + + + + UTF-8 + 1.8 + + + + + org.springframework.cloud.internal + releaser-spring + ${project.version} + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + sonar + + + + org.jacoco + jacoco-maven-plugin + + + pre-unit-test + + prepare-agent + + + surefireArgLine + ${project.build.directory}/jacoco.exec + + + + post-unit-test + test + + report + + + + ${project.build.directory}/jacoco.exec + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${surefireArgLine} + + + + + + + + diff --git a/projects/reactor/src/main/java/releaser/ReleaserApplication.java b/projects/reactor/src/main/java/releaser/ReleaserApplication.java new file mode 100644 index 00000000..cb2f3aa4 --- /dev/null +++ b/projects/reactor/src/main/java/releaser/ReleaserApplication.java @@ -0,0 +1,41 @@ +/* + * Copyright 2013-2019 the original author or authors. + * + * 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 + * + * https://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. + */ + +package releaser; + +import releaser.internal.options.Parser; +import releaser.internal.spring.ExecutionResultHandler; +import releaser.internal.spring.SpringReleaser; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.WebApplicationType; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ReleaserApplication extends ReleaserCommandLineRunner { + + public ReleaserApplication(SpringReleaser releaser, + ExecutionResultHandler executionResultHandler, Parser parser) { + super(releaser, executionResultHandler, parser); + } + + public static void main(String[] args) { + SpringApplication application = new SpringApplication(ReleaserApplication.class); + application.setWebApplicationType(WebApplicationType.NONE); + application.run(args); + } + +} diff --git a/projects/reactor/src/main/resources/application.yml b/projects/reactor/src/main/resources/application.yml new file mode 100644 index 00000000..2eea9d59 --- /dev/null +++ b/projects/reactor/src/main/resources/application.yml @@ -0,0 +1,17 @@ +spring: + main: + web-application-type: none + datasource: + url: jdbc:h2:mem:${random.uuid} + jackson: + deserialization: + FAIL_ON_UNKNOWN_PROPERTIES: true +releaser: + git: + release-train-bom-url: https://github.com/reactor/reactor + fetch-versions-from-git: true + meta-release: + release-train-project-name: reactor + release-train-dependency-names: + - reactor + git-org-url: https://github.com/reactor \ No newline at end of file diff --git a/projects/reactor/src/test/java/releaser/ReleaserApplicationTests.java b/projects/reactor/src/test/java/releaser/ReleaserApplicationTests.java new file mode 100644 index 00000000..6d0c2bf8 --- /dev/null +++ b/projects/reactor/src/test/java/releaser/ReleaserApplicationTests.java @@ -0,0 +1,59 @@ +/* + * Copyright 2013-2019 the original author or authors. + * + * 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 + * + * https://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. + */ + +package releaser; + +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import releaser.internal.options.Parser; +import releaser.internal.spring.ExecutionResultHandler; +import releaser.internal.spring.SpringReleaser; + +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@SpringBootTest( + classes = { ReleaserApplicationTests.Config.class, ReleaserApplication.class }, + properties = { "releaser.sagan.update-sagan=false" }) +class ReleaserApplicationTests { + + @Test + void contextLoads() { + + } + + @Configuration + static class Config { + + @Bean + SpringReleaser mockReleaser() { + return Mockito.mock(SpringReleaser.class); + } + + @Bean + ExecutionResultHandler mockExecutionResultHandler() { + return Mockito.mock(ExecutionResultHandler.class); + } + + @Bean + Parser mockParser() { + return Mockito.mock(Parser.class); + } + + } + +} diff --git a/spring-cloud-release-tools-spring/.jdk8 b/projects/spring-cloud-stream/.jdk8 similarity index 100% rename from spring-cloud-release-tools-spring/.jdk8 rename to projects/spring-cloud-stream/.jdk8 diff --git a/projects/spring-cloud-stream/pom.xml b/projects/spring-cloud-stream/pom.xml new file mode 100644 index 00000000..04620a1c --- /dev/null +++ b/projects/spring-cloud-stream/pom.xml @@ -0,0 +1,90 @@ + + + 4.0.0 + + spring-cloud-stream + jar + + + org.springframework.cloud.internal + releaser-projects + 1.0.0.BUILD-SNAPSHOT + .. + + + + UTF-8 + 1.8 + + + + + org.springframework.cloud.internal + releaser-spring + ${project.version} + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + sonar + + + + org.jacoco + jacoco-maven-plugin + + + pre-unit-test + + prepare-agent + + + surefireArgLine + ${project.build.directory}/jacoco.exec + + + + post-unit-test + test + + report + + + + ${project.build.directory}/jacoco.exec + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${surefireArgLine} + + + + + + + + diff --git a/projects/spring-cloud-stream/src/main/java/releaser/ReleaserApplication.java b/projects/spring-cloud-stream/src/main/java/releaser/ReleaserApplication.java new file mode 100644 index 00000000..cb2f3aa4 --- /dev/null +++ b/projects/spring-cloud-stream/src/main/java/releaser/ReleaserApplication.java @@ -0,0 +1,41 @@ +/* + * Copyright 2013-2019 the original author or authors. + * + * 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 + * + * https://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. + */ + +package releaser; + +import releaser.internal.options.Parser; +import releaser.internal.spring.ExecutionResultHandler; +import releaser.internal.spring.SpringReleaser; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.WebApplicationType; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ReleaserApplication extends ReleaserCommandLineRunner { + + public ReleaserApplication(SpringReleaser releaser, + ExecutionResultHandler executionResultHandler, Parser parser) { + super(releaser, executionResultHandler, parser); + } + + public static void main(String[] args) { + SpringApplication application = new SpringApplication(ReleaserApplication.class); + application.setWebApplicationType(WebApplicationType.NONE); + application.run(args); + } + +} diff --git a/projects/spring-cloud-stream/src/main/resources/application.yml b/projects/spring-cloud-stream/src/main/resources/application.yml new file mode 100644 index 00000000..6d1c79ba --- /dev/null +++ b/projects/spring-cloud-stream/src/main/resources/application.yml @@ -0,0 +1,42 @@ +spring: + main: + web-application-type: none + datasource: + url: jdbc:h2:mem:${random.uuid} + jackson: + deserialization: + FAIL_ON_UNKNOWN_PROPERTIES: true +releaser: + git: + release-train-bom-url: https://github.com/spring-cloud/spring-cloud-stream-starters + documentation-url: https://github.com/spring-cloud/spring-cloud-static + number-of-checked-milestones: 50 + update-github-milestones: true + pom: + branch: master + pom-with-boot-starter-parent: spring-cloud-starter-parent/pom.xml + this-train-bom: spring-cloud-stream-dependencies/pom.xml + bom-version-pattern: "^(spring-cloud-.*)\\.version$" + ignored-pom-regex: + - "^.*\\.git/.*$" + maven: + build-command: "./mvnw clean install -B -Pdocs {{systemProps}}" + deploy-command: "./mvnw deploy -DskipTests -B -Pfast,deploy {{systemProps}}" + deploy-guides-command: "./mvnw clean verify deploy -B -Pguides,integration -pl guides {{systemProps}}" + publish-docs-commands: + - "mkdir -p target" + - "wget https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/ghpages.sh -O target/gh-pages.sh" + - "chmod +x target/gh-pages.sh" + - "./target/gh-pages.sh -v {{version}} -c" + generate-release-train-docs-command: "bash release_train.sh --retrieveversions --version {{version}} --ghpages --auto" + sagan: + update-sagan: true + meta-release: + release-train-project-name: spring-cloud-stream-starters + release-train-dependency-names: + - spring-cloud-stream-dependencies + git-org-url: https://github.com/spring-cloud + projects-to-skip: + - spring-boot + - spring-cloud-build + - spring-cloud-function \ No newline at end of file diff --git a/projects/spring-cloud-stream/src/test/java/releaser/ReleaserApplicationTests.java b/projects/spring-cloud-stream/src/test/java/releaser/ReleaserApplicationTests.java new file mode 100644 index 00000000..6d0c2bf8 --- /dev/null +++ b/projects/spring-cloud-stream/src/test/java/releaser/ReleaserApplicationTests.java @@ -0,0 +1,59 @@ +/* + * Copyright 2013-2019 the original author or authors. + * + * 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 + * + * https://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. + */ + +package releaser; + +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import releaser.internal.options.Parser; +import releaser.internal.spring.ExecutionResultHandler; +import releaser.internal.spring.SpringReleaser; + +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@SpringBootTest( + classes = { ReleaserApplicationTests.Config.class, ReleaserApplication.class }, + properties = { "releaser.sagan.update-sagan=false" }) +class ReleaserApplicationTests { + + @Test + void contextLoads() { + + } + + @Configuration + static class Config { + + @Bean + SpringReleaser mockReleaser() { + return Mockito.mock(SpringReleaser.class); + } + + @Bean + ExecutionResultHandler mockExecutionResultHandler() { + return Mockito.mock(ExecutionResultHandler.class); + } + + @Bean + Parser mockParser() { + return Mockito.mock(Parser.class); + } + + } + +} diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/builder/resolved/docs/file.txt b/projects/spring-cloud/.jdk8 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/builder/resolved/docs/file.txt rename to projects/spring-cloud/.jdk8 diff --git a/projects/spring-cloud/pom.xml b/projects/spring-cloud/pom.xml new file mode 100644 index 00000000..5306678f --- /dev/null +++ b/projects/spring-cloud/pom.xml @@ -0,0 +1,91 @@ + + + 4.0.0 + + spring-cloud + jar + + + org.springframework.cloud.internal + releaser-projects + 1.0.0.BUILD-SNAPSHOT + .. + + + + UTF-8 + 1.8 + + + + + org.springframework.cloud.internal + releaser-spring + ${project.version} + + + + org.springframework.cloud.internal + releaser-test + ${project.version} + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + sonar + + + + org.jacoco + jacoco-maven-plugin + + + pre-unit-test + + prepare-agent + + + surefireArgLine + ${project.build.directory}/jacoco.exec + + + + post-unit-test + test + + report + + + + ${project.build.directory}/jacoco.exec + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${surefireArgLine} + + + + + + + + diff --git a/projects/spring-cloud/src/main/java/releaser/ReleaserApplication.java b/projects/spring-cloud/src/main/java/releaser/ReleaserApplication.java new file mode 100644 index 00000000..cb2f3aa4 --- /dev/null +++ b/projects/spring-cloud/src/main/java/releaser/ReleaserApplication.java @@ -0,0 +1,41 @@ +/* + * Copyright 2013-2019 the original author or authors. + * + * 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 + * + * https://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. + */ + +package releaser; + +import releaser.internal.options.Parser; +import releaser.internal.spring.ExecutionResultHandler; +import releaser.internal.spring.SpringReleaser; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.WebApplicationType; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ReleaserApplication extends ReleaserCommandLineRunner { + + public ReleaserApplication(SpringReleaser releaser, + ExecutionResultHandler executionResultHandler, Parser parser) { + super(releaser, executionResultHandler, parser); + } + + public static void main(String[] args) { + SpringApplication application = new SpringApplication(ReleaserApplication.class); + application.setWebApplicationType(WebApplicationType.NONE); + application.run(args); + } + +} diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/cloud/buildsystem/SpringCloudBomConstants.java b/projects/spring-cloud/src/main/java/releaser/cloud/buildsystem/SpringCloudBomConstants.java similarity index 93% rename from spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/cloud/buildsystem/SpringCloudBomConstants.java rename to projects/spring-cloud/src/main/java/releaser/cloud/buildsystem/SpringCloudBomConstants.java index 299bc141..c6039a42 100644 --- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/cloud/buildsystem/SpringCloudBomConstants.java +++ b/projects/spring-cloud/src/main/java/releaser/cloud/buildsystem/SpringCloudBomConstants.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * https://www.apache.org/licenses/LICENSE-2.0 + * https://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, @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.release.cloud.buildsystem; +package releaser.cloud.buildsystem; /** * @author Marcin Grzejszczak diff --git a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/cloud/buildsystem/SpringCloudBuildsystemConfiguration.java b/projects/spring-cloud/src/main/java/releaser/cloud/buildsystem/SpringCloudBuildsystemConfiguration.java similarity index 88% rename from spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/cloud/buildsystem/SpringCloudBuildsystemConfiguration.java rename to projects/spring-cloud/src/main/java/releaser/cloud/buildsystem/SpringCloudBuildsystemConfiguration.java index 920be840..a2696d50 100644 --- a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/cloud/buildsystem/SpringCloudBuildsystemConfiguration.java +++ b/projects/spring-cloud/src/main/java/releaser/cloud/buildsystem/SpringCloudBuildsystemConfiguration.java @@ -5,7 +5,7 @@ * 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 + * https://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, @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.release.cloud.buildsystem; +package releaser.cloud.buildsystem; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/cloud/buildsystem/SpringCloudMavenBomParser.java b/projects/spring-cloud/src/main/java/releaser/cloud/buildsystem/SpringCloudMavenBomParser.java similarity index 72% rename from spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/cloud/buildsystem/SpringCloudMavenBomParser.java rename to projects/spring-cloud/src/main/java/releaser/cloud/buildsystem/SpringCloudMavenBomParser.java index af60995b..f5cedf64 100644 --- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/cloud/buildsystem/SpringCloudMavenBomParser.java +++ b/projects/spring-cloud/src/main/java/releaser/cloud/buildsystem/SpringCloudMavenBomParser.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * https://www.apache.org/licenses/LICENSE-2.0 + * https://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, @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.release.cloud.buildsystem; +package releaser.cloud.buildsystem; import java.io.File; import java.util.LinkedHashSet; @@ -23,47 +23,38 @@ import java.util.Set; import org.apache.maven.model.Model; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import releaser.internal.ReleaserProperties; +import releaser.internal.buildsystem.CustomBomParser; +import releaser.internal.buildsystem.VersionsFromBom; +import releaser.internal.buildsystem.VersionsFromBomBuilder; +import releaser.internal.project.Project; +import releaser.internal.tech.PomReader; -import org.springframework.cloud.release.internal.ReleaserProperties; -import org.springframework.cloud.release.internal.buildsystem.CustomBomParser; -import org.springframework.cloud.release.internal.buildsystem.VersionsFromBom; -import org.springframework.cloud.release.internal.buildsystem.VersionsFromBomBuilder; -import org.springframework.cloud.release.internal.project.Project; -import org.springframework.cloud.release.internal.tech.PomReader; import org.springframework.util.StringUtils; -import static org.springframework.cloud.release.cloud.buildsystem.SpringCloudBomConstants.BOOT_DEPENDENCIES_ARTIFACT_ID; -import static org.springframework.cloud.release.cloud.buildsystem.SpringCloudBomConstants.BOOT_STARTER_ARTIFACT_ID; -import static org.springframework.cloud.release.cloud.buildsystem.SpringCloudBomConstants.BOOT_STARTER_PARENT_ARTIFACT_ID; -import static org.springframework.cloud.release.cloud.buildsystem.SpringCloudBomConstants.BUILD_ARTIFACT_ID; -import static org.springframework.cloud.release.cloud.buildsystem.SpringCloudBomConstants.CLOUD_ARTIFACT_ID; -import static org.springframework.cloud.release.cloud.buildsystem.SpringCloudBomConstants.CLOUD_DEPENDENCIES_ARTIFACT_ID; -import static org.springframework.cloud.release.cloud.buildsystem.SpringCloudBomConstants.CLOUD_DEPENDENCIES_PARENT_ARTIFACT_ID; -import static org.springframework.cloud.release.cloud.buildsystem.SpringCloudBomConstants.CLOUD_RELEASE_ARTIFACT_ID; -import static org.springframework.cloud.release.cloud.buildsystem.SpringCloudBomConstants.CLOUD_STARTER_ARTIFACT_ID; -import static org.springframework.cloud.release.cloud.buildsystem.SpringCloudBomConstants.CLOUD_STARTER_PARENT_ARTIFACT_ID; -import static org.springframework.cloud.release.cloud.buildsystem.SpringCloudBomConstants.SPRING_BOOT; +import static releaser.cloud.buildsystem.SpringCloudBomConstants.BOOT_DEPENDENCIES_ARTIFACT_ID; +import static releaser.cloud.buildsystem.SpringCloudBomConstants.BOOT_STARTER_ARTIFACT_ID; +import static releaser.cloud.buildsystem.SpringCloudBomConstants.BOOT_STARTER_PARENT_ARTIFACT_ID; +import static releaser.cloud.buildsystem.SpringCloudBomConstants.BUILD_ARTIFACT_ID; +import static releaser.cloud.buildsystem.SpringCloudBomConstants.CLOUD_ARTIFACT_ID; +import static releaser.cloud.buildsystem.SpringCloudBomConstants.CLOUD_DEPENDENCIES_ARTIFACT_ID; +import static releaser.cloud.buildsystem.SpringCloudBomConstants.CLOUD_DEPENDENCIES_PARENT_ARTIFACT_ID; +import static releaser.cloud.buildsystem.SpringCloudBomConstants.CLOUD_RELEASE_ARTIFACT_ID; +import static releaser.cloud.buildsystem.SpringCloudBomConstants.CLOUD_STARTER_ARTIFACT_ID; +import static releaser.cloud.buildsystem.SpringCloudBomConstants.CLOUD_STARTER_PARENT_ARTIFACT_ID; +import static releaser.cloud.buildsystem.SpringCloudBomConstants.SPRING_BOOT; class SpringCloudMavenBomParser implements CustomBomParser { private static final Logger log = LoggerFactory .getLogger(SpringCloudMavenBomParser.class); - @Override - public boolean isApplicable(File root, ReleaserProperties properties, - Set projects) { - return isMaven(root) && root.getName().startsWith("spring-cloud") || projects - .stream().anyMatch(project -> BUILD_ARTIFACT_ID.equals(project.name)); - } - @Override public VersionsFromBom parseBom(File root, ReleaserProperties properties) { VersionsFromBom springCloudBuild = springCloudBuild(root, properties); VersionsFromBom boot = bootVersion(root, properties); - if (log.isDebugEnabled()) { - log.debug("Added Spring Cloud Build [{}] and boot versions [{}]", - springCloudBuild, boot); - } + log.debug("Added Spring Cloud Build [{}] and boot versions [{}]", + springCloudBuild, boot); return new VersionsFromBomBuilder().thisProjectRoot(root) .releaserProperties(properties).projects(springCloudBuild, boot).merged(); } @@ -119,12 +110,10 @@ class SpringCloudMavenBomParser implements CustomBomParser { } String bootArtifactId = model.getParent().getArtifactId(); log.debug("Boot artifact id is equal to [{}]", bootArtifactId); - if (!SpringCloudBomConstants.BOOT_STARTER_PARENT_ARTIFACT_ID - .equals(bootArtifactId)) { + if (!BOOT_STARTER_PARENT_ARTIFACT_ID.equals(bootArtifactId)) { if (log.isDebugEnabled()) { throw new IllegalStateException("The pom doesn't have a [" - + SpringCloudBomConstants.BOOT_STARTER_PARENT_ARTIFACT_ID - + "] artifact id"); + + BOOT_STARTER_PARENT_ARTIFACT_ID + "] artifact id"); } return ""; } diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/cloud/docs/SpringCloudCustomProjectDocumentationUpdater.java b/projects/spring-cloud/src/main/java/releaser/cloud/docs/SpringCloudCustomProjectDocumentationUpdater.java similarity index 76% rename from spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/cloud/docs/SpringCloudCustomProjectDocumentationUpdater.java rename to projects/spring-cloud/src/main/java/releaser/cloud/docs/SpringCloudCustomProjectDocumentationUpdater.java index b014385c..537fa8af 100644 --- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/cloud/docs/SpringCloudCustomProjectDocumentationUpdater.java +++ b/projects/spring-cloud/src/main/java/releaser/cloud/docs/SpringCloudCustomProjectDocumentationUpdater.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.release.cloud.docs; +package releaser.cloud.docs; import java.io.File; import java.io.IOException; @@ -23,12 +23,12 @@ import java.nio.file.Path; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import releaser.internal.ReleaserProperties; +import releaser.internal.docs.CustomProjectDocumentationUpdater; +import releaser.internal.git.ProjectGitHandler; +import releaser.internal.project.ProjectVersion; +import releaser.internal.project.Projects; -import org.springframework.cloud.release.internal.ReleaserProperties; -import org.springframework.cloud.release.internal.docs.CustomProjectDocumentationUpdater; -import org.springframework.cloud.release.internal.git.ProjectGitHandler; -import org.springframework.cloud.release.internal.project.ProjectVersion; -import org.springframework.cloud.release.internal.project.Projects; import org.springframework.util.FileSystemUtils; import org.springframework.util.StringUtils; @@ -51,13 +51,6 @@ class SpringCloudCustomProjectDocumentationUpdater this.releaserProperties = releaserProperties; } - @Override - public boolean isApplicable(File clonedDocumentationProject, - ProjectVersion currentProject, String bomBranch) { - return clonedDocumentationProject.getName().startsWith("spring-cloud") - || currentProject.projectName.startsWith("spring-cloud"); - } - /** * Updates the documentation repository if current release train version is greater or * equal than the one stored in the repo. @@ -67,7 +60,7 @@ class SpringCloudCustomProjectDocumentationUpdater * used */ @Override - public File updateDocsRepo(File clonedDocumentationProject, + public File updateDocsRepoForReleaseTrain(File clonedDocumentationProject, ProjectVersion currentProject, Projects projects, String bomBranch) { log.debug("Cloning the doc project to [{}]", clonedDocumentationProject); ProjectVersion releaseTrainProject = new ProjectVersion( @@ -79,28 +72,44 @@ class SpringCloudCustomProjectDocumentationUpdater removeAFolderWithRedirection(currentReleaseFolder); File docsRepo = updateTheDocsRepo(releaseTrainProject, clonedDocumentationProject, currentReleaseFolder); - log.info( - "Updating all current links to documentation for release train projects"); - projects.forEach(projectVersion -> { - File currentProjectReleaseFolder = new File(clonedDocumentationProject, - currentFolder(projectVersion.projectName, projectVersion.version)); - removeAFolderWithRedirection(currentProjectReleaseFolder); - try { - updateTheDocsRepo(projectVersion, clonedDocumentationProject, - currentProjectReleaseFolder); - log.info("Processed [{}] for project with name [{}]", - currentProjectReleaseFolder, projectVersion.projectName); - } - catch (Exception ex) { - log.warn( - "Exception occurred while trying o update the symlink of a project [" - + projectVersion.projectName + "]", - ex); - } - }); return pushChanges(docsRepo); } + /** + * Updates the documentation repository if current release train version is greater or + * equal than the one stored in the repo. + * @param currentProject project to update the docs repo for + * @return {@link File cloned temporary directory} - {@code null} if wrong version is + * used + */ + @Override + public File updateDocsRepoForSingleProject(File clonedDocumentationProject, + ProjectVersion currentProject, Projects projects) { + if (!projects.containsProject(currentProject.projectName)) { + log.warn( + "Can't update the documentation repo for project [{}] cause it's not present on the projects list {}", + currentProject.projectName, projects); + return clonedDocumentationProject; + } + log.info("Updating link to documentation for project [{}]", + currentProject.projectName); + ProjectVersion projectVersion = projects.forName(currentProject.projectName); + File currentProjectReleaseFolder = new File(clonedDocumentationProject, + currentFolder(projectVersion.projectName, projectVersion.version)); + removeAFolderWithRedirection(currentProjectReleaseFolder); + try { + updateTheDocsRepo(projectVersion, clonedDocumentationProject, + currentProjectReleaseFolder); + log.info("Processed [{}] for project with name [{}]", + currentProjectReleaseFolder, projectVersion.projectName); + } + catch (Exception ex) { + log.warn("Exception occurred while trying o update the symlink of a project [" + + projectVersion.projectName + "]", ex); + } + return pushChanges(clonedDocumentationProject); + } + private void removeAFolderWithRedirection(File currentReleaseFolder) { if (!isSymbolinkLink(currentReleaseFolder)) { FileSystemUtils.deleteRecursively(currentReleaseFolder); @@ -179,8 +188,7 @@ class SpringCloudCustomProjectDocumentationUpdater log.warn("Failed to create parent directory of [{}]", currentVersionFolder); } - File newTarget = new File(documentationProject, - concreteVersionFolder(projectVersion)); + File newTarget = new File(projectVersion.version); Files.createSymbolicLink(currentVersionFolder.toPath(), newTarget.toPath()); log.info("Updated the link [{}] to point to [{}]", currentVersionFolder.toPath(), diff --git a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/cloud/docs/SpringCloudDocsConfiguration.java b/projects/spring-cloud/src/main/java/releaser/cloud/docs/SpringCloudDocsConfiguration.java similarity index 84% rename from spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/cloud/docs/SpringCloudDocsConfiguration.java rename to projects/spring-cloud/src/main/java/releaser/cloud/docs/SpringCloudDocsConfiguration.java index 41e3595a..64004340 100644 --- a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/cloud/docs/SpringCloudDocsConfiguration.java +++ b/projects/spring-cloud/src/main/java/releaser/cloud/docs/SpringCloudDocsConfiguration.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package org.springframework.cloud.release.cloud.docs; +package releaser.cloud.docs; + +import releaser.internal.ReleaserProperties; +import releaser.internal.git.ProjectGitHandler; -import org.springframework.cloud.release.internal.ReleaserProperties; -import org.springframework.cloud.release.internal.git.ProjectGitHandler; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/cloud/github/SpringCloudGithubConfiguration.java b/projects/spring-cloud/src/main/java/releaser/cloud/github/SpringCloudGithubConfiguration.java similarity index 83% rename from spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/cloud/github/SpringCloudGithubConfiguration.java rename to projects/spring-cloud/src/main/java/releaser/cloud/github/SpringCloudGithubConfiguration.java index 9a5ef9ed..3e6f00c0 100644 --- a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/cloud/github/SpringCloudGithubConfiguration.java +++ b/projects/spring-cloud/src/main/java/releaser/cloud/github/SpringCloudGithubConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2013-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,10 @@ * limitations under the License. */ -package org.springframework.cloud.release.cloud.github; +package releaser.cloud.github; + +import releaser.internal.ReleaserProperties; -import org.springframework.cloud.release.internal.ReleaserProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/cloud/github/SpringCloudGithubIssues.java b/projects/spring-cloud/src/main/java/releaser/cloud/github/SpringCloudGithubIssues.java similarity index 82% rename from spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/cloud/github/SpringCloudGithubIssues.java rename to projects/spring-cloud/src/main/java/releaser/cloud/github/SpringCloudGithubIssues.java index cacf25d8..b0261b42 100644 --- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/cloud/github/SpringCloudGithubIssues.java +++ b/projects/spring-cloud/src/main/java/releaser/cloud/github/SpringCloudGithubIssues.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.cloud.release.cloud.github; +package releaser.cloud.github; import com.jcabi.github.Github; +import releaser.internal.ReleaserProperties; +import releaser.internal.github.CustomGithubIssues; +import releaser.internal.github.GithubIssueFiler; +import releaser.internal.project.ProjectVersion; +import releaser.internal.project.Projects; -import org.springframework.cloud.release.internal.ReleaserProperties; -import org.springframework.cloud.release.internal.github.CustomGithubIssues; -import org.springframework.cloud.release.internal.github.GithubIssueFiler; -import org.springframework.cloud.release.internal.project.ProjectVersion; -import org.springframework.cloud.release.internal.project.Projects; import org.springframework.util.StringUtils; class SpringCloudGithubIssues implements CustomGithubIssues { @@ -43,13 +43,6 @@ class SpringCloudGithubIssues implements CustomGithubIssues { this.properties = properties; } - @Override - public boolean isApplicable(ReleaserProperties properties, Projects projects, - ProjectVersion version) { - return projects.stream() - .anyMatch(project -> project.projectName.contains("spring-cloud-build")); - } - @Override public void fileIssueInSpringGuides(Projects projects, ProjectVersion version) { String user = "spring-guides"; diff --git a/projects/spring-cloud/src/main/resources/application.yml b/projects/spring-cloud/src/main/resources/application.yml new file mode 100644 index 00000000..1f2b11d8 --- /dev/null +++ b/projects/spring-cloud/src/main/resources/application.yml @@ -0,0 +1,123 @@ +spring: + main: + web-application-type: none + datasource: + url: jdbc:h2:mem:${random.uuid} + jackson: + deserialization: + FAIL_ON_UNKNOWN_PROPERTIES: true +releaser: + # working-dir: + post-release-tasks-only: false + skip-post-release-tasks: false + flow: + default-enabled: true + git: + release-train-bom-url: https://github.com/spring-cloud/spring-cloud-release + documentation-url: https://github.com/spring-cloud/spring-cloud-static + spring-project-url: https://github.com/spring-projects/spring-cloud + test-samples-project-url: https://github.com/spring-cloud/spring-cloud-core-tests + release-train-docs-url: https://github.com/spring-cloud-samples/scripts + release-train-wiki-url: https://github.com/spring-projects/spring-cloud.wiki + documentation-branch: gh-pages + spring-project-branch: gh-pages + test-samples-branch: master + release-train-docs-branch: master + release-train-wiki-page-prefix: Spring-Cloud + # clone-destination-dir: + fetch-versions-from-git: true + # oauth-token: + # username: + # password: + number-of-checked-milestones: 50 + update-documentation-repo: true + update-github-milestones: true + update-spring-guides: true + update-start-spring-io: true + update-spring-project: true + run-updated-samples: true + update-release-train-docs: true + update-release-train-wiki: true + update-all-test-samples: true + all-test-sample-urls: + spring-cloud-sleuth: + - https://github.com/spring-cloud-samples/sleuth-issues + - https://github.com/spring-cloud-samples/sleuth-documentation-apps + spring-cloud-contract: + - https://github.com/spring-cloud-samples/spring-cloud-contract-samples + - https://github.com/spring-cloud-samples/the-legacy-app + - https://github.com/spring-cloud-samples/sc-contract-car-rental + pom: + branch: master + pom-with-boot-starter-parent: spring-cloud-starter-parent/pom.xml + this-train-bom: spring-cloud-dependencies/pom.xml + bom-version-pattern: "^(spring-cloud-.*)\\.version$" + ignored-pom-regex: + - "^.*\\.git/.*$" + - "^.*spring-cloud-contract-maven-plugin/src/test/projects/.*$" + - "^.*spring-cloud-contract-maven-plugin/target/.*$" + - "^.*src/test/bats/.*$" + - "^.*samples/standalone/[a-z]+/.*$" + maven: + build-command: "./mvnw clean install -B -Pdocs {{systemProps}}" + deploy-command: "./mvnw deploy -DskipTests -B -Pfast,deploy {{systemProps}}" + deploy-guides-command: "./mvnw clean verify deploy -B -Pguides,integration -pl guides {{systemProps}}" + publish-docs-commands: + - "mkdir -p target" + - "wget https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/ghpages.sh -O target/gh-pages.sh" + - "chmod +x target/gh-pages.sh" + - "./target/gh-pages.sh -v {{version}} -c" + generate-release-train-docs-command: "bash release_train.sh --retrieveversions --version {{version}} --ghpages --auto" + system-properties: "" + wait-time-in-minutes: 20 + bash: + build-command: 'echo "{{systemProps}}"' + deploy-command: 'echo "{{systemProps}}"' + deploy-guides-command: 'echo "{{systemProps}}"' + publish-docs-commands: + - 'echo "{{systemProps}}"' + generate-release-train-docs-command: 'echo "{{systemProps}}"' + system-properties: "" + wait-time-in-minutes: 20 + gradle: + gradle-props-substitution: + bootVersion: spring-boot + BOOT_VERSION: spring-boot + bomVersion: spring-cloud-release + BOM_VERSION: spring-cloud-release + springCloudBuildVersion: spring-cloud-build + ignored-gradle-regex: + - "^.*spring-cloud-contract-maven-plugin/src/test/projects/.*$" + - "^.*spring-cloud-contract-maven-plugin/target/.*$" + - "^.*src/test/bats/.*$" + - "^.*samples/standalone/[a-z]+/.*$" + build-command: "./gradlew clean build publishToMavenLocal --console=plain -PnextVersion={{nextVersion}} -PoldVersion={{oldVersion}} -PcurrentVersion={{version}} {{systemProps}}" + deploy-command: "./gradlew publish --console=plain -PnextVersion={{nextVersion}} -PoldVersion={{oldVersion}} -PcurrentVersion={{version}} {{systemProps}}" + deploy-guides-command: "./gradlew clean build deployGuides --console=plain -PnextVersion={{nextVersion}} -PoldVersion={{oldVersion}} -PcurrentVersion={{version}} {{systemProps}}" + publish-docs-commands: + - "echo 'TODO'" + generate-release-train-docs-command: "echo 'TODO'" + system-properties: "" + wait-time-in-minutes: 20 + sagan: + update-sagan: true + template: + enabled: true + template-folder: cloud + versions: + all-versions-file-url: https://raw.githubusercontent.com/spring-io/start.spring.io/master/start-site/src/main/resources/application.yml + bom-name: spring-cloud + # fixed-versions: + meta-release: + enabled: false + release-train-project-name: spring-cloud-release + release-train-dependency-names: + - spring-cloud + - spring-cloud-dependencies + - spring-cloud-starter + - spring-cloud-starter-build + git-org-url: https://github.com/spring-cloud + projects-to-skip: + - spring-boot + - spring-cloud-stream + - spring-cloud-task \ No newline at end of file diff --git a/projects/spring-cloud/src/test/java/releaser/ReleaserApplicationTests.java b/projects/spring-cloud/src/test/java/releaser/ReleaserApplicationTests.java new file mode 100644 index 00000000..6d0c2bf8 --- /dev/null +++ b/projects/spring-cloud/src/test/java/releaser/ReleaserApplicationTests.java @@ -0,0 +1,59 @@ +/* + * Copyright 2013-2019 the original author or authors. + * + * 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 + * + * https://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. + */ + +package releaser; + +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import releaser.internal.options.Parser; +import releaser.internal.spring.ExecutionResultHandler; +import releaser.internal.spring.SpringReleaser; + +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@SpringBootTest( + classes = { ReleaserApplicationTests.Config.class, ReleaserApplication.class }, + properties = { "releaser.sagan.update-sagan=false" }) +class ReleaserApplicationTests { + + @Test + void contextLoads() { + + } + + @Configuration + static class Config { + + @Bean + SpringReleaser mockReleaser() { + return Mockito.mock(SpringReleaser.class); + } + + @Bean + ExecutionResultHandler mockExecutionResultHandler() { + return Mockito.mock(ExecutionResultHandler.class); + } + + @Bean + Parser mockParser() { + return Mockito.mock(Parser.class); + } + + } + +} diff --git a/projects/spring-cloud/src/test/java/releaser/cloud/SpringCloudReleaserProperties.java b/projects/spring-cloud/src/test/java/releaser/cloud/SpringCloudReleaserProperties.java new file mode 100644 index 00000000..a950b984 --- /dev/null +++ b/projects/spring-cloud/src/test/java/releaser/cloud/SpringCloudReleaserProperties.java @@ -0,0 +1,54 @@ +/* + * Copyright 2013-2019 the original author or authors. + * + * 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 + * + * https://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. + */ + +package releaser.cloud; + +import java.io.File; +import java.net.URISyntaxException; +import java.util.Properties; +import java.util.stream.Collectors; + +import releaser.internal.ReleaserProperties; + +import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; +import org.springframework.boot.context.properties.bind.Binder; +import org.springframework.boot.context.properties.source.MapConfigurationPropertySource; +import org.springframework.core.io.FileSystemResource; + +public class SpringCloudReleaserProperties { + + public static ReleaserProperties get() { + try { + File releaserConfig = new File(SpringCloudReleaserProperties.class + .getResource("/application.yml").toURI()); + YamlPropertiesFactoryBean yamlProcessor = new YamlPropertiesFactoryBean(); + yamlProcessor.setResources(new FileSystemResource(releaserConfig)); + Properties properties = yamlProcessor.getObject(); + ReleaserProperties releaserProperties = new Binder( + new MapConfigurationPropertySource(properties.entrySet().stream() + .collect(Collectors.toMap(e -> e.getKey().toString(), + e -> e.getValue().toString())))) + .bind("releaser", ReleaserProperties.class) + .get(); + return releaserProperties; + } + catch (URISyntaxException e) { + throw new IllegalStateException(e); + } + + } + +} diff --git a/projects/spring-cloud/src/test/java/releaser/cloud/buildsystem/SpringCloudCustomMavenBomTests.java b/projects/spring-cloud/src/test/java/releaser/cloud/buildsystem/SpringCloudCustomMavenBomTests.java new file mode 100644 index 00000000..e988b750 --- /dev/null +++ b/projects/spring-cloud/src/test/java/releaser/cloud/buildsystem/SpringCloudCustomMavenBomTests.java @@ -0,0 +1,134 @@ +/* + * Copyright 2013-2019 the original author or authors. + * + * 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 + * + * https://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. + */ + +package releaser.cloud.buildsystem; + +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.junit.Test; +import releaser.cloud.SpringCloudReleaserProperties; +import releaser.internal.buildsystem.CustomBomParser; +import releaser.internal.buildsystem.VersionsFromBom; +import releaser.internal.buildsystem.VersionsFromBomBuilder; +import releaser.internal.project.Project; + +import static org.assertj.core.api.BDDAssertions.then; + +/** + * @author Marcin Grzejszczak + */ +public class SpringCloudCustomMavenBomTests { + + @Test + public void should_add_boot_to_versions_when_version_is_created() { + List bomParsers = Collections + .singletonList(new SpringCloudMavenBomParser()); + VersionsFromBom customVersionsFromBom = new VersionsFromBomBuilder() + .releaserProperties(SpringCloudReleaserProperties.get()) + .parsers(bomParsers).projects(springCloudBuildProjects()) + .retrieveFromBom(); + customVersionsFromBom.setVersion("spring-boot", "1.2.3.RELEASE"); + + then(customVersionsFromBom.versionForProject("spring-boot")) + .isEqualTo("1.2.3.RELEASE"); + then(customVersionsFromBom.versionForProject("spring-boot-starter-parent")) + .isEqualTo("1.2.3.RELEASE"); + then(customVersionsFromBom.versionForProject("spring-boot-dependencies")) + .isEqualTo("1.2.3.RELEASE"); + } + + @Test + public void should_update_projects_for_boot() { + VersionsFromBom versionsFromBom = mixedVersions().setVersion("spring-boot", + "3.0.0"); + + then(versionsFromBom.versionForProject("spring-boot")).isEqualTo("3.0.0"); + then(versionsFromBom.versionForProject("spring-boot-starter-parent")) + .isEqualTo("3.0.0"); + then(versionsFromBom.versionForProject("spring-boot-dependencies")) + .isEqualTo("3.0.0"); + + versionsFromBom = mixedVersions().setVersion("spring-boot-starter-parent", + "3.0.0"); + + then(versionsFromBom.versionForProject("spring-boot")).isEqualTo("3.0.0"); + then(versionsFromBom.versionForProject("spring-boot-starter-parent")) + .isEqualTo("3.0.0"); + then(versionsFromBom.versionForProject("spring-boot-dependencies")) + .isEqualTo("3.0.0"); + + versionsFromBom = mixedVersions().setVersion("spring-boot-dependencies", "3.0.0"); + + then(versionsFromBom.versionForProject("spring-boot")).isEqualTo("3.0.0"); + then(versionsFromBom.versionForProject("spring-boot-starter-parent")) + .isEqualTo("3.0.0"); + then(versionsFromBom.versionForProject("spring-boot-dependencies")) + .isEqualTo("3.0.0"); + } + + @Test + public void should_update_projects_for_build() { + VersionsFromBom versionsFromBom = mixedVersions().setVersion("spring-cloud-build", + "3.0.0"); + + then(versionsFromBom.versionForProject("spring-cloud-build")).isEqualTo("3.0.0"); + + versionsFromBom = mixedVersions().setVersion("spring-cloud-build", "3.0.0"); + + then(versionsFromBom.versionForProject("spring-cloud-dependencies-parent")) + .isEqualTo("3.0.0"); + then(versionsFromBom.versionForProject("spring-cloud-dependencies")) + .isEqualTo("Greenwich.RELEASE"); + + versionsFromBom = mixedVersions().setVersion("spring-cloud-dependencies-parent", + "3.0.0"); + + then(versionsFromBom.versionForProject("spring-cloud-build")).isEqualTo("3.0.0"); + then(versionsFromBom.versionForProject("spring-cloud-dependencies-parent")) + .isEqualTo("3.0.0"); + then(versionsFromBom.versionForProject("spring-cloud-dependencies")) + .isEqualTo("Greenwich.RELEASE"); + } + + private VersionsFromBom mixedVersions() { + return new VersionsFromBomBuilder() + .releaserProperties(SpringCloudReleaserProperties.get()) + .parsers(Collections.singletonList(new SpringCloudMavenBomParser())) + .projects(mixedProjects()).merged(); + } + + Set springCloudBuildProjects() { + Set projects = new HashSet<>(); + projects.add(new Project("spring-cloud-build", "1.2.3.BUILD-SNAPSHOT")); + return projects; + } + + Set mixedProjects() { + Set projects = new HashSet<>(); + projects.add(new Project("foo", "1.0.0.BUILD-SNAPSHOT")); + projects.add(new Project("fooBar", "1.0.0.RELEASE")); + projects.add(new Project("spring-boot", "1.0.0")); + projects.add(new Project("spring-cloud-build", "2.0.0")); + projects.add(new Project("spring-cloud-release", "Greenwich.RELEASE")); + projects.add(new Project("spring-cloud-dependencies", "Greenwich.RELEASE")); + projects.add(new Project("spring-cloud-stream-starters", "Fishtown.RELEASE")); + return projects; + } + +} diff --git a/projects/spring-cloud/src/test/java/releaser/cloud/buildsystem/SpringCloudMavenBomParserTests.java b/projects/spring-cloud/src/test/java/releaser/cloud/buildsystem/SpringCloudMavenBomParserTests.java new file mode 100644 index 00000000..717ae82c --- /dev/null +++ b/projects/spring-cloud/src/test/java/releaser/cloud/buildsystem/SpringCloudMavenBomParserTests.java @@ -0,0 +1,171 @@ +/* + * Copyright 2013-2019 the original author or authors. + * + * 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 + * + * https://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. + */ + +package releaser.cloud.buildsystem; + +import java.io.File; +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.Arrays; + +import org.eclipse.jgit.api.errors.GitAPIException; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import releaser.cloud.SpringCloudReleaserProperties; +import releaser.cloud.docs.TestUtils; +import releaser.internal.ReleaserProperties; +import releaser.internal.buildsystem.BomParser; +import releaser.internal.buildsystem.MavenBomParserAccessor; +import releaser.internal.buildsystem.VersionsFromBom; + +import org.springframework.util.FileSystemUtils; + +import static org.assertj.core.api.BDDAssertions.then; +import static org.assertj.core.api.BDDAssertions.thenThrownBy; + +/** + * @author Marcin Grzejszczak + */ +public class SpringCloudMavenBomParserTests { + + @Rule + public TemporaryFolder tmp = new TemporaryFolder(); + + File tmpFolder; + + File springCloudReleaseProject; + + ReleaserProperties properties = SpringCloudReleaserProperties.get(); + + @Before + public void setup() throws URISyntaxException, IOException, GitAPIException { + this.tmpFolder = this.tmp.newFolder(); + TestUtils.prepareLocalRepo(); + FileSystemUtils.copyRecursively(file("/projects"), this.tmpFolder); + this.springCloudReleaseProject = new File(this.tmpFolder, + "/spring-cloud-release"); + } + + private File file(String relativePath) throws URISyntaxException { + return new File( + SpringCloudMavenBomParserTests.class.getResource(relativePath).toURI()); + } + + @Test + public void should_throw_exception_when_null_is_passed_to_boot() { + this.properties.getPom().setPomWithBootStarterParent(null); + this.properties.getPom().setThisTrainBom(null); + BomParser parser = MavenBomParserAccessor.bomParser(this.properties, + new SpringCloudMavenBomParser()); + + thenThrownBy(() -> parser.versionsFromBom(this.springCloudReleaseProject)) + .isInstanceOf(IllegalStateException.class) + .hasMessageContaining("Pom is not present"); + } + + @Test + public void should_populate_sc_release_version() { + BomParser parser = MavenBomParserAccessor.bomParser(this.properties, + new SpringCloudMavenBomParser()); + + String scReleaseVersion = parser.versionsFromBom(this.springCloudReleaseProject) + .versionForProject("spring-cloud-release"); + + then(scReleaseVersion).isNotBlank(); + } + + @Test + public void should_populate_boot_version() { + BomParser parser = MavenBomParserAccessor.bomParser(this.properties, + new SpringCloudMavenBomParser()); + + String bootVersion = parser.versionsFromBom(this.springCloudReleaseProject) + .versionForProject("spring-boot"); + + then(bootVersion).isNotBlank(); + } + + @Test + public void should_throw_exception_when_cloud_pom_is_missing() { + BomParser parser = MavenBomParserAccessor.bomParser(this.properties, + new SpringCloudMavenBomParser()); + + thenThrownBy(() -> parser.versionsFromBom(new File("."))) + .isInstanceOf(IllegalStateException.class) + .hasMessageContaining("Pom is not present"); + } + + @Test + public void should_throw_exception_when_null_is_passed_to_cloud() { + this.properties.getPom().setPomWithBootStarterParent(null); + this.properties.getPom().setThisTrainBom(null); + BomParser parser = MavenBomParserAccessor.bomParser(this.properties, + new SpringCloudMavenBomParser()); + + thenThrownBy(() -> parser.versionsFromBom(this.springCloudReleaseProject)) + .isInstanceOf(IllegalStateException.class) + .hasMessageContaining("Pom is not present"); + } + + @Test + public void should_throw_exception_when_cloud_version_is_missing_in_pom() { + this.properties.getPom().setPomWithBootStarterParent("pom.xml"); + this.properties.getPom().setThisTrainBom("pom.xml"); + BomParser parser = MavenBomParserAccessor.bomParser(this.properties, + new SpringCloudMavenBomParser()); + + thenThrownBy(() -> parser.versionsFromBom(this.springCloudReleaseProject)) + .isInstanceOf(IllegalStateException.class).hasMessageContaining( + "The pom doesn't have a [spring-cloud-dependencies-parent] artifact id"); + } + + @Test + public void should_populate_cloud_version() { + BomParser parser = MavenBomParserAccessor.bomParser(this.properties, + new SpringCloudMavenBomParser()); + + VersionsFromBom cloudVersionsFromBom = parser + .versionsFromBom(this.springCloudReleaseProject); + + thenAllCloudVersionsSet(cloudVersionsFromBom); + } + + private void thenAllCloudVersionsSet(VersionsFromBom cloudVersionsFromBom) { + Arrays.asList("spring-cloud-bus", "spring-cloud-contract", + "spring-cloud-cloudfoundry", "spring-cloud-commons", + "spring-cloud-config", "spring-cloud-netflix", "spring-cloud-security", + "spring-cloud-consul", "spring-cloud-sleuth", "spring-cloud-stream", + "spring-cloud-task", "spring-cloud-vault", "spring-cloud-zookeeper") + .forEach(s -> then(cloudVersionsFromBom.versionForProject(s)) + .isNotBlank()); + } + + @Test + public void should_populate_boot_and_cloud_version() { + BomParser parser = MavenBomParserAccessor.bomParser(this.properties, + new SpringCloudMavenBomParser()); + + VersionsFromBom cloudVersionsFromBom = parser + .versionsFromBom(this.springCloudReleaseProject); + + then(cloudVersionsFromBom.versionForProject("spring-boot")).isNotBlank(); + then(cloudVersionsFromBom.versionForProject("spring-cloud-build")).isNotBlank(); + thenAllCloudVersionsSet(cloudVersionsFromBom); + } + +} diff --git a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/buildsystem/ProjectPomUpdaterTests.java b/projects/spring-cloud/src/test/java/releaser/cloud/buildsystem/SpringCloudProjectPomUpdaterTests.java similarity index 74% rename from spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/buildsystem/ProjectPomUpdaterTests.java rename to projects/spring-cloud/src/test/java/releaser/cloud/buildsystem/SpringCloudProjectPomUpdaterTests.java index e26839ab..ef0ef6d3 100644 --- a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/buildsystem/ProjectPomUpdaterTests.java +++ b/projects/spring-cloud/src/test/java/releaser/cloud/buildsystem/SpringCloudProjectPomUpdaterTests.java @@ -14,30 +14,27 @@ * limitations under the License. */ -package org.springframework.cloud.release.internal.buildsystem; +package releaser.cloud.buildsystem; -import java.io.File; import java.util.Collections; import java.util.Map; import java.util.stream.Collectors; import org.assertj.core.api.BDDAssertions; import org.junit.Test; -import org.mockito.BDDMockito; - -import org.springframework.cloud.release.internal.ReleaserProperties; -import org.springframework.cloud.release.internal.git.ProjectGitHandler; -import org.springframework.cloud.release.internal.project.ProjectVersion; -import org.springframework.cloud.release.internal.project.Projects; +import releaser.cloud.SpringCloudReleaserProperties; +import releaser.internal.ReleaserProperties; +import releaser.internal.buildsystem.MavenBomParserAccessor; +import releaser.internal.buildsystem.ProjectPomUpdater; /** * @author Marcin Grzejszczak */ -public class ProjectPomUpdaterTests { +public class SpringCloudProjectPomUpdaterTests { @Test public void should_convert_fixed_versions_to_updated_fixed_versions() { - ReleaserProperties properties = new ReleaserProperties(); + ReleaserProperties properties = SpringCloudReleaserProperties.get(); properties.getFixedVersions().put("spring-cloud-task", "2.0.0.RELEASE"); properties.getFixedVersions().put("spring-cloud-openfeign", "2.0.1.BUILD-SNAPSHOT"); @@ -67,8 +64,9 @@ public class ProjectPomUpdaterTests { "Finchley.BUILD-SNAPSHOT"); properties.getFixedVersions().put("spring-boot", "2.0.3.RELEASE"); properties.getFixedVersions().put("spring-cloud-gateway", "2.0.1.BUILD-SNAPSHOT"); - ProjectPomUpdater updater = new ProjectPomUpdater(properties, Collections - .singletonList(MavenBomParserAccessor.cloudMavenBomParser(properties))); + ProjectPomUpdater updater = new ProjectPomUpdater(properties, + Collections.singletonList(MavenBomParserAccessor.bomParser(properties, + new SpringCloudMavenBomParser()))); Map fixedVersions = updater.fixedVersions().stream() .collect(Collectors.toMap(projectVersion -> projectVersion.projectName, @@ -84,17 +82,4 @@ public class ProjectPomUpdaterTests { .containsEntry("spring-cloud", "Finchley.BUILD-SNAPSHOT"); } - @Test - public void should_skip_any_steps_if_there_is_no_pom_xml() { - ReleaserProperties properties = new ReleaserProperties(); - ProjectGitHandler handler = BDDMockito.mock(ProjectGitHandler.class); - ProjectPomUpdater updater = new ProjectPomUpdater(properties, Collections - .singletonList(MavenBomParserAccessor.cloudMavenBomParser(properties))); - - updater.updateProjectFromReleaseTrain(new File("target"), new Projects(), - new ProjectVersion("foo", "1.0.0.RELEASE"), false); - - BDDMockito.then(handler).shouldHaveZeroInteractions(); - } - } diff --git a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/cloud/docs/SpringCloudCustomProjectDocumentationUpdaterTests.java b/projects/spring-cloud/src/test/java/releaser/cloud/docs/SpringCloudCustomProjectDocumentationUpdaterTests.java similarity index 81% rename from spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/cloud/docs/SpringCloudCustomProjectDocumentationUpdaterTests.java rename to projects/spring-cloud/src/test/java/releaser/cloud/docs/SpringCloudCustomProjectDocumentationUpdaterTests.java index 445af674..d3c49f8d 100644 --- a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/cloud/docs/SpringCloudCustomProjectDocumentationUpdaterTests.java +++ b/projects/spring-cloud/src/test/java/releaser/cloud/docs/SpringCloudCustomProjectDocumentationUpdaterTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.release.cloud.docs; +package releaser.cloud.docs; import java.io.File; import java.io.IOException; @@ -31,16 +31,16 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.mockito.BDDMockito; +import releaser.cloud.SpringCloudReleaserProperties; +import releaser.cloud.github.SpringCloudGithubIssuesAccessor; +import releaser.internal.ReleaserProperties; +import releaser.internal.docs.DocumentationUpdater; +import releaser.internal.git.ProjectGitHandler; +import releaser.internal.github.ProjectGitHubHandler; +import releaser.internal.project.ProjectVersion; +import releaser.internal.project.Projects; +import releaser.internal.template.TemplateGenerator; -import org.springframework.cloud.release.cloud.github.SpringCloudGithubIssuesAccessor; -import org.springframework.cloud.release.internal.ReleaserProperties; -import org.springframework.cloud.release.internal.buildsystem.TestUtils; -import org.springframework.cloud.release.internal.docs.DocumentationUpdater; -import org.springframework.cloud.release.internal.git.ProjectGitHandler; -import org.springframework.cloud.release.internal.github.ProjectGitHubHandler; -import org.springframework.cloud.release.internal.project.ProjectVersion; -import org.springframework.cloud.release.internal.project.Projects; -import org.springframework.cloud.release.internal.template.TemplateGenerator; import org.springframework.util.FileSystemUtils; import static org.assertj.core.api.BDDAssertions.then; @@ -63,7 +63,7 @@ public class SpringCloudCustomProjectDocumentationUpdaterTests { File clonedDocProject; - ReleaserProperties properties = new ReleaserProperties(); + ReleaserProperties properties = SpringCloudReleaserProperties.get(); @Before public void setup() throws IOException, URISyntaxException { @@ -85,7 +85,7 @@ public class SpringCloudCustomProjectDocumentationUpdaterTests { public void should_not_update_current_version_in_the_docs_if_current_release_is_not_ga_or_sr() { ProjectVersion releaseTrainVersion = new ProjectVersion("spring-cloud-release", "Angel.M7"); - ReleaserProperties properties = new ReleaserProperties(); + ReleaserProperties properties = SpringCloudReleaserProperties.get(); File updatedDocs = projectDocumentationUpdater(properties) .updateDocsRepo(projects(), releaseTrainVersion, "vAngel.M7"); @@ -118,16 +118,16 @@ public class SpringCloudCustomProjectDocumentationUpdaterTests { file("/projects/spring-cloud-static/").toURI().toString()); File updatedDocs = new SpringCloudCustomProjectDocumentationUpdater( - new ProjectGitHandler(properties), properties).updateDocsRepo( - this.clonedDocProject, releaseTrainVersion, projects(), - "vFinchley.SR33"); + new ProjectGitHandler(properties), properties) + .updateDocsRepoForReleaseTrain(this.clonedDocProject, + releaseTrainVersion, projects(), "vFinchley.SR33"); BDDAssertions.then(new File(updatedDocs, "current/index.html").toPath()) .doesNotExist(); Path current = new File(updatedDocs, "current/").toPath(); BDDAssertions.then(current).isSymbolicLink(); BDDAssertions.then(Files.readSymbolicLink(current).toString()) - .endsWith("Finchley.SR33"); + .isEqualTo("Finchley.SR33"); releaseTrainVersion = new ProjectVersion("spring-cloud-release", "Angel.SR33"); properties = new ReleaserProperties(); @@ -135,16 +135,16 @@ public class SpringCloudCustomProjectDocumentationUpdaterTests { file("/projects/spring-cloud-static/").toURI().toString()); updatedDocs = new SpringCloudCustomProjectDocumentationUpdater( - new ProjectGitHandler(properties), properties).updateDocsRepo( - this.clonedDocProject, releaseTrainVersion, projects(), - "vAngel.SR33"); + new ProjectGitHandler(properties), properties) + .updateDocsRepoForReleaseTrain(this.clonedDocProject, + releaseTrainVersion, projects(), "vAngel.SR33"); BDDAssertions.then(new File(updatedDocs, "current/index.html").toPath()) .doesNotExist(); current = new File(updatedDocs, "current/").toPath(); BDDAssertions.then(current).isSymbolicLink(); BDDAssertions.then(Files.readSymbolicLink(current).toString()) - .doesNotEndWith("Angel.SR33"); + .isNotEqualTo("Angel.SR33"); } @Test @@ -156,8 +156,8 @@ public class SpringCloudCustomProjectDocumentationUpdaterTests { ProjectGitHandler handler = BDDMockito.spy(new ProjectGitHandler(properties)); new SpringCloudCustomProjectDocumentationUpdater(handler, properties) - .updateDocsRepo(this.clonedDocProject, releaseTrainVersion, projects(), - "vDalston.SR3"); + .updateDocsRepoForReleaseTrain(this.clonedDocProject, releaseTrainVersion, + projects(), "vDalston.SR3"); BDDMockito.then(handler).should(BDDMockito.never()) .commit(BDDMockito.any(File.class), BDDMockito.anyString()); @@ -172,16 +172,16 @@ public class SpringCloudCustomProjectDocumentationUpdaterTests { properties.getGit().setDocumentationUrl(this.clonedDocProject.toURI().toString()); File updatedDocs = new SpringCloudCustomProjectDocumentationUpdater( - new ProjectGitHandler(properties), properties).updateDocsRepo( - this.clonedDocProject, releaseTrainVersion, projects(), - "Angel.SR33"); + new ProjectGitHandler(properties), properties) + .updateDocsRepoForReleaseTrain(this.clonedDocProject, + releaseTrainVersion, projects(), "Angel.SR33"); BDDAssertions.then(new File(updatedDocs, "current/index.html").toPath()) .doesNotExist(); Path current = new File(updatedDocs, "current/").toPath(); BDDAssertions.then(current).isSymbolicLink(); BDDAssertions.then(Files.readSymbolicLink(current).toString()) - .doesNotEndWith("Angel.SR33"); + .isNotEqualTo("Angel.SR33"); } @Test @@ -201,7 +201,7 @@ public class SpringCloudCustomProjectDocumentationUpdaterTests { Path current = new File(updatedDocs, "current/").toPath(); BDDAssertions.then(current).isSymbolicLink(); BDDAssertions.then(Files.readSymbolicLink(current).toString()) - .endsWith("spring-cloud-static/Finchley.SR33"); + .isEqualTo("Finchley.SR33"); } @Test @@ -213,16 +213,21 @@ public class SpringCloudCustomProjectDocumentationUpdaterTests { properties.getGit().setUpdateDocumentationRepo(true); properties.getGit().setDocumentationUrl(this.clonedDocProject.toURI().toString()); - File updatedDocs = projectDocumentationUpdater(properties).updateDocsRepo( - new Projects(new ProjectVersion("spring-cloud-sleuth", "2.0.0.RELEASE")), - releaseTrainVersion, "vFinchley.SR33"); + DocumentationUpdater updater = projectDocumentationUpdater(properties); + ProjectVersion sleuthVersion = new ProjectVersion("spring-cloud-sleuth", + "2.0.0.RELEASE"); + Projects bom = new Projects(sleuthVersion); + File updatedDocs = updater.updateDocsRepo(bom, releaseTrainVersion, + "vFinchley.SR33"); BDDAssertions.then(new File(updatedDocs, "current/index.html").toPath()) .doesNotExist(); Path current = new File(updatedDocs, "current/").toPath(); BDDAssertions.then(current).isSymbolicLink(); BDDAssertions.then(Files.readSymbolicLink(current).toString()) - .endsWith("spring-cloud-static/Finchley.SR33"); + .isEqualTo("Finchley.SR33"); + + updatedDocs = updater.updateDocsRepoForSingleProject(bom, sleuthVersion); BDDAssertions.then( new File(updatedDocs, "spring-cloud-sleuth/current/index.html").toPath()) @@ -230,7 +235,7 @@ public class SpringCloudCustomProjectDocumentationUpdaterTests { current = new File(updatedDocs, "spring-cloud-sleuth/current/").toPath(); BDDAssertions.then(current).isSymbolicLink(); BDDAssertions.then(Files.readSymbolicLink(current).toString()) - .endsWith("spring-cloud-static/spring-cloud-sleuth/2.0.0.RELEASE"); + .isEqualTo("2.0.0.RELEASE"); } @Test diff --git a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/buildsystem/TestUtils.java b/projects/spring-cloud/src/test/java/releaser/cloud/docs/TestUtils.java similarity index 96% rename from spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/buildsystem/TestUtils.java rename to projects/spring-cloud/src/test/java/releaser/cloud/docs/TestUtils.java index 99f4b138..c7427e57 100644 --- a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/buildsystem/TestUtils.java +++ b/projects/spring-cloud/src/test/java/releaser/cloud/docs/TestUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.release.internal.buildsystem; +package releaser.cloud.docs; import java.io.File; import java.io.IOException; diff --git a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/cloud/github/SpringCloudGithubIssuesAccessor.java b/projects/spring-cloud/src/test/java/releaser/cloud/github/SpringCloudGithubIssuesAccessor.java similarity index 79% rename from spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/cloud/github/SpringCloudGithubIssuesAccessor.java rename to projects/spring-cloud/src/test/java/releaser/cloud/github/SpringCloudGithubIssuesAccessor.java index af16bd87..6690e67b 100644 --- a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/cloud/github/SpringCloudGithubIssuesAccessor.java +++ b/projects/spring-cloud/src/test/java/releaser/cloud/github/SpringCloudGithubIssuesAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2013-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,11 @@ * limitations under the License. */ -package org.springframework.cloud.release.cloud.github; +package releaser.cloud.github; import com.jcabi.github.Github; - -import org.springframework.cloud.release.internal.ReleaserProperties; -import org.springframework.cloud.release.internal.github.CustomGithubIssues; +import releaser.internal.ReleaserProperties; +import releaser.internal.github.CustomGithubIssues; public class SpringCloudGithubIssuesAccessor { diff --git a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/github/GithubIssuesTests.java b/projects/spring-cloud/src/test/java/releaser/cloud/github/SpringCloudGithubIssuesTests.java similarity index 64% rename from spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/github/GithubIssuesTests.java rename to projects/spring-cloud/src/test/java/releaser/cloud/github/SpringCloudGithubIssuesTests.java index 5338aa20..59f30a75 100644 --- a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/github/GithubIssuesTests.java +++ b/projects/spring-cloud/src/test/java/releaser/cloud/github/SpringCloudGithubIssuesTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.release.internal.github; +package releaser.cloud.github; import java.io.IOException; import java.util.Collections; @@ -30,12 +30,11 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.mockito.BDDMockito; - -import org.springframework.boot.test.rule.OutputCapture; -import org.springframework.cloud.release.cloud.github.SpringCloudGithubIssuesAccessor; -import org.springframework.cloud.release.internal.ReleaserProperties; -import org.springframework.cloud.release.internal.project.ProjectVersion; -import org.springframework.cloud.release.internal.project.Projects; +import releaser.cloud.SpringCloudReleaserProperties; +import releaser.internal.ReleaserProperties; +import releaser.internal.github.CustomGithubIssues; +import releaser.internal.project.ProjectVersion; +import releaser.internal.project.Projects; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.api.BDDAssertions.thenThrownBy; @@ -43,13 +42,12 @@ import static org.assertj.core.api.BDDAssertions.thenThrownBy; /** * @author Marcin Grzejszczak */ -public class GithubIssuesTests { +public class SpringCloudGithubIssuesTests { @Rule public TemporaryFolder folder = new TemporaryFolder(); - @Rule - public OutputCapture capture = new OutputCapture(); + ReleaserProperties properties = SpringCloudReleaserProperties.get(); MkGithub github; @@ -58,6 +56,7 @@ public class GithubIssuesTests { @Before public void setup() throws IOException { this.github = github("spring-guides"); + this.properties.getGit().setOauthToken("a"); this.repo = createGettingStartedGuides(this.github); } @@ -73,38 +72,22 @@ public class GithubIssuesTests { @Test public void should_not_do_anything_for_non_release_train_version() { Github github = BDDMockito.mock(Github.class); - GithubIssues issues = new GithubIssues(withToken(), Collections.singletonList( - SpringCloudGithubIssuesAccessor.springCloud(github, withToken()))); + CustomGithubIssues githubIssues = new SpringCloudGithubIssues(github, properties); - issues.fileIssueInSpringGuides( - new Projects(new ProjectVersion("foo", "1.0.0.BUILD-SNAPSHOT"), - new ProjectVersion("spring-cloud-build", "2.0.0.BUILD-SNAPSHOT")), - new ProjectVersion("sc-release", "Edgware.BUILD-SNAPSHOT")); - - BDDMockito.then(github).shouldHaveZeroInteractions(); - } - - @Test - public void should_not_do_anything_if_not_applicable() { - Github github = BDDMockito.mock(Github.class); - ReleaserProperties properties = withToken(); - properties.getGit().setUpdateSpringGuides(false); - GithubIssues issues = new GithubIssues(properties, Collections.singletonList( - SpringCloudGithubIssuesAccessor.springCloud(github, properties))); - - issues.fileIssueInSpringGuides( - new Projects(new ProjectVersion("foo", "1.0.0.RELEASE"), - new ProjectVersion("bar", "2.0.0.RELEASE"), - new ProjectVersion("baz", "3.0.0.RELEASE")), - new ProjectVersion("sc-release", "Edgware.RELEASE")); + githubIssues + .fileIssueInSpringGuides( + new Projects(new ProjectVersion("foo", "1.0.0.BUILD-SNAPSHOT"), + new ProjectVersion("spring-cloud-build", + "2.0.0.BUILD-SNAPSHOT")), + new ProjectVersion("sc-release", "Edgware.BUILD-SNAPSHOT")); BDDMockito.then(github).shouldHaveZeroInteractions(); } @Test public void should_file_an_issue_for_release_version() throws IOException { - GithubIssues issues = new GithubIssues(withToken(), Collections.singletonList( - SpringCloudGithubIssuesAccessor.springCloud(github, withToken()))); + CustomGithubIssues issues = new SpringCloudGithubIssues(github, properties); + properties.getPom().setBranch("vEdgware.RELEASE"); issues.fileIssueInSpringGuides( new Projects(new ProjectVersion("spring-cloud-foo", "1.0.0.RELEASE"), @@ -113,8 +96,6 @@ public class GithubIssuesTests { new ProjectVersion("baz", "3.0.0.RELEASE")), new ProjectVersion("sc-release", "Edgware.RELEASE")); - then(this.capture.toString()) - .doesNotContain("Guide issue creation will occur only"); Issue issue = this.github.repos() .get(new Coordinates.Simple("spring-guides", "getting-started-guides")) .issues().get(1); @@ -129,9 +110,8 @@ public class GithubIssuesTests { @Test public void should_throw_exception_when_no_token_was_passed() { - GithubIssues issues = new GithubIssues(new ReleaserProperties(), - Collections.singletonList(SpringCloudGithubIssuesAccessor - .springCloud(new ReleaserProperties()))); + properties.getGit().setOauthToken(""); + CustomGithubIssues issues = new SpringCloudGithubIssues(github, properties); thenThrownBy(() -> issues.fileIssueInSpringGuides( new Projects(Collections.singletonList( @@ -146,8 +126,7 @@ public class GithubIssuesTests { throws IOException { setupStartSpringIo(); Github github = BDDMockito.mock(Github.class); - GithubIssues issues = new GithubIssues(withToken(), Collections.singletonList( - SpringCloudGithubIssuesAccessor.springCloud(github, withToken()))); + CustomGithubIssues issues = new SpringCloudGithubIssues(github, properties); issues.fileIssueInStartSpringIo( new Projects(new ProjectVersion("foo", "1.0.0.BUILD-SNAPSHOT"), @@ -157,31 +136,12 @@ public class GithubIssuesTests { BDDMockito.then(github).shouldHaveZeroInteractions(); } - @Test - public void should_not_do_anything_if_not_applicable_when_updating_startspringio() - throws IOException { - setupStartSpringIo(); - Github github = BDDMockito.mock(Github.class); - ReleaserProperties properties = withToken(); - properties.getGit().setUpdateStartSpringIo(false); - GithubIssues issues = new GithubIssues(properties, Collections.singletonList( - SpringCloudGithubIssuesAccessor.springCloud(github, properties))); - - issues.fileIssueInStartSpringIo( - new Projects(new ProjectVersion("foo", "1.0.0.RELEASE"), - new ProjectVersion("bar", "2.0.0.RELEASE"), - new ProjectVersion("baz", "3.0.0.RELEASE")), - new ProjectVersion("sc-release", "Edgware.RELEASE")); - - BDDMockito.then(github).shouldHaveZeroInteractions(); - } - @Test public void should_file_an_issue_for_release_version_when_updating_startspringio() throws IOException { setupStartSpringIo(); - GithubIssues issues = new GithubIssues(withToken(), Collections.singletonList( - SpringCloudGithubIssuesAccessor.springCloud(github, withToken()))); + CustomGithubIssues issues = new SpringCloudGithubIssues(github, properties); + properties.getPom().setBranch("vEdgware.RELEASE"); issues.fileIssueInStartSpringIo( new Projects(new ProjectVersion("spring-cloud-foo", "1.0.0.RELEASE"), @@ -191,7 +151,6 @@ public class GithubIssuesTests { new ProjectVersion("spring-boot", "1.2.3.RELEASE")), new ProjectVersion("sc-release", "Edgware.RELEASE")); - then(this.capture.toString()).doesNotContain("will occur only"); Issue issue = this.github.repos() .get(new Coordinates.Simple("spring-io", "start.spring.io")).issues() .get(1); @@ -206,9 +165,8 @@ public class GithubIssuesTests { public void should_throw_exception_when_no_token_was_passed_when_updating_startspringio() throws IOException { setupStartSpringIo(); - GithubIssues issues = new GithubIssues(new ReleaserProperties(), - Collections.singletonList(SpringCloudGithubIssuesAccessor - .springCloud(new ReleaserProperties()))); + properties.getGit().setOauthToken(""); + CustomGithubIssues issues = new SpringCloudGithubIssues(github, properties); thenThrownBy(() -> issues.fileIssueInStartSpringIo( new Projects(Collections.singletonList( @@ -232,7 +190,7 @@ public class GithubIssuesTests { } ReleaserProperties withToken() { - ReleaserProperties properties = new ReleaserProperties(); + ReleaserProperties properties = SpringCloudReleaserProperties.get(); properties.getGit().setOauthToken("foo"); properties.getPom().setBranch("vEdgware.RELEASE"); properties.getGit().setUpdateSpringGuides(true); diff --git a/projects/spring-cloud/src/test/java/releaser/cloud/spring/AbstractSpringCloudAcceptanceTests.java b/projects/spring-cloud/src/test/java/releaser/cloud/spring/AbstractSpringCloudAcceptanceTests.java new file mode 100644 index 00000000..2d5c9609 --- /dev/null +++ b/projects/spring-cloud/src/test/java/releaser/cloud/spring/AbstractSpringCloudAcceptanceTests.java @@ -0,0 +1,71 @@ +/* + * Copyright 2013-2019 the original author or authors. + * + * 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 + * + * https://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. + */ + +package releaser.cloud.spring; + +import java.io.File; +import java.util.Arrays; + +import org.junit.Before; +import releaser.internal.buildsystem.TestUtils; +import releaser.internal.spring.AbstractSpringAcceptanceTests; + +import org.springframework.util.FileSystemUtils; + +import static org.assertj.core.api.BDDAssertions.then; + +public class AbstractSpringCloudAcceptanceTests extends AbstractSpringAcceptanceTests { + + public File springCloudConsulProject; + + public File springCloudBuildProject; + + @Before + public void setupCloud() throws Exception { + this.temporaryFolder = this.tmp.newFolder(); + this.springCloudConsulProject = new File(AbstractSpringAcceptanceTests.class + .getResource("/projects/spring-cloud-consul").toURI()); + this.springCloudBuildProject = new File(AbstractSpringAcceptanceTests.class + .getResource("/projects/spring-cloud-build").toURI()); + TestUtils.prepareLocalRepo(); + FileSystemUtils.copyRecursively(file("/projects/"), this.temporaryFolder); + } + + public void consulPomParentVersionIsEqualTo(File project, String expected) { + pomParentVersionIsEqualTo(project, "spring-cloud-starter-consul", expected); + } + + public void thenAllDryRunStepsWereExecutedForEachProject( + NonAssertingTestProjectGitHandler nonAssertingTestProjectGitHandler) { + nonAssertingTestProjectGitHandler.clonedProjects.stream() + .filter(f -> !f.getName().contains("angel") + && !f.getName().equals("spring-cloud")) + .forEach(project -> { + then(Arrays.asList("spring-cloud-starter-build", + "spring-cloud-consul")) + .contains(pom(project).getArtifactId()); + then(new File("/tmp/executed_build")).exists(); + then(new File("/tmp/executed_deploy")).doesNotExist(); + then(new File("/tmp/executed_docs")).doesNotExist(); + }); + } + + public void assertThatClonedConsulProjectIsInSnapshots(File origin) { + pomVersionIsEqualTo(origin, "1.2.0.BUILD-SNAPSHOT"); + consulPomParentVersionIsEqualTo(origin, "1.2.0.BUILD-SNAPSHOT"); + } + +} diff --git a/projects/spring-cloud/src/test/java/releaser/cloud/spring/meta/AbstractSpringCloudMetaAcceptanceTests.java b/projects/spring-cloud/src/test/java/releaser/cloud/spring/meta/AbstractSpringCloudMetaAcceptanceTests.java new file mode 100644 index 00000000..cde22ce3 --- /dev/null +++ b/projects/spring-cloud/src/test/java/releaser/cloud/spring/meta/AbstractSpringCloudMetaAcceptanceTests.java @@ -0,0 +1,68 @@ +/* + * Copyright 2013-2019 the original author or authors. + * + * 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 + * + * https://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. + */ + +package releaser.cloud.spring.meta; + +import java.io.File; +import java.util.Arrays; + +import org.junit.Before; +import releaser.internal.spring.meta.AbstractSpringMetaReleaseAcceptanceTests; + +import static org.assertj.core.api.BDDAssertions.then; + +public class AbstractSpringCloudMetaAcceptanceTests + extends AbstractSpringMetaReleaseAcceptanceTests { + + public File springCloudConsulProject; + + public File springCloudBuildProject; + + @Before + public void setupCloud() throws Exception { + this.springCloudConsulProject = new File( + AbstractSpringCloudMetaAcceptanceTests.class + .getResource("/projects/spring-cloud-consul").toURI()); + this.springCloudBuildProject = new File( + AbstractSpringCloudMetaAcceptanceTests.class + .getResource("/projects/spring-cloud-build").toURI()); + } + + public void consulPomParentVersionIsEqualTo(File project, String expected) { + pomParentVersionIsEqualTo(project, "spring-cloud-starter-consul", expected); + } + + public void thenAllDryRunStepsWereExecutedForEachProject( + NonAssertingTestProjectGitHandler nonAssertingTestProjectGitHandler) { + nonAssertingTestProjectGitHandler.clonedProjects.stream() + .filter(f -> !f.getName().contains("angel") + && !f.getName().equals("spring-cloud")) + .forEach(project -> { + then(Arrays.asList("spring-cloud-starter-build", + "spring-cloud-consul")) + .contains(pom(project).getArtifactId()); + then(new File("/tmp/executed_build")).exists(); + then(new File("/tmp/executed_deploy")).doesNotExist(); + then(new File("/tmp/executed_docs")).doesNotExist(); + }); + } + + public void assertThatClonedConsulProjectIsInSnapshots(File origin) { + pomVersionIsEqualTo(origin, "1.2.0.BUILD-SNAPSHOT"); + consulPomParentVersionIsEqualTo(origin, "1.2.0.BUILD-SNAPSHOT"); + } + +} diff --git a/projects/spring-cloud/src/test/java/releaser/cloud/spring/meta/SpringMetaReleaseAcceptanceTests.java b/projects/spring-cloud/src/test/java/releaser/cloud/spring/meta/SpringMetaReleaseAcceptanceTests.java new file mode 100644 index 00000000..54d42046 --- /dev/null +++ b/projects/spring-cloud/src/test/java/releaser/cloud/spring/meta/SpringMetaReleaseAcceptanceTests.java @@ -0,0 +1,447 @@ +/* + * Copyright 2013-2019 the original author or authors. + * + * 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 + * + * https://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. + */ + +package releaser.cloud.spring.meta; + +import java.io.File; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import org.junit.Test; +import org.mockito.BDDMockito; +import releaser.internal.Releaser; +import releaser.internal.ReleaserProperties; +import releaser.internal.docs.CustomProjectDocumentationUpdater; +import releaser.internal.docs.DocumentationUpdater; +import releaser.internal.git.GitTestUtils; +import releaser.internal.git.ProjectGitHandler; +import releaser.internal.options.OptionsBuilder; +import releaser.internal.postrelease.PostReleaseActions; +import releaser.internal.project.Projects; +import releaser.internal.sagan.SaganClient; +import releaser.internal.sagan.SaganUpdater; +import releaser.internal.spring.ExecutionResult; +import releaser.internal.spring.SpringReleaser; +import releaser.internal.tasks.release.BuildProjectReleaseTask; +import releaser.internal.template.TemplateGenerator; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.WebApplicationType; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.util.FileSystemUtils; + +import static org.assertj.core.api.BDDAssertions.then; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.argThat; + +/** + * @author Marcin Grzejszczak + */ +public class SpringMetaReleaseAcceptanceTests + extends AbstractSpringCloudMetaAcceptanceTests { + + SpringApplicationBuilder runner = new SpringApplicationBuilder( + SpringMetaReleaseAcceptanceTests.MetaReleaseConfig.class, + SpringMetaReleaseAcceptanceTests.MetaReleaseScanningConfiguration.class) + .web(WebApplicationType.NONE).properties("spring.jmx.enabled=false"); + + @Test + public void should_perform_a_meta_release_of_sc_release_and_consul() + throws Exception { + checkoutReleaseTrainBranch("/projects/spring-cloud-release/", "Greenwich"); + File origin = cloneToTemporaryDirectory(this.springCloudConsulProject); + assertThatClonedConsulProjectIsInSnapshots(origin); + File project = cloneToTemporaryDirectory(tmpFile("spring-cloud-consul")); + GitTestUtils.setOriginOnProjectToTmp(origin, project); + + run(this.runner, + properties("debug=true").properties("test.metarelease=true") + .properties(metaReleaseArgs(project).bomBranch("vGreenwich.SR2") + .addFixedVersions(edgwareSr10()).build()), + context -> { + SpringReleaser releaser = context.getBean(SpringReleaser.class); + NonAssertingTestProjectGitHandler nonAssertingTestProjectGitHandler = context + .getBean(NonAssertingTestProjectGitHandler.class); + SaganUpdater saganUpdater = context.getBean(SaganUpdater.class); + TestDocumentationUpdater testDocumentationUpdater = context + .getBean(TestDocumentationUpdater.class); + PostReleaseActions postReleaseActions = context + .getBean(PostReleaseActions.class); + TestExecutionResultHandler testExecutionResultHandler = context + .getBean(TestExecutionResultHandler.class); + + ExecutionResult result = releaser + .release(new OptionsBuilder().metaRelease(true).options()); + + then(result.isFailureOrUnstable()).isFalse(); + // consul, release, documentation + then(nonAssertingTestProjectGitHandler.clonedProjects).hasSize(3); + // don't want to verify the docs + thenAllStepsWereExecutedForEachProject( + nonAssertingTestProjectGitHandler); + thenSaganWasCalled(saganUpdater); + thenDocumentationWasUpdated(testDocumentationUpdater); + then(clonedProject(nonAssertingTestProjectGitHandler, + "spring-cloud-consul").tagList().call()).extracting("name") + .contains("refs/tags/v5.3.5.RELEASE"); + thenRunUpdatedTestsWereCalled(postReleaseActions); + thenUpdateReleaseTrainDocsWasCalled(postReleaseActions); + + // print results + testExecutionResultHandler.accept(result); + then(testExecutionResultHandler.exitedSuccessOrUnstable).isTrue(); + }); + } + + @Test + public void should_perform_a_meta_release_of_sc_release_and_consul_in_parallel() + throws Exception { + checkoutReleaseTrainBranch("/projects/spring-cloud-release/", "Greenwich"); + File origin = cloneToTemporaryDirectory(this.springCloudConsulProject); + assertThatClonedConsulProjectIsInSnapshots(origin); + File project = cloneToTemporaryDirectory(tmpFile("spring-cloud-consul")); + GitTestUtils.setOriginOnProjectToTmp(origin, project); + + run(this.runner, properties("debug=true").properties("test.metarelease=true") + .properties(metaReleaseArgsForParallel(project) + .bomBranch("vGreenwich.SR2").addFixedVersions(edgwareSr10()) + .metaReleaseGroups("example1,example2", + "spring-cloud-build,spring-cloud-consul,spring-cloud-release") + .build()), + context -> { + SpringReleaser releaser = context.getBean(SpringReleaser.class); + NonAssertingTestProjectGitHandler nonAssertingTestProjectGitHandler = context + .getBean(NonAssertingTestProjectGitHandler.class); + SaganUpdater saganUpdater = context.getBean(SaganUpdater.class); + TestDocumentationUpdater testDocumentationUpdater = context + .getBean(TestDocumentationUpdater.class); + PostReleaseActions postReleaseActions = context + .getBean(PostReleaseActions.class); + TestExecutionResultHandler testExecutionResultHandler = context + .getBean(TestExecutionResultHandler.class); + + ExecutionResult result = releaser + .release(new OptionsBuilder().metaRelease(true).options()); + + // print results + testExecutionResultHandler.accept(result); + then(testExecutionResultHandler.exitedSuccessOrUnstable).isTrue(); + + then(result.isFailureOrUnstable()).isFalse(); + // TODO: Assert the steps + // build, consul, release, documentation + // then(nonAssertingTestProjectGitHandler.clonedProjects).hasSize(4); + // don't want to verify the docs + // thenAllStepsWereExecutedForEachProject( + // nonAssertingTestProjectGitHandler); + thenSaganWasCalled(saganUpdater); + thenDocumentationWasUpdated(testDocumentationUpdater); + then(clonedProject(nonAssertingTestProjectGitHandler, + "spring-cloud-consul").tagList().call()).extracting("name") + .contains("refs/tags/v5.3.5.RELEASE"); + thenRunUpdatedTestsWereCalled(postReleaseActions); + thenUpdateReleaseTrainDocsWasCalled(postReleaseActions); + }); + } + + @Test + public void should_perform_a_meta_release_dry_run_of_sc_release_and_consul() + throws Exception { + checkoutReleaseTrainBranch("/projects/spring-cloud-release/", "Greenwich"); + File origin = cloneToTemporaryDirectory(this.springCloudConsulProject); + assertThatClonedConsulProjectIsInSnapshots(origin); + File project = cloneToTemporaryDirectory(tmpFile("spring-cloud-consul")); + GitTestUtils.setOriginOnProjectToTmp(origin, project); + + run(this.runner, + properties("debug=true").properties("test.metarelease=true") + .properties(metaReleaseArgs(project).bomBranch("vGreenwich.SR2") + .addFixedVersions(edgwareSr10()).build()), + context -> { + SpringReleaser releaser = context.getBean(SpringReleaser.class); + NonAssertingTestProjectGitHandler nonAssertingTestProjectGitHandler = context + .getBean(NonAssertingTestProjectGitHandler.class); + SaganUpdater saganUpdater = context.getBean(SaganUpdater.class); + TestDocumentationUpdater testDocumentationUpdater = context + .getBean(TestDocumentationUpdater.class); + PostReleaseActions postReleaseActions = context + .getBean(PostReleaseActions.class); + TestExecutionResultHandler testExecutionResultHandler = context + .getBean(TestExecutionResultHandler.class); + + ExecutionResult result = releaser.release(new OptionsBuilder() + .metaRelease(true).dryRun(true).options()); + + then(result.isFailureOrUnstable()).isFalse(); + // consul, release + then(nonAssertingTestProjectGitHandler.clonedProjects).hasSize(2); + // only dry run tasks were called + thenAllDryRunStepsWereExecutedForEachProject( + nonAssertingTestProjectGitHandler); + thenSaganWasNotCalled(saganUpdater); + thenDocumentationWasNotUpdated(testDocumentationUpdater); + then(clonedProject(nonAssertingTestProjectGitHandler, + "spring-cloud-consul").tagList().call()).extracting("name") + .doesNotContain("refs/tags/v5.3.5.RELEASE"); + thenRunUpdatedTestsWereNotCalled(postReleaseActions); + thenUpdateReleaseTrainDocsWasNotCalled(postReleaseActions); + + // print results + testExecutionResultHandler.accept(result); + then(testExecutionResultHandler.exitedSuccessOrUnstable).isTrue(); + }); + } + + @Test + public void should_not_release_any_projects_when_they_are_on_list_of_projects_to_skip() + throws Exception { + checkoutReleaseTrainBranch("/projects/spring-cloud-release/", "Greenwich"); + File origin = cloneToTemporaryDirectory(this.springCloudConsulProject); + assertThatClonedConsulProjectIsInSnapshots(origin); + File project = cloneToTemporaryDirectory(tmpFile("spring-cloud-consul")); + GitTestUtils.setOriginOnProjectToTmp(origin, project); + File temporaryDestination = this.tmp.newFolder(); + + run(this.runner, + properties("debug=true") + .properties("test.metarelease=true", "test.mockBuild=true") + .properties(metaReleaseArgs(project).bomBranch("Greenwich") + .addFixedVersions(consulAndReleaseSnapshots()) + .updateReleaseTrainWiki(false) + .cloneDestinationDirectory(temporaryDestination) + .projectsToSkip("spring-cloud-consul").build()), + context -> { + SpringReleaser releaser = context.getBean(SpringReleaser.class); + BuildProjectReleaseTask build = context + .getBean(BuildProjectReleaseTask.class); + TestExecutionResultHandler testExecutionResultHandler = context + .getBean(TestExecutionResultHandler.class); + + ExecutionResult result = releaser + .release(new OptionsBuilder().metaRelease(true).options()); + + then(result.isFailureOrUnstable()).isFalse(); + thenBuildWasNeverCalledFor(build, "spring-cloud-consul"); + thenBuildWasCalledFor(build, "spring-cloud-release"); + + // print results + testExecutionResultHandler.accept(result); + then(testExecutionResultHandler.exitedSuccessOrUnstable).isTrue(); + }); + } + + @Test + public void should_perform_a_meta_release_of_consul_only_when_run_from_got_passed() + throws Exception { + checkoutReleaseTrainBranch("/projects/spring-cloud-release/", "Greenwich"); + File origin = cloneToTemporaryDirectory(this.springCloudConsulProject); + assertThatClonedConsulProjectIsInSnapshots(origin); + File project = cloneToTemporaryDirectory(tmpFile("spring-cloud-consul")); + GitTestUtils.setOriginOnProjectToTmp(origin, project); + File temporaryDestination = this.tmp.newFolder(); + + run(this.runner, + properties("debug=true") + .properties("test.metarelease=true", "test.mockBuild=true") + .properties(metaReleaseArgs(project).bomBranch("Greenwich") + .addFixedVersions(releaseConsulBuildSnapshots()) + .cloneDestinationDirectory(temporaryDestination).build()), + context -> { + SpringReleaser releaser = context.getBean(SpringReleaser.class); + BuildProjectReleaseTask build = context + .getBean(BuildProjectReleaseTask.class); + SaganUpdater saganUpdater = context.getBean(SaganUpdater.class); + TestDocumentationUpdater testDocumentationUpdater = context + .getBean(TestDocumentationUpdater.class); + TestExecutionResultHandler testExecutionResultHandler = context + .getBean(TestExecutionResultHandler.class); + + ExecutionResult result = releaser + .release(new OptionsBuilder().startFrom("spring-cloud-consul") + .metaRelease(true).options()); + + // release + then(result.isFailureOrUnstable()).isFalse(); + thenBuildWasNeverCalledFor(build, "spring-cloud-build"); + thenBuildWasCalledFor(build, "spring-cloud-consul"); + thenBuildWasCalledFor(build, "spring-cloud-release"); + + // post release + thenSaganWasCalled(saganUpdater); + thenDocumentationWasUpdated(testDocumentationUpdater); + thenWikiPageWasUpdated(testDocumentationUpdater); + + // print results + testExecutionResultHandler.accept(result); + then(testExecutionResultHandler.exitedSuccessOrUnstable).isTrue(); + }); + } + + @Test + public void should_perform_a_meta_release_of_consul_only_when_task_names_got_passed() + throws Exception { + checkoutReleaseTrainBranch("/projects/spring-cloud-release/", "Greenwich"); + File origin = cloneToTemporaryDirectory(this.springCloudConsulProject); + assertThatClonedConsulProjectIsInSnapshots(origin); + File project = cloneToTemporaryDirectory(tmpFile("spring-cloud-consul")); + GitTestUtils.setOriginOnProjectToTmp(origin, project); + File temporaryDestination = this.tmp.newFolder(); + + run(this.runner, + properties("debug=true") + .properties("test.metarelease=true", "test.mockBuild=true") + .properties(metaReleaseArgs(project).bomBranch("Greenwich") + .addFixedVersions(releaseConsulBuildSnapshots()) + .cloneDestinationDirectory(temporaryDestination).build()), + context -> { + SpringReleaser releaser = context.getBean(SpringReleaser.class); + BuildProjectReleaseTask build = context + .getBean(BuildProjectReleaseTask.class); + SaganUpdater saganUpdater = context.getBean(SaganUpdater.class); + TestDocumentationUpdater testDocumentationUpdater = context + .getBean(TestDocumentationUpdater.class); + TestExecutionResultHandler testExecutionResultHandler = context + .getBean(TestExecutionResultHandler.class); + + ExecutionResult result = releaser.release(new OptionsBuilder() + .taskNames(Collections.singletonList("spring-cloud-consul")) + .metaRelease(true).options()); + + // release + then(result.isFailureOrUnstable()).isFalse(); + thenBuildWasNeverCalledFor(build, "spring-cloud-release"); + thenBuildWasNeverCalledFor(build, "spring-cloud-build"); + thenBuildWasCalledFor(build, "spring-cloud-consul"); + + // post release + thenSaganWasCalled(saganUpdater); + thenDocumentationWasUpdated(testDocumentationUpdater); + thenWikiPageWasUpdated(testDocumentationUpdater); + + // print results + testExecutionResultHandler.accept(result); + then(testExecutionResultHandler.exitedSuccessOrUnstable).isTrue(); + }); + } + + private void thenWikiPageWasUpdated(DocumentationUpdater documentationUpdater) { + BDDMockito.then(documentationUpdater).should() + .updateReleaseTrainWiki(BDDMockito.any(Projects.class)); + } + + private void thenBuildWasCalledFor(BuildProjectReleaseTask build, + String projectName) { + BDDMockito.then(build).should().apply(argThat( + argument -> argument.originalVersion.projectName.equals(projectName) + || argument.project.getAbsolutePath().endsWith(projectName))); + } + + private void thenBuildWasNeverCalledFor(BuildProjectReleaseTask build, + String projectName) { + BDDMockito.then(build).should(BDDMockito.never()).apply(argThat( + argument -> argument.originalVersion.projectName.equals(projectName) + || argument.project.getAbsolutePath().endsWith(projectName))); + } + + private Map consulAndReleaseSnapshots() { + Map versions = new LinkedHashMap<>(); + versions.put("spring-cloud-consul", "1.1.2.BUILD-SNAPSHOT"); + versions.put("spring-cloud-release", "Camden.BUILD-SNAPSHOT"); + return versions; + } + + private Map releaseConsulBuildSnapshots() { + Map versions = new LinkedHashMap<>(); + versions.put("spring-cloud-release", "Camden.BUILD-SNAPSHOT"); + versions.put("spring-cloud-build", "1.1.2.BUILD-SNAPSHOT"); + versions.put("spring-cloud-consul", "1.1.2.BUILD-SNAPSHOT"); + return versions; + } + + @Configuration + @ConditionalOnProperty(value = "test.metarelease", havingValue = "true") + @EnableAutoConfiguration + static class MetaReleaseConfig extends DefaultTestConfiguration { + + @Bean + SaganClient testSaganClient() { + SaganClient saganClient = BDDMockito.mock(SaganClient.class); + BDDMockito.given(saganClient.getProject(anyString())) + .willReturn(newProject()); + return saganClient; + } + + @Bean + @ConditionalOnProperty(value = "test.mockBuild", havingValue = "true") + BuildProjectReleaseTask mockedBuildProjectReleaseTask(Releaser releaser) { + return BDDMockito.spy(new BuildProjectReleaseTask(releaser)); + } + + @Bean + SaganUpdater testSaganUpdater(SaganClient saganClient, + ReleaserProperties properties) { + return BDDMockito.spy(new SaganUpdater(saganClient, properties)); + } + + @Bean + PostReleaseActions myPostReleaseActions() { + return BDDMockito.mock(PostReleaseActions.class); + } + + @Bean + NonAssertingTestProjectGitHubHandler testProjectGitHubHandler( + ReleaserProperties releaserProperties) { + return new NonAssertingTestProjectGitHubHandler(releaserProperties); + } + + @Bean + NonAssertingTestProjectGitHandler nonAssertingTestProjectGitHandler( + ReleaserProperties releaserProperties, + @Value("${test.projectName}") String projectName) { + return new NonAssertingTestProjectGitHandler(releaserProperties, + file -> FileSystemUtils + .deleteRecursively(new File(file, projectName))); + } + + @Bean + TestDocumentationUpdater testDocumentationUpdater( + ProjectGitHandler projectGitHandler, + ReleaserProperties releaserProperties, + TemplateGenerator templateGenerator, @Autowired( + required = false) List updaters) { + return BDDMockito.spy(new TestDocumentationUpdater(projectGitHandler, + releaserProperties, templateGenerator, updaters)); + } + + } + + @Configuration + @ConditionalOnProperty(value = "test.metarelease", havingValue = "true", + matchIfMissing = true) + @ComponentScan({ "releaser.internal", "releaser.cloud" }) + static class MetaReleaseScanningConfiguration { + + } + +} diff --git a/projects/spring-cloud/src/test/java/releaser/cloud/spring/single/SpringSingleProjectAcceptanceTests.java b/projects/spring-cloud/src/test/java/releaser/cloud/spring/single/SpringSingleProjectAcceptanceTests.java new file mode 100644 index 00000000..57f4455d --- /dev/null +++ b/projects/spring-cloud/src/test/java/releaser/cloud/spring/single/SpringSingleProjectAcceptanceTests.java @@ -0,0 +1,419 @@ +/* + * Copyright 2013-2019 the original author or authors. + * + * 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 + * + * https://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. + */ + +package releaser.cloud.spring.single; + +import java.io.File; +import java.nio.file.Files; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + +import org.assertj.core.api.BDDAssertions; +import org.eclipse.jgit.revwalk.RevCommit; +import org.junit.Test; +import org.mockito.BDDMockito; +import releaser.cloud.spring.AbstractSpringCloudAcceptanceTests; +import releaser.internal.ReleaserProperties; +import releaser.internal.docs.CustomProjectDocumentationUpdater; +import releaser.internal.git.GitTestUtils; +import releaser.internal.git.ProjectGitHandler; +import releaser.internal.github.ProjectGitHubHandler; +import releaser.internal.options.OptionsBuilder; +import releaser.internal.postrelease.PostReleaseActions; +import releaser.internal.project.ProjectVersion; +import releaser.internal.project.Projects; +import releaser.internal.sagan.SaganClient; +import releaser.internal.spring.ArgsBuilder; +import releaser.internal.spring.ExecutionResult; +import releaser.internal.spring.SpringReleaser; +import releaser.internal.template.TemplateGenerator; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.WebApplicationType; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.util.FileSystemUtils; + +import static org.assertj.core.api.BDDAssertions.then; +import static org.mockito.ArgumentMatchers.anyString; + +/** + * @author Marcin Grzejszczak + */ +public class SpringSingleProjectAcceptanceTests + extends AbstractSpringCloudAcceptanceTests { + + SpringApplicationBuilder runner = new SpringApplicationBuilder( + SpringSingleProjectAcceptanceTests.SingleProjectReleaseConfig.class, + SpringSingleProjectAcceptanceTests.SingleProjectScanningConfiguration.class) + .web(WebApplicationType.NONE).properties("spring.jmx.enabled=false"); + + @Test + public void should_fail_to_perform_a_release_of_consul_when_sc_release_contains_snapshots() + throws Exception { + checkoutReleaseTrainBranch("/projects/spring-cloud-release-with-snapshot/", + "vCamden.SR5.BROKEN"); + File origin = cloneToTemporaryDirectory(this.springCloudConsulProject); + assertThatClonedConsulProjectIsInSnapshots(origin); + File project = cloneToTemporaryDirectory(tmpFile("spring-cloud-consul")); + GitTestUtils.setOriginOnProjectToTmp(origin, project); + + run(this.runner, + properties("debug=true").properties(new ArgsBuilder(project, this.tmp) + .releaseTrainUrl("/projects/spring-cloud-release-with-snapshot/") + .bomBranch("vCamden.SR5.BROKEN").expectedVersion("1.1.2.RELEASE") + .build()), + context -> { + SpringReleaser releaser = context.getBean(SpringReleaser.class); + BDDAssertions.thenThrownBy(releaser::release).hasMessageContaining( + "there is at least one SNAPSHOT library version in the Spring Cloud Release project"); + + }); + } + + @Test + public void should_perform_a_release_of_consul() throws Exception { + checkoutReleaseTrainBranch("/projects/spring-cloud-release/", "Greenwich"); + File origin = cloneToTemporaryDirectory(this.springCloudConsulProject); + assertThatClonedConsulProjectIsInSnapshots(origin); + File project = cloneToTemporaryDirectory(tmpFile("spring-cloud-consul")); + GitTestUtils.setOriginOnProjectToTmp(origin, project); + + run(this.runner, + properties("debug=true").properties(new ArgsBuilder(project, this.tmp) + .releaseTrainUrl("/projects/spring-cloud-release/") + .bomBranch("vGreenwich.SR2").expectedVersion("2.1.2.RELEASE") + .build()), + context -> { + SpringReleaser releaser = context.getBean(SpringReleaser.class); + TestProjectGitHubHandler gitHubHandler = context + .getBean(TestProjectGitHubHandler.class); + SaganClient saganClient = context.getBean(SaganClient.class); + TestDocumentationUpdater testDocumentationUpdater = context + .getBean(TestDocumentationUpdater.class); + PostReleaseActions postReleaseActions = context + .getBean(PostReleaseActions.class); + TestExecutionResultHandler testExecutionResultHandler = context + .getBean(TestExecutionResultHandler.class); + + ExecutionResult result = releaser + .release(new OptionsBuilder().interactive(true).options()); + + Iterable commits = listOfCommits(project); + Iterator iterator = commits.iterator(); + tagIsPresentInOrigin(origin, "v2.1.2.RELEASE"); + commitIsPresent(iterator, + "Bumping versions to 2.1.3.BUILD-SNAPSHOT after release"); + commitIsPresent(iterator, "Going back to snapshots"); + commitIsPresent(iterator, "Update SNAPSHOT to 2.1.2.RELEASE"); + pomVersionIsEqualTo(project, "2.1.3.BUILD-SNAPSHOT"); + consulPomParentVersionIsEqualTo(project, "2.1.3.BUILD-SNAPSHOT"); + then(gitHubHandler.closedMilestones).isTrue(); + then(emailTemplate()).doesNotExist(); + then(blogTemplate()).doesNotExist(); + then(tweetTemplate()).doesNotExist(); + then(releaseNotesTemplate()).doesNotExist(); + // once for updating GA + // second time to update SNAPSHOT + BDDMockito.then(saganClient).should(BDDMockito.times(2)) + .updateRelease(BDDMockito.eq("spring-cloud-consul"), + BDDMockito.anyList()); + BDDMockito.then(saganClient).should() + .deleteRelease("spring-cloud-consul", "2.1.2.BUILD-SNAPSHOT"); + then(gitHubHandler.issueCreatedInSpringGuides).isFalse(); + then(gitHubHandler.issueCreatedInStartSpringIo).isFalse(); + then(Files.readSymbolicLink( + new File(testDocumentationUpdater.getDocumentationRepo(), + "spring-cloud-consul/current").toPath()) + .toString()).isEqualTo("2.1.2.RELEASE"); + thenRunUpdatedTestsWereNotCalled(postReleaseActions); + + // print results + testExecutionResultHandler.accept(result); + then(testExecutionResultHandler.exitedSuccessOrUnstable).isTrue(); + }); + } + + // issue #74 + @Test + public void should_perform_a_release_of_sc_build() throws Exception { + checkoutReleaseTrainBranch("/projects/spring-cloud-release/", "vGreenwich.SR2"); + File origin = cloneToTemporaryDirectory(this.springCloudBuildProject); + assertThatClonedBuildProjectIsInSnapshots(origin); + File project = cloneToTemporaryDirectory(tmpFile("spring-cloud-build")); + GitTestUtils.setOriginOnProjectToTmp(origin, project); + + run(this.runner, + properties("debug=true").properties(new ArgsBuilder(project, this.tmp) + .releaseTrainUrl("/projects/spring-cloud-release/") + .bomBranch("vGreenwich.SR2").projectName("spring-cloud-build") + .expectedVersion("2.1.6.RELEASE").build()), + context -> { + SpringReleaser releaser = context.getBean(SpringReleaser.class); + TestProjectGitHubHandler gitHubHandler = context + .getBean(TestProjectGitHubHandler.class); + SaganClient saganClient = context.getBean(SaganClient.class); + TestDocumentationUpdater testDocumentationUpdater = context + .getBean(TestDocumentationUpdater.class); + PostReleaseActions postReleaseActions = context + .getBean(PostReleaseActions.class); + TestExecutionResultHandler testExecutionResultHandler = context + .getBean(TestExecutionResultHandler.class); + + ExecutionResult result = releaser + .release(new OptionsBuilder().interactive(true).options()); + + Iterable commits = listOfCommits(project); + Iterator iterator = commits.iterator(); + tagIsPresentInOrigin(origin, "v2.1.6.RELEASE"); + // we're running against camden sc-release + commitIsPresent(iterator, + "Bumping versions to 2.1.7.BUILD-SNAPSHOT after release"); + commitIsPresent(iterator, "Going back to snapshots"); + commitIsPresent(iterator, "Update SNAPSHOT to 2.1.6.RELEASE"); + pomVersionIsEqualTo(project, "2.1.7.BUILD-SNAPSHOT"); + pomParentVersionIsEqualTo(project, "spring-cloud-build-dependencies", + "2.1.6.RELEASE"); + then(gitHubHandler.closedMilestones).isTrue(); + then(emailTemplate()).doesNotExist(); + then(blogTemplate()).doesNotExist(); + then(tweetTemplate()).doesNotExist(); + then(releaseNotesTemplate()).doesNotExist(); + // once for updating GA + // second time to update SNAPSHOT + BDDMockito.then(saganClient).should(BDDMockito.times(2)) + .updateRelease(BDDMockito.eq("spring-cloud-build"), + BDDMockito.anyList()); + BDDMockito.then(saganClient).should() + .deleteRelease("spring-cloud-build", "2.1.6.BUILD-SNAPSHOT"); + then(gitHubHandler.issueCreatedInSpringGuides).isFalse(); + then(gitHubHandler.issueCreatedInStartSpringIo).isFalse(); + then(Files.readSymbolicLink( + new File(testDocumentationUpdater.getDocumentationRepo(), + "spring-cloud-build/current").toPath()) + .toString()).isEqualTo("2.1.6.RELEASE"); + thenRunUpdatedTestsWereNotCalled(postReleaseActions); + + // print results + testExecutionResultHandler.accept(result); + then(testExecutionResultHandler.exitedSuccessOrUnstable).isTrue(); + }); + } + + @Test + public void should_perform_a_release_of_consul_rc1() throws Exception { + checkoutReleaseTrainBranch("/projects/spring-cloud-release/", "vDalston.RC1"); + File origin = cloneToTemporaryDirectory(this.springCloudConsulProject); + assertThatClonedConsulProjectIsInSnapshots(origin); + File project = cloneToTemporaryDirectory(tmpFile("spring-cloud-consul")); + GitTestUtils.setOriginOnProjectToTmp(origin, project); + + run(this.runner, + properties("debug=true").properties(new ArgsBuilder(project, this.tmp) + .releaseTrainUrl("/projects/spring-cloud-release/") + .bomBranch("vDalston.RC1").expectedVersion("1.2.0.RC1").build()), + context -> { + SpringReleaser releaser = context.getBean(SpringReleaser.class); + TestProjectGitHubHandler gitHubHandler = context + .getBean(TestProjectGitHubHandler.class); + SaganClient saganClient = context.getBean(SaganClient.class); + TestDocumentationUpdater testDocumentationUpdater = context + .getBean(TestDocumentationUpdater.class); + PostReleaseActions postReleaseActions = context + .getBean(PostReleaseActions.class); + TestExecutionResultHandler testExecutionResultHandler = context + .getBean(TestExecutionResultHandler.class); + + ExecutionResult result = releaser + .release(new OptionsBuilder().interactive(true).options()); + + Iterable commits = listOfCommits(project); + tagIsPresentInOrigin(origin, "v1.2.0.RC1"); + commitIsNotPresent(commits, + "Bumping versions to 1.2.1.BUILD-SNAPSHOT after release"); + Iterator iterator = listOfCommits(project).iterator(); + commitIsPresent(iterator, "Going back to snapshots"); + commitIsPresent(iterator, "Update SNAPSHOT to 1.2.0.RC1"); + pomVersionIsEqualTo(project, "1.2.0.BUILD-SNAPSHOT"); + consulPomParentVersionIsEqualTo(project, "1.2.0.BUILD-SNAPSHOT"); + then(gitHubHandler.closedMilestones).isTrue(); + then(emailTemplate()).doesNotExist(); + then(blogTemplate()).doesNotExist(); + then(tweetTemplate()).doesNotExist(); + then(releaseNotesTemplate()).doesNotExist(); + BDDMockito.then(saganClient).should().updateRelease( + BDDMockito.eq("spring-cloud-consul"), BDDMockito.anyList()); + BDDMockito.then(saganClient).should() + .deleteRelease("spring-cloud-consul", "1.2.0.M8"); + BDDMockito.then(saganClient).should() + .deleteRelease("spring-cloud-consul", "1.2.0.RC1"); + // we update guides only for SR / RELEASE + then(gitHubHandler.issueCreatedInSpringGuides).isFalse(); + then(gitHubHandler.issueCreatedInStartSpringIo).isFalse(); + // haven't even checked out the branch + then(new File(testDocumentationUpdater.getDocumentationRepo(), + "current/index.html")).doesNotExist(); + thenRunUpdatedTestsWereNotCalled(postReleaseActions); + + // print results + testExecutionResultHandler.accept(result); + then(testExecutionResultHandler.exitedSuccessOrUnstable).isTrue(); + }); + } + + @Test + public void should_not_clone_when_option_not_to_clone_was_switched_on() + throws Exception { + checkoutReleaseTrainBranch("/projects/spring-cloud-release/", "master"); + File origin = cloneToTemporaryDirectory(this.springCloudConsulProject); + assertThatClonedConsulProjectIsInSnapshots(origin); + File project = cloneToTemporaryDirectory(tmpFile("spring-cloud-consul")); + GitTestUtils.setOriginOnProjectToTmp(origin, project); + final File temporaryDestination = this.tmp.newFolder(); + + run(this.runner, + properties("debug=true").properties(new ArgsBuilder(project, this.tmp) + .releaseTrainUrl("/projects/spring-cloud-release/") + .bomBranch("vCamden.SR5").expectedVersion("1.1.2.RELEASE") + // just build + .chosenOption("6").fetchVersionsFromGit(false) + .cloneDestinationDirectory(temporaryDestination) + .addFixedVersion("spring-cloud-release", "Finchley.RELEASE") + .addFixedVersion("spring-cloud-consul", "2.3.4.RELEASE").build()), + context -> { + SpringReleaser releaser = context.getBean(SpringReleaser.class); + + releaser.release(new OptionsBuilder().interactive(true).options()); + + then(temporaryDestination.list()).isEmpty(); + }); + } + + private void assertThatClonedBuildProjectIsInSnapshots(File origin) { + pomVersionIsEqualTo(origin, "1.3.7.BUILD-SNAPSHOT"); + pomParentVersionIsEqualTo(origin, "spring-cloud-build-dependencies", + "1.5.9.RELEASE"); + } + // @formatter:on + + static class TestProjectGitHubHandler extends ProjectGitHubHandler { + + final String expectedVersion; + + final String projectName; + + boolean closedMilestones = false; + + boolean issueCreatedInSpringGuides = false; + + boolean issueCreatedInStartSpringIo = false; + + TestProjectGitHubHandler(ReleaserProperties properties, String expectedVersion, + String projectName) { + super(properties, Collections.emptyList()); + this.expectedVersion = expectedVersion; + this.projectName = projectName; + } + + @Override + public void closeMilestone(ProjectVersion releaseVersion) { + then(releaseVersion.projectName).isEqualTo(this.projectName); + then(releaseVersion.version).isEqualTo(this.expectedVersion); + this.closedMilestones = true; + } + + @Override + public void createIssueInSpringGuides(Projects projects, ProjectVersion version) { + this.issueCreatedInSpringGuides = true; + } + + @Override + public void createIssueInStartSpringIo(Projects projects, + ProjectVersion version) { + this.issueCreatedInStartSpringIo = true; + } + + @Override + public String milestoneUrl(ProjectVersion releaseVersion) { + return "https://foo.bar.com/" + releaseVersion.toString(); + } + + } + + @Configuration + @EnableAutoConfiguration + @ConditionalOnProperty(value = "test.metarelease", havingValue = "false", + matchIfMissing = true) + static class SingleProjectReleaseConfig extends DefaultTestConfiguration { + + @Bean + SaganClient testSaganClient() { + SaganClient saganClient = BDDMockito.mock(SaganClient.class); + BDDMockito.given(saganClient.getProject(anyString())) + .willReturn(newProject()); + return saganClient; + } + + @Bean + PostReleaseActions myPostReleaseActions() { + return BDDMockito.mock(PostReleaseActions.class); + } + + @Bean + TestProjectGitHubHandler testProjectGitHubHandler( + ReleaserProperties releaserProperties, + @Value("${test.expectedVersion}") String expectedVersion, + @Value("${test.projectName}") String projectName) { + return new TestProjectGitHubHandler(releaserProperties, expectedVersion, + projectName); + } + + @Bean + NonAssertingTestProjectGitHandler nonAssertingTestProjectGitHandler( + ReleaserProperties releaserProperties, + @Value("${test.projectName}") String projectName) { + return new NonAssertingTestProjectGitHandler(releaserProperties, + file -> FileSystemUtils + .deleteRecursively(new File(file, projectName))); + } + + @Bean + TestDocumentationUpdater testDocumentationUpdater( + ProjectGitHandler projectGitHandler, + ReleaserProperties releaserProperties, + TemplateGenerator templateGenerator, @Autowired( + required = false) List updaters) { + return new TestDocumentationUpdater(projectGitHandler, releaserProperties, + templateGenerator, updaters); + } + + } + + @Configuration + @ConditionalOnProperty(value = "test.metarelease", havingValue = "false", + matchIfMissing = true) + @ComponentScan({ "releaser.internal", "releaser.cloud" }) + static class SingleProjectScanningConfiguration { + + } + +} diff --git a/projects/spring-cloud/src/test/resources/logback.xml b/projects/spring-cloud/src/test/resources/logback.xml new file mode 100644 index 00000000..328749c2 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/logback.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/project-with-config/config/releaser.yml b/projects/spring-cloud/src/test/resources/projects/project-with-config/config/releaser.yml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/project-with-config/config/releaser.yml rename to projects/spring-cloud/src/test/resources/projects/project-with-config/config/releaser.yml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/project-with-netflix-config/config/releaser.yml b/projects/spring-cloud/src/test/resources/projects/project-with-netflix-config/config/releaser.yml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/project-with-netflix-config/config/releaser.yml rename to projects/spring-cloud/src/test/resources/projects/project-with-netflix-config/config/releaser.yml diff --git a/projects/spring-cloud/src/test/resources/projects/releaser-updater/config/releaser.yml b/projects/spring-cloud/src/test/resources/projects/releaser-updater/config/releaser.yml new file mode 100644 index 00000000..c9810fba --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/releaser-updater/config/releaser.yml @@ -0,0 +1,6 @@ +releaser.maven.buildCommand: maven_build +releaser.bash.buildCommand: bash_build +releaser.gradle.buildCommand: gradle_build +releaser.gradle.gradlePropsSubstitution: + verifierVersion: spring-cloud-contract + bootVersion: spring-boot diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/.gitignore b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/.gitignore similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/.gitignore rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/.gitignore diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-core-tests/.settings.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/.settings.xml similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-core-tests/.settings.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/.settings.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/.travis.yml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/.travis.yml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/.travis.yml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/.travis.yml diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/LICENSE.txt b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/LICENSE.txt similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/LICENSE.txt rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/LICENSE.txt diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/README.adoc b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/README.adoc similarity index 72% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/README.adoc rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/README.adoc index d37654aa..ebc0c7ce 100644 --- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/README.adoc +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/README.adoc @@ -2,8 +2,7 @@ image:https://circleci.com/gh/spring-cloud/spring-cloud-build.svg?style=svg[link="https://travis-ci.org/spring-cloud/spring-cloud-build"] -Spring Cloud Build is a common utility project for Spring Cloud -to use for plugin and dependency management. +Spring Cloud Build is a common utility project for Spring Cloud to use for plugin and dependency management. == Building and Deploying @@ -42,57 +41,49 @@ $ mvn deploy -P central -DaltReleaseDeploymentRepository=sonatype-nexus-staging: == Contributing -Spring Cloud is released under the non-restrictive Apache 2.0 license, -and follows a very standard Github development process, using Github -tracker for issues and merging pull requests into master. If you want -to contribute even something trivial please do not hesitate, but -follow the guidelines below. +Spring Cloud is released under the non-restrictive Apache 2.0 license, and follows a very standard Github development process, using Github tracker for issues and merging pull requests into master. +If you want to contribute even something trivial please do not hesitate, but follow the guidelines below. === Sign the Contributor License Agreement + Before we accept a non-trivial patch or pull request we will need you to sign the https://cla.pivotal.io/sign/spring[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. Active contributors might be asked to join the core team, and -given the ability to merge pull requests. +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. +Active contributors might be asked to join the core team, and given the ability to merge pull requests. === Code of Conduct + This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc[code of -conduct]. By participating, you are expected to uphold this code. Please report -unacceptable behavior to spring-code-of-conduct@pivotal.io. +conduct]. +By participating, you are expected to uphold this code. +Please report unacceptable behavior to spring-code-of-conduct@pivotal.io. === Code Conventions and Housekeeping -None of these is essential for a pull request, but they will all help. They can also be -added after the original pull request but before a merge. -* Use the Spring Framework code format conventions. If you use Eclipse - you can import formatter settings using the +None of these is essential for a pull request, but they will all help. +They can also be added after the original pull request but before a merge. + +* Use the Spring Framework code format conventions. +If you use Eclipse you can import formatter settings using the `eclipse-code-formatter.xml` file from the https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring - Cloud Build] project. If using IntelliJ, you can use the + Cloud Build] project. +If using IntelliJ, you can use the https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin] to import the same file. * Make sure all new `.java` files to have a simple Javadoc class comment with at least an - `@author` tag identifying you, and preferably at least a paragraph on what the class is - for. -* Add the ASF license header comment to all new `.java` files (copy from existing files - in the project) -* Add yourself as an `@author` to the .java files that you modify substantially (more - than cosmetic changes). + `@author` tag identifying you, and preferably at least a paragraph on what the class is for. +* Add the ASF license header comment to all new `.java` files (copy from existing files in the project) +* Add yourself as an `@author` to the .java files that you modify substantially (more than cosmetic changes). * Add some Javadocs and, if you change the namespace, some XSD doc elements. * A few unit tests would help a lot as well -- someone has to do it. -* If no-one else is using your branch, please rebase it against the current master (or - other target branch in the main project). -* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], - if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit - message (where XXXX is the issue number). +* If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project). +* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit message (where XXXX is the issue number). == Reusing the documentation -Spring Cloud Build publishes its `spring-cloud-build-docs` module that contains -helpful scripts (e.g. README generation ruby script) and css, xslt and images -for the Spring Cloud documentation. If you want to follow the same convention -approach of generating documentation just add these plugins to your `docs` module +Spring Cloud Build publishes its `spring-cloud-build-docs` module that contains helpful scripts (e.g. README generation ruby script) and css, xslt and images for the Spring Cloud documentation. +If you want to follow the same convention approach of generating documentation just add these plugins to your `docs` module [source,xml] ---- diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/circle.yml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/circle.yml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/circle.yml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/circle.yml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/pom.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/pom.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/pom.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/pom.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/README.adoc b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/README.adoc similarity index 89% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/README.adoc rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/README.adoc index 27561297..679b6505 100644 --- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/README.adoc +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/README.adoc @@ -1,7 +1,6 @@ image:https://circleci.com/gh/spring-cloud/spring-cloud-build.svg?style=svg[link="https://travis-ci.org/spring-cloud/spring-cloud-build"] -Spring Cloud Build is a common utility project for Spring Cloud -to use for plugin and dependency management. +Spring Cloud Build is a common utility project for Spring Cloud to use for plugin and dependency management. == Building and Deploying @@ -44,10 +43,8 @@ include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/maste == Reusing the documentation -Spring Cloud Build publishes its `spring-cloud-build-docs` module that contains -helpful scripts (e.g. README generation ruby script) and css, xslt and images -for the Spring Cloud documentation. If you want to follow the same convention -approach of generating documentation just add these plugins to your `docs` module +Spring Cloud Build publishes its `spring-cloud-build-docs` module that contains helpful scripts (e.g. README generation ruby script) and css, xslt and images for the Spring Cloud documentation. +If you want to follow the same convention approach of generating documentation just add these plugins to your `docs` module [source,xml] ---- diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/building-base.adoc b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/building-base.adoc new file mode 100644 index 00000000..26bb9472 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/building-base.adoc @@ -0,0 +1,72 @@ +=== Basic Compile and Test + +To build the source you will need to install JDK {jdkversion}. + +Spring Cloud uses Maven for most build-related activities, and you should be able to get off the ground quite quickly by cloning the project you are interested in and typing + +---- +$ ./mvnw install +---- + +NOTE: You can also install Maven (>=3.3.3) yourself and run the `mvn` command in place of `./mvnw` in the examples below. +If you do that you also might need to add `-P spring` if your local Maven settings do not contain repository declarations for spring pre-release artifacts. + +NOTE: Be aware that you might need to increase the amount of memory available to Maven by setting a `MAVEN_OPTS` environment variable with a value like `-Xmx512m -XX:MaxPermSize=128m`. +We try to cover this in the `.mvn` configuration, so if you find you have to do it to make a build succeed, please raise a ticket to get the settings added to source control. + +For hints on how to build the project look in `.travis.yml` if there is one. +There should be a "script" and maybe "install" command. +Also look at the "services" section to see if any services need to be running locally (e.g. mongo or rabbit). +Ignore the git-related bits that you might find in "before_install" since they're related to setting git credentials and you already have those. + +The projects that require middleware generally include a +`docker-compose.yml`, so consider using +https://compose.docker.io/[Docker Compose] to run the middeware servers in Docker containers. +See the README in the +https://github.com/spring-cloud-samples/scripts[scripts demo +repository] for specific instructions about the common cases of mongo, rabbit and redis. + +NOTE: If all else fails, build with the command from `.travis.yml` (usually +`./mvnw install`). + +=== Documentation + +The spring-cloud-build module has a "docs" profile, and if you switch that on it will try to build asciidoc sources from +`src/main/asciidoc`. +As part of that process it will look for a +`README.adoc` and process it by loading all the includes, but not parsing or rendering it, just copying it to `${main.basedir}` +(defaults to `${basedir}`, i.e. the root of the project). +If there are any changes in the README it will then show up after a Maven build as a modified file in the correct place. +Just commit it and push the change. + +=== Working with the code + +If you don't have an IDE preference we would recommend that you use +https://www.springsource.com/developer/sts[Spring Tools Suite] or +https://eclipse.org[Eclipse] when working with the code. +We use the +https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. +Other IDEs and tools should also work without issue as long as they use Maven 3.3.3 or better. + +==== Importing into eclipse with m2eclipse + +We recommend the https://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with eclipse. +If you don't already have m2eclipse installed it is available from the "eclipse marketplace". + +NOTE: Older versions of m2e do not support Maven 3.3, so once the projects are imported into Eclipse you will also need to tell m2eclipse to use the right profile for the projects. +If you see many different errors related to the POMs in the projects, check that you have an up to date installation. +If you can't upgrade m2e, add the "spring" profile to your `settings.xml`. +Alternatively you can copy the repository settings from the "spring" profile of the parent pom into your `settings.xml`. + +==== Importing into eclipse without m2eclipse + +If you prefer not to use m2eclipse you can generate eclipse project metadata using the following command: + +[indent=0] +---- + $ ./mvnw eclipse:eclipse +---- + +The generated eclipse projects can be imported by selecting `import existing projects` +from the `file` menu. + diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/building-jdk8.adoc b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/building-jdk8.adoc similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/building-jdk8.adoc rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/building-jdk8.adoc diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/building-lombok.adoc b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/building-lombok.adoc similarity index 60% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/building-lombok.adoc rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/building-lombok.adoc index c0a55e7f..6d0c4615 100644 --- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/building-lombok.adoc +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/building-lombok.adoc @@ -1,11 +1,9 @@ ==== Adding Project Lombok Agent Spring Cloud uses https://projectlombok.org/features/index.html[Project Lombok] -to generate getters and setters etc. Compiling from the command line this -shouldn't cause any problems, but in an IDE you need to add an agent -to the JVM. Full instructions can be found in the Lombok website. The -sign that you need to do this is a lot of compiler errors to do with -missing methods and fields, e.g. +to generate getters and setters etc. +Compiling from the command line this shouldn't cause any problems, but in an IDE you need to add an agent to the JVM. Full instructions can be found in the Lombok website. +The sign that you need to do this is a lot of compiler errors to do with missing methods and fields, e.g. [indent=0] ---- @@ -18,16 +16,22 @@ The method getLocation() is undefined for the type ProxyRouteLocator.ProxyRouteS ---- ==== Importing into Intellij -Spring Cloud projects use annotation processing, particularly Lombok, which requires configuration -or you will encounter compile problems. It also needs a specific version of maven and a profile -enabled. Intellij 14.1+ requires some configuration to ensure these are setup properly. - 1. Click Preferences, Plugins. *Ensure Lombok is installed* - 2. Click New, Project from Existing Sources, choose your spring-cloud project directory - 3. Choose Maven, and select Environment Settings. *Ensure you are using Maven 3.3.3* - 4. In the next screen, *Select the profile `spring`* click Next until Finish. - 5. Click Preferences, "Build, Execution, Deployment", Compiler, Annotation Processors. *Click Enable Annotation Processing* - 6. Click Build, Rebuild Project, and you are ready to go! +Spring Cloud projects use annotation processing, particularly Lombok, which requires configuration or you will encounter compile problems. +It also needs a specific version of maven and a profile enabled. +Intellij 14.1+ requires some configuration to ensure these are setup properly. + +1. Click Preferences, Plugins. +*Ensure Lombok is installed* +2. Click New, Project from Existing Sources, choose your spring-cloud project directory +3. Choose Maven, and select Environment Settings. +*Ensure you are using Maven 3.3.3* +4. In the next screen, *Select the profile `spring`* click Next until Finish. +5. Click Preferences, "Build, Execution, Deployment", Compiler, Annotation Processors. +*Click Enable Annotation Processing* +6. Click Build, Rebuild Project, and you are ready to go! ==== Importing into other IDEs -Maven is well supported by most Java IDEs. Refer to you vendor documentation. + +Maven is well supported by most Java IDEs. +Refer to you vendor documentation. diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/building.adoc b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/building.adoc similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/building.adoc rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/building.adoc diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/code-of-conduct.adoc b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/code-of-conduct.adoc new file mode 100644 index 00000000..acc29250 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/code-of-conduct.adoc @@ -0,0 +1,28 @@ += Contributor Code of Conduct + +As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities. + +We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality. + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery +* Personal attacks +* Trolling or insulting/derogatory comments +* Public or private harassment +* Publishing other's private information, such as physical or electronic addresses, without explicit permission +* Other unethical or unprofessional conduct + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. + +By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. +Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team. + +This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a project maintainer at spring-code-of-conduct@pivotal.io . All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. +Maintainers are obligated to maintain confidentiality with regard to the reporter of an incident. + +This Code of Conduct is adapted from the +https://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at +https://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/] \ No newline at end of file diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/contributing-docs.adoc b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/contributing-docs.adoc new file mode 100644 index 00000000..7fe88c27 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/contributing-docs.adoc @@ -0,0 +1,2 @@ +NOTE: Spring Cloud is released under the non-restrictive Apache 2.0 license. +If you would like to contribute to this section of the documentation or if you find an error, please find the source code and issue trackers in the project at {docslink}[github]. \ No newline at end of file diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/contributing.adoc b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/contributing.adoc similarity index 55% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/contributing.adoc rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/contributing.adoc index 6ec605e3..57dd491a 100644 --- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/contributing.adoc +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/contributing.adoc @@ -1,44 +1,38 @@ -Spring Cloud is released under the non-restrictive Apache 2.0 license, -and follows a very standard Github development process, using Github -tracker for issues and merging pull requests into master. If you want -to contribute even something trivial please do not hesitate, but -follow the guidelines below. +Spring Cloud is released under the non-restrictive Apache 2.0 license, and follows a very standard Github development process, using Github tracker for issues and merging pull requests into master. +If you want to contribute even something trivial please do not hesitate, but follow the guidelines below. === Sign the Contributor License Agreement + Before we accept a non-trivial patch or pull request we will need you to sign the https://cla.pivotal.io/sign/spring[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. Active contributors might be asked to join the core team, and -given the ability to merge pull requests. +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. +Active contributors might be asked to join the core team, and given the ability to merge pull requests. === Code of Conduct + This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc[code of -conduct]. By participating, you are expected to uphold this code. Please report -unacceptable behavior to spring-code-of-conduct@pivotal.io. +conduct]. +By participating, you are expected to uphold this code. +Please report unacceptable behavior to spring-code-of-conduct@pivotal.io. === Code Conventions and Housekeeping -None of these is essential for a pull request, but they will all help. They can also be -added after the original pull request but before a merge. -* Use the Spring Framework code format conventions. If you use Eclipse - you can import formatter settings using the +None of these is essential for a pull request, but they will all help. +They can also be added after the original pull request but before a merge. + +* Use the Spring Framework code format conventions. +If you use Eclipse you can import formatter settings using the `eclipse-code-formatter.xml` file from the https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring - Cloud Build] project. If using IntelliJ, you can use the + Cloud Build] project. +If using IntelliJ, you can use the https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin] to import the same file. * Make sure all new `.java` files to have a simple Javadoc class comment with at least an - `@author` tag identifying you, and preferably at least a paragraph on what the class is - for. -* Add the ASF license header comment to all new `.java` files (copy from existing files - in the project) -* Add yourself as an `@author` to the .java files that you modify substantially (more - than cosmetic changes). + `@author` tag identifying you, and preferably at least a paragraph on what the class is for. +* Add the ASF license header comment to all new `.java` files (copy from existing files in the project) +* Add yourself as an `@author` to the .java files that you modify substantially (more than cosmetic changes). * Add some Javadocs and, if you change the namespace, some XSD doc elements. * A few unit tests would help a lot as well -- someone has to do it. -* If no-one else is using your branch, please rebase it against the current master (or - other target branch in the main project). -* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], - if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit - message (where XXXX is the issue number). +* If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project). +* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit message (where XXXX is the issue number). diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/ghpages.sh b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/ghpages.sh similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/ghpages.sh rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/ghpages.sh diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/spring-cloud-build.adoc b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/spring-cloud-build.adoc similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/spring-cloud-build.adoc rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/spring-cloud-build.adoc diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/bash/sync_ghpages.sh b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/bash/sync_ghpages.sh similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/bash/sync_ghpages.sh rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/bash/sync_ghpages.sh diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/css/highlight.css b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/css/highlight.css similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/css/highlight.css rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/css/highlight.css diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/css/manual-multipage.css b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/css/manual-multipage.css similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/css/manual-multipage.css rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/css/manual-multipage.css diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/css/manual-singlepage.css b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/css/manual-singlepage.css similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/css/manual-singlepage.css rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/css/manual-singlepage.css diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/css/manual.css b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/css/manual.css similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/css/manual.css rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/css/manual.css diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/background.png b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/background.png similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/background.png rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/background.png diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/caution.png b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/caution.png similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/caution.png rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/caution.png diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/important.png b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/important.png similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/important.png rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/important.png diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/logo.png b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/logo.png similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/logo.png rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/logo.png diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/note.png b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/note.png similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/note.png rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/note.png diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/sts_exception.png b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/sts_exception.png similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/sts_exception.png rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/sts_exception.png diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/tip.png b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/tip.png similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/tip.png rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/tip.png diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/warning.png b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/warning.png similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/warning.png rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/warning.png diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/web-selected.png b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/web-selected.png similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/web-selected.png rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/images/web-selected.png diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/common.xsl b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/common.xsl similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/common.xsl rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/common.xsl diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/epub.xsl b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/epub.xsl similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/epub.xsl rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/epub.xsl diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/html-multipage.xsl b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/html-multipage.xsl similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/html-multipage.xsl rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/html-multipage.xsl diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/html-singlepage.xsl b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/html-singlepage.xsl similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/html-singlepage.xsl rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/html-singlepage.xsl diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/html.xsl b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/html.xsl similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/html.xsl rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/html.xsl diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/pdf.xsl b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/pdf.xsl similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/pdf.xsl rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/pdf.xsl diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl-config.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl-config.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl-config.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl-config.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/asciidoc-hl.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/asciidoc-hl.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/asciidoc-hl.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/asciidoc-hl.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/bourne-hl.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/bourne-hl.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/bourne-hl.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/bourne-hl.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/c-hl.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/c-hl.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/c-hl.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/c-hl.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/cpp-hl.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/cpp-hl.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/cpp-hl.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/cpp-hl.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/csharp-hl.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/csharp-hl.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/csharp-hl.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/csharp-hl.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/css-hl.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/css-hl.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/css-hl.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/css-hl.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/html-hl.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/html-hl.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/html-hl.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/html-hl.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/ini-hl.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/ini-hl.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/ini-hl.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/ini-hl.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/java-hl.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/java-hl.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/java-hl.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/java-hl.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/javascript-hl.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/javascript-hl.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/javascript-hl.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/javascript-hl.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/json-hl.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/json-hl.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/json-hl.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/json-hl.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/perl-hl.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/perl-hl.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/perl-hl.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/perl-hl.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/php-hl.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/php-hl.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/php-hl.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/php-hl.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/properties-hl.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/properties-hl.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/properties-hl.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/properties-hl.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/python-hl.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/python-hl.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/python-hl.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/python-hl.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/ruby-hl.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/ruby-hl.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/ruby-hl.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/ruby-hl.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/sql2003-hl.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/sql2003-hl.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/sql2003-hl.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/sql2003-hl.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/yaml-hl.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/yaml-hl.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/yaml-hl.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/xslthl/yaml-hl.xml diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/docs/src/main/ruby/generate_readme.sh b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/ruby/generate_readme.sh similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/docs/src/main/ruby/generate_readme.sh rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/src/main/ruby/generate_readme.sh diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/COMMIT_EDITMSG b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/COMMIT_EDITMSG similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/COMMIT_EDITMSG rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/COMMIT_EDITMSG diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/HEAD b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/HEAD similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/HEAD rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/HEAD diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/ORIG_HEAD b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/ORIG_HEAD similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/ORIG_HEAD rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/ORIG_HEAD diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/config b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/config similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/config rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/config diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/description b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/description similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/description rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/description diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/index b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/index similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/index rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/index diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/logs/HEAD b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/HEAD similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/logs/HEAD rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/HEAD diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/logs/refs/heads/1.3.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/heads/1.3.x similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/logs/refs/heads/1.3.x rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/heads/1.3.x diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/logs/refs/heads/master b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/heads/master similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/logs/refs/heads/master rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/heads/master diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/HEAD b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/HEAD similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/HEAD rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/HEAD diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/logs/refs/stash b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/stash similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/logs/refs/stash rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/stash diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/objects/3a/73674ab02efb72f308c51d6525dc2881966b66 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/objects/3a/73674ab02efb72f308c51d6525dc2881966b66 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/objects/3a/73674ab02efb72f308c51d6525dc2881966b66 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/objects/3a/73674ab02efb72f308c51d6525dc2881966b66 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/objects/6c/440242fd0d99ea81d901dfce0c9feef817afa3 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/objects/6c/440242fd0d99ea81d901dfce0c9feef817afa3 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/objects/6c/440242fd0d99ea81d901dfce0c9feef817afa3 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/objects/6c/440242fd0d99ea81d901dfce0c9feef817afa3 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/objects/d3/1212f524df9edc0de8b770b13b9d29b17e14ce b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/objects/d3/1212f524df9edc0de8b770b13b9d29b17e14ce similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/objects/d3/1212f524df9edc0de8b770b13b9d29b17e14ce rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/objects/d3/1212f524df9edc0de8b770b13b9d29b17e14ce diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/objects/d4/d5865c142f92aebb5dd1a7c9b745395e65873a b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/objects/d4/d5865c142f92aebb5dd1a7c9b745395e65873a similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/objects/d4/d5865c142f92aebb5dd1a7c9b745395e65873a rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/objects/d4/d5865c142f92aebb5dd1a7c9b745395e65873a diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/objects/pack/pack-6741afef35586f266d1057d1fb950b162a6fa31b.idx b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/objects/pack/pack-6741afef35586f266d1057d1fb950b162a6fa31b.idx similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/objects/pack/pack-6741afef35586f266d1057d1fb950b162a6fa31b.idx rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/objects/pack/pack-6741afef35586f266d1057d1fb950b162a6fa31b.idx diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/objects/pack/pack-6741afef35586f266d1057d1fb950b162a6fa31b.pack b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/objects/pack/pack-6741afef35586f266d1057d1fb950b162a6fa31b.pack similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/objects/pack/pack-6741afef35586f266d1057d1fb950b162a6fa31b.pack rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/objects/pack/pack-6741afef35586f266d1057d1fb950b162a6fa31b.pack diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/packed-refs b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/packed-refs similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/packed-refs rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/packed-refs diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/refs/heads/1.3.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/heads/1.3.x similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/refs/heads/1.3.x rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/heads/1.3.x diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/refs/heads/master b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/heads/master similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/git/refs/heads/master rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/heads/master diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/pom.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/pom.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/pom.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/pom.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/scripts/sync_mvnw.sh b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/scripts/sync_mvnw.sh similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/scripts/sync_mvnw.sh rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/scripts/sync_mvnw.sh diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/spring-cloud-build-dependencies/pom.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/spring-cloud-build-dependencies/pom.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/spring-cloud-build-dependencies/pom.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/spring-cloud-build-dependencies/pom.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/spring-cloud-build-tools/pom.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/spring-cloud-build-tools/pom.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/spring-cloud-build-tools/pom.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/spring-cloud-build-tools/pom.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/LICENSE.txt b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/spring-cloud-build-tools/src/main/resources/LICENSE.txt similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/LICENSE.txt rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/spring-cloud-build-tools/src/main/resources/LICENSE.txt diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/spring-cloud-build-tools/src/main/resources/checkstyle.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/spring-cloud-build-tools/src/main/resources/checkstyle.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/spring-cloud-build-tools/src/main/resources/checkstyle.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/spring-cloud-build-tools/src/main/resources/checkstyle.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/spring-cloud-dependencies-parent/Guardfile b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/spring-cloud-dependencies-parent/Guardfile similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/spring-cloud-dependencies-parent/Guardfile rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/spring-cloud-dependencies-parent/Guardfile diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/spring-cloud-dependencies-parent/README.adoc b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/spring-cloud-dependencies-parent/README.adoc similarity index 63% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/spring-cloud-dependencies-parent/README.adoc rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/spring-cloud-dependencies-parent/README.adoc index 0ffc7973..4e81d9f4 100644 --- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/spring-cloud-dependencies-parent/README.adoc +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/spring-cloud-dependencies-parent/README.adoc @@ -1,4 +1,3 @@ // Do not edit this file (e.g. go instead to src/main/asciidoc) -Spring Cloud Build is a common utility project for Spring Cloud -to use for plugin and dependency management. +Spring Cloud Build is a common utility project for Spring Cloud to use for plugin and dependency management. diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/spring-cloud-dependencies-parent/eclipse-code-formatter.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/spring-cloud-dependencies-parent/eclipse-code-formatter.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/spring-cloud-dependencies-parent/eclipse-code-formatter.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/spring-cloud-dependencies-parent/eclipse-code-formatter.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/spring-cloud-dependencies-parent/pom.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/spring-cloud-dependencies-parent/pom.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/spring-cloud-dependencies-parent/pom.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-build/spring-cloud-dependencies-parent/pom.xml diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/.gitignore b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/.gitignore similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/.gitignore rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/.gitignore diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/COMMIT_EDITMSG b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/COMMIT_EDITMSG similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/COMMIT_EDITMSG rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/COMMIT_EDITMSG diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/HEAD b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/HEAD similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/HEAD rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/HEAD diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/config b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/config similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/config rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/config diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-core-tests/git/description b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/description similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-core-tests/git/description rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/description diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/index b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/index similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/index rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/index diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/logs/HEAD b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/logs/HEAD similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/logs/HEAD rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/logs/HEAD diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/logs/refs/heads/master b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/logs/refs/heads/master similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/logs/refs/heads/master rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/logs/refs/heads/master diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/objects/14/e930a30601eee731b77d0a84499aaf56be8b26 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/objects/14/e930a30601eee731b77d0a84499aaf56be8b26 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/objects/14/e930a30601eee731b77d0a84499aaf56be8b26 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/objects/14/e930a30601eee731b77d0a84499aaf56be8b26 diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/objects/2e/289de071592d4d361957e59cc0485c5e1941a0 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/objects/2e/289de071592d4d361957e59cc0485c5e1941a0 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/objects/2e/289de071592d4d361957e59cc0485c5e1941a0 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/objects/2e/289de071592d4d361957e59cc0485c5e1941a0 diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/objects/37/296724b949a9c2126e0c3e2e7bf5e5d7678802 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/objects/37/296724b949a9c2126e0c3e2e7bf5e5d7678802 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/objects/37/296724b949a9c2126e0c3e2e7bf5e5d7678802 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/objects/37/296724b949a9c2126e0c3e2e7bf5e5d7678802 diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/objects/38/6e26ed81099e05b791bbea27a0236abc42a455 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/objects/38/6e26ed81099e05b791bbea27a0236abc42a455 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/objects/38/6e26ed81099e05b791bbea27a0236abc42a455 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/objects/38/6e26ed81099e05b791bbea27a0236abc42a455 diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/objects/3f/e60ad83d20b9fcc485d1f4a07c84f81a4820f9 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/objects/3f/e60ad83d20b9fcc485d1f4a07c84f81a4820f9 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/objects/3f/e60ad83d20b9fcc485d1f4a07c84f81a4820f9 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/objects/3f/e60ad83d20b9fcc485d1f4a07c84f81a4820f9 diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/objects/41/a65456b03d965616e321ae1c3d3afc44599cec b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/objects/41/a65456b03d965616e321ae1c3d3afc44599cec similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/objects/41/a65456b03d965616e321ae1c3d3afc44599cec rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/objects/41/a65456b03d965616e321ae1c3d3afc44599cec diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/objects/51/4eff03a3ead54a8a2cc950ace02f85baf24e35 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/objects/51/4eff03a3ead54a8a2cc950ace02f85baf24e35 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/objects/51/4eff03a3ead54a8a2cc950ace02f85baf24e35 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/objects/51/4eff03a3ead54a8a2cc950ace02f85baf24e35 diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/objects/7e/a3be063a4f6503fe63c3a1db5b653cf774ab97 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/objects/7e/a3be063a4f6503fe63c3a1db5b653cf774ab97 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/objects/7e/a3be063a4f6503fe63c3a1db5b653cf774ab97 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/objects/7e/a3be063a4f6503fe63c3a1db5b653cf774ab97 diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/objects/8d/b262c5ba9b96d3a26a5e2b133f131194e4f915 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/objects/8d/b262c5ba9b96d3a26a5e2b133f131194e4f915 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/objects/8d/b262c5ba9b96d3a26a5e2b133f131194e4f915 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/objects/8d/b262c5ba9b96d3a26a5e2b133f131194e4f915 diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/refs/heads/master b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/refs/heads/master similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/git/refs/heads/master rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/refs/heads/master diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/pom.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/pom.xml similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/pom.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/pom.xml diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/spring-cloud-starter-consul/pom.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/spring-cloud-starter-consul/pom.xml similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-consul/spring-cloud-starter-consul/pom.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/spring-cloud-starter-consul/pom.xml diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/.gitignore b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/.gitignore similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/.gitignore rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/.gitignore diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/.mvn/jvm.config b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/.mvn/jvm.config similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/.mvn/jvm.config rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/.mvn/jvm.config diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/.mvn/maven.config b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/.mvn/maven.config similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/.mvn/maven.config rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/.mvn/maven.config diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-core-tests/.mvn/wrapper/maven-wrapper.jar b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-core-tests/.mvn/wrapper/maven-wrapper.jar rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/.mvn/wrapper/maven-wrapper.jar diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/.mvn/wrapper/maven-wrapper.properties b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/.mvn/wrapper/maven-wrapper.properties rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/.mvn/wrapper/maven-wrapper.properties diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/.settings.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/.settings.xml similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/.settings.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/.settings.xml diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/.travis.yml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/.travis.yml similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/.travis.yml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/.travis.yml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/spring-cloud-build-tools/src/main/resources/LICENSE.txt b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/LICENSE.txt similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/spring-cloud-build-tools/src/main/resources/LICENSE.txt rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/LICENSE.txt diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/README.adoc b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/README.adoc similarity index 61% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/README.adoc rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/README.adoc index 2f700d5a..5963dd45 100644 --- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/README.adoc +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/README.adoc @@ -1,63 +1,55 @@ // Do not edit this file (e.g. go instead to src/main/asciidoc) -Spring Cloud Release Train is a curated set of dependencies across a -range of Spring Cloud projects. You consume it by using the -spring-cloud-dependencies POM to manage dependencies in Maven or -Gradle. The release trains have names, not versions, to avoid -confusion with the sub-projects. The names are an alphabetic sequence -(so you can sort them chronologically) with names of London Tube -stations ("Angel" is the first release, "Brixton" is the second). +Spring Cloud Release Train is a curated set of dependencies across a range of Spring Cloud projects. +You consume it by using the spring-cloud-dependencies POM to manage dependencies in Maven or Gradle. +The release trains have names, not versions, to avoid confusion with the sub-projects. +The names are an alphabetic sequence (so you can sort them chronologically) with names of London Tube stations ("Angel" is the first release, "Brixton" is the second). == Contributing -Spring Cloud is released under the non-restrictive Apache 2.0 license, -and follows a very standard Github development process, using Github -tracker for issues and merging pull requests into master. If you want -to contribute even something trivial please do not hesitate, but -follow the guidelines below. +Spring Cloud is released under the non-restrictive Apache 2.0 license, and follows a very standard Github development process, using Github tracker for issues and merging pull requests into master. +If you want to contribute even something trivial please do not hesitate, but follow the guidelines below. === Sign the Contributor License Agreement + Before we accept a non-trivial patch or pull request we will need you to sign the https://cla.pivotal.io/sign/spring[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. Active contributors might be asked to join the core team, and -given the ability to merge pull requests. +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. +Active contributors might be asked to join the core team, and given the ability to merge pull requests. === Code of Conduct + This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc[code of -conduct]. By participating, you are expected to uphold this code. Please report -unacceptable behavior to spring-code-of-conduct@pivotal.io. +conduct]. +By participating, you are expected to uphold this code. +Please report unacceptable behavior to spring-code-of-conduct@pivotal.io. === Code Conventions and Housekeeping -None of these is essential for a pull request, but they will all help. They can also be -added after the original pull request but before a merge. -* Use the Spring Framework code format conventions. If you use Eclipse - you can import formatter settings using the +None of these is essential for a pull request, but they will all help. +They can also be added after the original pull request but before a merge. + +* Use the Spring Framework code format conventions. +If you use Eclipse you can import formatter settings using the `eclipse-code-formatter.xml` file from the https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring - Cloud Build] project. If using IntelliJ, you can use the + Cloud Build] project. +If using IntelliJ, you can use the https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin] to import the same file. * Make sure all new `.java` files to have a simple Javadoc class comment with at least an - `@author` tag identifying you, and preferably at least a paragraph on what the class is - for. -* Add the ASF license header comment to all new `.java` files (copy from existing files - in the project) -* Add yourself as an `@author` to the .java files that you modify substantially (more - than cosmetic changes). + `@author` tag identifying you, and preferably at least a paragraph on what the class is for. +* Add the ASF license header comment to all new `.java` files (copy from existing files in the project) +* Add yourself as an `@author` to the .java files that you modify substantially (more than cosmetic changes). * Add some Javadocs and, if you change the namespace, some XSD doc elements. * A few unit tests would help a lot as well -- someone has to do it. -* If no-one else is using your branch, please rebase it against the current master (or - other target branch in the main project). -* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], - if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit - message (where XXXX is the issue number). +* If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project). +* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit message (where XXXX is the issue number). == Building and Deploying -Since there is no code to compile in the starters they should do not need to compile, but a compiler has to be available because they are built and deployed as JAR artifacts. To install locally: +Since there is no code to compile in the starters they should do not need to compile, but a compiler has to be available because they are built and deployed as JAR artifacts. +To install locally: ---- diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/docs/pom.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/docs/pom.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/docs/pom.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/docs/pom.xml diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/docs/src/main/asciidoc/README.adoc b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/docs/src/main/asciidoc/README.adoc similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/docs/src/main/asciidoc/README.adoc rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/docs/src/main/asciidoc/README.adoc diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/docs/src/main/asciidoc/ghpages.sh b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/docs/src/main/asciidoc/ghpages.sh similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/docs/src/main/asciidoc/ghpages.sh rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/docs/src/main/asciidoc/ghpages.sh diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/docs/src/main/asciidoc/intro.adoc b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/docs/src/main/asciidoc/intro.adoc new file mode 100644 index 00000000..d8910f57 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/docs/src/main/asciidoc/intro.adoc @@ -0,0 +1,4 @@ +Spring Cloud Release Train is a curated set of dependencies across a range of Spring Cloud projects. +You consume it by using the spring-cloud-dependencies POM to manage dependencies in Maven or Gradle. +The release trains have names, not versions, to avoid confusion with the sub-projects. +The names are an alphabetic sequence (so you can sort them chronologically) with names of London Tube stations ("Angel" is the first release, "Brixton" is the second). diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/docs/src/main/asciidoc/spring-cloud-starters.adoc b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/docs/src/main/asciidoc/spring-cloud-starters.adoc similarity index 93% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/docs/src/main/asciidoc/spring-cloud-starters.adoc rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/docs/src/main/asciidoc/spring-cloud-starters.adoc index 113816ea..330323fb 100644 --- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/docs/src/main/asciidoc/spring-cloud-starters.adoc +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/docs/src/main/asciidoc/spring-cloud-starters.adoc @@ -11,7 +11,8 @@ include::intro.adoc[] == Using Spring Cloud Dependencies with Spring IO Platform -The Spring IO Platform is a modular, enterprise-grade curated set of dependencies. To use the Spring Cloud Starters with Spring IO Platform, you must import the Spring Cloud Dependencies bill of materials (BOM) first. +The Spring IO Platform is a modular, enterprise-grade curated set of dependencies. +To use the Spring Cloud Starters with Spring IO Platform, you must import the Spring Cloud Dependencies bill of materials (BOM) first. To use version {springioplatformversion} of the Spring IO Platform and Spring Cloud Release Train {springcloudversion} with Maven, update the pom.xml as follows: diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/ruby/generate_readme.sh b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/docs/src/main/ruby/generate_readme.sh similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/ruby/generate_readme.sh rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/docs/src/main/ruby/generate_readme.sh diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/COMMIT_EDITMSG b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/COMMIT_EDITMSG similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/COMMIT_EDITMSG rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/COMMIT_EDITMSG diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/FETCH_HEAD b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/FETCH_HEAD similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/FETCH_HEAD rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/FETCH_HEAD diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/HEAD b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/HEAD similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/HEAD rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/HEAD diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-consul/git/config b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/config similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-consul/git/config rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/config diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/description b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/description similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/description rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/description diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/index b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/index similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/index rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/index diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/00/a89502506f1f412fc1073892d831afb7076a6c b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/00/a89502506f1f412fc1073892d831afb7076a6c similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/00/a89502506f1f412fc1073892d831afb7076a6c rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/00/a89502506f1f412fc1073892d831afb7076a6c diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/01/6dad28d8c71894d8e44af232112c9c55a1837e b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/01/6dad28d8c71894d8e44af232112c9c55a1837e similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/01/6dad28d8c71894d8e44af232112c9c55a1837e rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/01/6dad28d8c71894d8e44af232112c9c55a1837e diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/04/43185eb0d287a8e642a0ed2d4fd1263df6e782 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/04/43185eb0d287a8e642a0ed2d4fd1263df6e782 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/04/43185eb0d287a8e642a0ed2d4fd1263df6e782 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/04/43185eb0d287a8e642a0ed2d4fd1263df6e782 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/04/ab6451a0ca2c74385606754f98b0d1bbdedcb3 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/04/ab6451a0ca2c74385606754f98b0d1bbdedcb3 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/04/ab6451a0ca2c74385606754f98b0d1bbdedcb3 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/04/ab6451a0ca2c74385606754f98b0d1bbdedcb3 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/06/5b0b650838bf569c71825208c05fd2ab98fbe7 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/06/5b0b650838bf569c71825208c05fd2ab98fbe7 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/06/5b0b650838bf569c71825208c05fd2ab98fbe7 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/06/5b0b650838bf569c71825208c05fd2ab98fbe7 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/06/f59b58f24e6fb7fbf242e35ee830a5d990e1fb b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/06/f59b58f24e6fb7fbf242e35ee830a5d990e1fb similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/06/f59b58f24e6fb7fbf242e35ee830a5d990e1fb rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/06/f59b58f24e6fb7fbf242e35ee830a5d990e1fb diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/07/fa7ab2edb3f5d3266534d7483e07a11b2af934 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/07/fa7ab2edb3f5d3266534d7483e07a11b2af934 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/07/fa7ab2edb3f5d3266534d7483e07a11b2af934 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/07/fa7ab2edb3f5d3266534d7483e07a11b2af934 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/08/c6cb159e999b062425f21d3ff241ff8716eeee b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/08/c6cb159e999b062425f21d3ff241ff8716eeee similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/08/c6cb159e999b062425f21d3ff241ff8716eeee rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/08/c6cb159e999b062425f21d3ff241ff8716eeee diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/08/ca4797e9798630d33eb8977c25c48b1ad7002c b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/08/ca4797e9798630d33eb8977c25c48b1ad7002c similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/08/ca4797e9798630d33eb8977c25c48b1ad7002c rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/08/ca4797e9798630d33eb8977c25c48b1ad7002c diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/09/46dce6d42e6209822f9ef1b36033b0af1a8309 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/09/46dce6d42e6209822f9ef1b36033b0af1a8309 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/09/46dce6d42e6209822f9ef1b36033b0af1a8309 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/09/46dce6d42e6209822f9ef1b36033b0af1a8309 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/0c/cd2833e149e9b8a7974ecf74a5e9e172322ab9 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/0c/cd2833e149e9b8a7974ecf74a5e9e172322ab9 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/0c/cd2833e149e9b8a7974ecf74a5e9e172322ab9 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/0c/cd2833e149e9b8a7974ecf74a5e9e172322ab9 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/0d/a5b74861eb22d39f9e2289864f900a05bb15e4 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/0d/a5b74861eb22d39f9e2289864f900a05bb15e4 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/0d/a5b74861eb22d39f9e2289864f900a05bb15e4 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/0d/a5b74861eb22d39f9e2289864f900a05bb15e4 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/0e/1ba9a2a5b9401491b56d3078dc3200d0a8063b b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/0e/1ba9a2a5b9401491b56d3078dc3200d0a8063b similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/0e/1ba9a2a5b9401491b56d3078dc3200d0a8063b rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/0e/1ba9a2a5b9401491b56d3078dc3200d0a8063b diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/10/eed14391f71bcb947fadbda73c5d282111f14e b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/10/eed14391f71bcb947fadbda73c5d282111f14e similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/10/eed14391f71bcb947fadbda73c5d282111f14e rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/10/eed14391f71bcb947fadbda73c5d282111f14e diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/11/12d979e9da95e845fbfa9b8857387af4b9055e b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/11/12d979e9da95e845fbfa9b8857387af4b9055e similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/11/12d979e9da95e845fbfa9b8857387af4b9055e rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/11/12d979e9da95e845fbfa9b8857387af4b9055e diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/11/3816eae412ca26437957377c86ef1a27dcf512 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/11/3816eae412ca26437957377c86ef1a27dcf512 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/11/3816eae412ca26437957377c86ef1a27dcf512 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/11/3816eae412ca26437957377c86ef1a27dcf512 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/14/351aabf9935f7ff2554d4bc737a2be25042a7a b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/14/351aabf9935f7ff2554d4bc737a2be25042a7a similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/14/351aabf9935f7ff2554d4bc737a2be25042a7a rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/14/351aabf9935f7ff2554d4bc737a2be25042a7a diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/17/092007bce765ae3842bcabd9daf9dcf2e48683 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/17/092007bce765ae3842bcabd9daf9dcf2e48683 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/17/092007bce765ae3842bcabd9daf9dcf2e48683 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/17/092007bce765ae3842bcabd9daf9dcf2e48683 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/1a/79ba70cfda4c30da3d44ba8f4e084ecd00ab86 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/1a/79ba70cfda4c30da3d44ba8f4e084ecd00ab86 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/1a/79ba70cfda4c30da3d44ba8f4e084ecd00ab86 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/1a/79ba70cfda4c30da3d44ba8f4e084ecd00ab86 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/1a/db404cef232b743c7da43e18403b215cf6b7f9 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/1a/db404cef232b743c7da43e18403b215cf6b7f9 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/1a/db404cef232b743c7da43e18403b215cf6b7f9 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/1a/db404cef232b743c7da43e18403b215cf6b7f9 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/1b/90adfc6d5ec4d0ebce9c8531caab7e5a10436a b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/1b/90adfc6d5ec4d0ebce9c8531caab7e5a10436a similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/1b/90adfc6d5ec4d0ebce9c8531caab7e5a10436a rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/1b/90adfc6d5ec4d0ebce9c8531caab7e5a10436a diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/1c/22ca6365f4d96a556f8ca7d169ef0b4d12bbb5 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/1c/22ca6365f4d96a556f8ca7d169ef0b4d12bbb5 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/1c/22ca6365f4d96a556f8ca7d169ef0b4d12bbb5 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/1c/22ca6365f4d96a556f8ca7d169ef0b4d12bbb5 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/1c/9435d9d1762608550d7ad7d41b7884205c9a71 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/1c/9435d9d1762608550d7ad7d41b7884205c9a71 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/1c/9435d9d1762608550d7ad7d41b7884205c9a71 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/1c/9435d9d1762608550d7ad7d41b7884205c9a71 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/22/61866d48e80a763b934681dc8c3ccd98d0de00 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/22/61866d48e80a763b934681dc8c3ccd98d0de00 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/22/61866d48e80a763b934681dc8c3ccd98d0de00 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/22/61866d48e80a763b934681dc8c3ccd98d0de00 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/24/01350eae39a0f8c093ceb11671a8490e200e37 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/24/01350eae39a0f8c093ceb11671a8490e200e37 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/24/01350eae39a0f8c093ceb11671a8490e200e37 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/24/01350eae39a0f8c093ceb11671a8490e200e37 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/24/8d7fa9967e855b592603a38cabebabf2f33717 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/24/8d7fa9967e855b592603a38cabebabf2f33717 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/24/8d7fa9967e855b592603a38cabebabf2f33717 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/24/8d7fa9967e855b592603a38cabebabf2f33717 diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/25/af4f2162cdf0642c78ea8e63c1744158b6ad1b b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/25/af4f2162cdf0642c78ea8e63c1744158b6ad1b similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/25/af4f2162cdf0642c78ea8e63c1744158b6ad1b rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/25/af4f2162cdf0642c78ea8e63c1744158b6ad1b diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/26/3463cd218b9abb0dc21caaad5d9a2b04e238d5 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/26/3463cd218b9abb0dc21caaad5d9a2b04e238d5 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/26/3463cd218b9abb0dc21caaad5d9a2b04e238d5 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/26/3463cd218b9abb0dc21caaad5d9a2b04e238d5 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/26/a9b0645d017402ec5851a703d80430d5e0d6da b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/26/a9b0645d017402ec5851a703d80430d5e0d6da similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/26/a9b0645d017402ec5851a703d80430d5e0d6da rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/26/a9b0645d017402ec5851a703d80430d5e0d6da diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/26/e51358b66170cacabb0d12ff9c788591765d3d b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/26/e51358b66170cacabb0d12ff9c788591765d3d similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/26/e51358b66170cacabb0d12ff9c788591765d3d rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/26/e51358b66170cacabb0d12ff9c788591765d3d diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/28/fa14e79972fdba65a826f09fc31ca344348e1d b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/28/fa14e79972fdba65a826f09fc31ca344348e1d similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/28/fa14e79972fdba65a826f09fc31ca344348e1d rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/28/fa14e79972fdba65a826f09fc31ca344348e1d diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/29/dde5f8e4c5096612ac8669dd7bfbcc95c7ef39 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/29/dde5f8e4c5096612ac8669dd7bfbcc95c7ef39 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/29/dde5f8e4c5096612ac8669dd7bfbcc95c7ef39 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/29/dde5f8e4c5096612ac8669dd7bfbcc95c7ef39 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/2c/f807a8f2705f3d4ea4f9871c5cd195b4459102 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/2c/f807a8f2705f3d4ea4f9871c5cd195b4459102 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/2c/f807a8f2705f3d4ea4f9871c5cd195b4459102 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/2c/f807a8f2705f3d4ea4f9871c5cd195b4459102 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/2d/b1c7134855e385ee54617ed9ed33f61b517f07 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/2d/b1c7134855e385ee54617ed9ed33f61b517f07 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/2d/b1c7134855e385ee54617ed9ed33f61b517f07 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/2d/b1c7134855e385ee54617ed9ed33f61b517f07 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/2f/705940b7e003af2510b3241e5428ca7a2fdb2c b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/2f/705940b7e003af2510b3241e5428ca7a2fdb2c similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/2f/705940b7e003af2510b3241e5428ca7a2fdb2c rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/2f/705940b7e003af2510b3241e5428ca7a2fdb2c diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/2f/912f067342a5f5227d5dcc5801ee28c03f810b b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/2f/912f067342a5f5227d5dcc5801ee28c03f810b similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/2f/912f067342a5f5227d5dcc5801ee28c03f810b rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/2f/912f067342a5f5227d5dcc5801ee28c03f810b diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/30/c84aed22253f4adba012417eeaac82b78e7aca b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/30/c84aed22253f4adba012417eeaac82b78e7aca similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/30/c84aed22253f4adba012417eeaac82b78e7aca rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/30/c84aed22253f4adba012417eeaac82b78e7aca diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/32/0597b84bb0312c15228c4d42f46c189b86ed90 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/32/0597b84bb0312c15228c4d42f46c189b86ed90 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/32/0597b84bb0312c15228c4d42f46c189b86ed90 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/32/0597b84bb0312c15228c4d42f46c189b86ed90 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/32/ebcd2c317339400d65ad43999d4e5ddc05bd30 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/32/ebcd2c317339400d65ad43999d4e5ddc05bd30 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/32/ebcd2c317339400d65ad43999d4e5ddc05bd30 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/32/ebcd2c317339400d65ad43999d4e5ddc05bd30 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/3e/f49d448c45bd8c164a969cfbc81a2ee7d6dade b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/3e/f49d448c45bd8c164a969cfbc81a2ee7d6dade similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/3e/f49d448c45bd8c164a969cfbc81a2ee7d6dade rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/3e/f49d448c45bd8c164a969cfbc81a2ee7d6dade diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/40/26990f53a380129e19892d8c2c1d60851647b0 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/40/26990f53a380129e19892d8c2c1d60851647b0 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/40/26990f53a380129e19892d8c2c1d60851647b0 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/40/26990f53a380129e19892d8c2c1d60851647b0 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/40/914dbb351175f0313ac4f7379ac82e2803e943 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/40/914dbb351175f0313ac4f7379ac82e2803e943 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/40/914dbb351175f0313ac4f7379ac82e2803e943 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/40/914dbb351175f0313ac4f7379ac82e2803e943 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/41/2fc309a6b4d93ebe1768dcbcc721c85288a22a b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/41/2fc309a6b4d93ebe1768dcbcc721c85288a22a similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/41/2fc309a6b4d93ebe1768dcbcc721c85288a22a rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/41/2fc309a6b4d93ebe1768dcbcc721c85288a22a diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/42/c590355a8deb405ca0e38e76bdfbfa253bfecb b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/42/c590355a8deb405ca0e38e76bdfbfa253bfecb similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/42/c590355a8deb405ca0e38e76bdfbfa253bfecb rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/42/c590355a8deb405ca0e38e76bdfbfa253bfecb diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/46/1fe2b2571a3edba6f37a4c6f0ea82e25da0c57 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/46/1fe2b2571a3edba6f37a4c6f0ea82e25da0c57 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/46/1fe2b2571a3edba6f37a4c6f0ea82e25da0c57 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/46/1fe2b2571a3edba6f37a4c6f0ea82e25da0c57 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/46/2ea36e1be312886a3071d3d065f14c98c50ba6 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/46/2ea36e1be312886a3071d3d065f14c98c50ba6 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/46/2ea36e1be312886a3071d3d065f14c98c50ba6 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/46/2ea36e1be312886a3071d3d065f14c98c50ba6 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/48/c4aa9e128127a4fa67afbaaecef913c05c6c95 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/48/c4aa9e128127a4fa67afbaaecef913c05c6c95 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/48/c4aa9e128127a4fa67afbaaecef913c05c6c95 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/48/c4aa9e128127a4fa67afbaaecef913c05c6c95 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/49/78326d37eb4e8d8fd4ace8bc7b16907b524a89 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/49/78326d37eb4e8d8fd4ace8bc7b16907b524a89 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/49/78326d37eb4e8d8fd4ace8bc7b16907b524a89 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/49/78326d37eb4e8d8fd4ace8bc7b16907b524a89 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/4d/473a4a40413608f4825ac89bc11aef89be0aa1 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/4d/473a4a40413608f4825ac89bc11aef89be0aa1 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/4d/473a4a40413608f4825ac89bc11aef89be0aa1 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/4d/473a4a40413608f4825ac89bc11aef89be0aa1 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/4e/fd6ff33ad729f56ca812374d6a6e420429a055 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/4e/fd6ff33ad729f56ca812374d6a6e420429a055 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/4e/fd6ff33ad729f56ca812374d6a6e420429a055 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/4e/fd6ff33ad729f56ca812374d6a6e420429a055 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/50/58e844e95f7800c5c3c8337b1c02d60b58e9df b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/50/58e844e95f7800c5c3c8337b1c02d60b58e9df similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/50/58e844e95f7800c5c3c8337b1c02d60b58e9df rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/50/58e844e95f7800c5c3c8337b1c02d60b58e9df diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/50/d8e7a932df85e5436801575895a8bd6e1e63fd b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/50/d8e7a932df85e5436801575895a8bd6e1e63fd similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/50/d8e7a932df85e5436801575895a8bd6e1e63fd rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/50/d8e7a932df85e5436801575895a8bd6e1e63fd diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/53/f063f075f829baa92c0b20189c4f37d175df54 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/53/f063f075f829baa92c0b20189c4f37d175df54 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/53/f063f075f829baa92c0b20189c4f37d175df54 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/53/f063f075f829baa92c0b20189c4f37d175df54 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/54/b57816e97f3d7ec73f4cb2facf093c377ee9f7 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/54/b57816e97f3d7ec73f4cb2facf093c377ee9f7 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/54/b57816e97f3d7ec73f4cb2facf093c377ee9f7 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/54/b57816e97f3d7ec73f4cb2facf093c377ee9f7 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/56/1a933f652e9b274e17de2e1479b450dd429146 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/56/1a933f652e9b274e17de2e1479b450dd429146 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/56/1a933f652e9b274e17de2e1479b450dd429146 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/56/1a933f652e9b274e17de2e1479b450dd429146 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/56/6daa418f53e211932941cc554b34fdc72c779e b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/56/6daa418f53e211932941cc554b34fdc72c779e similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/56/6daa418f53e211932941cc554b34fdc72c779e rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/56/6daa418f53e211932941cc554b34fdc72c779e diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/56/ad416aece87b71601448972587c8030dfd4b9b b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/56/ad416aece87b71601448972587c8030dfd4b9b similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/56/ad416aece87b71601448972587c8030dfd4b9b rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/56/ad416aece87b71601448972587c8030dfd4b9b diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/56/f1ab20f574d99ecd0a8277fc9f97a95322b8f0 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/56/f1ab20f574d99ecd0a8277fc9f97a95322b8f0 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/56/f1ab20f574d99ecd0a8277fc9f97a95322b8f0 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/56/f1ab20f574d99ecd0a8277fc9f97a95322b8f0 diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/57/8e15047403e46a1a05f7d45ced53dc89eb59b7 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/57/8e15047403e46a1a05f7d45ced53dc89eb59b7 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/57/8e15047403e46a1a05f7d45ced53dc89eb59b7 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/57/8e15047403e46a1a05f7d45ced53dc89eb59b7 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/5d/8f113513337f846493590b6685aab72f9df01d b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/5d/8f113513337f846493590b6685aab72f9df01d similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/5d/8f113513337f846493590b6685aab72f9df01d rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/5d/8f113513337f846493590b6685aab72f9df01d diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/5e/0d7c3f9c24c16da6b268aa3a18ad41a7ff3b70 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/5e/0d7c3f9c24c16da6b268aa3a18ad41a7ff3b70 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/5e/0d7c3f9c24c16da6b268aa3a18ad41a7ff3b70 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/5e/0d7c3f9c24c16da6b268aa3a18ad41a7ff3b70 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/60/0668b4941402871fa4b642021ebc826a01d0cb b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/60/0668b4941402871fa4b642021ebc826a01d0cb similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/60/0668b4941402871fa4b642021ebc826a01d0cb rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/60/0668b4941402871fa4b642021ebc826a01d0cb diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/60/8e99c011c5fb1bb65c5f8cdac873713dd9cb44 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/60/8e99c011c5fb1bb65c5f8cdac873713dd9cb44 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/60/8e99c011c5fb1bb65c5f8cdac873713dd9cb44 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/60/8e99c011c5fb1bb65c5f8cdac873713dd9cb44 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/60/e3e953827c99631c77ce0ee57516ca37a15a7a b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/60/e3e953827c99631c77ce0ee57516ca37a15a7a similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/60/e3e953827c99631c77ce0ee57516ca37a15a7a rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/60/e3e953827c99631c77ce0ee57516ca37a15a7a diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/61/e46f0eb08a5f0e2d143a79ce4896dc0a18c6a9 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/61/e46f0eb08a5f0e2d143a79ce4896dc0a18c6a9 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/61/e46f0eb08a5f0e2d143a79ce4896dc0a18c6a9 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/61/e46f0eb08a5f0e2d143a79ce4896dc0a18c6a9 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/62/9f2fa7ab6c97d6126523c09cdefd8fce776a56 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/62/9f2fa7ab6c97d6126523c09cdefd8fce776a56 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/62/9f2fa7ab6c97d6126523c09cdefd8fce776a56 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/62/9f2fa7ab6c97d6126523c09cdefd8fce776a56 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/64/59ec5877fb2d620fb0f276784bd4a3c30cefc8 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/64/59ec5877fb2d620fb0f276784bd4a3c30cefc8 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/64/59ec5877fb2d620fb0f276784bd4a3c30cefc8 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/64/59ec5877fb2d620fb0f276784bd4a3c30cefc8 diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/65/4c098d3851d941610ff7b0c65e2b15d3bf6f7d b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/65/4c098d3851d941610ff7b0c65e2b15d3bf6f7d similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/65/4c098d3851d941610ff7b0c65e2b15d3bf6f7d rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/65/4c098d3851d941610ff7b0c65e2b15d3bf6f7d diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/67/0941965670c973ce6fc4032bc7106145d92240 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/67/0941965670c973ce6fc4032bc7106145d92240 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/67/0941965670c973ce6fc4032bc7106145d92240 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/67/0941965670c973ce6fc4032bc7106145d92240 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/67/c51473a750f8acd5c3808cc692af5d43351418 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/67/c51473a750f8acd5c3808cc692af5d43351418 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/67/c51473a750f8acd5c3808cc692af5d43351418 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/67/c51473a750f8acd5c3808cc692af5d43351418 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/68/49c11ca7fea748726b9fc1716fb2a210a83642 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/68/49c11ca7fea748726b9fc1716fb2a210a83642 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/68/49c11ca7fea748726b9fc1716fb2a210a83642 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/68/49c11ca7fea748726b9fc1716fb2a210a83642 diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/6b/49ef3e032baf487eb496da619849900e05a4f5 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/6b/49ef3e032baf487eb496da619849900e05a4f5 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/6b/49ef3e032baf487eb496da619849900e05a4f5 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/6b/49ef3e032baf487eb496da619849900e05a4f5 diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/6d/9542e0dc33a0feee4d4015963e20f99ab0ef6a b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/6d/9542e0dc33a0feee4d4015963e20f99ab0ef6a similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/6d/9542e0dc33a0feee4d4015963e20f99ab0ef6a rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/6d/9542e0dc33a0feee4d4015963e20f99ab0ef6a diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/71/af8d00fbc4e977c05e0e9826c0d45c1b1da5a7 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/71/af8d00fbc4e977c05e0e9826c0d45c1b1da5a7 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/71/af8d00fbc4e977c05e0e9826c0d45c1b1da5a7 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/71/af8d00fbc4e977c05e0e9826c0d45c1b1da5a7 diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/73/3865c10b0c4b2357437a8116c58c57d4730460 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/73/3865c10b0c4b2357437a8116c58c57d4730460 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/73/3865c10b0c4b2357437a8116c58c57d4730460 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/73/3865c10b0c4b2357437a8116c58c57d4730460 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/73/dba9e0f8451117473e54fb10e5d820de7d286d b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/73/dba9e0f8451117473e54fb10e5d820de7d286d similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/73/dba9e0f8451117473e54fb10e5d820de7d286d rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/73/dba9e0f8451117473e54fb10e5d820de7d286d diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/74/2a6f55adbcf38790d53673b2c203bfd5417f67 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/74/2a6f55adbcf38790d53673b2c203bfd5417f67 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/74/2a6f55adbcf38790d53673b2c203bfd5417f67 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/74/2a6f55adbcf38790d53673b2c203bfd5417f67 diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/74/9fbf3d85c7db1c8ea51866435d5b8dba317218 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/74/9fbf3d85c7db1c8ea51866435d5b8dba317218 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/74/9fbf3d85c7db1c8ea51866435d5b8dba317218 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/74/9fbf3d85c7db1c8ea51866435d5b8dba317218 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/7a/3a1aaf3a4c129c744e744028907ccddfb9c8c6 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/7a/3a1aaf3a4c129c744e744028907ccddfb9c8c6 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/7a/3a1aaf3a4c129c744e744028907ccddfb9c8c6 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/7a/3a1aaf3a4c129c744e744028907ccddfb9c8c6 diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/7b/069f0d9a9e695980d5d6119162c21433f91619 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/7b/069f0d9a9e695980d5d6119162c21433f91619 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/7b/069f0d9a9e695980d5d6119162c21433f91619 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/7b/069f0d9a9e695980d5d6119162c21433f91619 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/7d/3e39d11818aaaf7a648ec9fd626617571b9a3d b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/7d/3e39d11818aaaf7a648ec9fd626617571b9a3d similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/7d/3e39d11818aaaf7a648ec9fd626617571b9a3d rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/7d/3e39d11818aaaf7a648ec9fd626617571b9a3d diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/82/1555cad8a6132fd045755733e6a0ec6d0957f3 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/82/1555cad8a6132fd045755733e6a0ec6d0957f3 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/82/1555cad8a6132fd045755733e6a0ec6d0957f3 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/82/1555cad8a6132fd045755733e6a0ec6d0957f3 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/82/2e7457a1ed320e4da3b69e30a4e94a2f6da719 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/82/2e7457a1ed320e4da3b69e30a4e94a2f6da719 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/82/2e7457a1ed320e4da3b69e30a4e94a2f6da719 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/82/2e7457a1ed320e4da3b69e30a4e94a2f6da719 diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/83/3b84acf1b3e49e5f8a1fa7a77e4cd9848f2852 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/83/3b84acf1b3e49e5f8a1fa7a77e4cd9848f2852 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/83/3b84acf1b3e49e5f8a1fa7a77e4cd9848f2852 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/83/3b84acf1b3e49e5f8a1fa7a77e4cd9848f2852 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/84/7dec75915bd59cd17ddf2325f4acba53d4e682 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/84/7dec75915bd59cd17ddf2325f4acba53d4e682 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/84/7dec75915bd59cd17ddf2325f4acba53d4e682 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/84/7dec75915bd59cd17ddf2325f4acba53d4e682 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/85/b43abea24bfc749f9bd3c0aa4089a449abd8c2 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/85/b43abea24bfc749f9bd3c0aa4089a449abd8c2 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/85/b43abea24bfc749f9bd3c0aa4089a449abd8c2 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/85/b43abea24bfc749f9bd3c0aa4089a449abd8c2 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/86/50838d6ebb575eb99fcd4e6dbe86454384709b b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/86/50838d6ebb575eb99fcd4e6dbe86454384709b similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/86/50838d6ebb575eb99fcd4e6dbe86454384709b rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/86/50838d6ebb575eb99fcd4e6dbe86454384709b diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/88/7bfb221e4c37922e1edf95d5d55c20281c7c5f b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/88/7bfb221e4c37922e1edf95d5d55c20281c7c5f similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/88/7bfb221e4c37922e1edf95d5d55c20281c7c5f rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/88/7bfb221e4c37922e1edf95d5d55c20281c7c5f diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/8a/adc2afeaa9226ab7c7ed70148b555b431e51db b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/8a/adc2afeaa9226ab7c7ed70148b555b431e51db similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/8a/adc2afeaa9226ab7c7ed70148b555b431e51db rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/8a/adc2afeaa9226ab7c7ed70148b555b431e51db diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/8f/5e2d16e33240cd0b38a4ed5704ab757bbc8339 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/8f/5e2d16e33240cd0b38a4ed5704ab757bbc8339 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/8f/5e2d16e33240cd0b38a4ed5704ab757bbc8339 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/8f/5e2d16e33240cd0b38a4ed5704ab757bbc8339 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/90/a947bc9ac091a0c47de20eb70d0bdcabf447c5 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/90/a947bc9ac091a0c47de20eb70d0bdcabf447c5 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/90/a947bc9ac091a0c47de20eb70d0bdcabf447c5 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/90/a947bc9ac091a0c47de20eb70d0bdcabf447c5 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/91/881ba86e2f7c9cb12ec883c063e391c7e025d2 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/91/881ba86e2f7c9cb12ec883c063e391c7e025d2 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/91/881ba86e2f7c9cb12ec883c063e391c7e025d2 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/91/881ba86e2f7c9cb12ec883c063e391c7e025d2 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/93/e48459aba68e92c707c1b6c8b944a0d04d2eab b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/93/e48459aba68e92c707c1b6c8b944a0d04d2eab similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/93/e48459aba68e92c707c1b6c8b944a0d04d2eab rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/93/e48459aba68e92c707c1b6c8b944a0d04d2eab diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/94/5042705d57cbed3a278379b4cb17c7825ef2ff b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/94/5042705d57cbed3a278379b4cb17c7825ef2ff similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/94/5042705d57cbed3a278379b4cb17c7825ef2ff rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/94/5042705d57cbed3a278379b4cb17c7825ef2ff diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/94/69a53d3babffb0c1d3f1feb3c4fd8caf7e228b b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/94/69a53d3babffb0c1d3f1feb3c4fd8caf7e228b similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/94/69a53d3babffb0c1d3f1feb3c4fd8caf7e228b rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/94/69a53d3babffb0c1d3f1feb3c4fd8caf7e228b diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/94/836159d3159f0e7d829574a14d3a304d4c596f b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/94/836159d3159f0e7d829574a14d3a304d4c596f similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/94/836159d3159f0e7d829574a14d3a304d4c596f rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/94/836159d3159f0e7d829574a14d3a304d4c596f diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/95/2f705808a9399c065a6ed5f45f90097b57e6b7 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/95/2f705808a9399c065a6ed5f45f90097b57e6b7 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/95/2f705808a9399c065a6ed5f45f90097b57e6b7 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/95/2f705808a9399c065a6ed5f45f90097b57e6b7 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/97/3f06c28ebcad239ebcb511d1566bd4928a61f5 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/97/3f06c28ebcad239ebcb511d1566bd4928a61f5 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/97/3f06c28ebcad239ebcb511d1566bd4928a61f5 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/97/3f06c28ebcad239ebcb511d1566bd4928a61f5 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/99/017a6fa992e0b6fe03a79c9cc7173c29bf182a b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/99/017a6fa992e0b6fe03a79c9cc7173c29bf182a similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/99/017a6fa992e0b6fe03a79c9cc7173c29bf182a rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/99/017a6fa992e0b6fe03a79c9cc7173c29bf182a diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/99/65f5edb85d298de1a02e82bd41c58ea68e7cf4 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/99/65f5edb85d298de1a02e82bd41c58ea68e7cf4 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/99/65f5edb85d298de1a02e82bd41c58ea68e7cf4 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/99/65f5edb85d298de1a02e82bd41c58ea68e7cf4 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/9a/159fda3be84786bd3559bfe25693c164af824d b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/9a/159fda3be84786bd3559bfe25693c164af824d similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/9a/159fda3be84786bd3559bfe25693c164af824d rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/9a/159fda3be84786bd3559bfe25693c164af824d diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/9a/1b1cfa878b14b2ed5b49c7c81b9de911a612df b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/9a/1b1cfa878b14b2ed5b49c7c81b9de911a612df similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/9a/1b1cfa878b14b2ed5b49c7c81b9de911a612df rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/9a/1b1cfa878b14b2ed5b49c7c81b9de911a612df diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/9c/3ac133a1e3f3c292657c15caec469582455ed3 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/9c/3ac133a1e3f3c292657c15caec469582455ed3 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/9c/3ac133a1e3f3c292657c15caec469582455ed3 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/9c/3ac133a1e3f3c292657c15caec469582455ed3 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/9d/172ef16bf4260f26a40c1105ad736466f0240b b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/9d/172ef16bf4260f26a40c1105ad736466f0240b similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/9d/172ef16bf4260f26a40c1105ad736466f0240b rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/9d/172ef16bf4260f26a40c1105ad736466f0240b diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/9d/396e0bebeba62d284c8539c952f17d764647d1 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/9d/396e0bebeba62d284c8539c952f17d764647d1 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/9d/396e0bebeba62d284c8539c952f17d764647d1 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/9d/396e0bebeba62d284c8539c952f17d764647d1 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/9d/6b849e70e306e900a1b83e6b37bf1967a9499f b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/9d/6b849e70e306e900a1b83e6b37bf1967a9499f similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/9d/6b849e70e306e900a1b83e6b37bf1967a9499f rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/9d/6b849e70e306e900a1b83e6b37bf1967a9499f diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/a1/36f9eb5b9dfd3160b52bef499157e67df6c301 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/a1/36f9eb5b9dfd3160b52bef499157e67df6c301 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/a1/36f9eb5b9dfd3160b52bef499157e67df6c301 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/a1/36f9eb5b9dfd3160b52bef499157e67df6c301 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/a6/158c2a5aa3349d7d7d50f7badfacd959e288a7 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/a6/158c2a5aa3349d7d7d50f7badfacd959e288a7 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/a6/158c2a5aa3349d7d7d50f7badfacd959e288a7 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/a6/158c2a5aa3349d7d7d50f7badfacd959e288a7 diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/a6/dc9cafec05566e1ebaac8c59c29d5b7f68cd25 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/a6/dc9cafec05566e1ebaac8c59c29d5b7f68cd25 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/a6/dc9cafec05566e1ebaac8c59c29d5b7f68cd25 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/a6/dc9cafec05566e1ebaac8c59c29d5b7f68cd25 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/ab/4da5bb4a21ef89e3a84666064aa13ebc2e7cb3 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/ab/4da5bb4a21ef89e3a84666064aa13ebc2e7cb3 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/ab/4da5bb4a21ef89e3a84666064aa13ebc2e7cb3 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/ab/4da5bb4a21ef89e3a84666064aa13ebc2e7cb3 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/af/1862edd7acfab8b8e4489b61ee65237f222651 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/af/1862edd7acfab8b8e4489b61ee65237f222651 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/af/1862edd7acfab8b8e4489b61ee65237f222651 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/af/1862edd7acfab8b8e4489b61ee65237f222651 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/b0/5cdc5318cbc5c049a391fe67ac4a8cf763689d b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/b0/5cdc5318cbc5c049a391fe67ac4a8cf763689d similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/b0/5cdc5318cbc5c049a391fe67ac4a8cf763689d rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/b0/5cdc5318cbc5c049a391fe67ac4a8cf763689d diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/b4/d75d7a6bbc9fe199d506a579264e9fa40cf070 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/b4/d75d7a6bbc9fe199d506a579264e9fa40cf070 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/b4/d75d7a6bbc9fe199d506a579264e9fa40cf070 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/b4/d75d7a6bbc9fe199d506a579264e9fa40cf070 diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/b5/66ab3bea0506bccaa10f83784a41673606d6ee b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/b5/66ab3bea0506bccaa10f83784a41673606d6ee similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/b5/66ab3bea0506bccaa10f83784a41673606d6ee rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/b5/66ab3bea0506bccaa10f83784a41673606d6ee diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/b6/8a7a2f973c3f06f0594f9219bec7a79dcda421 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/b6/8a7a2f973c3f06f0594f9219bec7a79dcda421 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/b6/8a7a2f973c3f06f0594f9219bec7a79dcda421 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/b6/8a7a2f973c3f06f0594f9219bec7a79dcda421 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/bb/2cd377bfc8577fa1a5859b436518f1b43cf910 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/bb/2cd377bfc8577fa1a5859b436518f1b43cf910 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/bb/2cd377bfc8577fa1a5859b436518f1b43cf910 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/bb/2cd377bfc8577fa1a5859b436518f1b43cf910 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/bb/7728175acb380192f2f4add6dd349ef0609a60 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/bb/7728175acb380192f2f4add6dd349ef0609a60 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/bb/7728175acb380192f2f4add6dd349ef0609a60 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/bb/7728175acb380192f2f4add6dd349ef0609a60 diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/bc/b89f67890069c033195cc11e9fe763d28deffd b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/bc/b89f67890069c033195cc11e9fe763d28deffd similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/bc/b89f67890069c033195cc11e9fe763d28deffd rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/bc/b89f67890069c033195cc11e9fe763d28deffd diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/bd/346a39875e07d8515a58ee7d0f5aadebc0c2ae b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/bd/346a39875e07d8515a58ee7d0f5aadebc0c2ae similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/bd/346a39875e07d8515a58ee7d0f5aadebc0c2ae rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/bd/346a39875e07d8515a58ee7d0f5aadebc0c2ae diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/c1/756ec64336ed793a443d32d12aab36e1e556ec b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/c1/756ec64336ed793a443d32d12aab36e1e556ec similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/c1/756ec64336ed793a443d32d12aab36e1e556ec rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/c1/756ec64336ed793a443d32d12aab36e1e556ec diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/c2/35e7f0e234e66110b92e7e3f3213553f3d1eb8 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/c2/35e7f0e234e66110b92e7e3f3213553f3d1eb8 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/c2/35e7f0e234e66110b92e7e3f3213553f3d1eb8 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/c2/35e7f0e234e66110b92e7e3f3213553f3d1eb8 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/c2/4510e2814c52053624de2b2bfaec7233b9a93f b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/c2/4510e2814c52053624de2b2bfaec7233b9a93f similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/c2/4510e2814c52053624de2b2bfaec7233b9a93f rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/c2/4510e2814c52053624de2b2bfaec7233b9a93f diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/c5/84b2ec7da735171a551f7a2362054065b4805e b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/c5/84b2ec7da735171a551f7a2362054065b4805e similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/c5/84b2ec7da735171a551f7a2362054065b4805e rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/c5/84b2ec7da735171a551f7a2362054065b4805e diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/cc/c825da288e1f291d113693a71ed0e66eeb1e74 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/cc/c825da288e1f291d113693a71ed0e66eeb1e74 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/cc/c825da288e1f291d113693a71ed0e66eeb1e74 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/cc/c825da288e1f291d113693a71ed0e66eeb1e74 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/cd/3c9b9fb4bc994767e4a1050399d3b1c457b10b b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/cd/3c9b9fb4bc994767e4a1050399d3b1c457b10b similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/cd/3c9b9fb4bc994767e4a1050399d3b1c457b10b rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/cd/3c9b9fb4bc994767e4a1050399d3b1c457b10b diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/cd/bb7224cc4537f87f768ca9162846e715c3b602 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/cd/bb7224cc4537f87f768ca9162846e715c3b602 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/cd/bb7224cc4537f87f768ca9162846e715c3b602 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/cd/bb7224cc4537f87f768ca9162846e715c3b602 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/cf/609a883343dad133c99412f7e2e1c81790785a b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/cf/609a883343dad133c99412f7e2e1c81790785a similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/cf/609a883343dad133c99412f7e2e1c81790785a rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/cf/609a883343dad133c99412f7e2e1c81790785a diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/d0/f0ae8cdaba2d7b5abe586a0be9aafc958ef734 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/d0/f0ae8cdaba2d7b5abe586a0be9aafc958ef734 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/d0/f0ae8cdaba2d7b5abe586a0be9aafc958ef734 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/d0/f0ae8cdaba2d7b5abe586a0be9aafc958ef734 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/d2/7eb89ac9447fd9debad488c5fe54bb708752a7 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/d2/7eb89ac9447fd9debad488c5fe54bb708752a7 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/d2/7eb89ac9447fd9debad488c5fe54bb708752a7 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/d2/7eb89ac9447fd9debad488c5fe54bb708752a7 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/d4/4988209e4f9b49952eb5ecadae997ea0bf9e31 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/d4/4988209e4f9b49952eb5ecadae997ea0bf9e31 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/d4/4988209e4f9b49952eb5ecadae997ea0bf9e31 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/d4/4988209e4f9b49952eb5ecadae997ea0bf9e31 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/d7/ea68a47059c76dea155128d8c3679656d7f7ae b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/d7/ea68a47059c76dea155128d8c3679656d7f7ae similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/d7/ea68a47059c76dea155128d8c3679656d7f7ae rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/d7/ea68a47059c76dea155128d8c3679656d7f7ae diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/d9/7c5378fda25bd0280c942dc304d218bf2a0816 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/d9/7c5378fda25bd0280c942dc304d218bf2a0816 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/d9/7c5378fda25bd0280c942dc304d218bf2a0816 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/d9/7c5378fda25bd0280c942dc304d218bf2a0816 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/da/23127861d5fda0a57c49c838bf6321a8e17697 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/da/23127861d5fda0a57c49c838bf6321a8e17697 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/da/23127861d5fda0a57c49c838bf6321a8e17697 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/da/23127861d5fda0a57c49c838bf6321a8e17697 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/db/b67bdbb471399e7696abeb3d71cc3937f64b89 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/db/b67bdbb471399e7696abeb3d71cc3937f64b89 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/db/b67bdbb471399e7696abeb3d71cc3937f64b89 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/db/b67bdbb471399e7696abeb3d71cc3937f64b89 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/de/09c4e95e21fd223ed5683be29c7a3cd7b78574 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/de/09c4e95e21fd223ed5683be29c7a3cd7b78574 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/de/09c4e95e21fd223ed5683be29c7a3cd7b78574 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/de/09c4e95e21fd223ed5683be29c7a3cd7b78574 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/de/95138fc467b57600a66b62ec6706595a169478 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/de/95138fc467b57600a66b62ec6706595a169478 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/de/95138fc467b57600a66b62ec6706595a169478 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/de/95138fc467b57600a66b62ec6706595a169478 diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/df/1f77d55f141730c06bf7a344df6e753c62dfbd b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/df/1f77d55f141730c06bf7a344df6e753c62dfbd similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/df/1f77d55f141730c06bf7a344df6e753c62dfbd rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/df/1f77d55f141730c06bf7a344df6e753c62dfbd diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e0/e6bc4a1a4e2979f49a4d384f9097f9ca317bfa b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e0/e6bc4a1a4e2979f49a4d384f9097f9ca317bfa similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e0/e6bc4a1a4e2979f49a4d384f9097f9ca317bfa rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e0/e6bc4a1a4e2979f49a4d384f9097f9ca317bfa diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e1/258b78209ef39a7adf7055964e3ac6a2ce000f b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e1/258b78209ef39a7adf7055964e3ac6a2ce000f similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e1/258b78209ef39a7adf7055964e3ac6a2ce000f rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e1/258b78209ef39a7adf7055964e3ac6a2ce000f diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e1/349ede251dd7549fa0fba018fe9e6119151eae b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e1/349ede251dd7549fa0fba018fe9e6119151eae similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e1/349ede251dd7549fa0fba018fe9e6119151eae rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e1/349ede251dd7549fa0fba018fe9e6119151eae diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e1/584e8cc3ddcaec89a5429c28d3226bdd8ed5a7 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e1/584e8cc3ddcaec89a5429c28d3226bdd8ed5a7 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e1/584e8cc3ddcaec89a5429c28d3226bdd8ed5a7 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e1/584e8cc3ddcaec89a5429c28d3226bdd8ed5a7 diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/e2/296a6007d40e9ced44246b142e463705417865 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e2/296a6007d40e9ced44246b142e463705417865 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/objects/e2/296a6007d40e9ced44246b142e463705417865 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e2/296a6007d40e9ced44246b142e463705417865 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e3/599b07990ed9d0d13e0cbee4320a4fc03ed28d b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e3/599b07990ed9d0d13e0cbee4320a4fc03ed28d similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e3/599b07990ed9d0d13e0cbee4320a4fc03ed28d rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e3/599b07990ed9d0d13e0cbee4320a4fc03ed28d diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e5/4343349241d716ffb2bc5e02b612c07438485a b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e5/4343349241d716ffb2bc5e02b612c07438485a similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e5/4343349241d716ffb2bc5e02b612c07438485a rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e5/4343349241d716ffb2bc5e02b612c07438485a diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e6/abd78c498e1fa052e3018f89e2d594e973d76f b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e6/abd78c498e1fa052e3018f89e2d594e973d76f similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e6/abd78c498e1fa052e3018f89e2d594e973d76f rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/e6/abd78c498e1fa052e3018f89e2d594e973d76f diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/eb/9a5803015b49fc2c769f61fe80805141826e82 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/eb/9a5803015b49fc2c769f61fe80805141826e82 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/eb/9a5803015b49fc2c769f61fe80805141826e82 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/eb/9a5803015b49fc2c769f61fe80805141826e82 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/eb/c45db7146670c654ce85d54b6316a0fcd68098 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/eb/c45db7146670c654ce85d54b6316a0fcd68098 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/eb/c45db7146670c654ce85d54b6316a0fcd68098 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/eb/c45db7146670c654ce85d54b6316a0fcd68098 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/ec/61e52f729c7beb5a28e729e56920829bba3c08 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/ec/61e52f729c7beb5a28e729e56920829bba3c08 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/ec/61e52f729c7beb5a28e729e56920829bba3c08 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/ec/61e52f729c7beb5a28e729e56920829bba3c08 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/ee/5486962934b72a4c7f7cf298cd8e32dc745177 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/ee/5486962934b72a4c7f7cf298cd8e32dc745177 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/ee/5486962934b72a4c7f7cf298cd8e32dc745177 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/ee/5486962934b72a4c7f7cf298cd8e32dc745177 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f0/52b1f31938fd73f9216c0b461b96b4ce23f6a2 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f0/52b1f31938fd73f9216c0b461b96b4ce23f6a2 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f0/52b1f31938fd73f9216c0b461b96b4ce23f6a2 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f0/52b1f31938fd73f9216c0b461b96b4ce23f6a2 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f1/2b46126e3c66854392e360cb63cbd92962b231 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f1/2b46126e3c66854392e360cb63cbd92962b231 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f1/2b46126e3c66854392e360cb63cbd92962b231 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f1/2b46126e3c66854392e360cb63cbd92962b231 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f1/9b0dbe6e79bfa67f1c1f2fad42ed5fb0d6eb1c b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f1/9b0dbe6e79bfa67f1c1f2fad42ed5fb0d6eb1c similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f1/9b0dbe6e79bfa67f1c1f2fad42ed5fb0d6eb1c rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f1/9b0dbe6e79bfa67f1c1f2fad42ed5fb0d6eb1c diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f4/5463e30b6b687dea4b97655e9e9a440e4cd629 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f4/5463e30b6b687dea4b97655e9e9a440e4cd629 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f4/5463e30b6b687dea4b97655e9e9a440e4cd629 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f4/5463e30b6b687dea4b97655e9e9a440e4cd629 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f6/1584ea1b944e6ad8062fce4c700cc0de84074f b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f6/1584ea1b944e6ad8062fce4c700cc0de84074f similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f6/1584ea1b944e6ad8062fce4c700cc0de84074f rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f6/1584ea1b944e6ad8062fce4c700cc0de84074f diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f7/0bf5f7dd66d952f9285e7370d0d6ccb79c7951 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f7/0bf5f7dd66d952f9285e7370d0d6ccb79c7951 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f7/0bf5f7dd66d952f9285e7370d0d6ccb79c7951 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f7/0bf5f7dd66d952f9285e7370d0d6ccb79c7951 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f7/5166675bc1455a70aa0b8e7c6b497ed1590c01 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f7/5166675bc1455a70aa0b8e7c6b497ed1590c01 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f7/5166675bc1455a70aa0b8e7c6b497ed1590c01 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f7/5166675bc1455a70aa0b8e7c6b497ed1590c01 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f8/31d8ac31851f32983b7d81b6c46206c8ec2987 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f8/31d8ac31851f32983b7d81b6c46206c8ec2987 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f8/31d8ac31851f32983b7d81b6c46206c8ec2987 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f8/31d8ac31851f32983b7d81b6c46206c8ec2987 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f9/c7c1a40395dbc0304f53fa438dc097196fe3ef b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f9/c7c1a40395dbc0304f53fa438dc097196fe3ef similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f9/c7c1a40395dbc0304f53fa438dc097196fe3ef rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/f9/c7c1a40395dbc0304f53fa438dc097196fe3ef diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/fa/400c6714a32b5c1c589f5a8ca892400584331a b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/fa/400c6714a32b5c1c589f5a8ca892400584331a similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/fa/400c6714a32b5c1c589f5a8ca892400584331a rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/fa/400c6714a32b5c1c589f5a8ca892400584331a diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/fb/e89eb687764420b8f65d613794d45330e57721 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/fb/e89eb687764420b8f65d613794d45330e57721 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/fb/e89eb687764420b8f65d613794d45330e57721 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/fb/e89eb687764420b8f65d613794d45330e57721 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/fc/640390701e47db93c1dfb16100e43907ac61dc b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/fc/640390701e47db93c1dfb16100e43907ac61dc similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/fc/640390701e47db93c1dfb16100e43907ac61dc rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/fc/640390701e47db93c1dfb16100e43907ac61dc diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/ff/5f2f04a18cf96a517b697f015d41c219cc4347 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/ff/5f2f04a18cf96a517b697f015d41c219cc4347 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/ff/5f2f04a18cf96a517b697f015d41c219cc4347 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/ff/5f2f04a18cf96a517b697f015d41c219cc4347 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/ff/9744c4230ff8881fe219627d9b0e91a19546be b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/ff/9744c4230ff8881fe219627d9b0e91a19546be similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/ff/9744c4230ff8881fe219627d9b0e91a19546be rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/ff/9744c4230ff8881fe219627d9b0e91a19546be diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/pack/pack-d62f52f8c3e63e27b478df46099feca5c562cc15.idx b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/pack/pack-d62f52f8c3e63e27b478df46099feca5c562cc15.idx similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/pack/pack-d62f52f8c3e63e27b478df46099feca5c562cc15.idx rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/pack/pack-d62f52f8c3e63e27b478df46099feca5c562cc15.idx diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/pack/pack-d62f52f8c3e63e27b478df46099feca5c562cc15.pack b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/pack/pack-d62f52f8c3e63e27b478df46099feca5c562cc15.pack similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/pack/pack-d62f52f8c3e63e27b478df46099feca5c562cc15.pack rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/objects/pack/pack-d62f52f8c3e63e27b478df46099feca5c562cc15.pack diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/packed-refs b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/packed-refs similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/packed-refs rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/packed-refs diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Brixton b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/heads/Brixton similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Brixton rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/heads/Brixton diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/heads/Camden.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/heads/Camden.x similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/heads/Camden.x rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/heads/Camden.x diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/heads/Dalston.RC1 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/heads/Dalston.RC1 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/heads/Dalston.RC1 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/heads/Dalston.RC1 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/heads/master b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/heads/master similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/heads/master rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/heads/master diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/heads/vCamden.SR5.BROKEN b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/heads/vCamden.SR5.BROKEN similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/heads/vCamden.SR5.BROKEN rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/heads/vCamden.SR5.BROKEN diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/stash b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/stash similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/stash rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/stash diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/refs/tags/vCamden.SR4 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/tags/vCamden.SR4 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/refs/tags/vCamden.SR4 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/tags/vCamden.SR4 diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/refs/tags/vCamden.SR5 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/tags/vCamden.SR5 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/refs/tags/vCamden.SR5 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/tags/vCamden.SR5 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/tags/vCamden.SR6 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/tags/vCamden.SR6 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/tags/vCamden.SR6 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/tags/vCamden.SR6 diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/refs/tags/vDalston.M1 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/tags/vDalston.M1 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/refs/tags/vDalston.M1 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/git/refs/tags/vDalston.M1 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/mvnw b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/mvnw similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/mvnw rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/mvnw diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-core-tests/mvnw.cmd b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/mvnw.cmd similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-core-tests/mvnw.cmd rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/mvnw.cmd diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/pom.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/pom.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/pom.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/pom.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/spring-cloud-dependencies/pom.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/spring-cloud-dependencies/pom.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/spring-cloud-dependencies/pom.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/spring-cloud-dependencies/pom.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/spring-cloud-dependencies/src/main/resources/META-INF/spring.provides b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/spring-cloud-dependencies/src/main/resources/META-INF/spring.provides similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/spring-cloud-dependencies/src/main/resources/META-INF/spring.provides rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/spring-cloud-dependencies/src/main/resources/META-INF/spring.provides diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/spring-cloud-starter-parent/pom.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/spring-cloud-starter-parent/pom.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/spring-cloud-starter-parent/pom.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/spring-cloud-starter-parent/pom.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/spring-cloud-starter-parent/src/main/resources/META-INF/spring.provides b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/spring-cloud-starter-parent/src/main/resources/META-INF/spring.provides similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/spring-cloud-starter-parent/src/main/resources/META-INF/spring.provides rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release-with-snapshot/spring-cloud-starter-parent/src/main/resources/META-INF/spring.provides diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/.editorconfig b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/.editorconfig similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/.editorconfig rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/.editorconfig diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/.gitignore b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/.gitignore similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/.gitignore rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/.gitignore diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/.settings.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/.settings.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/.settings.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/.settings.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/.springformat b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/.springformat similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/.springformat rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/.springformat diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/LICENSE.txt b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/LICENSE.txt similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/LICENSE.txt rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/LICENSE.txt diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/README.adoc b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/README.adoc similarity index 61% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/README.adoc rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/README.adoc index 99acf0b1..b5dce7d8 100644 --- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/README.adoc +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/README.adoc @@ -1,63 +1,55 @@ // Do not edit this file (e.g. go instead to src/main/asciidoc) -Spring Cloud Release Train is a curated set of dependencies across a -range of Spring Cloud projects. You consume it by using the -spring-cloud-dependencies POM to manage dependencies in Maven or -Gradle. The release trains have names, not versions, to avoid -confusion with the sub-projects. The names are an alphabetic sequence -(so you can sort them chronologically) with names of London Tube -stations ("Angel" is the first release, "Brixton" is the second). +Spring Cloud Release Train is a curated set of dependencies across a range of Spring Cloud projects. +You consume it by using the spring-cloud-dependencies POM to manage dependencies in Maven or Gradle. +The release trains have names, not versions, to avoid confusion with the sub-projects. +The names are an alphabetic sequence (so you can sort them chronologically) with names of London Tube stations ("Angel" is the first release, "Brixton" is the second). == Contributing -Spring Cloud is released under the non-restrictive Apache 2.0 license, -and follows a very standard Github development process, using Github -tracker for issues and merging pull requests into master. If you want -to contribute even something trivial please do not hesitate, but -follow the guidelines below. +Spring Cloud is released under the non-restrictive Apache 2.0 license, and follows a very standard Github development process, using Github tracker for issues and merging pull requests into master. +If you want to contribute even something trivial please do not hesitate, but follow the guidelines below. === Sign the Contributor License Agreement + Before we accept a non-trivial patch or pull request we will need you to sign the https://cla.pivotal.io/sign/spring[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. Active contributors might be asked to join the core team, and -given the ability to merge pull requests. +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. +Active contributors might be asked to join the core team, and given the ability to merge pull requests. === Code of Conduct + This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc[code of -conduct]. By participating, you are expected to uphold this code. Please report -unacceptable behavior to spring-code-of-conduct@pivotal.io. +conduct]. +By participating, you are expected to uphold this code. +Please report unacceptable behavior to spring-code-of-conduct@pivotal.io. === Code Conventions and Housekeeping -None of these is essential for a pull request, but they will all help. They can also be -added after the original pull request but before a merge. -* Use the Spring Framework code format conventions. If you use Eclipse - you can import formatter settings using the +None of these is essential for a pull request, but they will all help. +They can also be added after the original pull request but before a merge. + +* Use the Spring Framework code format conventions. +If you use Eclipse you can import formatter settings using the `eclipse-code-formatter.xml` file from the https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring - Cloud Build] project. If using IntelliJ, you can use the + Cloud Build] project. +If using IntelliJ, you can use the https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin] to import the same file. * Make sure all new `.java` files to have a simple Javadoc class comment with at least an - `@author` tag identifying you, and preferably at least a paragraph on what the class is - for. -* Add the ASF license header comment to all new `.java` files (copy from existing files - in the project) -* Add yourself as an `@author` to the .java files that you modify substantially (more - than cosmetic changes). + `@author` tag identifying you, and preferably at least a paragraph on what the class is for. +* Add the ASF license header comment to all new `.java` files (copy from existing files in the project) +* Add yourself as an `@author` to the .java files that you modify substantially (more than cosmetic changes). * Add some Javadocs and, if you change the namespace, some XSD doc elements. * A few unit tests would help a lot as well -- someone has to do it. -* If no-one else is using your branch, please rebase it against the current master (or - other target branch in the main project). -* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], - if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit - message (where XXXX is the issue number). +* If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project). +* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit message (where XXXX is the issue number). == Building and Deploying -Since there is no code to compile in the starters they should do not need to compile, but a compiler has to be available because they are built and deployed as JAR artifacts. To install locally: +Since there is no code to compile in the starters they should do not need to compile, but a compiler has to be available because they are built and deployed as JAR artifacts. +To install locally: ---- diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/docs/pom.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/docs/pom.xml similarity index 98% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/docs/pom.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/docs/pom.xml index f0361390..be73df0f 100644 --- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/docs/pom.xml +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/docs/pom.xml @@ -31,7 +31,7 @@ docs - + org.apache.maven.plugins maven-dependency-plugin diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/docs/src/main/asciidoc/README.adoc b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/docs/src/main/asciidoc/README.adoc similarity index 94% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/docs/src/main/asciidoc/README.adoc rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/docs/src/main/asciidoc/README.adoc index bdda3668..fc8ddf6a 100644 --- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/docs/src/main/asciidoc/README.adoc +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/docs/src/main/asciidoc/README.adoc @@ -6,7 +6,8 @@ include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/maste == Building and Deploying -Since there is no code to compile in the starters they should do not need to compile, but a compiler has to be available because they are built and deployed as JAR artifacts. To install locally: +Since there is no code to compile in the starters they should do not need to compile, but a compiler has to be available because they are built and deployed as JAR artifacts. +To install locally: ---- diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/docs/src/main/asciidoc/ghpages.sh b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/docs/src/main/asciidoc/ghpages.sh similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/docs/src/main/asciidoc/ghpages.sh rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/docs/src/main/asciidoc/ghpages.sh diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/docs/src/main/asciidoc/intro.adoc b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/docs/src/main/asciidoc/intro.adoc similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/docs/src/main/asciidoc/intro.adoc rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/docs/src/main/asciidoc/intro.adoc diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/docs/src/main/asciidoc/spring-cloud-starters.adoc b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/docs/src/main/asciidoc/spring-cloud-starters.adoc similarity index 93% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/docs/src/main/asciidoc/spring-cloud-starters.adoc rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/docs/src/main/asciidoc/spring-cloud-starters.adoc index 4de572eb..34060b5f 100644 --- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/docs/src/main/asciidoc/spring-cloud-starters.adoc +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/docs/src/main/asciidoc/spring-cloud-starters.adoc @@ -11,7 +11,8 @@ include::intro.adoc[] == Using Spring Cloud Dependencies with Spring IO Platform -The Spring IO Platform is a modular, enterprise-grade curated set of dependencies. To use the Spring Cloud Starters with Spring IO Platform, you must import the Spring Cloud Dependencies bill of materials (BOM) first. +The Spring IO Platform is a modular, enterprise-grade curated set of dependencies. +To use the Spring Cloud Starters with Spring IO Platform, you must import the Spring Cloud Dependencies bill of materials (BOM) first. To use version {springioplatformversion} of the Spring IO Platform and Spring Cloud Release Train {springcloudversion} with Maven, update the pom.xml as follows: diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/COMMIT_EDITMSG b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/COMMIT_EDITMSG similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/COMMIT_EDITMSG rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/COMMIT_EDITMSG diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/FETCH_HEAD b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/FETCH_HEAD similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/FETCH_HEAD rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/FETCH_HEAD diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-core-tests/git/HEAD b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/HEAD similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-core-tests/git/HEAD rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/HEAD diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/ORIG_HEAD b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/ORIG_HEAD similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/ORIG_HEAD rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/ORIG_HEAD diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/config b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/config similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/config rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/config diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-static/git/description b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/description similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-static/git/description rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/description diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-core-tests/git/hooks/applypatch-msg.sample b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/hooks/applypatch-msg.sample similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-core-tests/git/hooks/applypatch-msg.sample rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/hooks/applypatch-msg.sample diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/hooks/commit-msg.sample b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/hooks/commit-msg.sample similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/hooks/commit-msg.sample rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/hooks/commit-msg.sample diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/hooks/fsmonitor-watchman.sample b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/hooks/fsmonitor-watchman.sample similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/hooks/fsmonitor-watchman.sample rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/hooks/fsmonitor-watchman.sample diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-core-tests/git/hooks/post-update.sample b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/hooks/post-update.sample similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-core-tests/git/hooks/post-update.sample rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/hooks/post-update.sample diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-core-tests/git/hooks/pre-applypatch.sample b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/hooks/pre-applypatch.sample similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-core-tests/git/hooks/pre-applypatch.sample rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/hooks/pre-applypatch.sample diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/hooks/pre-commit.sample b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/hooks/pre-commit.sample similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/hooks/pre-commit.sample rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/hooks/pre-commit.sample diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/hooks/pre-push.sample b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/hooks/pre-push.sample similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/hooks/pre-push.sample rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/hooks/pre-push.sample diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/hooks/pre-rebase.sample b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/hooks/pre-rebase.sample similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/hooks/pre-rebase.sample rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/hooks/pre-rebase.sample diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/hooks/pre-receive.sample b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/hooks/pre-receive.sample similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/hooks/pre-receive.sample rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/hooks/pre-receive.sample diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-core-tests/git/hooks/prepare-commit-msg.sample b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/hooks/prepare-commit-msg.sample similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-core-tests/git/hooks/prepare-commit-msg.sample rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/hooks/prepare-commit-msg.sample diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/hooks/update.sample b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/hooks/update.sample similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/hooks/update.sample rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/hooks/update.sample diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/index b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/index similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/index rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/index diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-core-tests/git/info/exclude b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/info/exclude similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-core-tests/git/info/exclude rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/info/exclude diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/HEAD b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/HEAD similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/HEAD rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/HEAD diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/Dalston b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/Dalston similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/Dalston rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/Dalston diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/Edgware b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/Edgware similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/Edgware rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/Edgware diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/Finchley b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/Finchley similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/Finchley rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/Finchley diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/Greenwich b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/Greenwich similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/Greenwich rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/Greenwich diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/build_for_greenwich b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/build_for_greenwich similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/build_for_greenwich rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/build_for_greenwich diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/master b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/master similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/master rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/master diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/scBuild214 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/scBuild214 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/scBuild214 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/scBuild214 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/springCloudBuildRelease b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/springCloudBuildRelease similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/springCloudBuildRelease rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/springCloudBuildRelease diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Brixton b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Brixton similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Brixton rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Brixton diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Camden b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Camden similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Camden rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Camden diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Camden.RC1 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Camden.RC1 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Camden.RC1 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Camden.RC1 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Dalston b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Dalston similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Dalston rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Dalston diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Edgware b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Edgware similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Edgware rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Edgware diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Edgware.SR5 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Edgware.SR5 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Edgware.SR5 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Edgware.SR5 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Finchley b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Finchley similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Finchley rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Finchley diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Greenwich b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Greenwich similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Greenwich rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Greenwich diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/HEAD b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/HEAD similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/HEAD rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/HEAD diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Hoxton b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Hoxton similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Hoxton rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/Hoxton diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/functionForStreamRelease b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/functionForStreamRelease similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/functionForStreamRelease rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/functionForStreamRelease diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/gh-pages b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/gh-pages similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/gh-pages rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/gh-pages diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/jenkins-releaser-config b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/jenkins-releaser-config similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/jenkins-releaser-config rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/jenkins-releaser-config diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/master b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/master similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/master rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/master diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/release/e-scc1355 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/release/e-scc1355 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/release/e-scc1355 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/release/e-scc1355 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/release/f-scc1355 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/release/f-scc1355 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/release/f-scc1355 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/release/f-scc1355 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/release/g-scc1355 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/release/g-scc1355 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/release/g-scc1355 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/release/g-scc1355 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/release/sca-0-1-2 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/release/sca-0-1-2 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/release/sca-0-1-2 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/release/sca-0-1-2 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/release/sca-0-2-2 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/release/sca-0-2-2 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/release/sca-0-2-2 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/release/sca-0-2-2 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/release/sca-0-9-0 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/release/sca-0-9-0 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/release/sca-0-9-0 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/release/sca-0-9-0 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/scBuild214 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/scBuild214 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/scBuild214 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/scBuild214 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/springCloudBuildRelease b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/springCloudBuildRelease similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/springCloudBuildRelease rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/springCloudBuildRelease diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/stash b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/stash similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/stash rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/stash diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/00/3e24344583082d7a70b64915ed17168b64bf04 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/00/3e24344583082d7a70b64915ed17168b64bf04 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/00/3e24344583082d7a70b64915ed17168b64bf04 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/00/3e24344583082d7a70b64915ed17168b64bf04 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/00/876d5008f9c50c04ff3cbddb1a8eb563d4a6de b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/00/876d5008f9c50c04ff3cbddb1a8eb563d4a6de similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/00/876d5008f9c50c04ff3cbddb1a8eb563d4a6de rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/00/876d5008f9c50c04ff3cbddb1a8eb563d4a6de diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/00/a235dcc4afa3acf32285d6e297b0fea11f3b8d b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/00/a235dcc4afa3acf32285d6e297b0fea11f3b8d similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/00/a235dcc4afa3acf32285d6e297b0fea11f3b8d rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/00/a235dcc4afa3acf32285d6e297b0fea11f3b8d diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/00/d32aab1d44085ccfba1be9c5af0f321bd6ca3d b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/00/d32aab1d44085ccfba1be9c5af0f321bd6ca3d similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/00/d32aab1d44085ccfba1be9c5af0f321bd6ca3d rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/00/d32aab1d44085ccfba1be9c5af0f321bd6ca3d diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/01/ce553b85b46bb5b06d610cc6f4633cbdd0391c b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/01/ce553b85b46bb5b06d610cc6f4633cbdd0391c similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/01/ce553b85b46bb5b06d610cc6f4633cbdd0391c rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/01/ce553b85b46bb5b06d610cc6f4633cbdd0391c diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/01/deb507356f4a36ea3209f8e57ddbac348f460b b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/01/deb507356f4a36ea3209f8e57ddbac348f460b similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/01/deb507356f4a36ea3209f8e57ddbac348f460b rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/01/deb507356f4a36ea3209f8e57ddbac348f460b diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/01/e67997377a393fd672c7dcde9dccbedf0cb1e9 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/01/e67997377a393fd672c7dcde9dccbedf0cb1e9 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/01/e67997377a393fd672c7dcde9dccbedf0cb1e9 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/01/e67997377a393fd672c7dcde9dccbedf0cb1e9 diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-core-tests/git/objects/03/645e8cee9e5ed0e1bc731e76e048d31687638f b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/03/645e8cee9e5ed0e1bc731e76e048d31687638f similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-core-tests/git/objects/03/645e8cee9e5ed0e1bc731e76e048d31687638f rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/03/645e8cee9e5ed0e1bc731e76e048d31687638f diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/04/44bf038bb3308c68d79bf23d18ddc3284941e9 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/04/44bf038bb3308c68d79bf23d18ddc3284941e9 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/04/44bf038bb3308c68d79bf23d18ddc3284941e9 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/04/44bf038bb3308c68d79bf23d18ddc3284941e9 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/04/a10e0ce4cce2d7072c3d78968f415a3f2c2957 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/04/a10e0ce4cce2d7072c3d78968f415a3f2c2957 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/04/a10e0ce4cce2d7072c3d78968f415a3f2c2957 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/04/a10e0ce4cce2d7072c3d78968f415a3f2c2957 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/06/c9a1f5ad9e20e674170a6d5140beb23fd00253 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/06/c9a1f5ad9e20e674170a6d5140beb23fd00253 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/06/c9a1f5ad9e20e674170a6d5140beb23fd00253 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/06/c9a1f5ad9e20e674170a6d5140beb23fd00253 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/07/f58d6e49092e465a6f4e157abb95a234a05da8 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/07/f58d6e49092e465a6f4e157abb95a234a05da8 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/07/f58d6e49092e465a6f4e157abb95a234a05da8 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/07/f58d6e49092e465a6f4e157abb95a234a05da8 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/08/1e38ef49166e09defa52e64f5a712359999453 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/08/1e38ef49166e09defa52e64f5a712359999453 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/08/1e38ef49166e09defa52e64f5a712359999453 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/08/1e38ef49166e09defa52e64f5a712359999453 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/08/2fe7a8b61d19424a1af48dbf38995d553893a6 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/08/2fe7a8b61d19424a1af48dbf38995d553893a6 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/08/2fe7a8b61d19424a1af48dbf38995d553893a6 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/08/2fe7a8b61d19424a1af48dbf38995d553893a6 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/09/38d34ab8cee6530b1b9c60c3de883349830d1a b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/09/38d34ab8cee6530b1b9c60c3de883349830d1a similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/09/38d34ab8cee6530b1b9c60c3de883349830d1a rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/09/38d34ab8cee6530b1b9c60c3de883349830d1a diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/09/606ab040ffd30f6b55080431569a1adc841130 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/09/606ab040ffd30f6b55080431569a1adc841130 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/09/606ab040ffd30f6b55080431569a1adc841130 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/09/606ab040ffd30f6b55080431569a1adc841130 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/09/b9c3940ee47cbaf8cd01f16bab98a45a3cb5f6 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/09/b9c3940ee47cbaf8cd01f16bab98a45a3cb5f6 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/09/b9c3940ee47cbaf8cd01f16bab98a45a3cb5f6 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/09/b9c3940ee47cbaf8cd01f16bab98a45a3cb5f6 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/0a/0e63302d79842bd287e94f84d654cdd90218ea b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/0a/0e63302d79842bd287e94f84d654cdd90218ea similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/0a/0e63302d79842bd287e94f84d654cdd90218ea rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/0a/0e63302d79842bd287e94f84d654cdd90218ea diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/0b/a9e6fdedc3f61ecbb8228b5dfcada396bbde84 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/0b/a9e6fdedc3f61ecbb8228b5dfcada396bbde84 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/0b/a9e6fdedc3f61ecbb8228b5dfcada396bbde84 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/0b/a9e6fdedc3f61ecbb8228b5dfcada396bbde84 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/0c/80da0a8c8f51604148998f7b51a1a978118d61 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/0c/80da0a8c8f51604148998f7b51a1a978118d61 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/0c/80da0a8c8f51604148998f7b51a1a978118d61 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/0c/80da0a8c8f51604148998f7b51a1a978118d61 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/0c/82f4b8789301862b6238b7eed3d24211fb387e b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/0c/82f4b8789301862b6238b7eed3d24211fb387e similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/0c/82f4b8789301862b6238b7eed3d24211fb387e rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/0c/82f4b8789301862b6238b7eed3d24211fb387e diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/0d/1d1007985a28f2892ee8b41563410373aa9b78 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/0d/1d1007985a28f2892ee8b41563410373aa9b78 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/0d/1d1007985a28f2892ee8b41563410373aa9b78 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/0d/1d1007985a28f2892ee8b41563410373aa9b78 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/0d/a93cfb0cc1430dde35d6189f520378e0a02369 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/0d/a93cfb0cc1430dde35d6189f520378e0a02369 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/0d/a93cfb0cc1430dde35d6189f520378e0a02369 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/0d/a93cfb0cc1430dde35d6189f520378e0a02369 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/0d/fe0b0d109afe8969c2379a1d9789ae15e80e32 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/0d/fe0b0d109afe8969c2379a1d9789ae15e80e32 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/0d/fe0b0d109afe8969c2379a1d9789ae15e80e32 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/0d/fe0b0d109afe8969c2379a1d9789ae15e80e32 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/0e/acac64725098970e13fd98c3fe00e2dd9ad743 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/0e/acac64725098970e13fd98c3fe00e2dd9ad743 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/0e/acac64725098970e13fd98c3fe00e2dd9ad743 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/0e/acac64725098970e13fd98c3fe00e2dd9ad743 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/0e/c2f4f913c151cba35a456c70e3fdb173f03b1b b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/0e/c2f4f913c151cba35a456c70e3fdb173f03b1b similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/0e/c2f4f913c151cba35a456c70e3fdb173f03b1b rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/0e/c2f4f913c151cba35a456c70e3fdb173f03b1b diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/0f/4580df1e94cc7d0b0a6de0f1e8881aa8f19aa7 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/0f/4580df1e94cc7d0b0a6de0f1e8881aa8f19aa7 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/0f/4580df1e94cc7d0b0a6de0f1e8881aa8f19aa7 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/0f/4580df1e94cc7d0b0a6de0f1e8881aa8f19aa7 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/0f/a78e4c78faacb02f5de55aefb8df1f27f9a6d7 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/0f/a78e4c78faacb02f5de55aefb8df1f27f9a6d7 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/0f/a78e4c78faacb02f5de55aefb8df1f27f9a6d7 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/0f/a78e4c78faacb02f5de55aefb8df1f27f9a6d7 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/0f/e6f6171041cf261c91965fcff120483e0f8568 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/0f/e6f6171041cf261c91965fcff120483e0f8568 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/0f/e6f6171041cf261c91965fcff120483e0f8568 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/0f/e6f6171041cf261c91965fcff120483e0f8568 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/0f/f8f9d8652ba181f6fef5a0b9da8000c0b4814e b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/0f/f8f9d8652ba181f6fef5a0b9da8000c0b4814e similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/0f/f8f9d8652ba181f6fef5a0b9da8000c0b4814e rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/0f/f8f9d8652ba181f6fef5a0b9da8000c0b4814e diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/10/99ff9c02d9d32fd369fc99d46dffb17b732a43 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/10/99ff9c02d9d32fd369fc99d46dffb17b732a43 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/10/99ff9c02d9d32fd369fc99d46dffb17b732a43 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/10/99ff9c02d9d32fd369fc99d46dffb17b732a43 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/11/9e0117aac6e1b0ab3bccb032a84888632af251 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/11/9e0117aac6e1b0ab3bccb032a84888632af251 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/11/9e0117aac6e1b0ab3bccb032a84888632af251 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/11/9e0117aac6e1b0ab3bccb032a84888632af251 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/12/614e25bcbb7732232f83d9afe26c0fcd505fe5 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/12/614e25bcbb7732232f83d9afe26c0fcd505fe5 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/12/614e25bcbb7732232f83d9afe26c0fcd505fe5 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/12/614e25bcbb7732232f83d9afe26c0fcd505fe5 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/13/c24054d07e376fbfa52dcf7d4fd77c5bdbd63b b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/13/c24054d07e376fbfa52dcf7d4fd77c5bdbd63b similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/13/c24054d07e376fbfa52dcf7d4fd77c5bdbd63b rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/13/c24054d07e376fbfa52dcf7d4fd77c5bdbd63b diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/13/d37b643837c873dc73615056ea23e5df63e6cd b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/13/d37b643837c873dc73615056ea23e5df63e6cd similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/13/d37b643837c873dc73615056ea23e5df63e6cd rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/13/d37b643837c873dc73615056ea23e5df63e6cd diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/14/a8580392ec7ba375ffaa4bfca9ca2ba6c74ffe b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/14/a8580392ec7ba375ffaa4bfca9ca2ba6c74ffe similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/14/a8580392ec7ba375ffaa4bfca9ca2ba6c74ffe rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/14/a8580392ec7ba375ffaa4bfca9ca2ba6c74ffe diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/15/779c4b3f4be6f2f22480cd7d6dbafe2c0604b0 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/15/779c4b3f4be6f2f22480cd7d6dbafe2c0604b0 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/15/779c4b3f4be6f2f22480cd7d6dbafe2c0604b0 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/15/779c4b3f4be6f2f22480cd7d6dbafe2c0604b0 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/17/d08479fe5232a20498c9558c60068163f2dc31 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/17/d08479fe5232a20498c9558c60068163f2dc31 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/17/d08479fe5232a20498c9558c60068163f2dc31 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/17/d08479fe5232a20498c9558c60068163f2dc31 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/18/0db12420e17cebb72fa88d191bddee3131c6f7 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/18/0db12420e17cebb72fa88d191bddee3131c6f7 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/18/0db12420e17cebb72fa88d191bddee3131c6f7 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/18/0db12420e17cebb72fa88d191bddee3131c6f7 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/18/b84d9394b436706df04f73fd74095a61e8d7d6 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/18/b84d9394b436706df04f73fd74095a61e8d7d6 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/18/b84d9394b436706df04f73fd74095a61e8d7d6 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/18/b84d9394b436706df04f73fd74095a61e8d7d6 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/19/cd5760bb235822f58274a95dbf4c2451ece5ca b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/19/cd5760bb235822f58274a95dbf4c2451ece5ca similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/19/cd5760bb235822f58274a95dbf4c2451ece5ca rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/19/cd5760bb235822f58274a95dbf4c2451ece5ca diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/1a/406732669ed1e652c7dbd72e1553fda2bfee85 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/1a/406732669ed1e652c7dbd72e1553fda2bfee85 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/1a/406732669ed1e652c7dbd72e1553fda2bfee85 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/1a/406732669ed1e652c7dbd72e1553fda2bfee85 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/1c/5a39305d5870d727c3678520a14734e792056d b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/1c/5a39305d5870d727c3678520a14734e792056d similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/1c/5a39305d5870d727c3678520a14734e792056d rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/1c/5a39305d5870d727c3678520a14734e792056d diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/1d/cc47e1639fa13803e989615799a6eb086d932e b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/1d/cc47e1639fa13803e989615799a6eb086d932e similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/1d/cc47e1639fa13803e989615799a6eb086d932e rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/1d/cc47e1639fa13803e989615799a6eb086d932e diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/1e/c582ffc64557723d17280354f8285e0dbc9e07 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/1e/c582ffc64557723d17280354f8285e0dbc9e07 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/1e/c582ffc64557723d17280354f8285e0dbc9e07 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/1e/c582ffc64557723d17280354f8285e0dbc9e07 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/1e/f8377f12688d2ab4378485df9abee7639d071e b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/1e/f8377f12688d2ab4378485df9abee7639d071e similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/1e/f8377f12688d2ab4378485df9abee7639d071e rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/1e/f8377f12688d2ab4378485df9abee7639d071e diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/1f/5fac324da50e7e6b7741579cd07ca6be63b989 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/1f/5fac324da50e7e6b7741579cd07ca6be63b989 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/1f/5fac324da50e7e6b7741579cd07ca6be63b989 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/1f/5fac324da50e7e6b7741579cd07ca6be63b989 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/1f/943b3b149b6a975f8180fa8e6f893a7673e2ec b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/1f/943b3b149b6a975f8180fa8e6f893a7673e2ec similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/1f/943b3b149b6a975f8180fa8e6f893a7673e2ec rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/1f/943b3b149b6a975f8180fa8e6f893a7673e2ec diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/21/87041b3517aec1d9a208a9fc61b740b5f6fbdf b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/21/87041b3517aec1d9a208a9fc61b740b5f6fbdf similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/21/87041b3517aec1d9a208a9fc61b740b5f6fbdf rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/21/87041b3517aec1d9a208a9fc61b740b5f6fbdf diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/23/ca2a67450666468b552454c890ba6956d7e5d8 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/23/ca2a67450666468b552454c890ba6956d7e5d8 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/23/ca2a67450666468b552454c890ba6956d7e5d8 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/23/ca2a67450666468b552454c890ba6956d7e5d8 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/23/cabb80516385784b64ee2d31aa9d9f543ebb17 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/23/cabb80516385784b64ee2d31aa9d9f543ebb17 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/23/cabb80516385784b64ee2d31aa9d9f543ebb17 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/23/cabb80516385784b64ee2d31aa9d9f543ebb17 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/24/cd72f09181e1fa1b3f64449db5d248cc93d706 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/24/cd72f09181e1fa1b3f64449db5d248cc93d706 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/24/cd72f09181e1fa1b3f64449db5d248cc93d706 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/24/cd72f09181e1fa1b3f64449db5d248cc93d706 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/25/d36c116933e83f5e11c87eb6abba491226a517 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/25/d36c116933e83f5e11c87eb6abba491226a517 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/25/d36c116933e83f5e11c87eb6abba491226a517 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/25/d36c116933e83f5e11c87eb6abba491226a517 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/26/3a8037e4e7ad86bd315f0c87ecddb75c6723ee b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/26/3a8037e4e7ad86bd315f0c87ecddb75c6723ee similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/26/3a8037e4e7ad86bd315f0c87ecddb75c6723ee rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/26/3a8037e4e7ad86bd315f0c87ecddb75c6723ee diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/29/cec85521056b12b371d9b7cf4593492000035d b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/29/cec85521056b12b371d9b7cf4593492000035d similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/29/cec85521056b12b371d9b7cf4593492000035d rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/29/cec85521056b12b371d9b7cf4593492000035d diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/2a/d251c177e45b4c824a842a46d8242873aa000a b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/2a/d251c177e45b4c824a842a46d8242873aa000a similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/2a/d251c177e45b4c824a842a46d8242873aa000a rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/2a/d251c177e45b4c824a842a46d8242873aa000a diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/2b/4ceb2f43b2565d9fa380f8aaafc0634975c34a b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/2b/4ceb2f43b2565d9fa380f8aaafc0634975c34a similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/2b/4ceb2f43b2565d9fa380f8aaafc0634975c34a rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/2b/4ceb2f43b2565d9fa380f8aaafc0634975c34a diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/2b/7e9e197d39a78f469a2d37bbea1dfc4042898e b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/2b/7e9e197d39a78f469a2d37bbea1dfc4042898e similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/2b/7e9e197d39a78f469a2d37bbea1dfc4042898e rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/2b/7e9e197d39a78f469a2d37bbea1dfc4042898e diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/2e/394d5b347b532fa06dda38c09877193619bf42 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/2e/394d5b347b532fa06dda38c09877193619bf42 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/2e/394d5b347b532fa06dda38c09877193619bf42 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/2e/394d5b347b532fa06dda38c09877193619bf42 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/2e/84053d640145aae436f778f58c7b26a2129434 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/2e/84053d640145aae436f778f58c7b26a2129434 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/2e/84053d640145aae436f778f58c7b26a2129434 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/2e/84053d640145aae436f778f58c7b26a2129434 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/2e/af6f09aaf3dfa38cfff6c689d0e6dec55345b2 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/2e/af6f09aaf3dfa38cfff6c689d0e6dec55345b2 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/2e/af6f09aaf3dfa38cfff6c689d0e6dec55345b2 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/2e/af6f09aaf3dfa38cfff6c689d0e6dec55345b2 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/2e/daae2a06c021b048dddda6bbe827fd1cadad08 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/2e/daae2a06c021b048dddda6bbe827fd1cadad08 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/2e/daae2a06c021b048dddda6bbe827fd1cadad08 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/2e/daae2a06c021b048dddda6bbe827fd1cadad08 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/31/0c8f29ce9e1537c43523ad9c7f2b272afda7d8 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/31/0c8f29ce9e1537c43523ad9c7f2b272afda7d8 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/31/0c8f29ce9e1537c43523ad9c7f2b272afda7d8 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/31/0c8f29ce9e1537c43523ad9c7f2b272afda7d8 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/32/79b64acbcd152018006ab1d8f760f9e5c5f6e5 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/32/79b64acbcd152018006ab1d8f760f9e5c5f6e5 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/32/79b64acbcd152018006ab1d8f760f9e5c5f6e5 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/32/79b64acbcd152018006ab1d8f760f9e5c5f6e5 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/33/abce3cee60c9b01fd8da9ddc3adbde59b2de65 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/33/abce3cee60c9b01fd8da9ddc3adbde59b2de65 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/33/abce3cee60c9b01fd8da9ddc3adbde59b2de65 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/33/abce3cee60c9b01fd8da9ddc3adbde59b2de65 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/33/b5e28764c1fdaa10db8d3e03ce3e7ff43068f8 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/33/b5e28764c1fdaa10db8d3e03ce3e7ff43068f8 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/33/b5e28764c1fdaa10db8d3e03ce3e7ff43068f8 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/33/b5e28764c1fdaa10db8d3e03ce3e7ff43068f8 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/34/44ec7655081e8baaa9d67da39003413f152361 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/34/44ec7655081e8baaa9d67da39003413f152361 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/34/44ec7655081e8baaa9d67da39003413f152361 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/34/44ec7655081e8baaa9d67da39003413f152361 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/36/442654c53fb2b7af8fa78b174ed60e7be8a4c1 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/36/442654c53fb2b7af8fa78b174ed60e7be8a4c1 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/36/442654c53fb2b7af8fa78b174ed60e7be8a4c1 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/36/442654c53fb2b7af8fa78b174ed60e7be8a4c1 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/36/b1fc71be5c290679009dda8873c960632816d7 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/36/b1fc71be5c290679009dda8873c960632816d7 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/36/b1fc71be5c290679009dda8873c960632816d7 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/36/b1fc71be5c290679009dda8873c960632816d7 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/36/c64c00c6eaf75fde2cf9e5e5f9824dc3f8f36f b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/36/c64c00c6eaf75fde2cf9e5e5f9824dc3f8f36f similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/36/c64c00c6eaf75fde2cf9e5e5f9824dc3f8f36f rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/36/c64c00c6eaf75fde2cf9e5e5f9824dc3f8f36f diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/37/1f4038422970a25bafcab8827f01c86f67915e b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/37/1f4038422970a25bafcab8827f01c86f67915e similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/37/1f4038422970a25bafcab8827f01c86f67915e rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/37/1f4038422970a25bafcab8827f01c86f67915e diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/37/906eb126ea0a1f322ecdca9807e9d5f66fa6ab b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/37/906eb126ea0a1f322ecdca9807e9d5f66fa6ab similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/37/906eb126ea0a1f322ecdca9807e9d5f66fa6ab rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/37/906eb126ea0a1f322ecdca9807e9d5f66fa6ab diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/39/02aa192226e49e325ae776049303b0b09cf73c b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/39/02aa192226e49e325ae776049303b0b09cf73c similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/39/02aa192226e49e325ae776049303b0b09cf73c rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/39/02aa192226e49e325ae776049303b0b09cf73c diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/3a/dd182efec3ae14ad4cce366996120f4fcc5e21 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/3a/dd182efec3ae14ad4cce366996120f4fcc5e21 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/3a/dd182efec3ae14ad4cce366996120f4fcc5e21 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/3a/dd182efec3ae14ad4cce366996120f4fcc5e21 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/3b/e388f28302cb2ef7496d67ef9685e4d634597a b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/3b/e388f28302cb2ef7496d67ef9685e4d634597a similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/3b/e388f28302cb2ef7496d67ef9685e4d634597a rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/3b/e388f28302cb2ef7496d67ef9685e4d634597a diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/3c/93b4dfa34fd7b1e836cb35fe7a97bf70c2b858 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/3c/93b4dfa34fd7b1e836cb35fe7a97bf70c2b858 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/3c/93b4dfa34fd7b1e836cb35fe7a97bf70c2b858 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/3c/93b4dfa34fd7b1e836cb35fe7a97bf70c2b858 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/3c/c45daa32392f769ce8365a0e0810715e920b12 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/3c/c45daa32392f769ce8365a0e0810715e920b12 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/3c/c45daa32392f769ce8365a0e0810715e920b12 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/3c/c45daa32392f769ce8365a0e0810715e920b12 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/3e/d0718f2aa5a433230580897869e765b2b2c339 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/3e/d0718f2aa5a433230580897869e765b2b2c339 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/3e/d0718f2aa5a433230580897869e765b2b2c339 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/3e/d0718f2aa5a433230580897869e765b2b2c339 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/3e/fa89700a72645644c949177491459bcbc5db10 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/3e/fa89700a72645644c949177491459bcbc5db10 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/3e/fa89700a72645644c949177491459bcbc5db10 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/3e/fa89700a72645644c949177491459bcbc5db10 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/3f/dfb0bdebf8a7db26e7f69689e780085b5a4f31 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/3f/dfb0bdebf8a7db26e7f69689e780085b5a4f31 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/3f/dfb0bdebf8a7db26e7f69689e780085b5a4f31 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/3f/dfb0bdebf8a7db26e7f69689e780085b5a4f31 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/40/0f9294736a127514947c78fe43af165bf64f7b b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/40/0f9294736a127514947c78fe43af165bf64f7b similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/40/0f9294736a127514947c78fe43af165bf64f7b rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/40/0f9294736a127514947c78fe43af165bf64f7b diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/40/91b880dd29af04ad2f0155aced50fe0fb7e08a b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/40/91b880dd29af04ad2f0155aced50fe0fb7e08a similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/40/91b880dd29af04ad2f0155aced50fe0fb7e08a rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/40/91b880dd29af04ad2f0155aced50fe0fb7e08a diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/41/073706c1543adea07cf64b38a67d016139b6b3 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/41/073706c1543adea07cf64b38a67d016139b6b3 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/41/073706c1543adea07cf64b38a67d016139b6b3 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/41/073706c1543adea07cf64b38a67d016139b6b3 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/41/425205a90af3c39ce15f3a50bea1a583cdc1ff b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/41/425205a90af3c39ce15f3a50bea1a583cdc1ff similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/41/425205a90af3c39ce15f3a50bea1a583cdc1ff rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/41/425205a90af3c39ce15f3a50bea1a583cdc1ff diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/42/07e3f13f0a7c6c08b3257e4208065a4d05196e b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/42/07e3f13f0a7c6c08b3257e4208065a4d05196e similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/42/07e3f13f0a7c6c08b3257e4208065a4d05196e rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/42/07e3f13f0a7c6c08b3257e4208065a4d05196e diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/42/b64e22cdd7b0c28a1f0caeae566e0db4f02b36 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/42/b64e22cdd7b0c28a1f0caeae566e0db4f02b36 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/42/b64e22cdd7b0c28a1f0caeae566e0db4f02b36 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/42/b64e22cdd7b0c28a1f0caeae566e0db4f02b36 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/43/0d03e39b9c58c3bec301029fe08c16c18fd862 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/43/0d03e39b9c58c3bec301029fe08c16c18fd862 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/43/0d03e39b9c58c3bec301029fe08c16c18fd862 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/43/0d03e39b9c58c3bec301029fe08c16c18fd862 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/44/3875e9f2de87d83f8e1c2fe290261b0ede3017 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/44/3875e9f2de87d83f8e1c2fe290261b0ede3017 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/44/3875e9f2de87d83f8e1c2fe290261b0ede3017 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/44/3875e9f2de87d83f8e1c2fe290261b0ede3017 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/45/de1f474415213bea8336aca25a8f9750891e81 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/45/de1f474415213bea8336aca25a8f9750891e81 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/45/de1f474415213bea8336aca25a8f9750891e81 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/45/de1f474415213bea8336aca25a8f9750891e81 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/46/530d7d4ccf5725df07c15a8f675802085953a6 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/46/530d7d4ccf5725df07c15a8f675802085953a6 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/46/530d7d4ccf5725df07c15a8f675802085953a6 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/46/530d7d4ccf5725df07c15a8f675802085953a6 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/46/639ba7ab60007fe3fd5084d19424bb4eaae79e b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/46/639ba7ab60007fe3fd5084d19424bb4eaae79e similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/46/639ba7ab60007fe3fd5084d19424bb4eaae79e rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/46/639ba7ab60007fe3fd5084d19424bb4eaae79e diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/48/01a9388a53f894ea9d396a271a7e20f0dd23b5 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/48/01a9388a53f894ea9d396a271a7e20f0dd23b5 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/48/01a9388a53f894ea9d396a271a7e20f0dd23b5 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/48/01a9388a53f894ea9d396a271a7e20f0dd23b5 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/48/363fa60b93fae41f6d98d44b8db0f84f90be82 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/48/363fa60b93fae41f6d98d44b8db0f84f90be82 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/48/363fa60b93fae41f6d98d44b8db0f84f90be82 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/48/363fa60b93fae41f6d98d44b8db0f84f90be82 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/48/49839aab10da30a359cf6e957c3945265ba49f b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/48/49839aab10da30a359cf6e957c3945265ba49f similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/48/49839aab10da30a359cf6e957c3945265ba49f rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/48/49839aab10da30a359cf6e957c3945265ba49f diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/48/52212a90d2219e7098b5a9b0363a38217d1c2d b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/48/52212a90d2219e7098b5a9b0363a38217d1c2d similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/48/52212a90d2219e7098b5a9b0363a38217d1c2d rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/48/52212a90d2219e7098b5a9b0363a38217d1c2d diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/4a/ac591c7c89706a0c3dded410db4c3cfc7a7f4d b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/4a/ac591c7c89706a0c3dded410db4c3cfc7a7f4d similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/4a/ac591c7c89706a0c3dded410db4c3cfc7a7f4d rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/4a/ac591c7c89706a0c3dded410db4c3cfc7a7f4d diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/4a/fed5023d7800a8d9057c070df2fc823c7c5d4d b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/4a/fed5023d7800a8d9057c070df2fc823c7c5d4d similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/4a/fed5023d7800a8d9057c070df2fc823c7c5d4d rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/4a/fed5023d7800a8d9057c070df2fc823c7c5d4d diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/4c/0fa80af0aa026419203d4cdd5e246bf5b58ac0 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/4c/0fa80af0aa026419203d4cdd5e246bf5b58ac0 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/4c/0fa80af0aa026419203d4cdd5e246bf5b58ac0 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/4c/0fa80af0aa026419203d4cdd5e246bf5b58ac0 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/4d/3656c3411c666e4bab64e1e5b02b5d02c3af7c b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/4d/3656c3411c666e4bab64e1e5b02b5d02c3af7c similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/4d/3656c3411c666e4bab64e1e5b02b5d02c3af7c rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/4d/3656c3411c666e4bab64e1e5b02b5d02c3af7c diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/4e/6c6d372878ddcaa54b2030fd2fde3c2adda964 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/4e/6c6d372878ddcaa54b2030fd2fde3c2adda964 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/4e/6c6d372878ddcaa54b2030fd2fde3c2adda964 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/4e/6c6d372878ddcaa54b2030fd2fde3c2adda964 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/4e/9539ba7ef8bd66ec251253dfab7d4237558ec9 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/4e/9539ba7ef8bd66ec251253dfab7d4237558ec9 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/4e/9539ba7ef8bd66ec251253dfab7d4237558ec9 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/4e/9539ba7ef8bd66ec251253dfab7d4237558ec9 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/52/007fb7de24aaf8e4d3641886460a0f81eee77d b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/52/007fb7de24aaf8e4d3641886460a0f81eee77d similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/52/007fb7de24aaf8e4d3641886460a0f81eee77d rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/52/007fb7de24aaf8e4d3641886460a0f81eee77d diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/52/3dc9fdef4e13560692da482b5d08797fdf3a6f b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/52/3dc9fdef4e13560692da482b5d08797fdf3a6f similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/52/3dc9fdef4e13560692da482b5d08797fdf3a6f rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/52/3dc9fdef4e13560692da482b5d08797fdf3a6f diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/54/6f38e6f4c75e2cd0664177448e354a97a0f55b b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/54/6f38e6f4c75e2cd0664177448e354a97a0f55b similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/54/6f38e6f4c75e2cd0664177448e354a97a0f55b rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/54/6f38e6f4c75e2cd0664177448e354a97a0f55b diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/54/a2ba74fbf24684180e296ed8d3392bf583923e b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/54/a2ba74fbf24684180e296ed8d3392bf583923e similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/54/a2ba74fbf24684180e296ed8d3392bf583923e rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/54/a2ba74fbf24684180e296ed8d3392bf583923e diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/55/46452841d9aaa5672d2b0224216b7904ee3b36 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/55/46452841d9aaa5672d2b0224216b7904ee3b36 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/55/46452841d9aaa5672d2b0224216b7904ee3b36 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/55/46452841d9aaa5672d2b0224216b7904ee3b36 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/55/51fde8e7dba1e37a1821e8b26374893e2a9e2e b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/55/51fde8e7dba1e37a1821e8b26374893e2a9e2e similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/55/51fde8e7dba1e37a1821e8b26374893e2a9e2e rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/55/51fde8e7dba1e37a1821e8b26374893e2a9e2e diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/55/f174c4b69b7ac540d8bdae958750fe72ca47c3 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/55/f174c4b69b7ac540d8bdae958750fe72ca47c3 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/55/f174c4b69b7ac540d8bdae958750fe72ca47c3 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/55/f174c4b69b7ac540d8bdae958750fe72ca47c3 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/55/f5b12133f57adb0ba8df227bdd55f4417c5cb6 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/55/f5b12133f57adb0ba8df227bdd55f4417c5cb6 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/55/f5b12133f57adb0ba8df227bdd55f4417c5cb6 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/55/f5b12133f57adb0ba8df227bdd55f4417c5cb6 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/56/fcc6f110c13d5e9e9aabc24a7d6e8518aa651b b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/56/fcc6f110c13d5e9e9aabc24a7d6e8518aa651b similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/56/fcc6f110c13d5e9e9aabc24a7d6e8518aa651b rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/56/fcc6f110c13d5e9e9aabc24a7d6e8518aa651b diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/57/3c60783b41f3cf0a28f9bb311f4419fc452e27 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/57/3c60783b41f3cf0a28f9bb311f4419fc452e27 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/57/3c60783b41f3cf0a28f9bb311f4419fc452e27 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/57/3c60783b41f3cf0a28f9bb311f4419fc452e27 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/57/6adb2640eb0f8c1e3aebd60205f8dd88098dc7 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/57/6adb2640eb0f8c1e3aebd60205f8dd88098dc7 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/57/6adb2640eb0f8c1e3aebd60205f8dd88098dc7 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/57/6adb2640eb0f8c1e3aebd60205f8dd88098dc7 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/58/5b05a27935769009f1d9bc1b8f1defb7792a0a b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/58/5b05a27935769009f1d9bc1b8f1defb7792a0a similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/58/5b05a27935769009f1d9bc1b8f1defb7792a0a rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/58/5b05a27935769009f1d9bc1b8f1defb7792a0a diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/58/bab7da2b5807bd8020a5036e14bf6e1c6127a6 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/58/bab7da2b5807bd8020a5036e14bf6e1c6127a6 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/58/bab7da2b5807bd8020a5036e14bf6e1c6127a6 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/58/bab7da2b5807bd8020a5036e14bf6e1c6127a6 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/5a/345436f0ae8060eb3427ee5adf762bd0427e8d b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/5a/345436f0ae8060eb3427ee5adf762bd0427e8d similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/5a/345436f0ae8060eb3427ee5adf762bd0427e8d rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/5a/345436f0ae8060eb3427ee5adf762bd0427e8d diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/5b/6c1bb69627acfe2285aaba3e29097ff076d1bc b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/5b/6c1bb69627acfe2285aaba3e29097ff076d1bc similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/5b/6c1bb69627acfe2285aaba3e29097ff076d1bc rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/5b/6c1bb69627acfe2285aaba3e29097ff076d1bc diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/5c/7c4b5189e175dacf5bedee09cad7742a453468 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/5c/7c4b5189e175dacf5bedee09cad7742a453468 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/5c/7c4b5189e175dacf5bedee09cad7742a453468 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/5c/7c4b5189e175dacf5bedee09cad7742a453468 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/5c/a5419dbc17ead6004e5b4b3fbcc5f227c03ec9 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/5c/a5419dbc17ead6004e5b4b3fbcc5f227c03ec9 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/5c/a5419dbc17ead6004e5b4b3fbcc5f227c03ec9 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/5c/a5419dbc17ead6004e5b4b3fbcc5f227c03ec9 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/5d/99a44f92f53e72b9cf2fd5fe18ceb8070dee6e b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/5d/99a44f92f53e72b9cf2fd5fe18ceb8070dee6e similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/5d/99a44f92f53e72b9cf2fd5fe18ceb8070dee6e rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/5d/99a44f92f53e72b9cf2fd5fe18ceb8070dee6e diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/5d/d1d48d0f770521586ab413929c19e434b1640d b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/5d/d1d48d0f770521586ab413929c19e434b1640d similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/5d/d1d48d0f770521586ab413929c19e434b1640d rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/5d/d1d48d0f770521586ab413929c19e434b1640d diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/5e/1d136ff677d836166bf83d58bd9d9ecea6ecd3 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/5e/1d136ff677d836166bf83d58bd9d9ecea6ecd3 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/5e/1d136ff677d836166bf83d58bd9d9ecea6ecd3 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/5e/1d136ff677d836166bf83d58bd9d9ecea6ecd3 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/5f/9a28a0896b4052b64809205741896772645607 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/5f/9a28a0896b4052b64809205741896772645607 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/5f/9a28a0896b4052b64809205741896772645607 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/5f/9a28a0896b4052b64809205741896772645607 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/60/eb441798eb997b02e1e65fcf1d8303e319300c b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/60/eb441798eb997b02e1e65fcf1d8303e319300c similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/60/eb441798eb997b02e1e65fcf1d8303e319300c rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/60/eb441798eb997b02e1e65fcf1d8303e319300c diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/61/ff5098d293b06153f458225d6fe6f90ee75262 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/61/ff5098d293b06153f458225d6fe6f90ee75262 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/61/ff5098d293b06153f458225d6fe6f90ee75262 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/61/ff5098d293b06153f458225d6fe6f90ee75262 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/62/589edd12a37dd28b6b6fed1e2d728ac9f05c8d b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/62/589edd12a37dd28b6b6fed1e2d728ac9f05c8d similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/62/589edd12a37dd28b6b6fed1e2d728ac9f05c8d rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/62/589edd12a37dd28b6b6fed1e2d728ac9f05c8d diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/62/dc199edfd7f2ce3695162470df62f60286bdf9 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/62/dc199edfd7f2ce3695162470df62f60286bdf9 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/62/dc199edfd7f2ce3695162470df62f60286bdf9 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/62/dc199edfd7f2ce3695162470df62f60286bdf9 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/64/5869818bd0ecc0715b937987a04412baa351f2 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/64/5869818bd0ecc0715b937987a04412baa351f2 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/64/5869818bd0ecc0715b937987a04412baa351f2 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/64/5869818bd0ecc0715b937987a04412baa351f2 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/66/8cad17c774ef02efa78b6f2d9a92d75ab976ea b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/66/8cad17c774ef02efa78b6f2d9a92d75ab976ea similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/66/8cad17c774ef02efa78b6f2d9a92d75ab976ea rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/66/8cad17c774ef02efa78b6f2d9a92d75ab976ea diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/67/f9acd342961b3206c9e806e9d83958385b9bcf b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/67/f9acd342961b3206c9e806e9d83958385b9bcf similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/67/f9acd342961b3206c9e806e9d83958385b9bcf rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/67/f9acd342961b3206c9e806e9d83958385b9bcf diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/68/1ae59a5393229ab43f71e7416c49c63c053ac7 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/68/1ae59a5393229ab43f71e7416c49c63c053ac7 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/68/1ae59a5393229ab43f71e7416c49c63c053ac7 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/68/1ae59a5393229ab43f71e7416c49c63c053ac7 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/6b/a9c668cd107236245e1e56cf0df2b6b843e6d7 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/6b/a9c668cd107236245e1e56cf0df2b6b843e6d7 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/6b/a9c668cd107236245e1e56cf0df2b6b843e6d7 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/6b/a9c668cd107236245e1e56cf0df2b6b843e6d7 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/6b/faeed552d396a7e5b879bbcd4f7e3d6ff66603 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/6b/faeed552d396a7e5b879bbcd4f7e3d6ff66603 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/6b/faeed552d396a7e5b879bbcd4f7e3d6ff66603 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/6b/faeed552d396a7e5b879bbcd4f7e3d6ff66603 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/6f/542c9408dd93a7475e9859f74c02c673f0e37b b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/6f/542c9408dd93a7475e9859f74c02c673f0e37b similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/6f/542c9408dd93a7475e9859f74c02c673f0e37b rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/6f/542c9408dd93a7475e9859f74c02c673f0e37b diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/6f/8247fd423b17ce1ce5857e15456be227092a99 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/6f/8247fd423b17ce1ce5857e15456be227092a99 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/6f/8247fd423b17ce1ce5857e15456be227092a99 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/6f/8247fd423b17ce1ce5857e15456be227092a99 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/6f/a07e8b0840b2b86c841f687897a228f7d88d52 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/6f/a07e8b0840b2b86c841f687897a228f7d88d52 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/6f/a07e8b0840b2b86c841f687897a228f7d88d52 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/6f/a07e8b0840b2b86c841f687897a228f7d88d52 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/70/14f68c0ef6de167045e60460f58a3a1514118b b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/70/14f68c0ef6de167045e60460f58a3a1514118b similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/70/14f68c0ef6de167045e60460f58a3a1514118b rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/70/14f68c0ef6de167045e60460f58a3a1514118b diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/71/d5c34392c5922657c0ebf982845e17d843cdfc b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/71/d5c34392c5922657c0ebf982845e17d843cdfc similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/71/d5c34392c5922657c0ebf982845e17d843cdfc rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/71/d5c34392c5922657c0ebf982845e17d843cdfc diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/72/61da3198d892b3bfb06a818ecd7617933309f1 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/72/61da3198d892b3bfb06a818ecd7617933309f1 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/72/61da3198d892b3bfb06a818ecd7617933309f1 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/72/61da3198d892b3bfb06a818ecd7617933309f1 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/72/6564c97b76aad59f4d367726bf73969d7cbb0e b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/72/6564c97b76aad59f4d367726bf73969d7cbb0e similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/72/6564c97b76aad59f4d367726bf73969d7cbb0e rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/72/6564c97b76aad59f4d367726bf73969d7cbb0e diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/73/4167f8dfbf81f84a4f0cfed5c635514c0d0547 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/73/4167f8dfbf81f84a4f0cfed5c635514c0d0547 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/73/4167f8dfbf81f84a4f0cfed5c635514c0d0547 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/73/4167f8dfbf81f84a4f0cfed5c635514c0d0547 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/73/74ad48a20f8c391d45252cb4967d7df567c623 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/73/74ad48a20f8c391d45252cb4967d7df567c623 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/73/74ad48a20f8c391d45252cb4967d7df567c623 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/73/74ad48a20f8c391d45252cb4967d7df567c623 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/74/3fa1931b098c2043491aa10e289c0b710298d9 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/74/3fa1931b098c2043491aa10e289c0b710298d9 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/74/3fa1931b098c2043491aa10e289c0b710298d9 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/74/3fa1931b098c2043491aa10e289c0b710298d9 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/74/b1ba1c5fc210b1875eddbda00c2e9e921a9ad8 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/74/b1ba1c5fc210b1875eddbda00c2e9e921a9ad8 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/74/b1ba1c5fc210b1875eddbda00c2e9e921a9ad8 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/74/b1ba1c5fc210b1875eddbda00c2e9e921a9ad8 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/76/c65db0d0c499d061a94d5efceed89ff3681401 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/76/c65db0d0c499d061a94d5efceed89ff3681401 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/76/c65db0d0c499d061a94d5efceed89ff3681401 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/76/c65db0d0c499d061a94d5efceed89ff3681401 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/76/d0c3aa0421c5a0e1c19db773e2a7de319e376e b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/76/d0c3aa0421c5a0e1c19db773e2a7de319e376e similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/76/d0c3aa0421c5a0e1c19db773e2a7de319e376e rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/76/d0c3aa0421c5a0e1c19db773e2a7de319e376e diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/78/539657564560007447c6d349669316216b6064 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/78/539657564560007447c6d349669316216b6064 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/78/539657564560007447c6d349669316216b6064 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/78/539657564560007447c6d349669316216b6064 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/7a/6789392397f71d4560b43a4bb52824d97a610a b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/7a/6789392397f71d4560b43a4bb52824d97a610a similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/7a/6789392397f71d4560b43a4bb52824d97a610a rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/7a/6789392397f71d4560b43a4bb52824d97a610a diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/7a/7fb61f21601a2502417aafdfef760a212675aa b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/7a/7fb61f21601a2502417aafdfef760a212675aa similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/7a/7fb61f21601a2502417aafdfef760a212675aa rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/7a/7fb61f21601a2502417aafdfef760a212675aa diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/7a/f791a9c0ffb8f9c8d416ce493c053fd5bfb214 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/7a/f791a9c0ffb8f9c8d416ce493c053fd5bfb214 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/7a/f791a9c0ffb8f9c8d416ce493c053fd5bfb214 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/7a/f791a9c0ffb8f9c8d416ce493c053fd5bfb214 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/7b/b498d9e9a0b69da0d70a6c28d76c708eddb915 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/7b/b498d9e9a0b69da0d70a6c28d76c708eddb915 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/7b/b498d9e9a0b69da0d70a6c28d76c708eddb915 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/7b/b498d9e9a0b69da0d70a6c28d76c708eddb915 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/7b/f299a69461a1531fe5afbf886c00a69b94d97f b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/7b/f299a69461a1531fe5afbf886c00a69b94d97f similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/7b/f299a69461a1531fe5afbf886c00a69b94d97f rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/7b/f299a69461a1531fe5afbf886c00a69b94d97f diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/7d/102e895bee1fc1ce70ee20e98ebfac03fb671e b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/7d/102e895bee1fc1ce70ee20e98ebfac03fb671e similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/7d/102e895bee1fc1ce70ee20e98ebfac03fb671e rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/7d/102e895bee1fc1ce70ee20e98ebfac03fb671e diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/7d/1e1c56c5046f5e6c6c19e996baf43edd37dc92 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/7d/1e1c56c5046f5e6c6c19e996baf43edd37dc92 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/7d/1e1c56c5046f5e6c6c19e996baf43edd37dc92 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/7d/1e1c56c5046f5e6c6c19e996baf43edd37dc92 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/7e/b07fb2cfe5167e7b8f4d1e8b5ca97b2172f337 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/7e/b07fb2cfe5167e7b8f4d1e8b5ca97b2172f337 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/7e/b07fb2cfe5167e7b8f4d1e8b5ca97b2172f337 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/7e/b07fb2cfe5167e7b8f4d1e8b5ca97b2172f337 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/7f/33ac0047adc7ac2ccde0145a4f77f34b4e1bbe b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/7f/33ac0047adc7ac2ccde0145a4f77f34b4e1bbe similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/7f/33ac0047adc7ac2ccde0145a4f77f34b4e1bbe rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/7f/33ac0047adc7ac2ccde0145a4f77f34b4e1bbe diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/81/a0b6016defbcb51e5fc5f77c36aab3765b62c1 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/81/a0b6016defbcb51e5fc5f77c36aab3765b62c1 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/81/a0b6016defbcb51e5fc5f77c36aab3765b62c1 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/81/a0b6016defbcb51e5fc5f77c36aab3765b62c1 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/83/13da56bc0dc9b9ea8a86815704d091c5d5116c b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/83/13da56bc0dc9b9ea8a86815704d091c5d5116c similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/83/13da56bc0dc9b9ea8a86815704d091c5d5116c rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/83/13da56bc0dc9b9ea8a86815704d091c5d5116c diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/83/834b15c6f89bc2b1937fac791047d7b1e4e0fc b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/83/834b15c6f89bc2b1937fac791047d7b1e4e0fc similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/83/834b15c6f89bc2b1937fac791047d7b1e4e0fc rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/83/834b15c6f89bc2b1937fac791047d7b1e4e0fc diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/83/8a8c3b021fa5fbca8257229a923eaa1b5e07e6 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/83/8a8c3b021fa5fbca8257229a923eaa1b5e07e6 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/83/8a8c3b021fa5fbca8257229a923eaa1b5e07e6 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/83/8a8c3b021fa5fbca8257229a923eaa1b5e07e6 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/84/1d21a2b6e9257f04d32852bf1723de57dfc336 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/84/1d21a2b6e9257f04d32852bf1723de57dfc336 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/84/1d21a2b6e9257f04d32852bf1723de57dfc336 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/84/1d21a2b6e9257f04d32852bf1723de57dfc336 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/84/8ff4d07b61e34ef2591b83aa17a0de62bd3e98 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/84/8ff4d07b61e34ef2591b83aa17a0de62bd3e98 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/84/8ff4d07b61e34ef2591b83aa17a0de62bd3e98 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/84/8ff4d07b61e34ef2591b83aa17a0de62bd3e98 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/84/dcb519ab8b24c170b193d3da3c1d72d2ffff09 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/84/dcb519ab8b24c170b193d3da3c1d72d2ffff09 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/84/dcb519ab8b24c170b193d3da3c1d72d2ffff09 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/84/dcb519ab8b24c170b193d3da3c1d72d2ffff09 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/84/e15198b51df271b0739e9554738e1c2093c565 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/84/e15198b51df271b0739e9554738e1c2093c565 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/84/e15198b51df271b0739e9554738e1c2093c565 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/84/e15198b51df271b0739e9554738e1c2093c565 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/85/5f4d73b9aa6b2c4465e4b1569cd032f72e202e b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/85/5f4d73b9aa6b2c4465e4b1569cd032f72e202e similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/85/5f4d73b9aa6b2c4465e4b1569cd032f72e202e rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/85/5f4d73b9aa6b2c4465e4b1569cd032f72e202e diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/86/0734f02cde1348c6e65d88d63cf0a128f7a98e b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/86/0734f02cde1348c6e65d88d63cf0a128f7a98e similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/86/0734f02cde1348c6e65d88d63cf0a128f7a98e rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/86/0734f02cde1348c6e65d88d63cf0a128f7a98e diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/86/57c72bd8096d9de408f70deb92d4d6bf726b2e b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/86/57c72bd8096d9de408f70deb92d4d6bf726b2e similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/86/57c72bd8096d9de408f70deb92d4d6bf726b2e rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/86/57c72bd8096d9de408f70deb92d4d6bf726b2e diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/87/0b3cfe04e33704829f12508ee10e2e778d075e b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/87/0b3cfe04e33704829f12508ee10e2e778d075e similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/87/0b3cfe04e33704829f12508ee10e2e778d075e rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/87/0b3cfe04e33704829f12508ee10e2e778d075e diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/88/ce7cb6fbb654af451ac6bf173475314bec3fe0 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/88/ce7cb6fbb654af451ac6bf173475314bec3fe0 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/88/ce7cb6fbb654af451ac6bf173475314bec3fe0 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/88/ce7cb6fbb654af451ac6bf173475314bec3fe0 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/8a/a3cb92a11adedbc5acfb300e721e0c7c7cd875 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/8a/a3cb92a11adedbc5acfb300e721e0c7c7cd875 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/8a/a3cb92a11adedbc5acfb300e721e0c7c7cd875 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/8a/a3cb92a11adedbc5acfb300e721e0c7c7cd875 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/8a/c9480dca73ca76b3f77fe0c0db306e384ec53f b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/8a/c9480dca73ca76b3f77fe0c0db306e384ec53f similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/8a/c9480dca73ca76b3f77fe0c0db306e384ec53f rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/8a/c9480dca73ca76b3f77fe0c0db306e384ec53f diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/8b/6d908f6af1766f8f8c50f15f1663d10a9dbf58 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/8b/6d908f6af1766f8f8c50f15f1663d10a9dbf58 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/8b/6d908f6af1766f8f8c50f15f1663d10a9dbf58 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/8b/6d908f6af1766f8f8c50f15f1663d10a9dbf58 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/8b/9da3b8b6006ed618243365e6d653d391a6b524 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/8b/9da3b8b6006ed618243365e6d653d391a6b524 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/8b/9da3b8b6006ed618243365e6d653d391a6b524 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/8b/9da3b8b6006ed618243365e6d653d391a6b524 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/8b/be64ab529a28329f34dca8d2c6e00b2ac5dfb9 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/8b/be64ab529a28329f34dca8d2c6e00b2ac5dfb9 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/8b/be64ab529a28329f34dca8d2c6e00b2ac5dfb9 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/8b/be64ab529a28329f34dca8d2c6e00b2ac5dfb9 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/8b/c5bd3f047d95df3978099091dccc150c3e5be5 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/8b/c5bd3f047d95df3978099091dccc150c3e5be5 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/8b/c5bd3f047d95df3978099091dccc150c3e5be5 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/8b/c5bd3f047d95df3978099091dccc150c3e5be5 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/8b/cdbb290a9e6c10fc08d728dbcdf5469948ad5d b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/8b/cdbb290a9e6c10fc08d728dbcdf5469948ad5d similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/8b/cdbb290a9e6c10fc08d728dbcdf5469948ad5d rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/8b/cdbb290a9e6c10fc08d728dbcdf5469948ad5d diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/90/629d1635e5778103b89270793a88dcf6ad6028 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/90/629d1635e5778103b89270793a88dcf6ad6028 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/90/629d1635e5778103b89270793a88dcf6ad6028 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/90/629d1635e5778103b89270793a88dcf6ad6028 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/90/a84f65f8a2e6da5c4f8279a56caba97d907d46 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/90/a84f65f8a2e6da5c4f8279a56caba97d907d46 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/90/a84f65f8a2e6da5c4f8279a56caba97d907d46 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/90/a84f65f8a2e6da5c4f8279a56caba97d907d46 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/90/ad431b6182d2da6fd108068fdbfcb8a54f1a07 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/90/ad431b6182d2da6fd108068fdbfcb8a54f1a07 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/90/ad431b6182d2da6fd108068fdbfcb8a54f1a07 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/90/ad431b6182d2da6fd108068fdbfcb8a54f1a07 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/90/d3f909f1977ad8e86b4d06c840c86b712a5e86 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/90/d3f909f1977ad8e86b4d06c840c86b712a5e86 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/90/d3f909f1977ad8e86b4d06c840c86b712a5e86 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/90/d3f909f1977ad8e86b4d06c840c86b712a5e86 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/91/ba273b1daac9ed878be93effa66c661df28128 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/91/ba273b1daac9ed878be93effa66c661df28128 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/91/ba273b1daac9ed878be93effa66c661df28128 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/91/ba273b1daac9ed878be93effa66c661df28128 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/92/7f4cac762609fb1f6ddf9c4b1bbafdba3e6877 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/92/7f4cac762609fb1f6ddf9c4b1bbafdba3e6877 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/92/7f4cac762609fb1f6ddf9c4b1bbafdba3e6877 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/92/7f4cac762609fb1f6ddf9c4b1bbafdba3e6877 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/94/0384c97c89effd1bb1fa467aa14f479f21fcfb b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/94/0384c97c89effd1bb1fa467aa14f479f21fcfb similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/94/0384c97c89effd1bb1fa467aa14f479f21fcfb rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/94/0384c97c89effd1bb1fa467aa14f479f21fcfb diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/94/e5602cb92e15adbc9de624264647066fb87cd1 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/94/e5602cb92e15adbc9de624264647066fb87cd1 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/94/e5602cb92e15adbc9de624264647066fb87cd1 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/94/e5602cb92e15adbc9de624264647066fb87cd1 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/95/f1da2cac8134d53db9880f8e4b541d7091e6b3 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/95/f1da2cac8134d53db9880f8e4b541d7091e6b3 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/95/f1da2cac8134d53db9880f8e4b541d7091e6b3 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/95/f1da2cac8134d53db9880f8e4b541d7091e6b3 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/96/69206b43cb02b701f39a59f2616d4d3dc5c7ec b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/96/69206b43cb02b701f39a59f2616d4d3dc5c7ec similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/96/69206b43cb02b701f39a59f2616d4d3dc5c7ec rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/96/69206b43cb02b701f39a59f2616d4d3dc5c7ec diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/97/8f940c6a2b485085daeb719088da083cdc9e9b b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/97/8f940c6a2b485085daeb719088da083cdc9e9b similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/97/8f940c6a2b485085daeb719088da083cdc9e9b rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/97/8f940c6a2b485085daeb719088da083cdc9e9b diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/99/222d9c4161654352621d0a884c30f63ab930a5 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/99/222d9c4161654352621d0a884c30f63ab930a5 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/99/222d9c4161654352621d0a884c30f63ab930a5 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/99/222d9c4161654352621d0a884c30f63ab930a5 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/99/acf0b17d8d7c0572b1415890d8fc77e5131a17 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/99/acf0b17d8d7c0572b1415890d8fc77e5131a17 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/99/acf0b17d8d7c0572b1415890d8fc77e5131a17 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/99/acf0b17d8d7c0572b1415890d8fc77e5131a17 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/99/c18dd7a272f4e70637c3e429c370ebbc9497b0 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/99/c18dd7a272f4e70637c3e429c370ebbc9497b0 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/99/c18dd7a272f4e70637c3e429c370ebbc9497b0 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/99/c18dd7a272f4e70637c3e429c370ebbc9497b0 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/9a/f065d499cff7eea30894140b97bd929b7f052b b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/9a/f065d499cff7eea30894140b97bd929b7f052b similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/9a/f065d499cff7eea30894140b97bd929b7f052b rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/9a/f065d499cff7eea30894140b97bd929b7f052b diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/9b/68386f8b5ad69da6295bee8b03396f726dc3b4 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/9b/68386f8b5ad69da6295bee8b03396f726dc3b4 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/9b/68386f8b5ad69da6295bee8b03396f726dc3b4 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/9b/68386f8b5ad69da6295bee8b03396f726dc3b4 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/9c/cb4985fd8f7cd22df266ffffae8640c6f01735 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/9c/cb4985fd8f7cd22df266ffffae8640c6f01735 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/9c/cb4985fd8f7cd22df266ffffae8640c6f01735 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/9c/cb4985fd8f7cd22df266ffffae8640c6f01735 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/9d/4963d339cb71161fe54510bcd0e30cd8c6f8f6 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/9d/4963d339cb71161fe54510bcd0e30cd8c6f8f6 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/9d/4963d339cb71161fe54510bcd0e30cd8c6f8f6 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/9d/4963d339cb71161fe54510bcd0e30cd8c6f8f6 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/9e/70d9508ce6faafcb9ab785b1f939540c0deac6 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/9e/70d9508ce6faafcb9ab785b1f939540c0deac6 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/9e/70d9508ce6faafcb9ab785b1f939540c0deac6 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/9e/70d9508ce6faafcb9ab785b1f939540c0deac6 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/9f/bb5124661454f35102228d95d9bad0f920ab37 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/9f/bb5124661454f35102228d95d9bad0f920ab37 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/9f/bb5124661454f35102228d95d9bad0f920ab37 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/9f/bb5124661454f35102228d95d9bad0f920ab37 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/a0/6b51f45f40bf0f7c924f6e62b54f03ed0020f5 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/a0/6b51f45f40bf0f7c924f6e62b54f03ed0020f5 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/a0/6b51f45f40bf0f7c924f6e62b54f03ed0020f5 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/a0/6b51f45f40bf0f7c924f6e62b54f03ed0020f5 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/a1/4215fc0a22a354753bcc40ffa4779cba8fb891 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/a1/4215fc0a22a354753bcc40ffa4779cba8fb891 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/a1/4215fc0a22a354753bcc40ffa4779cba8fb891 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/a1/4215fc0a22a354753bcc40ffa4779cba8fb891 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/a2/57d72c25256e49a042ed00275df6dbdb096371 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/a2/57d72c25256e49a042ed00275df6dbdb096371 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/a2/57d72c25256e49a042ed00275df6dbdb096371 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/a2/57d72c25256e49a042ed00275df6dbdb096371 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/a3/3643672892641471e4dca82a38f72c8ca3f35f b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/a3/3643672892641471e4dca82a38f72c8ca3f35f similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/a3/3643672892641471e4dca82a38f72c8ca3f35f rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/a3/3643672892641471e4dca82a38f72c8ca3f35f diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/a3/654663ed013f2a325014e244e5bb7de7ae07a7 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/a3/654663ed013f2a325014e244e5bb7de7ae07a7 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/a3/654663ed013f2a325014e244e5bb7de7ae07a7 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/a3/654663ed013f2a325014e244e5bb7de7ae07a7 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/a3/9b3853ebd3ec36710795d5f5e27bf645f56091 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/a3/9b3853ebd3ec36710795d5f5e27bf645f56091 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/a3/9b3853ebd3ec36710795d5f5e27bf645f56091 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/a3/9b3853ebd3ec36710795d5f5e27bf645f56091 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/a5/284c79395d80047f5d23be5ada7100f3998347 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/a5/284c79395d80047f5d23be5ada7100f3998347 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/a5/284c79395d80047f5d23be5ada7100f3998347 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/a5/284c79395d80047f5d23be5ada7100f3998347 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/a5/3dd3f555d23444d661f26fe42e3067777c536c b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/a5/3dd3f555d23444d661f26fe42e3067777c536c similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/a5/3dd3f555d23444d661f26fe42e3067777c536c rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/a5/3dd3f555d23444d661f26fe42e3067777c536c diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/a6/17549d928d96ef1bece03a892b67a21a2dad04 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/a6/17549d928d96ef1bece03a892b67a21a2dad04 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/a6/17549d928d96ef1bece03a892b67a21a2dad04 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/a6/17549d928d96ef1bece03a892b67a21a2dad04 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/a6/3c6deffa52fa01e3d8a8554acafb6998e94480 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/a6/3c6deffa52fa01e3d8a8554acafb6998e94480 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/a6/3c6deffa52fa01e3d8a8554acafb6998e94480 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/a6/3c6deffa52fa01e3d8a8554acafb6998e94480 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/a6/7fc263e744c6b77b8b9793277ffa4f6937b8eb b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/a6/7fc263e744c6b77b8b9793277ffa4f6937b8eb similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/a6/7fc263e744c6b77b8b9793277ffa4f6937b8eb rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/a6/7fc263e744c6b77b8b9793277ffa4f6937b8eb diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/a8/244174b44c31cab224b699d87e996253066688 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/a8/244174b44c31cab224b699d87e996253066688 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/a8/244174b44c31cab224b699d87e996253066688 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/a8/244174b44c31cab224b699d87e996253066688 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/a9/c903373dbfe70bf20410d242c026d700886678 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/a9/c903373dbfe70bf20410d242c026d700886678 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/a9/c903373dbfe70bf20410d242c026d700886678 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/a9/c903373dbfe70bf20410d242c026d700886678 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/a9/f46045756c338f3b5bd2e6ca0903895d305a04 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/a9/f46045756c338f3b5bd2e6ca0903895d305a04 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/a9/f46045756c338f3b5bd2e6ca0903895d305a04 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/a9/f46045756c338f3b5bd2e6ca0903895d305a04 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/aa/e91fe03a4d8012413dfad2d3b6d99d9796d1ee b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/aa/e91fe03a4d8012413dfad2d3b6d99d9796d1ee similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/aa/e91fe03a4d8012413dfad2d3b6d99d9796d1ee rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/aa/e91fe03a4d8012413dfad2d3b6d99d9796d1ee diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ab/188691563a71d423b0843b69d50ea2c9a91254 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ab/188691563a71d423b0843b69d50ea2c9a91254 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ab/188691563a71d423b0843b69d50ea2c9a91254 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ab/188691563a71d423b0843b69d50ea2c9a91254 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ac/6bc2f51229a1aefc196b18a2ae85bd44b1d2a7 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ac/6bc2f51229a1aefc196b18a2ae85bd44b1d2a7 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ac/6bc2f51229a1aefc196b18a2ae85bd44b1d2a7 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ac/6bc2f51229a1aefc196b18a2ae85bd44b1d2a7 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ac/a2edd123f3bbf2ea1b245fbc9c387daa9864e9 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ac/a2edd123f3bbf2ea1b245fbc9c387daa9864e9 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ac/a2edd123f3bbf2ea1b245fbc9c387daa9864e9 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ac/a2edd123f3bbf2ea1b245fbc9c387daa9864e9 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ae/054d9c894ec00b05a23198352faaf26686ffb8 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ae/054d9c894ec00b05a23198352faaf26686ffb8 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ae/054d9c894ec00b05a23198352faaf26686ffb8 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ae/054d9c894ec00b05a23198352faaf26686ffb8 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ae/08c60339719fc1cd606d1123884c7fa302ccf2 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ae/08c60339719fc1cd606d1123884c7fa302ccf2 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ae/08c60339719fc1cd606d1123884c7fa302ccf2 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ae/08c60339719fc1cd606d1123884c7fa302ccf2 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ae/9e626c8df42627518cbba78e1aad4428979f02 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ae/9e626c8df42627518cbba78e1aad4428979f02 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ae/9e626c8df42627518cbba78e1aad4428979f02 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ae/9e626c8df42627518cbba78e1aad4428979f02 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/af/872f33232171f00b5c63cec46c6fb1242a0242 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/af/872f33232171f00b5c63cec46c6fb1242a0242 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/af/872f33232171f00b5c63cec46c6fb1242a0242 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/af/872f33232171f00b5c63cec46c6fb1242a0242 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/b0/81456c6ccea9f316683c7531d16442e7d4d4f8 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/b0/81456c6ccea9f316683c7531d16442e7d4d4f8 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/b0/81456c6ccea9f316683c7531d16442e7d4d4f8 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/b0/81456c6ccea9f316683c7531d16442e7d4d4f8 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/b0/8675473588a6e2d56cf19c4afc7f0cdc2b7cc3 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/b0/8675473588a6e2d56cf19c4afc7f0cdc2b7cc3 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/b0/8675473588a6e2d56cf19c4afc7f0cdc2b7cc3 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/b0/8675473588a6e2d56cf19c4afc7f0cdc2b7cc3 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/b1/4ede22cb5de30c31cd50aa240cb321197ef8ef b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/b1/4ede22cb5de30c31cd50aa240cb321197ef8ef similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/b1/4ede22cb5de30c31cd50aa240cb321197ef8ef rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/b1/4ede22cb5de30c31cd50aa240cb321197ef8ef diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/b2/fe62c70d4684bdb21e9fd436814dd965a8b3e5 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/b2/fe62c70d4684bdb21e9fd436814dd965a8b3e5 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/b2/fe62c70d4684bdb21e9fd436814dd965a8b3e5 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/b2/fe62c70d4684bdb21e9fd436814dd965a8b3e5 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/b4/1cb06250222387843e3b30c28325777490cdfc b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/b4/1cb06250222387843e3b30c28325777490cdfc similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/b4/1cb06250222387843e3b30c28325777490cdfc rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/b4/1cb06250222387843e3b30c28325777490cdfc diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/b5/a078a19788839bb7e96d9748e58ae76983aca3 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/b5/a078a19788839bb7e96d9748e58ae76983aca3 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/b5/a078a19788839bb7e96d9748e58ae76983aca3 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/b5/a078a19788839bb7e96d9748e58ae76983aca3 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/b5/a4f3b81e056067fd3cbbfb067ef298f0f982c8 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/b5/a4f3b81e056067fd3cbbfb067ef298f0f982c8 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/b5/a4f3b81e056067fd3cbbfb067ef298f0f982c8 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/b5/a4f3b81e056067fd3cbbfb067ef298f0f982c8 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/b5/e6b3dfbe36769b4a9efbf8636666daa876bcd3 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/b5/e6b3dfbe36769b4a9efbf8636666daa876bcd3 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/b5/e6b3dfbe36769b4a9efbf8636666daa876bcd3 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/b5/e6b3dfbe36769b4a9efbf8636666daa876bcd3 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/b6/61a8187e96a4db284445d89092150432b05f4f b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/b6/61a8187e96a4db284445d89092150432b05f4f similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/b6/61a8187e96a4db284445d89092150432b05f4f rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/b6/61a8187e96a4db284445d89092150432b05f4f diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/b7/204c64d76c0a554f6b539bfbb3a9159c6fca88 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/b7/204c64d76c0a554f6b539bfbb3a9159c6fca88 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/b7/204c64d76c0a554f6b539bfbb3a9159c6fca88 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/b7/204c64d76c0a554f6b539bfbb3a9159c6fca88 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/b7/66ad857b3c436d7c4cada59f41a2f9276c21ce b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/b7/66ad857b3c436d7c4cada59f41a2f9276c21ce similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/b7/66ad857b3c436d7c4cada59f41a2f9276c21ce rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/b7/66ad857b3c436d7c4cada59f41a2f9276c21ce diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/b7/f6ec898315d364a22b171cb90532ac0be85e3f b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/b7/f6ec898315d364a22b171cb90532ac0be85e3f similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/b7/f6ec898315d364a22b171cb90532ac0be85e3f rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/b7/f6ec898315d364a22b171cb90532ac0be85e3f diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/b7/feb60fbecd482d0148bf90afe108cabe122561 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/b7/feb60fbecd482d0148bf90afe108cabe122561 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/b7/feb60fbecd482d0148bf90afe108cabe122561 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/b7/feb60fbecd482d0148bf90afe108cabe122561 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/b9/2957bab7ddad5d00f302886f3e8d18e5fc4e3e b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/b9/2957bab7ddad5d00f302886f3e8d18e5fc4e3e similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/b9/2957bab7ddad5d00f302886f3e8d18e5fc4e3e rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/b9/2957bab7ddad5d00f302886f3e8d18e5fc4e3e diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ba/36cba3b8998bcf9ff90455f75162a7fde174b6 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ba/36cba3b8998bcf9ff90455f75162a7fde174b6 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ba/36cba3b8998bcf9ff90455f75162a7fde174b6 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ba/36cba3b8998bcf9ff90455f75162a7fde174b6 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ba/82725e6a0abd0aa3441df5d0f4ae5ec020b7bf b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ba/82725e6a0abd0aa3441df5d0f4ae5ec020b7bf similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ba/82725e6a0abd0aa3441df5d0f4ae5ec020b7bf rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ba/82725e6a0abd0aa3441df5d0f4ae5ec020b7bf diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ba/8d34f8a5be62eb4029599a5b2337f2f6eba303 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ba/8d34f8a5be62eb4029599a5b2337f2f6eba303 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ba/8d34f8a5be62eb4029599a5b2337f2f6eba303 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ba/8d34f8a5be62eb4029599a5b2337f2f6eba303 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ba/da7d0e0f616c13bccdf65b699bd29b4ad5ed4d b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ba/da7d0e0f616c13bccdf65b699bd29b4ad5ed4d similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ba/da7d0e0f616c13bccdf65b699bd29b4ad5ed4d rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ba/da7d0e0f616c13bccdf65b699bd29b4ad5ed4d diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/bc/8bcac0eb3102a22921c20fe5978b7a8b7ba9b3 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/bc/8bcac0eb3102a22921c20fe5978b7a8b7ba9b3 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/bc/8bcac0eb3102a22921c20fe5978b7a8b7ba9b3 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/bc/8bcac0eb3102a22921c20fe5978b7a8b7ba9b3 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/be/ce815dcfc78185588566588a5f368fb66943f9 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/be/ce815dcfc78185588566588a5f368fb66943f9 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/be/ce815dcfc78185588566588a5f368fb66943f9 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/be/ce815dcfc78185588566588a5f368fb66943f9 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/be/fbdda47eecb2b642404aa7cb2598642b682634 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/be/fbdda47eecb2b642404aa7cb2598642b682634 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/be/fbdda47eecb2b642404aa7cb2598642b682634 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/be/fbdda47eecb2b642404aa7cb2598642b682634 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/bf/245538141dda1054e1c971964d099bdf6ff25a b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/bf/245538141dda1054e1c971964d099bdf6ff25a similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/bf/245538141dda1054e1c971964d099bdf6ff25a rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/bf/245538141dda1054e1c971964d099bdf6ff25a diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/bf/3c050a5cdf74d41ad58139e66167ea873b012a b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/bf/3c050a5cdf74d41ad58139e66167ea873b012a similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/bf/3c050a5cdf74d41ad58139e66167ea873b012a rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/bf/3c050a5cdf74d41ad58139e66167ea873b012a diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c0/6ecbe7610da409ba6cced213c8f0ef8d48e2b6 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c0/6ecbe7610da409ba6cced213c8f0ef8d48e2b6 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c0/6ecbe7610da409ba6cced213c8f0ef8d48e2b6 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c0/6ecbe7610da409ba6cced213c8f0ef8d48e2b6 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c0/ae7618bdffdcfb817126feef66f27a543f01db b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c0/ae7618bdffdcfb817126feef66f27a543f01db similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c0/ae7618bdffdcfb817126feef66f27a543f01db rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c0/ae7618bdffdcfb817126feef66f27a543f01db diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c0/e9d246f871a0205bf15632e34c3d4c1d4b19e6 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c0/e9d246f871a0205bf15632e34c3d4c1d4b19e6 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c0/e9d246f871a0205bf15632e34c3d4c1d4b19e6 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c0/e9d246f871a0205bf15632e34c3d4c1d4b19e6 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c1/ddbdaeaeb9a164403ff9ea6e9557cb85bbdaed b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c1/ddbdaeaeb9a164403ff9ea6e9557cb85bbdaed similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c1/ddbdaeaeb9a164403ff9ea6e9557cb85bbdaed rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c1/ddbdaeaeb9a164403ff9ea6e9557cb85bbdaed diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c2/81a2884800f70fac5d838cdf417c45d127d6e1 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c2/81a2884800f70fac5d838cdf417c45d127d6e1 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c2/81a2884800f70fac5d838cdf417c45d127d6e1 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c2/81a2884800f70fac5d838cdf417c45d127d6e1 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c4/5cd2accc5330acbd061b768c67d931d6b8eaec b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c4/5cd2accc5330acbd061b768c67d931d6b8eaec similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c4/5cd2accc5330acbd061b768c67d931d6b8eaec rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c4/5cd2accc5330acbd061b768c67d931d6b8eaec diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c4/6144b632d8a3f67d9f32e19c8cfc097ada00e6 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c4/6144b632d8a3f67d9f32e19c8cfc097ada00e6 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c4/6144b632d8a3f67d9f32e19c8cfc097ada00e6 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c4/6144b632d8a3f67d9f32e19c8cfc097ada00e6 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c4/8049166fa59ffa057c9c511e63cf295ce79968 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c4/8049166fa59ffa057c9c511e63cf295ce79968 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c4/8049166fa59ffa057c9c511e63cf295ce79968 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c4/8049166fa59ffa057c9c511e63cf295ce79968 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c5/da662c7c0cde06b7202b095e8881cc787d4da0 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c5/da662c7c0cde06b7202b095e8881cc787d4da0 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c5/da662c7c0cde06b7202b095e8881cc787d4da0 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c5/da662c7c0cde06b7202b095e8881cc787d4da0 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c6/0f3837ce3e9631f7fe812cc46e5a3e060e783c b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c6/0f3837ce3e9631f7fe812cc46e5a3e060e783c similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c6/0f3837ce3e9631f7fe812cc46e5a3e060e783c rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c6/0f3837ce3e9631f7fe812cc46e5a3e060e783c diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c6/7e076d45a433331a2ea75a358a07e76bd5e78c b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c6/7e076d45a433331a2ea75a358a07e76bd5e78c similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c6/7e076d45a433331a2ea75a358a07e76bd5e78c rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c6/7e076d45a433331a2ea75a358a07e76bd5e78c diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c7/ebfabea21d1ad6c096ba24446f8fcc9736f478 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c7/ebfabea21d1ad6c096ba24446f8fcc9736f478 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c7/ebfabea21d1ad6c096ba24446f8fcc9736f478 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c7/ebfabea21d1ad6c096ba24446f8fcc9736f478 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c8/02ee8954e893e5367b6240e853ce95ccdf9dfb b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c8/02ee8954e893e5367b6240e853ce95ccdf9dfb similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c8/02ee8954e893e5367b6240e853ce95ccdf9dfb rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c8/02ee8954e893e5367b6240e853ce95ccdf9dfb diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c8/b7ed9df7530f43dc7702934660cae7c5ba16d4 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c8/b7ed9df7530f43dc7702934660cae7c5ba16d4 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c8/b7ed9df7530f43dc7702934660cae7c5ba16d4 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c8/b7ed9df7530f43dc7702934660cae7c5ba16d4 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c9/18a50887b30a6465d217224bd2940963afce5d b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c9/18a50887b30a6465d217224bd2940963afce5d similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/c9/18a50887b30a6465d217224bd2940963afce5d rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/c9/18a50887b30a6465d217224bd2940963afce5d diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ca/a72691da75cfb9208264d33b80ac39fc744cd6 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ca/a72691da75cfb9208264d33b80ac39fc744cd6 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ca/a72691da75cfb9208264d33b80ac39fc744cd6 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ca/a72691da75cfb9208264d33b80ac39fc744cd6 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ca/e4680e7c970f46bb52819b7ed684c7c0349570 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ca/e4680e7c970f46bb52819b7ed684c7c0349570 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ca/e4680e7c970f46bb52819b7ed684c7c0349570 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ca/e4680e7c970f46bb52819b7ed684c7c0349570 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/cc/54ac2e86b7f75b2f3055eb3b08f5ceba06548d b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/cc/54ac2e86b7f75b2f3055eb3b08f5ceba06548d similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/cc/54ac2e86b7f75b2f3055eb3b08f5ceba06548d rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/cc/54ac2e86b7f75b2f3055eb3b08f5ceba06548d diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/cc/99e40607e22e5239e6033a5e815e0ba09c65f3 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/cc/99e40607e22e5239e6033a5e815e0ba09c65f3 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/cc/99e40607e22e5239e6033a5e815e0ba09c65f3 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/cc/99e40607e22e5239e6033a5e815e0ba09c65f3 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/cc/9cf48c7cffe0a1a082c2e8ae277794faedff92 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/cc/9cf48c7cffe0a1a082c2e8ae277794faedff92 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/cc/9cf48c7cffe0a1a082c2e8ae277794faedff92 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/cc/9cf48c7cffe0a1a082c2e8ae277794faedff92 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d0/bd817358b8ff6a72bf3a75e089bc9114a24534 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d0/bd817358b8ff6a72bf3a75e089bc9114a24534 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d0/bd817358b8ff6a72bf3a75e089bc9114a24534 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d0/bd817358b8ff6a72bf3a75e089bc9114a24534 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d0/ddd399ae7f3076d81c09304703a7656dbfda46 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d0/ddd399ae7f3076d81c09304703a7656dbfda46 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d0/ddd399ae7f3076d81c09304703a7656dbfda46 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d0/ddd399ae7f3076d81c09304703a7656dbfda46 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d1/77ab6c2a5d3ef1c1dd9edbbde411a57d4a745f b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d1/77ab6c2a5d3ef1c1dd9edbbde411a57d4a745f similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d1/77ab6c2a5d3ef1c1dd9edbbde411a57d4a745f rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d1/77ab6c2a5d3ef1c1dd9edbbde411a57d4a745f diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d1/c7c4614603b226d61dc7fad3ea7d988b83b447 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d1/c7c4614603b226d61dc7fad3ea7d988b83b447 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d1/c7c4614603b226d61dc7fad3ea7d988b83b447 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d1/c7c4614603b226d61dc7fad3ea7d988b83b447 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d1/effebdd87965a35b15b07387a9cebcb0f56ad4 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d1/effebdd87965a35b15b07387a9cebcb0f56ad4 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d1/effebdd87965a35b15b07387a9cebcb0f56ad4 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d1/effebdd87965a35b15b07387a9cebcb0f56ad4 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d2/61f7910a7c877e4d24e9238e9ea73c98a0f882 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d2/61f7910a7c877e4d24e9238e9ea73c98a0f882 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d2/61f7910a7c877e4d24e9238e9ea73c98a0f882 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d2/61f7910a7c877e4d24e9238e9ea73c98a0f882 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d3/7cdcca8f91907eb1f9dee54eafde7b18ebb326 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d3/7cdcca8f91907eb1f9dee54eafde7b18ebb326 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d3/7cdcca8f91907eb1f9dee54eafde7b18ebb326 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d3/7cdcca8f91907eb1f9dee54eafde7b18ebb326 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d5/638cb336e8d294c7d051b867dc2d1a686b9270 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d5/638cb336e8d294c7d051b867dc2d1a686b9270 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d5/638cb336e8d294c7d051b867dc2d1a686b9270 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d5/638cb336e8d294c7d051b867dc2d1a686b9270 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d5/7bc455053c2cd99e27f405518c83f5afc844b6 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d5/7bc455053c2cd99e27f405518c83f5afc844b6 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d5/7bc455053c2cd99e27f405518c83f5afc844b6 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d5/7bc455053c2cd99e27f405518c83f5afc844b6 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d5/9abfe87d3a66022c63e37cad3ac3194fdf08f2 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d5/9abfe87d3a66022c63e37cad3ac3194fdf08f2 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d5/9abfe87d3a66022c63e37cad3ac3194fdf08f2 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d5/9abfe87d3a66022c63e37cad3ac3194fdf08f2 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d6/1c632b018f8e423afc038340310705c521648c b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d6/1c632b018f8e423afc038340310705c521648c similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d6/1c632b018f8e423afc038340310705c521648c rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d6/1c632b018f8e423afc038340310705c521648c diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d6/d0a4b26597d270157b9a428bad43c9b01e7c26 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d6/d0a4b26597d270157b9a428bad43c9b01e7c26 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d6/d0a4b26597d270157b9a428bad43c9b01e7c26 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d6/d0a4b26597d270157b9a428bad43c9b01e7c26 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d7/26d7ae281a646fbc7af30a81f74ecfda423b26 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d7/26d7ae281a646fbc7af30a81f74ecfda423b26 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d7/26d7ae281a646fbc7af30a81f74ecfda423b26 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d7/26d7ae281a646fbc7af30a81f74ecfda423b26 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d7/6b265d0f0cfc646b17ca025c062d935b294000 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d7/6b265d0f0cfc646b17ca025c062d935b294000 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d7/6b265d0f0cfc646b17ca025c062d935b294000 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d7/6b265d0f0cfc646b17ca025c062d935b294000 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d7/863f28106f71d53d5a46bd2c08d0c6dff91b5a b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d7/863f28106f71d53d5a46bd2c08d0c6dff91b5a similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d7/863f28106f71d53d5a46bd2c08d0c6dff91b5a rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d7/863f28106f71d53d5a46bd2c08d0c6dff91b5a diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d7/aa87b8d591463d926cd3f2fdf1ef898c5d1714 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d7/aa87b8d591463d926cd3f2fdf1ef898c5d1714 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/d7/aa87b8d591463d926cd3f2fdf1ef898c5d1714 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/d7/aa87b8d591463d926cd3f2fdf1ef898c5d1714 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/da/8958e7179e5e70e31da32e3b023a2aa8812e6b b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/da/8958e7179e5e70e31da32e3b023a2aa8812e6b similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/da/8958e7179e5e70e31da32e3b023a2aa8812e6b rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/da/8958e7179e5e70e31da32e3b023a2aa8812e6b diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/da/90050928cd15a5988a90f97e78e3d1818884c7 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/da/90050928cd15a5988a90f97e78e3d1818884c7 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/da/90050928cd15a5988a90f97e78e3d1818884c7 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/da/90050928cd15a5988a90f97e78e3d1818884c7 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/da/994d5600c15389f7fc7aa15f0414660d5343e1 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/da/994d5600c15389f7fc7aa15f0414660d5343e1 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/da/994d5600c15389f7fc7aa15f0414660d5343e1 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/da/994d5600c15389f7fc7aa15f0414660d5343e1 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/db/5d90de37ee360dc1753e0551094455155265b8 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/db/5d90de37ee360dc1753e0551094455155265b8 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/db/5d90de37ee360dc1753e0551094455155265b8 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/db/5d90de37ee360dc1753e0551094455155265b8 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/db/fce3a46e3990964a311db379d0cf48e8b9af8c b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/db/fce3a46e3990964a311db379d0cf48e8b9af8c similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/db/fce3a46e3990964a311db379d0cf48e8b9af8c rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/db/fce3a46e3990964a311db379d0cf48e8b9af8c diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/dc/20a2a617f0a7fe599d23c30fc766d2d550b8e0 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/dc/20a2a617f0a7fe599d23c30fc766d2d550b8e0 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/dc/20a2a617f0a7fe599d23c30fc766d2d550b8e0 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/dc/20a2a617f0a7fe599d23c30fc766d2d550b8e0 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/dc/b30669ceaba5bfdd9775910594518bdc62f20b b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/dc/b30669ceaba5bfdd9775910594518bdc62f20b similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/dc/b30669ceaba5bfdd9775910594518bdc62f20b rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/dc/b30669ceaba5bfdd9775910594518bdc62f20b diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/dd/da9782f6f9f9751c8e36d89fc4c4b57d84b633 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/dd/da9782f6f9f9751c8e36d89fc4c4b57d84b633 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/dd/da9782f6f9f9751c8e36d89fc4c4b57d84b633 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/dd/da9782f6f9f9751c8e36d89fc4c4b57d84b633 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/de/79b9729de8e0ce3589fb8d329ab92c2238219d b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/de/79b9729de8e0ce3589fb8d329ab92c2238219d similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/de/79b9729de8e0ce3589fb8d329ab92c2238219d rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/de/79b9729de8e0ce3589fb8d329ab92c2238219d diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/de/a5dbe01b1d9578a23bbcb0bca761f88b9699af b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/de/a5dbe01b1d9578a23bbcb0bca761f88b9699af similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/de/a5dbe01b1d9578a23bbcb0bca761f88b9699af rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/de/a5dbe01b1d9578a23bbcb0bca761f88b9699af diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/df/0b833630ab7e16a08ea6206bb4a458a97b7bcf b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/df/0b833630ab7e16a08ea6206bb4a458a97b7bcf similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/df/0b833630ab7e16a08ea6206bb4a458a97b7bcf rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/df/0b833630ab7e16a08ea6206bb4a458a97b7bcf diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/df/1ebc96f21bcedad0dbd72e57def463a57d065b b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/df/1ebc96f21bcedad0dbd72e57def463a57d065b similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/df/1ebc96f21bcedad0dbd72e57def463a57d065b rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/df/1ebc96f21bcedad0dbd72e57def463a57d065b diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/df/27d5e6ac5d705e415a5f7272a165701a141649 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/df/27d5e6ac5d705e415a5f7272a165701a141649 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/df/27d5e6ac5d705e415a5f7272a165701a141649 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/df/27d5e6ac5d705e415a5f7272a165701a141649 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/df/df8f9678a4854875f432cafcf727ee0682ce8a b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/df/df8f9678a4854875f432cafcf727ee0682ce8a similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/df/df8f9678a4854875f432cafcf727ee0682ce8a rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/df/df8f9678a4854875f432cafcf727ee0682ce8a diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/e0/f15db2eb22b5d618150277e48b741f8fdd277a b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/e0/f15db2eb22b5d618150277e48b741f8fdd277a similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/e0/f15db2eb22b5d618150277e48b741f8fdd277a rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/e0/f15db2eb22b5d618150277e48b741f8fdd277a diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/e1/a1ed7d4d2aafaadf40b9fea9c1896477261a10 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/e1/a1ed7d4d2aafaadf40b9fea9c1896477261a10 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/e1/a1ed7d4d2aafaadf40b9fea9c1896477261a10 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/e1/a1ed7d4d2aafaadf40b9fea9c1896477261a10 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/e5/bcc03582e9ed4f3557a13592d652115f02140b b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/e5/bcc03582e9ed4f3557a13592d652115f02140b similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/e5/bcc03582e9ed4f3557a13592d652115f02140b rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/e5/bcc03582e9ed4f3557a13592d652115f02140b diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/e6/27fc70943434e19bbba93c2f780c78d4311e32 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/e6/27fc70943434e19bbba93c2f780c78d4311e32 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/e6/27fc70943434e19bbba93c2f780c78d4311e32 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/e6/27fc70943434e19bbba93c2f780c78d4311e32 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/e6/2dd69e318558d1197930cf169b8fa006d62aff b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/e6/2dd69e318558d1197930cf169b8fa006d62aff similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/e6/2dd69e318558d1197930cf169b8fa006d62aff rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/e6/2dd69e318558d1197930cf169b8fa006d62aff diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/e8/4beea9b2ccd9a98c89dbdc835d157efb376148 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/e8/4beea9b2ccd9a98c89dbdc835d157efb376148 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/e8/4beea9b2ccd9a98c89dbdc835d157efb376148 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/e8/4beea9b2ccd9a98c89dbdc835d157efb376148 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/e8/c0a0fb5e04ae358658f44a2f213f4eebd394b8 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/e8/c0a0fb5e04ae358658f44a2f213f4eebd394b8 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/e8/c0a0fb5e04ae358658f44a2f213f4eebd394b8 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/e8/c0a0fb5e04ae358658f44a2f213f4eebd394b8 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/e8/c9b6e2eb51c30f2378dc04ceecff94ffc4ff1a b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/e8/c9b6e2eb51c30f2378dc04ceecff94ffc4ff1a similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/e8/c9b6e2eb51c30f2378dc04ceecff94ffc4ff1a rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/e8/c9b6e2eb51c30f2378dc04ceecff94ffc4ff1a diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ea/b3fd06ca17c34452681bc25400459e10691aaa b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ea/b3fd06ca17c34452681bc25400459e10691aaa similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ea/b3fd06ca17c34452681bc25400459e10691aaa rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ea/b3fd06ca17c34452681bc25400459e10691aaa diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ea/e940dab02f7a9b9783d75002acd7056ed4f53d b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ea/e940dab02f7a9b9783d75002acd7056ed4f53d similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ea/e940dab02f7a9b9783d75002acd7056ed4f53d rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ea/e940dab02f7a9b9783d75002acd7056ed4f53d diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ea/f0a1e056d64d26351541b99ea28000b302f352 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ea/f0a1e056d64d26351541b99ea28000b302f352 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ea/f0a1e056d64d26351541b99ea28000b302f352 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ea/f0a1e056d64d26351541b99ea28000b302f352 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/eb/1b023efd95eadb52d28b370d5c5b039332e3d6 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/eb/1b023efd95eadb52d28b370d5c5b039332e3d6 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/eb/1b023efd95eadb52d28b370d5c5b039332e3d6 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/eb/1b023efd95eadb52d28b370d5c5b039332e3d6 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/eb/9a16ae63b1ea82ef920f849e59cc4c08e5539e b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/eb/9a16ae63b1ea82ef920f849e59cc4c08e5539e similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/eb/9a16ae63b1ea82ef920f849e59cc4c08e5539e rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/eb/9a16ae63b1ea82ef920f849e59cc4c08e5539e diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/eb/a573ee57d2a3380988574df1d4f48918cc4776 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/eb/a573ee57d2a3380988574df1d4f48918cc4776 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/eb/a573ee57d2a3380988574df1d4f48918cc4776 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/eb/a573ee57d2a3380988574df1d4f48918cc4776 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/eb/b5a506a566e2c94bbbb9b85c1af3ace19a6e1a b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/eb/b5a506a566e2c94bbbb9b85c1af3ace19a6e1a similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/eb/b5a506a566e2c94bbbb9b85c1af3ace19a6e1a rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/eb/b5a506a566e2c94bbbb9b85c1af3ace19a6e1a diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ec/508fdca37fadefd1fe64c7bc3e6310e6be643c b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ec/508fdca37fadefd1fe64c7bc3e6310e6be643c similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ec/508fdca37fadefd1fe64c7bc3e6310e6be643c rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ec/508fdca37fadefd1fe64c7bc3e6310e6be643c diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ec/90044cf347180250d6b96e64e049704949e31d b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ec/90044cf347180250d6b96e64e049704949e31d similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ec/90044cf347180250d6b96e64e049704949e31d rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ec/90044cf347180250d6b96e64e049704949e31d diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ec/ef6997f00185324926cd269e113320cbc00875 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ec/ef6997f00185324926cd269e113320cbc00875 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ec/ef6997f00185324926cd269e113320cbc00875 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ec/ef6997f00185324926cd269e113320cbc00875 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ed/4ef45e068ec1d779c35958d50621d4def620c0 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ed/4ef45e068ec1d779c35958d50621d4def620c0 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ed/4ef45e068ec1d779c35958d50621d4def620c0 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ed/4ef45e068ec1d779c35958d50621d4def620c0 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ed/d1910d9837b58d9569858c0ea2fe86fb64c802 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ed/d1910d9837b58d9569858c0ea2fe86fb64c802 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ed/d1910d9837b58d9569858c0ea2fe86fb64c802 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ed/d1910d9837b58d9569858c0ea2fe86fb64c802 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f0/361390a7fef9ca8bf5b8d8a577f149247717c9 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f0/361390a7fef9ca8bf5b8d8a577f149247717c9 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f0/361390a7fef9ca8bf5b8d8a577f149247717c9 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f0/361390a7fef9ca8bf5b8d8a577f149247717c9 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f0/46cfcbf93d23a2e4154270c084f72e527e944c b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f0/46cfcbf93d23a2e4154270c084f72e527e944c similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f0/46cfcbf93d23a2e4154270c084f72e527e944c rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f0/46cfcbf93d23a2e4154270c084f72e527e944c diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f0/51e69301ab7459275e68b35504aa555ac9c94b b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f0/51e69301ab7459275e68b35504aa555ac9c94b similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f0/51e69301ab7459275e68b35504aa555ac9c94b rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f0/51e69301ab7459275e68b35504aa555ac9c94b diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f2/2f79709f07d95bec1d1b5774f9d8ebeaeba8dc b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f2/2f79709f07d95bec1d1b5774f9d8ebeaeba8dc similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f2/2f79709f07d95bec1d1b5774f9d8ebeaeba8dc rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f2/2f79709f07d95bec1d1b5774f9d8ebeaeba8dc diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f2/a3b7469b441e034f77e70e204fe3c7155ca036 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f2/a3b7469b441e034f77e70e204fe3c7155ca036 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f2/a3b7469b441e034f77e70e204fe3c7155ca036 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f2/a3b7469b441e034f77e70e204fe3c7155ca036 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f2/f8c5df94a5013c3886cbf4485d0cfbf46c4ca1 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f2/f8c5df94a5013c3886cbf4485d0cfbf46c4ca1 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f2/f8c5df94a5013c3886cbf4485d0cfbf46c4ca1 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f2/f8c5df94a5013c3886cbf4485d0cfbf46c4ca1 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f4/6f941f5869e8bd70041c8842953f6ffd6da7d4 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f4/6f941f5869e8bd70041c8842953f6ffd6da7d4 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f4/6f941f5869e8bd70041c8842953f6ffd6da7d4 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f4/6f941f5869e8bd70041c8842953f6ffd6da7d4 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f4/fe2c7d686551e0ad76a1186a7d607f5aef6470 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f4/fe2c7d686551e0ad76a1186a7d607f5aef6470 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f4/fe2c7d686551e0ad76a1186a7d607f5aef6470 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f4/fe2c7d686551e0ad76a1186a7d607f5aef6470 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f5/9c9b77263292c770963e1824429b7d78bd321b b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f5/9c9b77263292c770963e1824429b7d78bd321b similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f5/9c9b77263292c770963e1824429b7d78bd321b rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f5/9c9b77263292c770963e1824429b7d78bd321b diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f5/c28e2224fc7a02db2fd6d412fb9d8e4df39086 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f5/c28e2224fc7a02db2fd6d412fb9d8e4df39086 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f5/c28e2224fc7a02db2fd6d412fb9d8e4df39086 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f5/c28e2224fc7a02db2fd6d412fb9d8e4df39086 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f7/9a2e4dcb7b0d13940aad73fe2d3b0289ff3c53 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f7/9a2e4dcb7b0d13940aad73fe2d3b0289ff3c53 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f7/9a2e4dcb7b0d13940aad73fe2d3b0289ff3c53 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f7/9a2e4dcb7b0d13940aad73fe2d3b0289ff3c53 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f7/ae50ac9e0947c0cea5948faf21179f6391257b b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f7/ae50ac9e0947c0cea5948faf21179f6391257b similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f7/ae50ac9e0947c0cea5948faf21179f6391257b rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f7/ae50ac9e0947c0cea5948faf21179f6391257b diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f8/5366a05e15149a6902381c9804d596d63acb9e b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f8/5366a05e15149a6902381c9804d596d63acb9e similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f8/5366a05e15149a6902381c9804d596d63acb9e rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f8/5366a05e15149a6902381c9804d596d63acb9e diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f9/0e41d5619c0bf430aa0895437662e8a188f431 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f9/0e41d5619c0bf430aa0895437662e8a188f431 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f9/0e41d5619c0bf430aa0895437662e8a188f431 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f9/0e41d5619c0bf430aa0895437662e8a188f431 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f9/947d2d0a8e27e0d28de3b98ced56fbc9f0c06f b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f9/947d2d0a8e27e0d28de3b98ced56fbc9f0c06f similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/f9/947d2d0a8e27e0d28de3b98ced56fbc9f0c06f rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/f9/947d2d0a8e27e0d28de3b98ced56fbc9f0c06f diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/fa/0f3e467b1873c32a6ec5031f24ce1fa44e479f b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/fa/0f3e467b1873c32a6ec5031f24ce1fa44e479f similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/fa/0f3e467b1873c32a6ec5031f24ce1fa44e479f rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/fa/0f3e467b1873c32a6ec5031f24ce1fa44e479f diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/fa/4f7b499fdd7dd860763f348ca4c58c9cbf69f8 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/fa/4f7b499fdd7dd860763f348ca4c58c9cbf69f8 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/fa/4f7b499fdd7dd860763f348ca4c58c9cbf69f8 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/fa/4f7b499fdd7dd860763f348ca4c58c9cbf69f8 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/fa/6e882550fd08f9b2083afa1a311fdca4769add b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/fa/6e882550fd08f9b2083afa1a311fdca4769add similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/fa/6e882550fd08f9b2083afa1a311fdca4769add rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/fa/6e882550fd08f9b2083afa1a311fdca4769add diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/fb/324235b550b54ebe2b3a715e0c4151daf3f7d2 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/fb/324235b550b54ebe2b3a715e0c4151daf3f7d2 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/fb/324235b550b54ebe2b3a715e0c4151daf3f7d2 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/fb/324235b550b54ebe2b3a715e0c4151daf3f7d2 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/fc/d79a42bc53a037bd28a5418a9671c377e371b5 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/fc/d79a42bc53a037bd28a5418a9671c377e371b5 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/fc/d79a42bc53a037bd28a5418a9671c377e371b5 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/fc/d79a42bc53a037bd28a5418a9671c377e371b5 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/fe/95623a93001526030c9589b9aaf29e0e8b4dca b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/fe/95623a93001526030c9589b9aaf29e0e8b4dca similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/fe/95623a93001526030c9589b9aaf29e0e8b4dca rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/fe/95623a93001526030c9589b9aaf29e0e8b4dca diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/fe/a83c7bf06ec4d8de327b1bedc38783e8a34ca4 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/fe/a83c7bf06ec4d8de327b1bedc38783e8a34ca4 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/fe/a83c7bf06ec4d8de327b1bedc38783e8a34ca4 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/fe/a83c7bf06ec4d8de327b1bedc38783e8a34ca4 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ff/ca4de8f882ed532c4b5e1b974774a78dc5b2d6 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ff/ca4de8f882ed532c4b5e1b974774a78dc5b2d6 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ff/ca4de8f882ed532c4b5e1b974774a78dc5b2d6 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ff/ca4de8f882ed532c4b5e1b974774a78dc5b2d6 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ff/e46cb99fd21f020d87c0ce1a77db67af9ced2e b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ff/e46cb99fd21f020d87c0ce1a77db67af9ced2e similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ff/e46cb99fd21f020d87c0ce1a77db67af9ced2e rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/ff/e46cb99fd21f020d87c0ce1a77db67af9ced2e diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/pack/pack-6c6a693d2b6b85a67172ade318ed17c3cb0f5adb.idx b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/pack/pack-6c6a693d2b6b85a67172ade318ed17c3cb0f5adb.idx similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/pack/pack-6c6a693d2b6b85a67172ade318ed17c3cb0f5adb.idx rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/pack/pack-6c6a693d2b6b85a67172ade318ed17c3cb0f5adb.idx diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/pack/pack-6c6a693d2b6b85a67172ade318ed17c3cb0f5adb.pack b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/pack/pack-6c6a693d2b6b85a67172ade318ed17c3cb0f5adb.pack similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/pack/pack-6c6a693d2b6b85a67172ade318ed17c3cb0f5adb.pack rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/pack/pack-6c6a693d2b6b85a67172ade318ed17c3cb0f5adb.pack diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/pack/pack-8415f08be26229e851eb6d5a62620bf5dbad56c1.idx b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/pack/pack-8415f08be26229e851eb6d5a62620bf5dbad56c1.idx similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/pack/pack-8415f08be26229e851eb6d5a62620bf5dbad56c1.idx rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/pack/pack-8415f08be26229e851eb6d5a62620bf5dbad56c1.idx diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/pack/pack-8415f08be26229e851eb6d5a62620bf5dbad56c1.pack b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/pack/pack-8415f08be26229e851eb6d5a62620bf5dbad56c1.pack similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/pack/pack-8415f08be26229e851eb6d5a62620bf5dbad56c1.pack rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/pack/pack-8415f08be26229e851eb6d5a62620bf5dbad56c1.pack diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/packed-refs b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/packed-refs similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/packed-refs rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/packed-refs diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/heads/Dalston b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/heads/Dalston similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/heads/Dalston rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/heads/Dalston diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/heads/Edgware b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/heads/Edgware similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/heads/Edgware rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/heads/Edgware diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/heads/Finchley b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/heads/Finchley similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/heads/Finchley rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/heads/Finchley diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/heads/Greenwich b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/heads/Greenwich similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/heads/Greenwich rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/heads/Greenwich diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/heads/build_for_greenwich b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/heads/build_for_greenwich similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/heads/build_for_greenwich rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/heads/build_for_greenwich diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/heads/master b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/heads/master similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/heads/master rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/heads/master diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/heads/scBuild214 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/heads/scBuild214 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/heads/scBuild214 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/heads/scBuild214 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/heads/springCloudBuildRelease b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/heads/springCloudBuildRelease similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/heads/springCloudBuildRelease rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/heads/springCloudBuildRelease diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Brixton b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Brixton similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Brixton rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Brixton diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Camden b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Camden similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Camden rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Camden diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Camden.RC1 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Camden.RC1 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Camden.RC1 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Camden.RC1 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Dalston b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Dalston similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Dalston rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Dalston diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Edgware b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Edgware similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Edgware rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Edgware diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Edgware.SR5 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Edgware.SR5 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Edgware.SR5 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Edgware.SR5 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Finchley b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Finchley similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Finchley rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Finchley diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Greenwich b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Greenwich similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Greenwich rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Greenwich diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-core-tests/git/refs/remotes/origin/HEAD b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/HEAD similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-core-tests/git/refs/remotes/origin/HEAD rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/HEAD diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Hoxton b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Hoxton similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Hoxton rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/Hoxton diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/functionForStreamRelease b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/functionForStreamRelease similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/functionForStreamRelease rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/functionForStreamRelease diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/gh-pages b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/gh-pages similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/gh-pages rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/gh-pages diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/jenkins-releaser-config b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/jenkins-releaser-config similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/jenkins-releaser-config rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/jenkins-releaser-config diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/master b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/master similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/master rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/master diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/release/e-scc1355 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/release/e-scc1355 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/release/e-scc1355 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/release/e-scc1355 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/release/f-scc1355 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/release/f-scc1355 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/release/f-scc1355 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/release/f-scc1355 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/release/g-scc1355 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/release/g-scc1355 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/release/g-scc1355 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/release/g-scc1355 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/release/sca-0-1-2 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/release/sca-0-1-2 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/release/sca-0-1-2 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/release/sca-0-1-2 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/release/sca-0-2-2 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/release/sca-0-2-2 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/release/sca-0-2-2 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/release/sca-0-2-2 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/release/sca-0-9-0 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/release/sca-0-9-0 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/release/sca-0-9-0 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/release/sca-0-9-0 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/scBuild214 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/scBuild214 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/scBuild214 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/scBuild214 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/springCloudBuildRelease b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/springCloudBuildRelease similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/springCloudBuildRelease rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/springCloudBuildRelease diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/stash b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/stash similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/stash rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/stash diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/tags/vEdgware.SR6 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/vEdgware.SR6 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/tags/vEdgware.SR6 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/vEdgware.SR6 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/tags/vFinchley.SR3 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/vFinchley.SR3 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/tags/vFinchley.SR3 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/vFinchley.SR3 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/tags/vFinchley.SR4 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/vFinchley.SR4 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/tags/vFinchley.SR4 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/vFinchley.SR4 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/tags/vGreenwich.RELEASE b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/vGreenwich.RELEASE similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/tags/vGreenwich.RELEASE rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/vGreenwich.RELEASE diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/tags/vGreenwich.SR1 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/vGreenwich.SR1 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/tags/vGreenwich.SR1 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/vGreenwich.SR1 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/tags/vGreenwich.SR2 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/vGreenwich.SR2 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/tags/vGreenwich.SR2 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/vGreenwich.SR2 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/tags/vHoxton.M1 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/vHoxton.M1 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/tags/vHoxton.M1 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/vHoxton.M1 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/tags/vHoxton.M2 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/vHoxton.M2 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/tags/vHoxton.M2 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/vHoxton.M2 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/pom.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/pom.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/pom.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/pom.xml diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/spring-cloud-dependencies/pom.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/spring-cloud-dependencies/pom.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/spring-cloud-dependencies/pom.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/spring-cloud-dependencies/pom.xml diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/spring-cloud-dependencies/src/main/resources/META-INF/spring.provides b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/spring-cloud-dependencies/src/main/resources/META-INF/spring.provides similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/spring-cloud-dependencies/src/main/resources/META-INF/spring.provides rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/spring-cloud-dependencies/src/main/resources/META-INF/spring.provides diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/spring-cloud-starter-parent/pom.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/spring-cloud-starter-parent/pom.xml similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/spring-cloud-starter-parent/pom.xml rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/spring-cloud-starter-parent/pom.xml diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/spring-cloud-starter-parent/src/main/resources/META-INF/spring.provides b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/spring-cloud-starter-parent/src/main/resources/META-INF/spring.provides similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/spring-cloud-starter-parent/src/main/resources/META-INF/spring.provides rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-release/spring-cloud-starter-parent/src/main/resources/META-INF/spring.provides diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-static/current/index.html b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/current/index.html similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-static/current/index.html rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/current/index.html diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/COMMIT_EDITMSG b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/COMMIT_EDITMSG similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/COMMIT_EDITMSG rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/COMMIT_EDITMSG diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/HEAD b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/HEAD similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-release/git/HEAD rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/HEAD diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-static/git/config b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/config similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-static/git/config rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/config diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-wiki/git/description b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/description similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-wiki/git/description rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/description diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-static/git/hooks/applypatch-msg.sample b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/hooks/applypatch-msg.sample similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-static/git/hooks/applypatch-msg.sample rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/hooks/applypatch-msg.sample diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/hooks/commit-msg.sample b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/hooks/commit-msg.sample similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/hooks/commit-msg.sample rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/hooks/commit-msg.sample diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-static/git/hooks/post-update.sample b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/hooks/post-update.sample similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-static/git/hooks/post-update.sample rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/hooks/post-update.sample diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-static/git/hooks/pre-applypatch.sample b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/hooks/pre-applypatch.sample similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-static/git/hooks/pre-applypatch.sample rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/hooks/pre-applypatch.sample diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/hooks/pre-commit.sample b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/hooks/pre-commit.sample similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/hooks/pre-commit.sample rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/hooks/pre-commit.sample diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/hooks/pre-push.sample b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/hooks/pre-push.sample similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/hooks/pre-push.sample rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/hooks/pre-push.sample diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/hooks/pre-rebase.sample b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/hooks/pre-rebase.sample similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/hooks/pre-rebase.sample rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/hooks/pre-rebase.sample diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/hooks/pre-receive.sample b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/hooks/pre-receive.sample similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/hooks/pre-receive.sample rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/hooks/pre-receive.sample diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-static/git/hooks/prepare-commit-msg.sample b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/hooks/prepare-commit-msg.sample similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-static/git/hooks/prepare-commit-msg.sample rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/hooks/prepare-commit-msg.sample diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/hooks/update.sample b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/hooks/update.sample similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/hooks/update.sample rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/hooks/update.sample diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/index b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/index similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/index rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/index diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-static/git/info/exclude b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/info/exclude similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-static/git/info/exclude rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/info/exclude diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/logs/HEAD b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/logs/HEAD similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/logs/HEAD rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/logs/HEAD diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/logs/refs/heads/gh-pages b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/logs/refs/heads/gh-pages similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/logs/refs/heads/gh-pages rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/logs/refs/heads/gh-pages diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/logs/refs/heads/master b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/logs/refs/heads/master similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/logs/refs/heads/master rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/logs/refs/heads/master diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/objects/17/cd6d5f465f3de069f64a3989a9985e78c3fef6 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/objects/17/cd6d5f465f3de069f64a3989a9985e78c3fef6 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/objects/17/cd6d5f465f3de069f64a3989a9985e78c3fef6 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/objects/17/cd6d5f465f3de069f64a3989a9985e78c3fef6 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/objects/2a/12acbeaadb7e5922baed3b92a3ce90613024a0 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/objects/2a/12acbeaadb7e5922baed3b92a3ce90613024a0 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/objects/2a/12acbeaadb7e5922baed3b92a3ce90613024a0 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/objects/2a/12acbeaadb7e5922baed3b92a3ce90613024a0 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/objects/47/ac6b4ea95bf76a393e50dc806b60c37c1d3f5b b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/objects/47/ac6b4ea95bf76a393e50dc806b60c37c1d3f5b similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/objects/47/ac6b4ea95bf76a393e50dc806b60c37c1d3f5b rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/objects/47/ac6b4ea95bf76a393e50dc806b60c37c1d3f5b diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-static/git/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-static/git/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/objects/5c/60390dd52c637d7b18c830210210edfdd0b74c b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/objects/5c/60390dd52c637d7b18c830210210edfdd0b74c similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/objects/5c/60390dd52c637d7b18c830210210edfdd0b74c rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/objects/5c/60390dd52c637d7b18c830210210edfdd0b74c diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-static/git/objects/8e/e4dcbf5bdd149d009d329025ab8d63c6dde459 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/objects/8e/e4dcbf5bdd149d009d329025ab8d63c6dde459 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-static/git/objects/8e/e4dcbf5bdd149d009d329025ab8d63c6dde459 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/objects/8e/e4dcbf5bdd149d009d329025ab8d63c6dde459 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/objects/90/438acc2f6bda0d89053934d8a75ac1f151b504 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/objects/90/438acc2f6bda0d89053934d8a75ac1f151b504 similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/objects/90/438acc2f6bda0d89053934d8a75ac1f151b504 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/objects/90/438acc2f6bda0d89053934d8a75ac1f151b504 diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-static/git/objects/b0/7401b24a67be7b2d597de4aea37a45bfefdf7f b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/objects/b0/7401b24a67be7b2d597de4aea37a45bfefdf7f similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-static/git/objects/b0/7401b24a67be7b2d597de4aea37a45bfefdf7f rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/objects/b0/7401b24a67be7b2d597de4aea37a45bfefdf7f diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-static/git/objects/b3/c3459277b23d4ce095c7d269fa23b1c178dea6 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/objects/b3/c3459277b23d4ce095c7d269fa23b1c178dea6 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-static/git/objects/b3/c3459277b23d4ce095c7d269fa23b1c178dea6 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/objects/b3/c3459277b23d4ce095c7d269fa23b1c178dea6 diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-static/git/objects/cc/e10ee90ba8d558f11b2ed032163fd139819dac b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/objects/cc/e10ee90ba8d558f11b2ed032163fd139819dac similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-static/git/objects/cc/e10ee90ba8d558f11b2ed032163fd139819dac rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/objects/cc/e10ee90ba8d558f11b2ed032163fd139819dac diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-static/git/objects/e2/b1c2588f3e27555b9e7cfcf98dc3c374cd30d5 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/objects/e2/b1c2588f3e27555b9e7cfcf98dc3c374cd30d5 similarity index 100% rename from spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-static/git/objects/e2/b1c2588f3e27555b9e7cfcf98dc3c374cd30d5 rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/objects/e2/b1c2588f3e27555b9e7cfcf98dc3c374cd30d5 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/refs/heads/gh-pages b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/refs/heads/gh-pages similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/refs/heads/gh-pages rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/refs/heads/gh-pages diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/refs/heads/master b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/refs/heads/master similarity index 100% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/git/refs/heads/master rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static-angel/git/refs/heads/master diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/current/index.html b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static/current/index.html similarity index 80% rename from spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/current/index.html rename to projects/spring-cloud/src/test/resources/projects/spring-cloud-static/current/index.html index d499456d..0e3ecb98 100644 --- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/current/index.html +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-static/current/index.html @@ -1,7 +1,7 @@ - + - + + $(addBlockSwitches); +
-
-

Spring Cloud Versions

-
-
-

Gets all the available Spring Cloud release trains.

-
-
-

cURL Request

-
-
+
+

Spring Cloud Versions

+
+
+

Gets all the available Spring Cloud release trains.

+
+
+

cURL Request

+
+ 
$ curl 'http://spring-cloud-info.cfapps.io/springcloudversions' -i -X GET \
     -H 'Accept: application/json'
-
-
-
-
-

HTTPie Request

-
-
+
+
+
+
+

HTTPie Request

+
+ 
$ http GET 'http://spring-cloud-info.cfapps.io/springcloudversions' \
     'Accept:application/json'
-
-
-
-
-

HTTP Request

-
-
+
+
+
+
+

HTTP Request

+
+ 
GET /springcloudversions HTTP/1.1
 Accept: application/json
 Host: spring-cloud-info.cfapps.io
-
-
-
-
-

Response

-
-
+
+
+
+
+

Response

+
+ 
HTTP/1.1 200 OK
 Content-Length: 449
 Content-Type: application/json;charset=UTF-8
 
 ["Greenwich.SR1","Greenwich.RELEASE","Greenwich.RC2","Greenwich.RC1","Greenwich.M3","Greenwich.M2","Greenwich.M1","Finchley.SR3","Finchley.SR2","Finchley.SR1","Finchley.RELEASE","Finchley.RC2","Finchley.RC1","Finchley.M9","Finchley.M8","Finchley.M7","Finchley.M6","Finchley.M5","Finchley.M3","Finchley.M2","Finchley.M1","Edgware.SR5","Edgware.SR4","Edgware.SR3","Edgware.SR2","Edgware.SR1","Edgware.RELEASE","Edgware.M1","Dalston.SR5","Dalston.SR4"]
-
-
-
-
-

Response Fields

- ----- - - - - - - - - - - - - - - -
PathTypeDescription

[]

Array

An array versions

-
-
-
-
-

Spring Cloud Version Given Spring Boot Version

-
-
-

Gets the Spring Cloud release train version given a Spring Boot version.

-
-
-

Path Parameters

- - ---- - - - - - - - - - - - - -
Table 1. /springcloudversion/springboot/{bootVersion}
ParameterDescription

bootVersion

The Spring Boot version

-
-
-

cURL Request

-
-
+
+
+
+
+

Response Fields

+ + + + + + + + + + + + + + + + + + + + +
PathTypeDescription

[]

Array

An array versions

+
+
+
+
+

Spring Cloud Version Given Spring Boot + Version

+
+
+

Gets the Spring Cloud release train version given a Spring Boot version.

+
+
+

Path Parameters

+ + + + + + + + + + + + + + + + + + +
Table 1. /springcloudversion/springboot/{bootVersion}
ParameterDescription

bootVersion

The Spring Boot version

+
+
+

cURL Request

+
+ 
$ curl 'http://spring-cloud-info.cfapps.io/springcloudversion/springboot/2.1.1.RELEASE' -i -X GET \
     -H 'Accept: application/json'
-
-
-
-
-

HTTPie Request

-
-
+
+
+
+
+

HTTPie Request

+
+ 
$ http GET 'http://spring-cloud-info.cfapps.io/springcloudversion/springboot/2.1.1.RELEASE' \
     'Accept:application/json'
-
-
-
-
-

HTTP Request

-
-
+
+
+
+
+

HTTP Request

+
+ 
GET /springcloudversion/springboot/2.1.1.RELEASE HTTP/1.1
 Accept: application/json
 Host: spring-cloud-info.cfapps.io
-
-
-
-
-

HTTP Response

-
-
+
+
+
+
+

HTTP Response

+
+ 
HTTP/1.1 200 OK
 Content-Length: 31
 Content-Disposition: inline;filename=f.txt
 Content-Type: application/json;charset=UTF-8
 
 {"version":"Greenwich.RELEASE"}
-
-
-
-
-

Response Fields

- ----- - - - - - - - - - - - - - - -
PathTypeDescription

version

String

Spring Cloud version

-
-
-
-
-

Spring Cloud Project Versions

-
-
-

Get the Spring Cloud project versions for a given Spring Cloud release train.

-
-
-

cURL Request

-
-
+
+
+
+
+

Response Fields

+ + + + + + + + + + + + + + + + + + + + +
PathTypeDescription

version

String

Spring Cloud version

+
+
+
+
+

Spring Cloud Project Versions

+
+
+

Get the Spring Cloud project versions for a given Spring Cloud release train.

+
+
+

cURL Request

+
+ 
$ curl 'http://spring-cloud-info.cfapps.io/bomversions/Finchley.SR1' -i -X GET \
     -H 'Accept: application/json'
-
-
-
-
-

HTTPie Request

-
-
+
+
+
+
+

HTTPie Request

+
+ 
$ http GET 'http://spring-cloud-info.cfapps.io/bomversions/Finchley.SR1' \
     'Accept:application/json'
-
-
-
-
-

HTTP Request

-
-
+
+
+
+
+

HTTP Request

+
+ 
GET /bomversions/Finchley.SR1 HTTP/1.1
 Accept: application/json
 Host: spring-cloud-info.cfapps.io
-
-
-
-
-

HTTP Response

-
-
+
+
+
+
+

HTTP Response

+
+ 
HTTP/1.1 200 OK
 Content-Length: 904
 Content-Disposition: inline;filename=f.txt
 Content-Type: application/json;charset=UTF-8
 
 {"spring-cloud-cloudfoundry":"2.2.0.BUILD-SNAPSHOT","spring-cloud-openfeign":"2.2.0.BUILD-SNAPSHOT","spring-cloud-task":"2.0.0.RELEASE","spring-cloud-security":"2.2.0.BUILD-SNAPSHOT","spring-cloud-zookeeper":"2.2.0.BUILD-SNAPSHOT","spring-cloud-config":"2.2.0.BUILD-SNAPSHOT","spring-cloud-function":"2.1.0.BUILD-SNAPSHOT","spring-cloud-netflix":"2.2.0.BUILD-SNAPSHOT","spring-cloud-vault":"2.2.0.BUILD-SNAPSHOT","spring-cloud-stream":"Germantown.BUILD-SNAPSHOT","spring-cloud-gcp":"1.1.0.BUILD-SNAPSHOT","spring-cloud-sleuth":"2.2.0.BUILD-SNAPSHOT","spring-cloud-kubernetes":"1.1.0.BUILD-SNAPSHOT","spring-cloud-commons":"2.2.0.BUILD-SNAPSHOT","spring-cloud-aws":"2.2.0.BUILD-SNAPSHOT","spring-cloud-contract":"2.2.0.BUILD-SNAPSHOT","spring-cloud-bus":"2.2.0.BUILD-SNAPSHOT","spring-cloud-gateway":"2.2.0.BUILD-SNAPSHOT","spring-boot":"2.2.0.BUILD-SNAPSHOT","spring-cloud-consul":"2.2.0.BUILD-SNAPSHOT"}
-
-
-
-
-
-
-

Upcoming Spring Cloud Releases

-
-
-

Gets all the upcoming Spring Cloud releases.

-
-
-

cURL Request

-
-
+
+
+
+
+
+
+

Upcoming Spring Cloud Releases

+
+
+

Gets all the upcoming Spring Cloud releases.

+
+
+

cURL Request

+
+ 
$ curl 'http://spring-cloud-info.cfapps.io/milestones' -i -X GET \
     -H 'Accept: application/json'
-
-
-
-
-

HTTPie Request

-
-
+
+
+
+
+

HTTPie Request

+
+ 
$ http GET 'http://spring-cloud-info.cfapps.io/milestones' \
     'Accept:application/json'
-
-
-
-
-

HTTP Request

-
-
+
+
+
+
+

HTTP Request

+
+ 
GET /milestones HTTP/1.1
 Accept: application/json
 Host: spring-cloud-info.cfapps.io
-
-
-
-
-

HTTP Response

-
-
+
+
+
+
+

HTTP Response

+
+ 
HTTP/1.1 200 OK
 Content-Type: application/json;charset=UTF-8
 Content-Length: 57
 
 ["Hoxton.RELEASE","Finchley.SR4","Hoxton.M1","Hoxton.M2"]
-
-
-
-
-
-
-

Get Spring Cloud Release Date

-
-
-

Gets the tentative date given an upcoming Spring Cloud release train name.

-
-
-

Path Parameters

- - ---- - - - - - - - - - - - - -
Table 2. /milestones/{release}/duedate
ParameterDescription

release

The Spring Cloud release train name

-
-
-

cURL Request

-
-
+
+
+
+
+
+
+

Get Spring Cloud Release Date

+
+
+

Gets the tentative date given an upcoming Spring Cloud release train name.

+
+
+

Path Parameters

+ + + + + + + + + + + + + + + + + + +
Table 2. /milestones/{release}/duedate
ParameterDescription

release

The Spring Cloud release train name

+
+
+

cURL Request

+
+ 
$ curl 'http://spring-cloud-info.cfapps.io/milestones/Hoxton.RELEASE/duedate' -i -X GET \
     -H 'Accept: application/json'
-
-
-
-
-

HTTPie Request

-
-
+
+
+
+
+

HTTPie Request

+
+ 
$ http GET 'http://spring-cloud-info.cfapps.io/milestones/Hoxton.RELEASE/duedate' \
     'Accept:application/json'
-
-
-
-
-

HTTP Request

-
-
+
+
+
+
+

HTTP Request

+
+ 
GET /milestones/Hoxton.RELEASE/duedate HTTP/1.1
 Accept: application/json
 Host: spring-cloud-info.cfapps.io
-
-
-
-
-

HTTP Response

-
-
+
+
+
+
+

HTTP Response

+
+ 
HTTP/1.1 200 OK
 Content-Type: application/json;charset=UTF-8
 Content-Length: 24
 
 {"dueDate":"2019-07-31"}
+
+
+
+
+

Response Fields

+ + + + + + + + + + + + + + + + + + + + +
PathTypeDescription

dueDate

String

Spring Cloud milestone due date

+
+
+
-
-
-
-

Response Fields

- ----- - - - - - - - - - - - - - - -
PathTypeDescription

dueDate

String

Spring Cloud milestone due date

-
-
-
-
- - - + + + diff --git a/spring-cloud-info/src/test/java/org/springframework/cloud/info/SpringCloudInfoRestControllerTests.java b/spring-cloud-info/src/test/java/org/springframework/cloud/info/SpringCloudInfoRestControllerTests.java index 8bb44f1e..5973e90c 100644 --- a/spring-cloud-info/src/test/java/org/springframework/cloud/info/SpringCloudInfoRestControllerTests.java +++ b/spring-cloud-info/src/test/java/org/springframework/cloud/info/SpringCloudInfoRestControllerTests.java @@ -56,15 +56,15 @@ public class SpringCloudInfoRestControllerTests { @Rule public JUnitRestDocumentation restDocumentation = new JUnitRestDocumentation(); + @MockBean + SpringCloudInfoService springCloudInfoService; + @Autowired private MockMvc mockMvc; @Autowired private WebApplicationContext context; - @MockBean - SpringCloudInfoService springCloudInfoService; - @Before public void setUp() { this.mockMvc = MockMvcBuilders.webAppContextSetup(this.context) diff --git a/spring-cloud-info/src/test/java/org/springframework/cloud/info/SpringCloudInfoTestData.java b/spring-cloud-info/src/test/java/org/springframework/cloud/info/SpringCloudInfoTestData.java index d157790d..6381a575 100644 --- a/spring-cloud-info/src/test/java/org/springframework/cloud/info/SpringCloudInfoTestData.java +++ b/spring-cloud-info/src/test/java/org/springframework/cloud/info/SpringCloudInfoTestData.java @@ -26,11 +26,12 @@ import java.util.Map; */ public final class SpringCloudInfoTestData { - private SpringCloudInfoTestData() { - throw new IllegalStateException("Can't instantiate utility class"); - } - public static Map releaseVersions = new HashMap<>(); + + public static List springCloudVersions = new ArrayList<>(); + + public static Map milestoneStrings = new HashMap<>(); + static { releaseVersions.put("spring-boot", "2.2.0.BUILD-SNAPSHOT"); releaseVersions.put("spring-cloud-aws", "2.2.0.BUILD-SNAPSHOT"); @@ -54,7 +55,6 @@ public final class SpringCloudInfoTestData { releaseVersions.put("spring-cloud-zookeeper", "2.2.0.BUILD-SNAPSHOT"); } - public static List springCloudVersions = new ArrayList<>(); static { springCloudVersions.add("vGreenwich.SR1"); springCloudVersions.add("vGreenwich.RELEASE"); @@ -88,7 +88,6 @@ public final class SpringCloudInfoTestData { springCloudVersions.add("vDalston.SR4"); } - public static Map milestoneStrings = new HashMap<>(); static { milestoneStrings.put("Hoxton.M1", "2019-05-23T07:00:00Z"); milestoneStrings.put("Hoxton.M2", "2019-06-27T07:00:00Z"); @@ -96,4 +95,8 @@ public final class SpringCloudInfoTestData { milestoneStrings.put("Finchley.SR4", null); } + private SpringCloudInfoTestData() { + throw new IllegalStateException("Can't instantiate utility class"); + } + } diff --git a/spring-cloud-info/src/test/resources/spring-cloud-versions.json b/spring-cloud-info/src/test/resources/spring-cloud-versions.json index 8f208a0f..81516172 100644 --- a/spring-cloud-info/src/test/resources/spring-cloud-versions.json +++ b/spring-cloud-info/src/test/resources/spring-cloud-versions.json @@ -1,302 +1,302 @@ [ { - "name":"vGreenwich.SR1", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vGreenwich.SR1", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vGreenwich.SR1", - "commit":{ - "sha":"a9c903373dbfe70bf20410d242c026d700886678", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/a9c903373dbfe70bf20410d242c026d700886678" + "name": "vGreenwich.SR1", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vGreenwich.SR1", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vGreenwich.SR1", + "commit": { + "sha": "a9c903373dbfe70bf20410d242c026d700886678", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/a9c903373dbfe70bf20410d242c026d700886678" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkdyZWVud2ljaC5TUjE=" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkdyZWVud2ljaC5TUjE=" }, { - "name":"vGreenwich.RELEASE", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vGreenwich.RELEASE", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vGreenwich.RELEASE", - "commit":{ - "sha":"b14ede22cb5de30c31cd50aa240cb321197ef8ef", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/b14ede22cb5de30c31cd50aa240cb321197ef8ef" + "name": "vGreenwich.RELEASE", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vGreenwich.RELEASE", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vGreenwich.RELEASE", + "commit": { + "sha": "b14ede22cb5de30c31cd50aa240cb321197ef8ef", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/b14ede22cb5de30c31cd50aa240cb321197ef8ef" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkdyZWVud2ljaC5SRUxFQVNF" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkdyZWVud2ljaC5SRUxFQVNF" }, { - "name":"vGreenwich.RC2", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vGreenwich.RC2", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vGreenwich.RC2", - "commit":{ - "sha":"b5a008184bf4bbacab18c6ac3e6f762fe557dbec", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/b5a008184bf4bbacab18c6ac3e6f762fe557dbec" + "name": "vGreenwich.RC2", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vGreenwich.RC2", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vGreenwich.RC2", + "commit": { + "sha": "b5a008184bf4bbacab18c6ac3e6f762fe557dbec", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/b5a008184bf4bbacab18c6ac3e6f762fe557dbec" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkdyZWVud2ljaC5SQzI=" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkdyZWVud2ljaC5SQzI=" }, { - "name":"vGreenwich.RC1", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vGreenwich.RC1", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vGreenwich.RC1", - "commit":{ - "sha":"c0f6f9acd93dc50051c880568c934a01c70a2092", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/c0f6f9acd93dc50051c880568c934a01c70a2092" + "name": "vGreenwich.RC1", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vGreenwich.RC1", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vGreenwich.RC1", + "commit": { + "sha": "c0f6f9acd93dc50051c880568c934a01c70a2092", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/c0f6f9acd93dc50051c880568c934a01c70a2092" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkdyZWVud2ljaC5SQzE=" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkdyZWVud2ljaC5SQzE=" }, { - "name":"vGreenwich.M3", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vGreenwich.M3", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vGreenwich.M3", - "commit":{ - "sha":"96ff83431ace468e48b5dfa3215d05b25c83e009", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/96ff83431ace468e48b5dfa3215d05b25c83e009" + "name": "vGreenwich.M3", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vGreenwich.M3", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vGreenwich.M3", + "commit": { + "sha": "96ff83431ace468e48b5dfa3215d05b25c83e009", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/96ff83431ace468e48b5dfa3215d05b25c83e009" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkdyZWVud2ljaC5NMw==" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkdyZWVud2ljaC5NMw==" }, { - "name":"vGreenwich.M2", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vGreenwich.M2", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vGreenwich.M2", - "commit":{ - "sha":"28ba483beb02b874013eb29a3cdeb09c1394998a", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/28ba483beb02b874013eb29a3cdeb09c1394998a" + "name": "vGreenwich.M2", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vGreenwich.M2", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vGreenwich.M2", + "commit": { + "sha": "28ba483beb02b874013eb29a3cdeb09c1394998a", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/28ba483beb02b874013eb29a3cdeb09c1394998a" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkdyZWVud2ljaC5NMg==" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkdyZWVud2ljaC5NMg==" }, { - "name":"vGreenwich.M1", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vGreenwich.M1", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vGreenwich.M1", - "commit":{ - "sha":"864aad4350d7c07a3b975d0522cb9f0a3442eec0", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/864aad4350d7c07a3b975d0522cb9f0a3442eec0" + "name": "vGreenwich.M1", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vGreenwich.M1", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vGreenwich.M1", + "commit": { + "sha": "864aad4350d7c07a3b975d0522cb9f0a3442eec0", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/864aad4350d7c07a3b975d0522cb9f0a3442eec0" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkdyZWVud2ljaC5NMQ==" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkdyZWVud2ljaC5NMQ==" }, { - "name":"vFinchley.SR3", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vFinchley.SR3", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vFinchley.SR3", - "commit":{ - "sha":"ce81fa120aef0d00a8c95664b373377eca8de3d7", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/ce81fa120aef0d00a8c95664b373377eca8de3d7" + "name": "vFinchley.SR3", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vFinchley.SR3", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vFinchley.SR3", + "commit": { + "sha": "ce81fa120aef0d00a8c95664b373377eca8de3d7", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/ce81fa120aef0d00a8c95664b373377eca8de3d7" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkZpbmNobGV5LlNSMw==" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkZpbmNobGV5LlNSMw==" }, { - "name":"vFinchley.SR2", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vFinchley.SR2", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vFinchley.SR2", - "commit":{ - "sha":"34ea6d4e2e751159589113d25f4a6510e4ed374b", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/34ea6d4e2e751159589113d25f4a6510e4ed374b" + "name": "vFinchley.SR2", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vFinchley.SR2", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vFinchley.SR2", + "commit": { + "sha": "34ea6d4e2e751159589113d25f4a6510e4ed374b", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/34ea6d4e2e751159589113d25f4a6510e4ed374b" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkZpbmNobGV5LlNSMg==" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkZpbmNobGV5LlNSMg==" }, { - "name":"vFinchley.SR1", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vFinchley.SR1", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vFinchley.SR1", - "commit":{ - "sha":"b3e3ab5f0e3badeaf4fab0d432c8881327c00a16", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/b3e3ab5f0e3badeaf4fab0d432c8881327c00a16" + "name": "vFinchley.SR1", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vFinchley.SR1", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vFinchley.SR1", + "commit": { + "sha": "b3e3ab5f0e3badeaf4fab0d432c8881327c00a16", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/b3e3ab5f0e3badeaf4fab0d432c8881327c00a16" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkZpbmNobGV5LlNSMQ==" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkZpbmNobGV5LlNSMQ==" }, { - "name":"vFinchley.RELEASE", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vFinchley.RELEASE", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vFinchley.RELEASE", - "commit":{ - "sha":"f7c64759e431b583d5da11422b7b67a2a323c5c8", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/f7c64759e431b583d5da11422b7b67a2a323c5c8" + "name": "vFinchley.RELEASE", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vFinchley.RELEASE", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vFinchley.RELEASE", + "commit": { + "sha": "f7c64759e431b583d5da11422b7b67a2a323c5c8", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/f7c64759e431b583d5da11422b7b67a2a323c5c8" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkZpbmNobGV5LlJFTEVBU0U=" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkZpbmNobGV5LlJFTEVBU0U=" }, { - "name":"vFinchley.RC2", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vFinchley.RC2", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vFinchley.RC2", - "commit":{ - "sha":"04dbea43b6f9b42b8b4b68a04b698df56b99b438", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/04dbea43b6f9b42b8b4b68a04b698df56b99b438" + "name": "vFinchley.RC2", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vFinchley.RC2", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vFinchley.RC2", + "commit": { + "sha": "04dbea43b6f9b42b8b4b68a04b698df56b99b438", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/04dbea43b6f9b42b8b4b68a04b698df56b99b438" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkZpbmNobGV5LlJDMg==" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkZpbmNobGV5LlJDMg==" }, { - "name":"vFinchley.RC1", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vFinchley.RC1", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vFinchley.RC1", - "commit":{ - "sha":"54ea18c4aee39654dbc4ffdf1808fb79654ec035", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/54ea18c4aee39654dbc4ffdf1808fb79654ec035" + "name": "vFinchley.RC1", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vFinchley.RC1", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vFinchley.RC1", + "commit": { + "sha": "54ea18c4aee39654dbc4ffdf1808fb79654ec035", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/54ea18c4aee39654dbc4ffdf1808fb79654ec035" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkZpbmNobGV5LlJDMQ==" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkZpbmNobGV5LlJDMQ==" }, { - "name":"vFinchley.M9", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vFinchley.M9", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vFinchley.M9", - "commit":{ - "sha":"2ed336bd8719ef2096390d4cb905c1b779046f0c", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/2ed336bd8719ef2096390d4cb905c1b779046f0c" + "name": "vFinchley.M9", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vFinchley.M9", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vFinchley.M9", + "commit": { + "sha": "2ed336bd8719ef2096390d4cb905c1b779046f0c", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/2ed336bd8719ef2096390d4cb905c1b779046f0c" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkZpbmNobGV5Lk05" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkZpbmNobGV5Lk05" }, { - "name":"vFinchley.M8", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vFinchley.M8", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vFinchley.M8", - "commit":{ - "sha":"eecc0e960b8b7e2bfd4c67138d4b88df43f9b7b6", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/eecc0e960b8b7e2bfd4c67138d4b88df43f9b7b6" + "name": "vFinchley.M8", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vFinchley.M8", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vFinchley.M8", + "commit": { + "sha": "eecc0e960b8b7e2bfd4c67138d4b88df43f9b7b6", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/eecc0e960b8b7e2bfd4c67138d4b88df43f9b7b6" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkZpbmNobGV5Lk04" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkZpbmNobGV5Lk04" }, { - "name":"vFinchley.M7", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vFinchley.M7", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vFinchley.M7", - "commit":{ - "sha":"2377cfd5386bc985d6d13bf3d9605249d66538e4", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/2377cfd5386bc985d6d13bf3d9605249d66538e4" + "name": "vFinchley.M7", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vFinchley.M7", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vFinchley.M7", + "commit": { + "sha": "2377cfd5386bc985d6d13bf3d9605249d66538e4", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/2377cfd5386bc985d6d13bf3d9605249d66538e4" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkZpbmNobGV5Lk03" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkZpbmNobGV5Lk03" }, { - "name":"vFinchley.M6", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vFinchley.M6", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vFinchley.M6", - "commit":{ - "sha":"3fbd9d7086627a1453c61e92e79259a2f3c3c8c1", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/3fbd9d7086627a1453c61e92e79259a2f3c3c8c1" + "name": "vFinchley.M6", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vFinchley.M6", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vFinchley.M6", + "commit": { + "sha": "3fbd9d7086627a1453c61e92e79259a2f3c3c8c1", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/3fbd9d7086627a1453c61e92e79259a2f3c3c8c1" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkZpbmNobGV5Lk02" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkZpbmNobGV5Lk02" }, { - "name":"vFinchley.M5", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vFinchley.M5", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vFinchley.M5", - "commit":{ - "sha":"2be145fa2dc7a8afe5f379920300b029b439ffeb", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/2be145fa2dc7a8afe5f379920300b029b439ffeb" + "name": "vFinchley.M5", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vFinchley.M5", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vFinchley.M5", + "commit": { + "sha": "2be145fa2dc7a8afe5f379920300b029b439ffeb", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/2be145fa2dc7a8afe5f379920300b029b439ffeb" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkZpbmNobGV5Lk01" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkZpbmNobGV5Lk01" }, { - "name":"vFinchley.M3", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vFinchley.M3", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vFinchley.M3", - "commit":{ - "sha":"e7362196ec5a5d9761a2668e4ef91a3ea3345a61", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/e7362196ec5a5d9761a2668e4ef91a3ea3345a61" + "name": "vFinchley.M3", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vFinchley.M3", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vFinchley.M3", + "commit": { + "sha": "e7362196ec5a5d9761a2668e4ef91a3ea3345a61", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/e7362196ec5a5d9761a2668e4ef91a3ea3345a61" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkZpbmNobGV5Lk0z" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkZpbmNobGV5Lk0z" }, { - "name":"vFinchley.M2", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vFinchley.M2", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vFinchley.M2", - "commit":{ - "sha":"fbac1e822c91cf2acfc542a01d2aae758e9143e8", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/fbac1e822c91cf2acfc542a01d2aae758e9143e8" + "name": "vFinchley.M2", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vFinchley.M2", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vFinchley.M2", + "commit": { + "sha": "fbac1e822c91cf2acfc542a01d2aae758e9143e8", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/fbac1e822c91cf2acfc542a01d2aae758e9143e8" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkZpbmNobGV5Lk0y" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkZpbmNobGV5Lk0y" }, { - "name":"vFinchley.M1", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vFinchley.M1", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vFinchley.M1", - "commit":{ - "sha":"af82b2d3ba2213dedd431f69e733923fbd81d11e", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/af82b2d3ba2213dedd431f69e733923fbd81d11e" + "name": "vFinchley.M1", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vFinchley.M1", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vFinchley.M1", + "commit": { + "sha": "af82b2d3ba2213dedd431f69e733923fbd81d11e", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/af82b2d3ba2213dedd431f69e733923fbd81d11e" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkZpbmNobGV5Lk0x" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkZpbmNobGV5Lk0x" }, { - "name":"vEdgware.SR5", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vEdgware.SR5", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vEdgware.SR5", - "commit":{ - "sha":"e913188e3ad1f2eaff7789d2738c5c27a8d81393", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/e913188e3ad1f2eaff7789d2738c5c27a8d81393" + "name": "vEdgware.SR5", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vEdgware.SR5", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vEdgware.SR5", + "commit": { + "sha": "e913188e3ad1f2eaff7789d2738c5c27a8d81393", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/e913188e3ad1f2eaff7789d2738c5c27a8d81393" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkVkZ3dhcmUuU1I1" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkVkZ3dhcmUuU1I1" }, { - "name":"vEdgware.SR4", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vEdgware.SR4", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vEdgware.SR4", - "commit":{ - "sha":"8a05a2f6b796777671c88b83526b8af79a1f59e1", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/8a05a2f6b796777671c88b83526b8af79a1f59e1" + "name": "vEdgware.SR4", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vEdgware.SR4", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vEdgware.SR4", + "commit": { + "sha": "8a05a2f6b796777671c88b83526b8af79a1f59e1", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/8a05a2f6b796777671c88b83526b8af79a1f59e1" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkVkZ3dhcmUuU1I0" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkVkZ3dhcmUuU1I0" }, { - "name":"vEdgware.SR3", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vEdgware.SR3", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vEdgware.SR3", - "commit":{ - "sha":"c20a51ae0f0066ea221597b5e86b5b55dca1a2af", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/c20a51ae0f0066ea221597b5e86b5b55dca1a2af" + "name": "vEdgware.SR3", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vEdgware.SR3", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vEdgware.SR3", + "commit": { + "sha": "c20a51ae0f0066ea221597b5e86b5b55dca1a2af", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/c20a51ae0f0066ea221597b5e86b5b55dca1a2af" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkVkZ3dhcmUuU1Iz" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkVkZ3dhcmUuU1Iz" }, { - "name":"vEdgware.SR2", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vEdgware.SR2", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vEdgware.SR2", - "commit":{ - "sha":"759413db879f79656ed9350e04b26dbc7a133992", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/759413db879f79656ed9350e04b26dbc7a133992" + "name": "vEdgware.SR2", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vEdgware.SR2", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vEdgware.SR2", + "commit": { + "sha": "759413db879f79656ed9350e04b26dbc7a133992", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/759413db879f79656ed9350e04b26dbc7a133992" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkVkZ3dhcmUuU1Iy" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkVkZ3dhcmUuU1Iy" }, { - "name":"vEdgware.SR1", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vEdgware.SR1", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vEdgware.SR1", - "commit":{ - "sha":"35e48e2fd1740ff7ae821fc3e61337c215737bb8", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/35e48e2fd1740ff7ae821fc3e61337c215737bb8" + "name": "vEdgware.SR1", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vEdgware.SR1", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vEdgware.SR1", + "commit": { + "sha": "35e48e2fd1740ff7ae821fc3e61337c215737bb8", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/35e48e2fd1740ff7ae821fc3e61337c215737bb8" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkVkZ3dhcmUuU1Ix" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkVkZ3dhcmUuU1Ix" }, { - "name":"vEdgware.RELEASE", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vEdgware.RELEASE", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vEdgware.RELEASE", - "commit":{ - "sha":"e39b986ec68d0a7b8b4a56281adfb9de096def53", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/e39b986ec68d0a7b8b4a56281adfb9de096def53" + "name": "vEdgware.RELEASE", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vEdgware.RELEASE", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vEdgware.RELEASE", + "commit": { + "sha": "e39b986ec68d0a7b8b4a56281adfb9de096def53", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/e39b986ec68d0a7b8b4a56281adfb9de096def53" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkVkZ3dhcmUuUkVMRUFTRQ==" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkVkZ3dhcmUuUkVMRUFTRQ==" }, { - "name":"vEdgware.M1", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vEdgware.M1", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vEdgware.M1", - "commit":{ - "sha":"5fce865896095137266c788a84ba9843f6781882", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/5fce865896095137266c788a84ba9843f6781882" + "name": "vEdgware.M1", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vEdgware.M1", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vEdgware.M1", + "commit": { + "sha": "5fce865896095137266c788a84ba9843f6781882", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/5fce865896095137266c788a84ba9843f6781882" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkVkZ3dhcmUuTTE=" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkVkZ3dhcmUuTTE=" }, { - "name":"vDalston.SR5", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vDalston.SR5", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vDalston.SR5", - "commit":{ - "sha":"d989c6b96590a8bafef5c0352908fcd4673836db", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/d989c6b96590a8bafef5c0352908fcd4673836db" + "name": "vDalston.SR5", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vDalston.SR5", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vDalston.SR5", + "commit": { + "sha": "d989c6b96590a8bafef5c0352908fcd4673836db", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/d989c6b96590a8bafef5c0352908fcd4673836db" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkRhbHN0b24uU1I1" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkRhbHN0b24uU1I1" }, { - "name":"vDalston.SR4", - "zipball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vDalston.SR4", - "tarball_url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vDalston.SR4", - "commit":{ - "sha":"28c14699695a76843a6d1c347b1f21055d83ca62", - "url":"https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/28c14699695a76843a6d1c347b1f21055d83ca62" + "name": "vDalston.SR4", + "zipball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/zipball/vDalston.SR4", + "tarball_url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/tarball/vDalston.SR4", + "commit": { + "sha": "28c14699695a76843a6d1c347b1f21055d83ca62", + "url": "https://api.github.com/repos/spring-cloud/spring-cloud-release/commits/28c14699695a76843a6d1c347b1f21055d83ca62" }, - "node_id":"MDM6UmVmMjI0ODI2NjQ6dkRhbHN0b24uU1I0" + "node_id": "MDM6UmVmMjI0ODI2NjQ6dkRhbHN0b24uU1I0" } ] \ No newline at end of file diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/tech/MakeBuildUnstableException.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/tech/MakeBuildUnstableException.java deleted file mode 100644 index 0dec6586..00000000 --- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/tech/MakeBuildUnstableException.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2013-2019 the original author or authors. - * - * 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 - * - * https://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. - */ - -package org.springframework.cloud.release.internal.tech; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Exception to be thrown if one wants to continue with the build and throw this exception - * at the end of the release. - * - * @author Marcin Grzejszczak - */ -public class MakeBuildUnstableException extends RuntimeException { - - private static final Logger log = LoggerFactory - .getLogger(MakeBuildUnstableException.class); - - public MakeBuildUnstableException(Throwable cause) { - super(cause); - log.error("\n\n[BUILD UNSTABLE] WARNING!", cause); - } - - public MakeBuildUnstableException(String message) { - super(message); - log.error("\n\n[BUILD UNSTABLE] WARNING! " + message); - } - - public MakeBuildUnstableException(String message, Throwable cause) { - super(message, cause); - log.error("\n\n[BUILD UNSTABLE] WARNING! " + message, cause); - } - -} diff --git a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/buildsystem/MavenBomParserAccessor.java b/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/buildsystem/MavenBomParserAccessor.java deleted file mode 100644 index dd8c8d96..00000000 --- a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/buildsystem/MavenBomParserAccessor.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2013-2019 the original author or authors. - * - * 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 - * - * https://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. - */ - -package org.springframework.cloud.release.internal.buildsystem; - -import java.util.Collections; - -import org.springframework.cloud.release.cloud.buildsystem.SpringCloudMavenBomParserAccessor; -import org.springframework.cloud.release.internal.ReleaserProperties; - -public class MavenBomParserAccessor { - - public static BomParser cloudMavenBomParser(ReleaserProperties properties) { - return new MavenBomParser(properties, - Collections.singletonList(SpringCloudMavenBomParserAccessor.cloud())); - } - -} diff --git a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/buildsystem/MavenBomParserTests.java b/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/buildsystem/MavenBomParserTests.java deleted file mode 100644 index 660b36ad..00000000 --- a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/buildsystem/MavenBomParserTests.java +++ /dev/null @@ -1,179 +0,0 @@ -/* - * Copyright 2013-2019 the original author or authors. - * - * 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 - * - * https://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. - */ - -package org.springframework.cloud.release.internal.buildsystem; - -import java.io.File; -import java.net.URISyntaxException; - -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -import org.springframework.cloud.release.internal.ReleaserProperties; -import org.springframework.cloud.release.internal.git.GitRepoTests; -import org.springframework.cloud.release.internal.project.Project; - -import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.api.BDDAssertions.thenThrownBy; - -/** - * @author Marcin Grzejszczak - */ -public class MavenBomParserTests { - - File springCloudReleaseProject; - - ReleaserProperties properties = new ReleaserProperties(); - - @Before - public void setup() throws URISyntaxException { - this.springCloudReleaseProject = new File( - GitRepoTests.class.getResource("/projects/spring-cloud-release").toURI()); - } - - @Test - @Ignore("flakey") - public void should_throw_exception_when_boot_pom_is_missing() { - BomParser parser = MavenBomParserAccessor.cloudMavenBomParser(this.properties); - File file = new File("."); - - thenThrownBy(() -> parser.versionsFromBom(file)) - .isInstanceOf(IllegalStateException.class) - .hasMessageContaining("Pom is not present"); - } - - @Test - public void should_throw_exception_when_null_is_passed_to_boot() { - this.properties.getPom().setPomWithBootStarterParent(null); - this.properties.getPom().setThisTrainBom(null); - BomParser parser = MavenBomParserAccessor.cloudMavenBomParser(this.properties); - - thenThrownBy(() -> parser.versionsFromBom(this.springCloudReleaseProject)) - .isInstanceOf(IllegalStateException.class) - .hasMessageContaining("Pom is not present"); - } - - @Test - @Ignore("flakey") - public void should_throw_exception_when_boot_version_is_missing_in_pom() { - this.properties.getPom().setPomWithBootStarterParent("pom.xml"); - BomParser parser = MavenBomParserAccessor.cloudMavenBomParser(this.properties); - - thenThrownBy(() -> parser.versionsFromBom(this.springCloudReleaseProject)) - .isInstanceOf(IllegalStateException.class).hasMessageContaining( - "The pom doesn't have a [spring-boot-starter-parent] artifact id"); - } - - @Test - public void should_populate_sc_release_version() { - BomParser parser = MavenBomParserAccessor.cloudMavenBomParser(this.properties); - - String scReleaseVersion = parser.versionsFromBom(this.springCloudReleaseProject) - .versionForProject("spring-cloud-release"); - - then(scReleaseVersion).isEqualTo("Dalston.BUILD-SNAPSHOT"); - } - - @Test - public void should_populate_boot_version() { - BomParser parser = MavenBomParserAccessor.cloudMavenBomParser(this.properties); - - String bootVersion = parser.versionsFromBom(this.springCloudReleaseProject) - .versionForProject("spring-boot"); - - then(bootVersion).isEqualTo("1.5.1.BUILD-SNAPSHOT"); - } - - @Test - public void should_throw_exception_when_cloud_pom_is_missing() { - BomParser parser = MavenBomParserAccessor.cloudMavenBomParser(this.properties); - - thenThrownBy(() -> parser.versionsFromBom(new File("."))) - .isInstanceOf(IllegalStateException.class) - .hasMessageContaining("Pom is not present"); - } - - @Test - public void should_throw_exception_when_null_is_passed_to_cloud() { - this.properties.getPom().setPomWithBootStarterParent(null); - this.properties.getPom().setThisTrainBom(null); - BomParser parser = MavenBomParserAccessor.cloudMavenBomParser(this.properties); - - thenThrownBy(() -> parser.versionsFromBom(this.springCloudReleaseProject)) - .isInstanceOf(IllegalStateException.class) - .hasMessageContaining("Pom is not present"); - } - - @Test - public void should_throw_exception_when_cloud_version_is_missing_in_pom() { - this.properties.getPom().setPomWithBootStarterParent("pom.xml"); - this.properties.getPom().setThisTrainBom("pom.xml"); - BomParser parser = MavenBomParserAccessor.cloudMavenBomParser(this.properties); - - thenThrownBy(() -> parser.versionsFromBom(this.springCloudReleaseProject)) - .isInstanceOf(IllegalStateException.class).hasMessageContaining( - "The pom doesn't have a [spring-cloud-dependencies-parent] artifact id"); - } - - @Test - public void should_populate_cloud_version() { - BomParser parser = MavenBomParserAccessor.cloudMavenBomParser(this.properties); - - VersionsFromBom cloudVersionsFromBom = parser - .versionsFromBom(this.springCloudReleaseProject); - - then(cloudVersionsFromBom.versionForProject("spring-cloud-build")) - .isEqualTo("1.3.1.BUILD-SNAPSHOT"); - then(cloudVersionsFromBom.projects).contains(allProjects()); - } - - @Test - public void should_populate_boot_and_cloud_version() { - BomParser parser = MavenBomParserAccessor.cloudMavenBomParser(this.properties); - - VersionsFromBom cloudVersionsFromBom = parser - .versionsFromBom(this.springCloudReleaseProject); - - then(cloudVersionsFromBom.versionForProject("spring-boot")) - .isEqualTo("1.5.1.BUILD-SNAPSHOT"); - then(cloudVersionsFromBom.versionForProject("spring-cloud-build")) - .isEqualTo("1.3.1.BUILD-SNAPSHOT"); - then(cloudVersionsFromBom.projects).contains(allProjects()); - } - - private Project[] allProjects() { - return new Project[] { project("spring-cloud-aws", "1.2.0.BUILD-SNAPSHOT"), - project("spring-cloud-bus", "1.3.0.BUILD-SNAPSHOT"), - project("spring-cloud-contract", "1.1.0.BUILD-SNAPSHOT"), - project("spring-cloud-cloudfoundry", "1.1.0.BUILD-SNAPSHOT"), - project("spring-cloud-commons", "1.2.0.BUILD-SNAPSHOT"), - project("spring-cloud-config", "1.3.0.BUILD-SNAPSHOT"), - project("spring-cloud-netflix", "1.3.0.BUILD-SNAPSHOT"), - project("spring-cloud-security", "1.2.0.BUILD-SNAPSHOT"), - project("spring-cloud-consul", "1.2.0.BUILD-SNAPSHOT"), - project("spring-cloud-sleuth", "1.2.0.BUILD-SNAPSHOT"), - project("spring-cloud-stream", "Chelsea.BUILD-SNAPSHOT"), - project("spring-cloud-task", "1.1.2.BUILD-SNAPSHOT"), - project("spring-cloud-vault", "1.0.0.BUILD-SNAPSHOT"), - project("spring-cloud-zookeeper", "1.1.0.BUILD-SNAPSHOT") }; - } - - Project project(String name, String value) { - return new Project(name, value); - } - -} diff --git a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/ReleaserApplication.java b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/ReleaserApplication.java deleted file mode 100644 index d747443c..00000000 --- a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/ReleaserApplication.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright 2013-2019 the original author or authors. - * - * 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 - * - * https://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. - */ - -package org.springframework.cloud.release; - -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.CommandLineRunner; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.WebApplicationType; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.release.internal.options.Options; -import org.springframework.cloud.release.internal.options.Parser; -import org.springframework.cloud.release.internal.spring.SpringReleaser; -import org.springframework.cloud.release.internal.tech.MakeBuildUnstableException; -import org.springframework.core.NestedExceptionUtils; - -@SpringBootApplication -public class ReleaserApplication implements CommandLineRunner { - - private static final Logger log = LoggerFactory.getLogger(ReleaserApplication.class); - - @Autowired - SpringReleaser releaser; - - @Autowired - Parser parser; - - public static void main(String[] args) { - SpringApplication application = new SpringApplication(ReleaserApplication.class); - application.setWebApplicationType(WebApplicationType.NONE); - application.run(args); - } - - @Override - public void run(String... strings) { - Options options = this.parser.parse(strings); - try { - this.releaser.release(options); - } - catch (MakeBuildUnstableException ex) { - handleUnstableException(ex); - } - catch (Throwable th) { - log.error("Exception occurred for the releaser", th); - Throwable mostSpecificCause = NestedExceptionUtils.getMostSpecificCause(th); - if (mostSpecificCause instanceof MakeBuildUnstableException) { - handleUnstableException((MakeBuildUnstableException) mostSpecificCause); - } - else { - throw th; - } - } - handleStableBuild(); - System.exit(0); - } - - private void handleUnstableException(MakeBuildUnstableException ex) { - log.error( - "[BUILD UNSTABLE] The following exceptions took place in the post release process", - ex); - log.error( - "[BUILD UNSTABLE] The release happened successfully, but there were post release issues"); - log.error("[BUILD UNSTABLE] An exception that should make " - + "the build unstable occurred. Will not throw an exception."); - File buildStatus = new File("build_status"); - try { - buildStatus.createNewFile(); - String text = "[BUILD UNSTABLE] The release happened successfully, but there were post release issues"; - Files.write(buildStatus.toPath(), text.getBytes()); - } - catch (IOException e) { - throw new IllegalStateException( - "[BUILD UNSTABLE] Couldn't create a file to show that the build is unstable"); - } - } - - private void handleStableBuild() { - File buildStatus = new File("build_status"); - if (buildStatus.exists()) { - log.info("Build status file has already been created!"); - return; - } - try { - buildStatus.createNewFile(); - String text = "[BUILD STABLE] All the release steps have been successfully executed!"; - Files.write(buildStatus.toPath(), text.getBytes()); - } - catch (IOException e) { - log.info("Failed to store the file but the build was stable"); - } - } - -} diff --git a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/buildsystem/BuildsystemConfiguration.java b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/buildsystem/BuildsystemConfiguration.java deleted file mode 100644 index e40f24e5..00000000 --- a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/buildsystem/BuildsystemConfiguration.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2013-2019 the original author or authors. - * - * 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 - * - * https://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. - */ - -package org.springframework.cloud.release.internal.buildsystem; - -import java.util.ArrayList; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.release.internal.ReleaserProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -class BuildsystemConfiguration { - - @Autowired - ReleaserProperties releaserProperties; - - @Autowired(required = false) - List customBomParsers = new ArrayList<>(); - - @Bean - BomParser mavenBomParser() { - return new MavenBomParser(this.releaserProperties, this.customBomParsers); - } - - @Bean - BomParser gradleBomParser() { - return new GradleBomParser(this.releaserProperties, this.customBomParsers); - } - - @Bean - ProjectPomUpdater pomUpdater(List bomParsers) { - return new ProjectPomUpdater(this.releaserProperties, bomParsers); - } - -} diff --git a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/Args.java b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/Args.java deleted file mode 100644 index b6d36c2f..00000000 --- a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/Args.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Copyright 2013-2019 the original author or authors. - * - * 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 - * - * https://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. - */ - -package org.springframework.cloud.release.internal.spring; - -import java.io.File; -import java.util.Collections; -import java.util.List; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.springframework.cloud.release.internal.Releaser; -import org.springframework.cloud.release.internal.ReleaserProperties; -import org.springframework.cloud.release.internal.project.ProcessedProject; -import org.springframework.cloud.release.internal.project.ProjectVersion; -import org.springframework.cloud.release.internal.project.Projects; -import org.springframework.context.ApplicationEvent; -import org.springframework.context.ApplicationEventPublisher; - -/** - * @author Marcin Grzejszczak - */ -class Args { - - private static final Logger log = LoggerFactory.getLogger(Args.class); - - final Releaser releaser; - - final File project; - - final Projects projects; - - final ProjectVersion originalVersion; - - final ProjectVersion versionFromBom; - - final ReleaserProperties properties; - - final List processedProjects; - - final boolean interactive; - - final TaskType taskType; - - final ApplicationEventPublisher applicationEventPublisher; - - Args(Releaser releaser, File project, Projects projects, - ProjectVersion originalVersion, ProjectVersion versionFromBom, - ReleaserProperties properties, boolean interactive, TaskType taskType, - ApplicationEventPublisher applicationEventPublisher) { - this.releaser = releaser; - this.project = project; - this.projects = projects; - this.originalVersion = originalVersion; - this.versionFromBom = versionFromBom; - this.properties = properties; - this.processedProjects = Collections.singletonList( - new ProcessedProject(properties, versionFromBom, originalVersion)); - this.interactive = interactive; - this.taskType = taskType; - this.applicationEventPublisher = applicationEventPublisher; - } - - // Used by meta-release task - Args(Releaser releaser, Projects projects, ProjectVersion versionFromBom, - ReleaserProperties properties, List processedProjects, - boolean interactive, ApplicationEventPublisher applicationEventPublisher) { - this.releaser = releaser; - this.project = null; - this.projects = projects; - this.originalVersion = null; - this.versionFromBom = versionFromBom; - this.properties = properties; - this.processedProjects = processedProjects; - this.interactive = interactive; - this.taskType = TaskType.POST_RELEASE; - this.applicationEventPublisher = applicationEventPublisher; - } - - // Used for tests - Args(TaskType taskType) { - this.releaser = null; - this.project = null; - this.projects = null; - this.originalVersion = null; - this.versionFromBom = null; - this.properties = null; - this.processedProjects = Collections.emptyList(); - this.interactive = false; - this.taskType = taskType; - this.applicationEventPublisher = null; - } - - String projectName() { - return this.project != null ? this.project.getName() : ""; - } - - void publishEvent(ApplicationEvent applicationEvent) { - if (this.applicationEventPublisher == null) { - log.warn("Application Event Publisher not present"); - return; - } - this.applicationEventPublisher.publishEvent(applicationEvent); - } - - @Override - public String toString() { - return "Args{" + "releaser=" + this.releaser + ", project=" + this.project - + ", projects=" + this.projects + ", originalVersion=" - + this.originalVersion + ", versionFromBom=" + this.versionFromBom - + ", properties=" + this.properties + ", interactive=" + this.interactive - + ", taskType=" + this.taskType + '}'; - } - -} diff --git a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/OptionsProcessor.java b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/OptionsProcessor.java deleted file mode 100644 index d608c1f0..00000000 --- a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/OptionsProcessor.java +++ /dev/null @@ -1,286 +0,0 @@ -/* - * Copyright 2013-2019 the original author or authors. - * - * 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 - * - * https://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. - */ - -package org.springframework.cloud.release.internal.spring; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.springframework.cloud.release.internal.Releaser; -import org.springframework.cloud.release.internal.ReleaserProperties; -import org.springframework.cloud.release.internal.options.Options; -import org.springframework.context.ApplicationEventPublisher; -import org.springframework.util.StringUtils; - -/** - * @author Marcin Grzejszczak - */ -class OptionsProcessor { - - private static final Logger log = LoggerFactory.getLogger(OptionsProcessor.class); - - private final Releaser releaser; - - private final ReleaserProperties properties; - - private final List allTasks; - - private final ApplicationEventPublisher applicationEventPublisher; - - OptionsProcessor(Releaser releaser, ReleaserProperties properties, - ApplicationEventPublisher applicationEventPublisher) { - this(releaser, properties, applicationEventPublisher, - Tasks.ALL_TASKS_PER_PROJECT); - } - - OptionsProcessor(Releaser releaser, ReleaserProperties properties, - ApplicationEventPublisher applicationEventPublisher, List allTasks) { - this.releaser = releaser; - this.properties = properties; - this.allTasks = allTasks; - this.applicationEventPublisher = applicationEventPublisher; - } - - OptionsProcessor(Releaser releaser, ReleaserProperties properties, - List allTasks) { - this.releaser = releaser; - this.properties = properties; - this.allTasks = allTasks; - this.applicationEventPublisher = null; - } - - void processOptions(Options options, Args defaultArgs) { - processOptions(options, defaultArgs, this.allTasks); - } - - void processOptions(Options options, Args defaultArgs, List tasks) { - Args args = args(defaultArgs, options.interactive); - if (args.taskType == TaskType.POST_RELEASE) { - if (options.metaRelease) { - postReleaseTask().execute(args); - return; - } - String chosenOption = chosenOption(); - int pickedInteger = StringUtils.hasText(chosenOption) - ? Integer.parseInt(chosenOption) : -1; - boolean pickedOptionIsComposite = pickedInteger <= 1 && pickedInteger >= 0; - boolean pickedOptionIsFromPostRelease = pickedInteger >= Tasks.ALL_TASKS_PER_PROJECT - .size() - Tasks.DEFAULT_TASKS_PER_RELEASE.size(); - if (options.metaRelease || options.fullRelease || pickedOptionIsComposite) { - postReleaseTask().execute(args); - } - else if (pickedOptionIsFromPostRelease) { - processNonComposite(options, tasks, args); - } - else { - log.info("Picked option [{}] doesn't allow post release steps", - pickedInteger); - } - return; - } - if (options.fullRelease && options.dryRun) { - log.info("Executing a full release in dry run mode"); - dryRunTask().execute(args); - } - else if (options.fullRelease && !options.interactive) { - log.info("Executing a full release in non-interactive mode"); - releaseTask().execute(args); - } - else if (options.fullRelease) { - log.info("Executing a full release in interactive mode"); - releaseVerboseTask().execute(args); - } - else { - processNonComposite(options, tasks, args); - } - } - - private void processNonComposite(Options options, List tasks, Args args) { - if (StringUtils.hasText(options.startFrom)) { - startFrom(tasks, options, args); - } - else if (StringUtils.hasText(options.range)) { - range(tasks, options.range, args); - } - else if (!options.taskNames.isEmpty()) { - tasks(tasks, options.taskNames, args); - } - else if (options.interactive) { - interactiveOnly(tasks, args); - } - else { - throw new IllegalStateException("You haven't picked any recognizable option"); - } - } - - void postReleaseOptions(Options options, Args defaultArgs) { - Args args = args(defaultArgs, options.interactive); - processOptions(options, args); - } - - Task postReleaseTask() { - return Tasks.POST_RELEASE; - } - - Task releaseTask() { - return Tasks.RELEASE; - } - - Task dryRunTask() { - return Tasks.DRY_RUN; - } - - Task releaseVerboseTask() { - return Tasks.RELEASE_VERBOSE; - } - - private void interactiveOnly(List tasks, Args defaultArgs) { - if (defaultArgs.taskType != TaskType.POST_RELEASE) { - log.info(buildOptionsText().toString()); - } - executeTaskFromOption(tasks, defaultArgs); - } - - private void tasks(List tasks, List taskNames, Args defaultArgs) { - Tasks.forNames(tasks, taskNames).forEach(task -> task.execute(defaultArgs)); - } - - private void range(List tasks, String range, Args defaultArgs) { - String[] splitRange = range.split("-"); - String start = splitRange[0]; - String stop = ""; - if (splitRange.length == 2) { - stop = splitRange[1]; - } - boolean started = false; - boolean sameRange = start.equals(stop); - for (Task task : tasks) { - if (start.equals(task.name) || start.equals(task.shortName)) { - started = true; - task.execute(defaultArgs); - if (sameRange) { - break; - } - } - else if (started && (stop.equals(task.name) || stop.equals(task.shortName))) { - task.execute(defaultArgs); - break; - } - else if (started) { - task.execute(defaultArgs); - } - } - } - - private void startFrom(List tasks, Options options, Args defaultArgs) { - boolean started = false; - for (Task task : tasks) { - if (options.startFrom.equals(task.name) - || options.startFrom.equals(task.shortName)) { - started = true; - task.execute(defaultArgs); - } - else if (started) { - task.execute(defaultArgs); - } - } - } - - private StringBuilder buildOptionsText() { - StringBuilder msg = new StringBuilder(); - msg.append("\n\n\n=== WHAT DO YOU WANT TO DO? ===\n\n"); - for (int i = 0; i < this.allTasks.size(); i++) { - msg.append(i).append(") ").append(this.allTasks.get(i).description) - .append("\n"); - } - msg.append("\n").append( - "You can pick a range of options by using the hyphen - e.g. '2-4' will execute jobs [2,3,4]\n"); - msg.append("You can execute all tasks starting from a job " - + "by using a hyphen and providing only one " - + "number - e.g. '8-' will execute jobs [8,9,10]\n"); - msg.append("You can execute given tasks by providing a " - + "comma separated list of tasks - e.g. " - + "'3,7,8' will execute jobs [3,7,8]\n"); - msg.append("\n").append("You can press 'q' to quit\n\n"); - return msg; - } - - void executeTaskFromOption(List tasks, Args defaultArgs) { - String input = chosenOption(); - switch (input.toLowerCase()) { - case "q": - System.exit(0); - default: - if (input.contains("-")) { - rangeInteractive(tasks, defaultArgs, input); - } - else if (input.contains(",")) { - tasksInteractive(tasks, defaultArgs, input); - } - else { - singleTask(tasks, defaultArgs, input); - } - } - } - - private void singleTask(List tasks, Args defaultArgs, String input) { - int chosenOption = Integer.parseInt(input); - Task task = tasks.get(chosenOption); - boolean interactive = false; - if (task == Tasks.RELEASE_VERBOSE) { - interactive = true; - } - log.info("\n\n\nYou chose [{}]: [{}]\n\n\n", chosenOption, task.description); - task.execute(args(defaultArgs, interactive)); - } - - private void tasksInteractive(List tasks, Args defaultArgs, String input) { - List tasksFromInput = Arrays.asList(input.split(",")); - List taskNames = new ArrayList<>(); - for (String task : tasksFromInput) { - int taskIndex = Integer.parseInt(task); - taskNames.add(tasks.get(taskIndex).name); - } - tasks(tasks, taskNames, defaultArgs); - } - - private void rangeInteractive(List tasks, Args defaultArgs, String input) { - String[] range = input.split("-"); - Integer start = Integer.valueOf(range[0]); - Integer stop = null; - if (range.length == 2) { - stop = Integer.valueOf(range[1]); - } - String firstName = tasks.get(start).name; - String second = stop != null ? tasks.get(stop).name : ""; - range(tasks, firstName + "-" + second, defaultArgs); - } - - private Args args(Args defaultArgs, boolean interactive) { - return new Args(this.releaser, defaultArgs.project, defaultArgs.projects, - defaultArgs.originalVersion, defaultArgs.versionFromBom, this.properties, - interactive, defaultArgs.taskType, this.applicationEventPublisher); - } - - String chosenOption() { - return System.console() == null ? "-1" : System.console().readLine(); - } - -} diff --git a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/ReleaserConfiguration.java b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/ReleaserConfiguration.java deleted file mode 100644 index 943016e8..00000000 --- a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/ReleaserConfiguration.java +++ /dev/null @@ -1,146 +0,0 @@ -/* - * Copyright 2013-2019 the original author or authors. - * - * 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 - * - * https://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. - */ - -package org.springframework.cloud.release.internal.spring; - -import java.util.ArrayList; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.cloud.release.internal.Releaser; -import org.springframework.cloud.release.internal.ReleaserProperties; -import org.springframework.cloud.release.internal.buildsystem.GradleUpdater; -import org.springframework.cloud.release.internal.buildsystem.ProjectPomUpdater; -import org.springframework.cloud.release.internal.docs.CustomProjectDocumentationUpdater; -import org.springframework.cloud.release.internal.docs.DocumentationUpdater; -import org.springframework.cloud.release.internal.git.ProjectGitHandler; -import org.springframework.cloud.release.internal.github.CustomGithubIssues; -import org.springframework.cloud.release.internal.github.ProjectGitHubHandler; -import org.springframework.cloud.release.internal.options.Parser; -import org.springframework.cloud.release.internal.postrelease.PostReleaseActions; -import org.springframework.cloud.release.internal.project.ProjectCommandExecutor; -import org.springframework.cloud.release.internal.sagan.SaganClient; -import org.springframework.cloud.release.internal.sagan.SaganUpdater; -import org.springframework.cloud.release.internal.template.TemplateGenerator; -import org.springframework.cloud.release.internal.versions.VersionsFetcher; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationEventPublisher; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -@EnableConfigurationProperties(ReleaserProperties.class) -class ReleaserConfiguration { - - @Autowired - ReleaserProperties properties; - - @Bean - TaskCollector taskCollector() { - return new TaskCollector(); - } - - @Bean - SpringReleaser springReleaser(Releaser releaser, ReleaserPropertiesUpdater updater, - ApplicationEventPublisher applicationEventPublisher) { - return new SpringReleaser(releaser, this.properties, updater, - applicationEventPublisher); - } - - @Bean - ProjectCommandExecutor projectBuilder() { - return new ProjectCommandExecutor(this.properties); - } - - @Bean - VersionsFetcher versionsFetcher(ProjectPomUpdater updater) { - return new VersionsFetcher(this.properties, updater); - } - - @Bean - ProjectGitHandler projectGitHandler() { - return new ProjectGitHandler(this.properties); - } - - @Autowired(required = false) - List customGithubIssues = new ArrayList<>(); - - @Bean - ProjectGitHubHandler projectGitHubHandler() { - return new ProjectGitHubHandler(this.properties, this.customGithubIssues); - } - - @Bean - TemplateGenerator templateGenerator(ProjectGitHubHandler handler) { - return new TemplateGenerator(this.properties, handler); - } - - @Bean - GradleUpdater gradleUpdater() { - return new GradleUpdater(this.properties); - } - - @Bean - SaganUpdater saganUpdater(SaganClient saganClient, - ReleaserProperties releaserProperties) { - return new SaganUpdater(saganClient, releaserProperties); - } - - @Bean - PostReleaseActions postReleaseActions(ProjectGitHandler handler, - ProjectPomUpdater pomUpdater, GradleUpdater gradleUpdater, - ProjectCommandExecutor projectCommandExecutor, - ReleaserProperties releaserProperties, VersionsFetcher versionsFetcher) { - return new PostReleaseActions(handler, pomUpdater, gradleUpdater, - projectCommandExecutor, releaserProperties, versionsFetcher); - } - - @Autowired(required = false) - List customProjectDocumentationUpdaters = new ArrayList<>(); - - @Bean - DocumentationUpdater documentationUpdater(ProjectGitHandler projectGitHandler, - ReleaserProperties properties, TemplateGenerator templateGenerator) { - return new DocumentationUpdater(projectGitHandler, properties, templateGenerator, - this.customProjectDocumentationUpdaters); - } - - @Bean - Releaser releaser(ProjectPomUpdater projectPomUpdater, - ProjectCommandExecutor projectCommandExecutor, - ProjectGitHandler projectGitHandler, - ProjectGitHubHandler projectGitHubHandler, - TemplateGenerator templateGenerator, GradleUpdater gradleUpdater, - SaganUpdater saganUpdater, DocumentationUpdater documentationUpdater, - PostReleaseActions postReleaseActions, - ReleaserProperties releaserProperties) { - return new Releaser(releaserProperties, projectPomUpdater, projectCommandExecutor, - projectGitHandler, projectGitHubHandler, templateGenerator, gradleUpdater, - saganUpdater, documentationUpdater, postReleaseActions); - } - - @Bean - ReleaserPropertiesUpdater releaserPropertiesUpdater(ApplicationContext context) { - return new ReleaserPropertiesUpdater(context); - } - - @Bean - Parser optionsParser() { - return new OptionsParser(); - } - -} diff --git a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/SpringReleaser.java b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/SpringReleaser.java deleted file mode 100644 index 7514dafa..00000000 --- a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/SpringReleaser.java +++ /dev/null @@ -1,345 +0,0 @@ -/* - * Copyright 2013-2019 the original author or authors. - * - * 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 - * - * https://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. - */ - -package org.springframework.cloud.release.internal.spring; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Collectors; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.springframework.cloud.release.internal.Releaser; -import org.springframework.cloud.release.internal.ReleaserProperties; -import org.springframework.cloud.release.internal.options.Options; -import org.springframework.cloud.release.internal.options.OptionsBuilder; -import org.springframework.cloud.release.internal.project.ProcessedProject; -import org.springframework.cloud.release.internal.project.ProjectVersion; -import org.springframework.cloud.release.internal.project.Projects; -import org.springframework.context.ApplicationEventPublisher; -import org.springframework.util.StringUtils; - -/** - * Releaser that gets input from console. - * - * @author Marcin Grzejszczak - */ -public class SpringReleaser { - - private static final Map CACHE = new ConcurrentHashMap<>(); - - private static final Logger log = LoggerFactory.getLogger(SpringReleaser.class); - - private final Releaser releaser; - - private final ReleaserProperties properties; - - private final OptionsProcessor optionsProcessor; - - private final ReleaserPropertiesUpdater updater; - - private final ApplicationEventPublisher applicationEventPublisher; - - public SpringReleaser(Releaser releaser, ReleaserProperties properties, - ReleaserPropertiesUpdater updater, - ApplicationEventPublisher applicationEventPublisher) { - this.releaser = releaser; - this.properties = properties; - this.updater = updater; - this.applicationEventPublisher = applicationEventPublisher; - this.optionsProcessor = new OptionsProcessor(releaser, properties, - applicationEventPublisher); - } - - SpringReleaser(Releaser releaser, ReleaserProperties properties, - OptionsProcessor optionsProcessor, ReleaserPropertiesUpdater updater, - ApplicationEventPublisher applicationEventPublisher) { - this.releaser = releaser; - this.properties = properties; - this.optionsProcessor = optionsProcessor; - this.updater = updater; - this.applicationEventPublisher = applicationEventPublisher; - } - - /** - * Default behaviour - interactive mode. - */ - public void release() { - release(new OptionsBuilder().options()); - } - - public void release(Options options) { - if (options.metaRelease) { - prepareForMetaRelease(options); - } - if (this.properties.isPostReleaseTasksOnly()) { - log.info("Skipping release process and moving only to post release"); - this.optionsProcessor.postReleaseOptions(options, postReleaseOptionsAgs( - options, null, postReleaseTaskOnlyProcessedProjects(options))); - buildCompleted(); - return; - } - performReleaseAndPostRelease(options, null); - buildCompleted(); - } - - private List postReleaseTaskOnlyProcessedProjects(Options options) { - return metaReleaseProjects(options).stream().map(project -> { - File clonedProjectFromOrg = this.releaser.clonedProjectFromOrg(project); - ReleaserProperties properties = updatePropertiesIfCustomConfigPresent( - this.properties.copy(), clonedProjectFromOrg); - log.info("Successfully cloned the project [{}] to [{}]", project, - clonedProjectFromOrg); - ProjectsAndVersion projects = projects(clonedProjectFromOrg); - ProjectVersion original = new ProjectVersion(clonedProjectFromOrg); - return new ProcessedProject(properties, projects.versionFromBom, original); - }).collect(Collectors.toList()); - } - - private void buildCompleted() { - this.applicationEventPublisher.publishEvent(new BuildCompleted(this)); - } - - private void performReleaseAndPostRelease(Options options, - ProjectsAndVersion projectsAndVersion) { - List processedProjects = new ArrayList<>(); - if (options.metaRelease) { - ReleaserProperties original = this.properties.copy(); - log.trace("The following properties were found [{}]", original); - processedProjects = metaReleaseProjects(options).stream() - .map(project -> processProjectForMetaRelease(original.copy(), options, - project)) - .collect(Collectors.toList()); - } - else { - log.info( - "Single project release picked. Will release only the current project"); - File projectFolder = projectFolder(); - projectsAndVersion = processProject(options, projectFolder, TaskType.RELEASE); - } - if (!options.dryRun) { - this.optionsProcessor.postReleaseOptions(options, postReleaseOptionsAgs( - options, projectsAndVersion, processedProjects)); - } - } - - private void prepareForMetaRelease(Options options) { - log.info( - "Meta Release picked. Will iterate over all projects and perform release of each one"); - this.properties.getGit().setFetchVersionsFromGit(false); - this.properties.getMetaRelease().setEnabled(options.metaRelease); - } - - ProcessedProject processProjectForMetaRelease(ReleaserProperties copy, - Options options, String project) { - log.trace("Original properties [\n\n{}\n\n]", copy); - File clonedProjectFromOrg = this.releaser.clonedProjectFromOrg(project); - copy = updatePropertiesIfCustomConfigPresent(copy, clonedProjectFromOrg); - log.info("Successfully cloned the project [{}] to [{}]", project, - clonedProjectFromOrg); - ProjectsAndVersion projectsAndVersion; - try { - ProjectVersion original = new ProjectVersion(clonedProjectFromOrg); - projectsAndVersion = processProject(options, clonedProjectFromOrg, - TaskType.RELEASE); - return new ProcessedProject(copy, projectsAndVersion.versionFromBom, - original); - } - catch (Exception e) { - log.error("\n\n\nBUILD FAILED!!!\n\nException occurred for project <" - + project + "> \n\n", e); - throw e; - } - } - - private ReleaserProperties updatePropertiesIfCustomConfigPresent( - ReleaserProperties copy, File clonedProjectFromOrg) { - return this.updater.updateProperties(copy, clonedProjectFromOrg); - } - - List metaReleaseProjects(Options options) { - List projects = new ArrayList<>( - this.properties.getFixedVersions().keySet()); - log.info("List of projects that should not be cloned {}", - this.properties.getMetaRelease().getProjectsToSkip()); - List filteredProjects = projects - .stream().filter(project -> !this.properties.getMetaRelease() - .getProjectsToSkip().contains(project)) - .collect(Collectors.toList()); - log.info("List of all projects to clone before filtering {}", filteredProjects); - if (StringUtils.hasText(options.startFrom)) { - log.info("Start from option provided [{}]", options.startFrom); - int projectIndex = filteredProjects.indexOf(options.startFrom); - if (projectIndex < 0) { - throw new IllegalStateException( - "Project [" + options.startFrom + "] not found"); - } - if (log.isDebugEnabled()) { - log.debug("Index of project [{}] is [{}]", options.startFrom, - projectIndex); - } - filteredProjects = filteredProjects.subList(projectIndex, - filteredProjects.size()); - options.startFrom = ""; - enforceFullRelease(options); - } - else if (!options.taskNames.isEmpty()) { - log.info("Task names provided {}", options.taskNames); - filteredProjects = filteredProjects.stream() - .filter(project -> options.taskNames.contains(project)) - .collect(Collectors.toList()); - options.taskNames = new ArrayList<>(); - enforceFullRelease(options); - } - log.info("\n\n\nFor meta-release, will release the projects {}\n\n\n", - filteredProjects); - return filteredProjects; - } - - protected void enforceFullRelease(Options options) { - options.fullRelease = true; - } - - private File projectFolder() { - String workingDir = this.properties.getWorkingDir(); - return new File(workingDir); - } - - Args postReleaseOptionsAgs(Options options, ProjectsAndVersion projectsAndVersion, - List processedProjects) { - Projects projects = projectsAndVersion == null - ? projectsToUpdateForFixedVersions() : projectsAndVersion.projectVersions; - ProjectVersion version = projects.containsProject( - this.properties.getMetaRelease().getReleaseTrainProjectName()) - ? projects.releaseTrain(this.properties) : versionFromBranch(); - if (options.metaRelease) { - this.properties.getPom().setBranch(version.version); - } - return new Args(this.releaser, projects, version, this.properties, - processedProjects, options.interactive, this.applicationEventPublisher); - } - - private ProjectVersion versionFromBranch() { - String branch = this.properties.getPom().getBranch(); - return new ProjectVersion(projectFolder().getName(), - branch.startsWith("v") ? branch.substring(1) : branch); - } - - private ProjectsAndVersion projects(File project) { - ProjectsAndVersion projectsAndVersion = CACHE.get(project); - if (projectsAndVersion != null) { - log.info("Found cached version of projects and version [{}]", - projectsAndVersion); - return projectsAndVersion; - } - ProjectVersion versionFromBom; - Projects projectsToUpdate; - log.info("Fetch from git [{}], meta release [{}], project [{}]", - this.properties.getGit().isFetchVersionsFromGit(), - this.properties.getMetaRelease().isEnabled(), project); - if (this.properties.getGit().isFetchVersionsFromGit() - && !this.properties.getMetaRelease().isEnabled()) { - printVersionRetrieval(); - projectsToUpdate = this.releaser.retrieveVersionsFromBom(); - versionFromBom = assertNoSnapshotsForANonSnapshotProject(project, - projectsToUpdate); - } - else { - ProjectVersion originalVersion = new ProjectVersion(project); - Projects fixedVersions = this.releaser.fixedVersions(); - String fixedVersionForProject = fixedVersions - .forName(project.getName()).version; - versionFromBom = StringUtils.hasText(fixedVersionForProject) - ? new ProjectVersion(originalVersion.projectName, - fixedVersionForProject) - : new ProjectVersion(project); - projectsToUpdate = fixedVersions; - projectsToUpdate.add(versionFromBom); - printSettingVersionFromFixedVersions(projectsToUpdate); - } - projectsAndVersion = new ProjectsAndVersion(projectsToUpdate, versionFromBom); - CACHE.put(project, projectsAndVersion); - return projectsAndVersion; - } - - ProjectVersion assertNoSnapshotsForANonSnapshotProject(File project, - Projects projectsToUpdate) { - ProjectVersion versionFromBom; - versionFromBom = projectsToUpdate.forFile(project); - assertNoSnapshotsForANonSnapshotProject(projectsToUpdate, versionFromBom); - return versionFromBom; - } - - ProjectsAndVersion processProject(Options options, File project, TaskType taskType) { - log.info("Processing the project in file [{}]", project); - ProjectsAndVersion projectsAndVersion = projects(project); - ProjectVersion originalVersion = new ProjectVersion(project); - final Args defaultArgs = new Args(this.releaser, project, - projectsAndVersion.projectVersions, originalVersion, - projectsAndVersion.versionFromBom, this.properties, options.interactive, - taskType, this.applicationEventPublisher); - log.trace("Processing project [{}] with args [{}]", project, defaultArgs); - this.optionsProcessor.processOptions(options, defaultArgs); - return projectsAndVersion; - } - - private Projects projectsToUpdateForFixedVersions() { - Projects projectsToUpdate = this.releaser.fixedVersions(); - printSettingVersionFromFixedVersions(projectsToUpdate); - return projectsToUpdate; - } - - private void printVersionRetrieval() { - log.info("\n\n\n=== RETRIEVING VERSIONS ===\n\nWill clone the BOM project" - + " to retrieve all versions"); - } - - private void printSettingVersionFromFixedVersions(Projects projectsToUpdate) { - log.info( - "\n\n\n=== RETRIEVED VERSIONS ===\n\nWill use the fixed versions" - + " of projects\n\n{}", - projectsToUpdate.stream().map(p -> p.projectName + " => " + p.version) - .collect(Collectors.joining("\n"))); - } - - private void assertNoSnapshotsForANonSnapshotProject(Projects projects, - ProjectVersion versionFromScRelease) { - if (!versionFromScRelease.isSnapshot() && projects.containsSnapshots()) { - throw new IllegalStateException("You are trying to release a non snapshot " - + "version [" + versionFromScRelease + "] of the project [" - + versionFromScRelease.projectName + "] but " - + "there is at least one SNAPSHOT library version in the Spring Cloud Release project"); - } - } - - class ProjectsAndVersion { - - final Projects projectVersions; - - final ProjectVersion versionFromBom; - - ProjectsAndVersion(Projects projectVersions, ProjectVersion versionFromBom) { - this.projectVersions = projectVersions; - this.versionFromBom = versionFromBom; - } - - } - -} diff --git a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/Task.java b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/Task.java deleted file mode 100644 index 2a4a1172..00000000 --- a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/Task.java +++ /dev/null @@ -1,119 +0,0 @@ -/* - * Copyright 2013-2019 the original author or authors. - * - * 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 - * - * https://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. - */ - -package org.springframework.cloud.release.internal.spring; - -import java.util.function.Consumer; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.springframework.cloud.release.internal.tech.MakeBuildUnstableException; - -/** - * @author Marcin Grzejszczak - */ -class Task { - - private static final Logger log = LoggerFactory.getLogger(Task.class); - - private static final String MSG = "\nPress 'q' to quit, 's' to skip, any key to continue\n\n"; - static StepSkipper stepSkipper = new ConsoleInputStepSkipper(); - - final String name; - - final String shortName; - - final String header; - - final String description; - - final TaskType taskType; - - private final Consumer consumer; - - Task(String name, String shortName, String header, String description, - Consumer consumer) { - this(name, shortName, header, description, consumer, TaskType.RELEASE); - } - - Task(String name, String shortName, String header, String description, - Consumer consumer, TaskType taskType) { - this.name = name; - this.shortName = shortName; - this.header = header; - this.description = description; - this.consumer = consumer; - this.taskType = taskType; - } - - TaskAndException execute(Args args) { - TaskAndException taskAndException = doExecute(args); - args.publishEvent(new TaskCompleted(this, args.projectName(), taskAndException)); - return taskAndException; - } - - private TaskAndException doExecute(Args args) { - if (args.taskType != this.taskType) { - log.info("Skipping [{}] since task type is [{}] and should be [{}]]", - this.name, this.taskType, args.taskType); - return TaskAndException.skipped(this); - } - try { - boolean interactive = args.interactive; - printLog(interactive); - if (interactive) { - boolean skipStep = stepSkipper.skipStep(); - if (!skipStep) { - return runTask(args); - } - return TaskAndException.skipped(this); - } - else { - return runTask(args); - } - } - catch (MakeBuildUnstableException atTheEnd) { - logError("TASK FAILED - WILL MARK THE BUILD UNSTABLE AT THE END!!!", args, - atTheEnd); - return TaskAndException.failure(this, atTheEnd); - } - catch (Exception e) { - logError("BUILD FAILED!!!", args, e); - if (this.taskType == TaskType.RELEASE) { - throw e; - } - return TaskAndException.failure(this, e); - } - } - - private void logError(String prefix, Args args, Exception e) { - log.error("\n\n\n" + prefix + "\n\nException occurred for project <" - + (args.project != null ? args.project.getName() : "") + "> task <" - + this.name + "> \n\nwith description <" + this.description + ">\n\n", e); - } - - private TaskAndException runTask(Args args) { - this.consumer.accept(args); - return TaskAndException.success(this); - } - - private void printLog(boolean interactive) { - log.info("\n\n\n=== {} ===\n\n{} {}\n\n", this.header, this.description, - interactive ? MSG : ""); - } - -} diff --git a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/TaskAndException.java b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/TaskAndException.java deleted file mode 100644 index 6554f55f..00000000 --- a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/TaskAndException.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright 2013-2018 the original author or authors. - * - * 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 - * - * https://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. - */ - -/* - * Copyright 2013-2019 the original author or authors. - * - * 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 - * - * https://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. - */ - -package org.springframework.cloud.release.internal.spring; - -/** - * @author Marcin Grzejszczak - */ -final class TaskAndException { - - final Task task; - - final TaskState taskState; - - final Exception exception; - - private TaskAndException(Task task, TaskState taskState) { - this.task = task; - this.taskState = taskState; - this.exception = null; - } - - private TaskAndException(Task task, TaskState taskState, Exception exception) { - this.task = task; - this.taskState = taskState; - this.exception = exception; - } - - static TaskAndException skipped(Task task) { - return new TaskAndException(task, TaskState.SKIPPED); - } - - static TaskAndException success(Task task) { - return new TaskAndException(task, TaskState.SUCCESS); - } - - static TaskAndException failure(Task task, Exception exception) { - return new TaskAndException(task, TaskState.FAILURE, exception); - } - - enum TaskState { - - SKIPPED, SUCCESS, FAILURE - - } - -} diff --git a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/TaskCollector.java b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/TaskCollector.java deleted file mode 100644 index d5ae3585..00000000 --- a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/TaskCollector.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright 2013-2019 the original author or authors. - * - * 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 - * - * https://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. - */ - -package org.springframework.cloud.release.internal.spring; - -import java.util.Arrays; -import java.util.List; -import java.util.Queue; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.stream.Collectors; - -import com.jakewharton.fliptables.FlipTableConverters; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.springframework.cloud.release.internal.tech.MakeBuildUnstableException; -import org.springframework.context.ApplicationListener; -import org.springframework.core.NestedExceptionUtils; -import org.springframework.util.StringUtils; - -class TaskCollector implements ApplicationListener { - - private static final Logger log = LoggerFactory.getLogger(TaskCollector.class); - - private final Queue completedTasks = new ArrayBlockingQueue<>(300); - - private void handleTaskCompleted(TaskCompleted taskCompleted) { - this.completedTasks.add(taskCompleted); - log.info("Completed task: " + taskCompleted); - } - - private void handleBuildCompleted(BuildCompleted buildCompleted) { - log.info("Build has finished. Will summarize the results"); - List table = this.completedTasks.stream() - .map(task -> new Table(task.projectName, task.taskAndException)) - .collect(Collectors.toList()); - String string = "\n\n***** BUILD REPORT *****\n\n" - + FlipTableConverters.fromIterable(table, Table.class) - + "\n\n***** BUILD REPORT *****\n\n"; - List
brokenTasks = table.stream() - .filter(table1 -> StringUtils.hasText(table1.thrownException)) - .collect(Collectors.toList()); - if (!brokenTasks.isEmpty()) { - String brokenBuilds = "\n\n[BUILD UNSTABLE] The following release tasks are failing!\n\n" - + brokenTasks.stream().map(table1 -> String.format( - "***** Project / Task : <%s/%s> ***** \nTask Description <%s>\nException Stacktrace \n\n%s", - table1.projectName, table1.taskCaption, - table1.taskDescription, - table1.exception + "\n" - + Arrays.stream(table1.exception.getStackTrace()) - .map(StackTraceElement::toString) - .collect(Collectors.joining("\n")))) - .collect(Collectors.joining("\n\n")); - log.warn(string + brokenBuilds); - this.completedTasks.clear(); - throw new MakeBuildUnstableException(brokenBuilds); - } - else { - log.info(string); - this.completedTasks.clear(); - } - } - - @Override - public void onApplicationEvent(ReleaserTask event) { - if (event instanceof TaskCompleted) { - handleTaskCompleted((TaskCompleted) event); - } - else if (event instanceof BuildCompleted) { - handleBuildCompleted((BuildCompleted) event); - } - } - -} - -class Table { - - final String projectName; - - final String taskCaption; - - final String taskDescription; - - final String taskState; - - final String thrownException; - - Exception exception; - - Table(String projectName, TaskAndException tae) { - this.projectName = StringUtils.hasText(projectName) ? projectName - : "Post Release"; - this.taskCaption = tae.task.name; - this.taskDescription = tae.task.description; - this.taskState = tae.taskState.name().toLowerCase(); - this.thrownException = tae.exception == null ? "" - : NestedExceptionUtils.getMostSpecificCause(tae.exception).toString(); - this.exception = tae.exception; - } - - public String getProjectName() { - return this.projectName; - } - - public String getTaskCaption() { - return this.taskCaption; - } - - public String getTaskDescription() { - return this.taskDescription; - } - - public String getTaskState() { - return this.taskState; - } - - public String getThrownException() { - return this.thrownException; - } - -} diff --git a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/TaskCompleted.java b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/TaskCompleted.java deleted file mode 100644 index bc0c34a0..00000000 --- a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/TaskCompleted.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2013-2019 the original author or authors. - * - * 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 - * - * https://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. - */ - -package org.springframework.cloud.release.internal.spring; - -class TaskCompleted extends ReleaserTask { - - final String projectName; - - final TaskAndException taskAndException; - - /** - * Create a new ApplicationEvent. - * @param source the object on which the event initially occurred (never {@code null}) - */ - TaskCompleted(Object source, String projectName, TaskAndException taskAndException) { - super(source); - this.taskAndException = taskAndException; - this.projectName = projectName; - } - - @Override - public String toString() { - return "TaskCompleted{" + "projectName='" + this.projectName + '\'' - + ", taskName=" + this.taskAndException.task.name + '}'; - } - -} diff --git a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/Tasks.java b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/Tasks.java deleted file mode 100644 index cb863ee3..00000000 --- a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/Tasks.java +++ /dev/null @@ -1,219 +0,0 @@ -/* - * Copyright 2013-2019 the original author or authors. - * - * 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 - * - * https://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. - */ - -package org.springframework.cloud.release.internal.spring; - -import java.util.ArrayList; -import java.util.List; -import java.util.function.Consumer; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -/** - * All tasks that can be executed by the releaser. - * - * @author Marcin Grzejszczak - */ -final class Tasks { - - private Tasks() { - throw new IllegalStateException("Can't instantiate a utility class"); - } - - static Task UPDATING_POMS = task("updatePoms", "u", "UPDATING VERSIONS", - "Update versions from the BOM", - args -> args.releaser.updateProjectFromBom(args.project, args.projects, - args.versionFromBom)); - static Task BUILD_PROJECT = task("build", "b", "BUILD PROJECT", "Build the project", - args -> args.releaser.buildProject(args.originalVersion, - args.versionFromBom)); - static Task COMMIT = task("commit", "c", - "COMMITTING (ALL) AND PUSHING TAGS (NON-SNAPSHOTS)", - "Commit, tag and push the tag", - args -> args.releaser.commitAndPushTags(args.project, args.versionFromBom)); - static Task DEPLOY = task("deploy", "d", "ARTIFACT DEPLOYMENT", - "Deploy the artifacts", - args -> args.releaser.deploy(args.originalVersion, args.versionFromBom)); - static Task PUBLISH_DOCS = task("docs", "o", "PUBLISHING DOCS", "Publish the docs", - args -> args.releaser.publishDocs(args.originalVersion, args.versionFromBom)); - static Task SNAPSHOTS = task("snapshots", "s", - "REVERTING CHANGES & BUMPING VERSION (RELEASE ONLY)", - "Go back to snapshots and bump originalVersion by patch", - args -> args.releaser.rollbackReleaseVersion(args.project, args.projects, - args.versionFromBom)); - static Task PUSH = task("push", "p", "PUSHING CHANGES", "Push the commits", - args -> args.releaser.pushCurrentBranch(args.project)); - static Task CLOSE_MILESTONE = task("closeMilestone", "m", "CLOSING MILESTONE", - "Close the milestone at Github", - args -> args.releaser.closeMilestone(args.versionFromBom)); - static Task CREATE_TEMPLATES = task("createTemplates", "t", "CREATING TEMPLATES", - "Create email / blog / tweet etc. templates", args -> { - args.releaser.createEmail(args.versionFromBom, args.projects); - args.releaser.createBlog(args.versionFromBom, args.projects); - args.releaser.createTweet(args.versionFromBom, args.projects); - args.releaser.createReleaseNotes(args.versionFromBom, args.projects); - }, TaskType.POST_RELEASE); - static Task UPDATE_GUIDES = task("updateGuides", "ug", "UPDATE GUIDES", - "Updating Spring Guides", args -> { - args.releaser.updateSpringGuides(args.versionFromBom, args.projects, - args.processedProjects); - }, TaskType.POST_RELEASE); - static Task UPDATE_START_SPRING_IO = task("updateStartSpringIo", "us", - "UPDATE START.SPRING.IO", "Updating start.spring.io", args -> { - args.releaser.updateStartSpringIo(args.versionFromBom, args.projects); - }, TaskType.POST_RELEASE); - static Task UPDATE_SAGAN = task("updateSagan", "g", "UPDATE SAGAN", - "Updating Sagan with release info", args -> { - args.releaser.updateSagan(args.project, args.versionFromBom, - args.projects); - }); - static Task UPDATE_DOCUMENTATION = task("updateDocumentation", "ud", - "UPDATE DOCUMENTATION", "Updating documentation repository", args -> { - args.releaser.updateDocumentationRepository(args.properties, - args.projects, args.versionFromBom); - }, TaskType.POST_RELEASE); - - static Task RUN_UPDATED_SAMPLES = task("runUpdatedSample", "ru", - "UPDATE AND RUN SAMPLES", - "Updates the sample project with versions and runs samples", args -> { - args.releaser.runUpdatedSamples(args.projects); - }, TaskType.POST_RELEASE); - static Task UPDATE_RELEASE_TRAIN_DOCUMENTATION = task("updateReleaseTrainDocs", "ur", - "UPDATE RELEASE TRAIN DOCS", "Update release train documentation", args -> { - args.releaser.generateReleaseTrainDocumentation(args.projects); - }, TaskType.POST_RELEASE); - static Task UPDATE_ALL_SAMPLES = task("updateAllSamples", "ua", - "UPDATE ALL SAMPLES WITH RELEASE TRAIN BUMPED VERSIONS", - "Update all samples with release train bumped versions", args -> { - args.releaser.updateAllSamples(args.projects); - }, TaskType.POST_RELEASE); - static Task UPDATE_RELEASE_TRAIN_WIKI = task("updateReleaseTrainWiki", "uw", - "UPDATE RELEASE TRAIN WIKI", "Update release train wiki page", args -> { - args.releaser.updateReleaseTrainWiki(args.projects); - }, TaskType.POST_RELEASE); - - static final List DEFAULT_TASKS_PER_PROJECT = Stream - .of(Tasks.UPDATING_POMS, Tasks.BUILD_PROJECT, Tasks.COMMIT, Tasks.DEPLOY, - Tasks.PUBLISH_DOCS, Tasks.SNAPSHOTS, Tasks.PUSH, - Tasks.CLOSE_MILESTONE, Tasks.UPDATE_SAGAN) - .collect(Collectors.toList()); - - static final List DEFAULT_DRY_RUN_TASKS_PER_PROJECT = Stream - .of(Tasks.UPDATING_POMS, Tasks.BUILD_PROJECT).collect(Collectors.toList()); - - static final List DEFAULT_TASKS_PER_RELEASE = Stream - .of(Tasks.RUN_UPDATED_SAMPLES, Tasks.CREATE_TEMPLATES, Tasks.UPDATE_GUIDES, - Tasks.UPDATE_START_SPRING_IO, - Tasks.UPDATE_RELEASE_TRAIN_DOCUMENTATION, Tasks.UPDATE_DOCUMENTATION, - Tasks.UPDATE_RELEASE_TRAIN_WIKI, Tasks.UPDATE_ALL_SAMPLES) - .collect(Collectors.toList()); - - static final List NON_COMPOSITE_TASKS = new ArrayList() { - { - addAll(DEFAULT_TASKS_PER_PROJECT); - addAll(DEFAULT_TASKS_PER_RELEASE); - } - }; - - static Task RELEASE = Tasks.task("release", "fr", "FULL RELEASE", - "Perform a full release of this project without interruptions", - args -> new CompositeConsumer(DEFAULT_TASKS_PER_PROJECT).accept(args)); - - static Task DRY_RUN = Tasks.task("dryRun", "dr", "DRY RUN", - "Perform a dry run release of a single project - bumps versions and installs them locally", - args -> new CompositeConsumer(DEFAULT_DRY_RUN_TASKS_PER_PROJECT) - .accept(args)); - - static Task POST_RELEASE = Tasks.task("postRelease", "pr", "POST RELEASE TASKS", - "Perform post release tasks for this release without interruptions", - args -> new CompositeConsumer(DEFAULT_TASKS_PER_RELEASE).accept(args), - TaskType.POST_RELEASE); - static Task RELEASE_VERBOSE = Tasks.task("releaseVerbose", "r", - "FULL VERBOSE RELEASE", - "Perform a full release of this project in interactive mode (you'll be asked about skipping steps)", - args -> new CompositeConsumer(DEFAULT_TASKS_PER_PROJECT).accept(args)); - static Task META_RELEASE = Tasks.task("metaRelease", "x", "META RELEASE", - "Perform a meta release of projects", - args -> new CompositeConsumer(DEFAULT_TASKS_PER_PROJECT, - (args1 -> args.properties.getMetaRelease().setEnabled(true))) - .accept(args)); - static Task META_RELEASE_DRY_RUN = Tasks.task("metaReleaseDryRun", "xdr", - "META RELEASE DRY RUN", "Perform a meta release dry run of projects", - args -> new CompositeConsumer(DEFAULT_DRY_RUN_TASKS_PER_PROJECT, - (args1 -> args.properties.getMetaRelease().setEnabled(true))) - .accept(args)); - - static final List COMPOSITE_TASKS = Stream.of(RELEASE, RELEASE_VERBOSE, DRY_RUN, - META_RELEASE, POST_RELEASE, META_RELEASE_DRY_RUN) - .collect(Collectors.toList()); - - static final List ALL_TASKS_PER_PROJECT = Stream - .of(COMPOSITE_TASKS, DEFAULT_TASKS_PER_PROJECT, DEFAULT_TASKS_PER_RELEASE) - .flatMap(List::stream).collect(Collectors.toList()); - - static Task task(String name, String shortName, String header, String description, - Consumer function) { - return task(name, shortName, header, description, function, TaskType.RELEASE); - } - - static Task task(String name, String shortName, String header, String description, - Consumer function, TaskType taskType) { - return new Task(name, shortName, header, description, function, taskType); - } - - static List forNames(List tasks, List names) { - return tasks.stream().filter( - task -> names.contains(task.name) || names.contains(task.shortName)) - .collect(Collectors.toList()); - } - - static String allTasksInOrder() { - return ALL_TASKS_PER_PROJECT.stream().map(task -> task.name) - .collect(Collectors.joining(",")); - } - -} - -enum TaskType { - - RELEASE, POST_RELEASE - -} - -class CompositeConsumer implements Consumer { - - private final List tasks; - - private final Consumer setup; - - CompositeConsumer(List tasks) { - this.tasks = tasks; - this.setup = args -> { - }; - } - - CompositeConsumer(List tasks, Consumer setup) { - this.tasks = tasks; - this.setup = setup; - } - - @Override - public void accept(Args args) { - this.setup.accept(args); - this.tasks.forEach(task -> task.execute(args)); - } - -} diff --git a/spring-cloud-release-tools-spring/src/main/resources/application.yml b/spring-cloud-release-tools-spring/src/main/resources/application.yml deleted file mode 100644 index c594d756..00000000 --- a/spring-cloud-release-tools-spring/src/main/resources/application.yml +++ /dev/null @@ -1,3 +0,0 @@ -spring: - main: - web-application-type: none diff --git a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/cloud/docs/SpringCloudDocsAccessor.java b/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/cloud/docs/SpringCloudDocsAccessor.java deleted file mode 100644 index 8cef51cd..00000000 --- a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/cloud/docs/SpringCloudDocsAccessor.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2013-2019 the original author or authors. - * - * 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 - * - * https://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. - */ - -package org.springframework.cloud.release.cloud.docs; - -import org.springframework.cloud.release.internal.ReleaserProperties; -import org.springframework.cloud.release.internal.docs.CustomProjectDocumentationUpdater; -import org.springframework.cloud.release.internal.git.ProjectGitHandler; - -public class SpringCloudDocsAccessor { - - public static CustomProjectDocumentationUpdater updater(ProjectGitHandler handler, - ReleaserProperties releaserProperties) { - return new SpringCloudCustomProjectDocumentationUpdater(handler, - releaserProperties); - } - - public static CustomProjectDocumentationUpdater testUpdater(ProjectGitHandler handler, - String version) { - ReleaserProperties releaserProperties = new ReleaserProperties(); - return new SpringCloudCustomProjectDocumentationUpdater(handler, - releaserProperties); - } - -} diff --git a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/cloud/github/SpringCloudGithubIssuesAccessor.java b/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/cloud/github/SpringCloudGithubIssuesAccessor.java deleted file mode 100644 index af16bd87..00000000 --- a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/cloud/github/SpringCloudGithubIssuesAccessor.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * 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 - * - * https://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. - */ - -package org.springframework.cloud.release.cloud.github; - -import com.jcabi.github.Github; - -import org.springframework.cloud.release.internal.ReleaserProperties; -import org.springframework.cloud.release.internal.github.CustomGithubIssues; - -public class SpringCloudGithubIssuesAccessor { - - public static CustomGithubIssues springCloud(Github github, - ReleaserProperties releaserProperties) { - return new SpringCloudGithubIssues(github, releaserProperties); - } - - public static CustomGithubIssues springCloud(ReleaserProperties releaserProperties) { - return new SpringCloudGithubIssues(releaserProperties); - } - -} diff --git a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/AcceptanceTests.java b/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/AcceptanceTests.java deleted file mode 100644 index d7b3813f..00000000 --- a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/AcceptanceTests.java +++ /dev/null @@ -1,1099 +0,0 @@ -/* - * Copyright 2013-2019 the original author or authors. - * - * 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 - * - * https://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. - */ - -package org.springframework.cloud.release.internal.spring; - -import java.io.File; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.nio.file.Files; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import org.apache.maven.model.Model; -import org.assertj.core.api.BDDAssertions; -import org.eclipse.jgit.api.Git; -import org.eclipse.jgit.api.ResetCommand; -import org.eclipse.jgit.api.errors.GitAPIException; -import org.eclipse.jgit.revwalk.RevCommit; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; -import org.mockito.BDDMockito; -import org.mockito.Mockito; - -import org.springframework.cloud.release.cloud.docs.SpringCloudDocsAccessor; -import org.springframework.cloud.release.cloud.github.SpringCloudGithubIssuesAccessor; -import org.springframework.cloud.release.internal.Releaser; -import org.springframework.cloud.release.internal.ReleaserProperties; -import org.springframework.cloud.release.internal.buildsystem.BomParser; -import org.springframework.cloud.release.internal.buildsystem.GradleUpdater; -import org.springframework.cloud.release.internal.buildsystem.MavenBomParserAccessor; -import org.springframework.cloud.release.internal.buildsystem.ProjectPomUpdater; -import org.springframework.cloud.release.internal.buildsystem.TestPomReader; -import org.springframework.cloud.release.internal.buildsystem.TestUtils; -import org.springframework.cloud.release.internal.docs.DocumentationUpdater; -import org.springframework.cloud.release.internal.docs.TestDocumentationUpdater; -import org.springframework.cloud.release.internal.docs.TestReleaseContentsUpdater; -import org.springframework.cloud.release.internal.git.GitTestUtils; -import org.springframework.cloud.release.internal.git.ProjectGitHandler; -import org.springframework.cloud.release.internal.github.ProjectGitHubHandler; -import org.springframework.cloud.release.internal.options.Options; -import org.springframework.cloud.release.internal.options.OptionsBuilder; -import org.springframework.cloud.release.internal.postrelease.PostReleaseActions; -import org.springframework.cloud.release.internal.project.ProjectCommandExecutor; -import org.springframework.cloud.release.internal.project.ProjectVersion; -import org.springframework.cloud.release.internal.project.Projects; -import org.springframework.cloud.release.internal.sagan.Project; -import org.springframework.cloud.release.internal.sagan.Release; -import org.springframework.cloud.release.internal.sagan.SaganClient; -import org.springframework.cloud.release.internal.sagan.SaganUpdater; -import org.springframework.cloud.release.internal.template.TemplateGenerator; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationEventPublisher; -import org.springframework.util.FileSystemUtils; - -import static org.assertj.core.api.BDDAssertions.then; -import static org.mockito.ArgumentMatchers.anyString; - -/** - * @author Marcin Grzejszczak - */ -public class AcceptanceTests { - - @Rule - public TemporaryFolder tmp = new TemporaryFolder(); - - TestPomReader testPomReader = new TestPomReader(); - - File springCloudConsulProject; - - File temporaryFolder; - - File documentationFolder; - - TestProjectGitHubHandler gitHandler; - - NonAssertingTestProjectGitHandler nonAssertingGitHandler; - - NonAssertingTestProjectGitHubHandler nonAssertingGitHubHandler; - - SaganClient saganClient = Mockito.mock(SaganClient.class); - - ReleaserProperties releaserProperties; - - TemplateGenerator templateGenerator; - - SaganUpdater saganUpdater; - - DocumentationUpdater documentationUpdater; - - ApplicationContext applicationContext = Mockito.mock(ApplicationContext.class); - - ReleaserPropertiesUpdater updater = new ReleaserPropertiesUpdater( - this.applicationContext); - - PostReleaseActions postReleaseActions = Mockito.mock(PostReleaseActions.class); - - ApplicationEventPublisher applicationEventPublisher = Mockito - .mock(ApplicationEventPublisher.class); - - @Before - public void setup() throws Exception { - this.temporaryFolder = this.tmp.newFolder(); - this.springCloudConsulProject = new File(AcceptanceTests.class - .getResource("/projects/spring-cloud-consul").toURI()); - TestUtils.prepareLocalRepo(); - FileSystemUtils.copyRecursively(file("/projects/"), this.temporaryFolder); - BDDMockito.given(this.saganClient.getProject(anyString())) - .willReturn(newProject()); - Task.stepSkipper = () -> false; - new File("/tmp/executed_build").delete(); - new File("/tmp/executed_deploy").delete(); - new File("/tmp/executed_docs").delete(); - } - - @After - public void clean() { - Task.stepSkipper = new ConsoleInputStepSkipper(); - } - - private Project newProject() { - Project project = new Project(); - project.projectReleases.addAll(Arrays.asList(release("1.0.0.M8"), - release("1.1.0.M8"), release("1.2.0.M8"), release("2.0.0.M8"))); - return project; - } - - private Release release(String version) { - Release release = new Release(); - release.version = version; - release.current = true; - return release; - } - - @Test - public void should_fail_to_perform_a_release_of_consul_when_sc_release_contains_snapshots() - throws Exception { - File origin = GitTestUtils.clonedProject(this.tmp.newFolder(), - this.springCloudConsulProject); - pomVersionIsEqualTo(origin, "1.2.0.BUILD-SNAPSHOT"); - consulPomParentVersionIsEqualTo(origin, "1.2.0.BUILD-SNAPSHOT"); - File project = GitTestUtils.clonedProject(this.tmp.newFolder(), - tmpFile("spring-cloud-consul")); - GitTestUtils.setOriginOnProjectToTmp(origin, project); - SpringReleaser releaser = releaserWithSnapshotScRelease(project, - "spring-cloud-consul", "vCamden.SR5.BROKEN", "1.1.2.RELEASE"); - - BDDAssertions.thenThrownBy(releaser::release).hasMessageContaining( - "there is at least one SNAPSHOT library version in the Spring Cloud Release project"); - } - - @Test - public void should_not_clone_when_option_not_to_clone_was_switched_on() - throws Exception { - File origin = GitTestUtils.clonedProject(this.tmp.newFolder(), - this.springCloudConsulProject); - pomVersionIsEqualTo(origin, "1.2.0.BUILD-SNAPSHOT"); - consulPomParentVersionIsEqualTo(origin, "1.2.0.BUILD-SNAPSHOT"); - File project = GitTestUtils.clonedProject(this.tmp.newFolder(), - tmpFile("spring-cloud-consul")); - GitTestUtils.setOriginOnProjectToTmp(origin, project); - SpringReleaser releaser = templateOnlyReleaser(project, "spring-cloud-consul", - "vCamden.SR5", "1.1.2.RELEASE"); - this.releaserProperties.getGit().setFetchVersionsFromGit(false); - this.releaserProperties.getFixedVersions().put("spring-cloud-release", - "Finchley.RELEASE"); - this.releaserProperties.getFixedVersions().put("spring-cloud-consul", - "2.3.4.RELEASE"); - File temporaryDestination = this.tmp.newFolder(); - this.releaserProperties.getGit() - .setCloneDestinationDir(temporaryDestination.getAbsolutePath()); - - releaser.release(); - - then(temporaryDestination.list()).isEmpty(); - } - - @Test - public void should_perform_a_release_of_consul() throws Exception { - GitTestUtils.openGitProject(file("/projects/spring-cloud-release/")).checkout() - .setName("Greenwich").call(); - File origin = GitTestUtils.clonedProject(this.tmp.newFolder(), - this.springCloudConsulProject); - pomVersionIsEqualTo(origin, "1.2.0.BUILD-SNAPSHOT"); - consulPomParentVersionIsEqualTo(origin, "1.2.0.BUILD-SNAPSHOT"); - File project = GitTestUtils.clonedProject(this.tmp.newFolder(), - tmpFile("spring-cloud-consul")); - GitTestUtils.setOriginOnProjectToTmp(origin, project); - SpringReleaser releaser = releaser(project, "spring-cloud-consul", - "vGreenwich.SR2", "2.1.2.RELEASE"); - - releaser.release(); - - Iterable commits = listOfCommits(project); - Iterator iterator = commits.iterator(); - tagIsPresentInOrigin(origin, "v2.1.2.RELEASE"); - commitIsPresent(iterator, - "Bumping versions to 2.1.3.BUILD-SNAPSHOT after release"); - commitIsPresent(iterator, "Going back to snapshots"); - commitIsPresent(iterator, "Update SNAPSHOT to 2.1.2.RELEASE"); - pomVersionIsEqualTo(project, "2.1.3.BUILD-SNAPSHOT"); - consulPomParentVersionIsEqualTo(project, "2.1.3.BUILD-SNAPSHOT"); - then(this.gitHandler.closedMilestones).isTrue(); - then(emailTemplate()).exists(); - then(emailTemplateContents()).contains("Spring Cloud Greenwich.SR2 available") - .contains("Spring Cloud Greenwich SR2 Train release"); - then(blogTemplate()).exists(); - then(blogTemplateContents()) - .contains("I am pleased to announce that the Service Release 2 (SR2)"); - then(releaseNotesTemplate()).exists(); - then(releaseNotesTemplateContents()).contains("Greenwich.SR2").contains( - "- Spring Cloud Config `2.1.3.RELEASE` ([issues](https://foo.bar.com/2.1.3.RELEASE))") - .contains( - "- Spring Cloud Aws `2.1.2.RELEASE` ([issues](https://foo.bar.com/2.1.2.RELEASE))"); - // once for updating GA - // second time to update SNAPSHOT - BDDMockito.then(this.saganClient).should(BDDMockito.times(2)).updateRelease( - BDDMockito.eq("spring-cloud-consul"), BDDMockito.anyList()); - BDDMockito.then(this.saganClient).should().deleteRelease("spring-cloud-consul", - "2.1.2.BUILD-SNAPSHOT"); - then(this.gitHandler.issueCreatedInSpringGuides).isTrue(); - then(this.gitHandler.issueCreatedInStartSpringIo).isTrue(); - then(Files.readSymbolicLink( - new File(this.documentationFolder, "spring-cloud-consul/current") - .toPath()) - .toString()).endsWith("5.3.5.RELEASE"); - then(Files - .readSymbolicLink(new File(this.documentationFolder, "current").toPath()) - .toString()).endsWith("Xitmars.SR4"); - thenRunUpdatedTestsWereCalled(); - } - - @Test - public void should_perform_a_meta_release_of_sc_release_and_consul() - throws Exception { - // simulates an org - GitTestUtils.openGitProject(file("/projects/spring-cloud-release/")).checkout() - .setName("Edgware").call(); - SpringReleaser releaser = metaReleaser(edgwareSr10()); - - releaser.release(new OptionsBuilder().metaRelease(true).options()); - - // consul, release, documentation - then(this.nonAssertingGitHandler.clonedProjects).hasSize(3); - // don't want to verify the docs - thenAllStepsWereExecutedForEachProject(); - thenSaganWasCalled(); - thenDocumentationWasUpdated(); - BDDAssertions.then(clonedProject("spring-cloud-consul").tagList().call()) - .extracting("name").contains("refs/tags/v5.3.5.RELEASE"); - thenRunUpdatedTestsWereCalled(); - thenUpdateReleaseTrainDocsWasCalled(); - } - - @Test - public void should_perform_a_meta_release_dry_run_of_sc_release_and_consul() - throws Exception { - // simulates an org - GitTestUtils.openGitProject(file("/projects/spring-cloud-release/")).checkout() - .setName("Edgware").call(); - SpringReleaser releaser = metaReleaserDryRun(edgwareSr10()); - - releaser.release(new OptionsBuilder().metaRelease(true).dryRun(true).options()); - - // consul, release - then(this.nonAssertingGitHandler.clonedProjects).hasSize(2); - thenAllDryRunStepsWereExecutedForEachProject(); - thenSaganWasNotCalled(); - thenDocumentationWasNotUpdated(); - BDDAssertions.then(clonedProject("spring-cloud-consul").tagList().call()) - .extracting("name").doesNotContain("refs/tags/v5.3.5.RELEASE"); - thenRunUpdatedTestsWereNotCalled(); - thenUpdateReleaseTrainDocsWasNotCalled(); - } - - private void thenRunUpdatedTestsWereCalled() { - BDDMockito.then(this.postReleaseActions).should() - .runUpdatedTests(BDDMockito.any(Projects.class)); - } - - private void thenRunUpdatedTestsWereNotCalled() { - BDDMockito.then(this.postReleaseActions).shouldHaveNoInteractions(); - } - - private void thenUpdateReleaseTrainDocsWasCalled() { - BDDMockito.then(this.postReleaseActions).should() - .generateReleaseTrainDocumentation(BDDMockito.any(Projects.class)); - } - - private void thenUpdateReleaseTrainDocsWasNotCalled() { - BDDMockito.then(this.postReleaseActions).shouldHaveNoInteractions(); - } - - private Map edgwareSr10() { - Map versions = new LinkedHashMap<>(); - versions.put("spring-boot", "5.5.16.RELEASE"); - versions.put("spring-cloud-build", "5.3.11.RELEASE"); - versions.put("spring-cloud-commons", "5.3.5.RELEASE"); - versions.put("spring-cloud-stream", "Xitmars.SR4"); - versions.put("spring-cloud-task", "5.2.3.RELEASE"); - versions.put("spring-cloud-function", "5.0.1.RELEASE"); - versions.put("spring-cloud-aws", "5.2.3.RELEASE"); - versions.put("spring-cloud-bus", "5.3.4.RELEASE"); - versions.put("spring-cloud-config", "5.4.5.RELEASE"); - versions.put("spring-cloud-netflix", "5.4.6.RELEASE"); - versions.put("spring-cloud-cloudfoundry", "5.1.2.RELEASE"); - versions.put("spring-cloud-gateway", "5.0.2.RELEASE"); - versions.put("spring-cloud-security", "5.2.3.RELEASE"); - versions.put("spring-cloud-consul", "5.3.5.RELEASE"); - versions.put("spring-cloud-zookeeper", "5.2.2.RELEASE"); - versions.put("spring-cloud-sleuth", "5.3.5.RELEASE"); - versions.put("spring-cloud-contract", "5.2.6.RELEASE"); - versions.put("spring-cloud-vault", "5.1.2.RELEASE"); - versions.put("spring-cloud-release", "Edgware.SR10"); - return versions; - } - - private Git clonedProject(String name) { - return GitTestUtils.openGitProject(this.nonAssertingGitHandler.clonedProjects - .stream().filter(file -> file.getName().equals(name)).findFirst().get()); - } - - private Git gitProject(File file) { - return GitTestUtils.openGitProject(file); - } - - private void thenSaganWasCalled() { - BDDMockito.then(this.saganUpdater).should(BDDMockito.atLeastOnce()).updateSagan( - BDDMockito.any(File.class), BDDMockito.anyString(), - BDDMockito.any(ProjectVersion.class), - BDDMockito.any(ProjectVersion.class), BDDMockito.any(Projects.class)); - } - - private void thenSaganWasNotCalled() { - BDDMockito.then(this.saganUpdater).shouldHaveNoInteractions(); - } - - private void thenAllStepsWereExecutedForEachProject() { - this.nonAssertingGitHandler.clonedProjects.stream() - .filter(f -> !f.getName().contains("angel") - && !f.getName().equals("spring-cloud")) - .forEach(project -> { - then(Arrays.asList("spring-cloud-starter-build", - "spring-cloud-consul")) - .contains(pom(project).getArtifactId()); - then(new File("/tmp/executed_build")).exists(); - then(new File("/tmp/executed_deploy")).exists(); - then(new File("/tmp/executed_docs")).exists(); - }); - } - - private void thenAllDryRunStepsWereExecutedForEachProject() { - this.nonAssertingGitHandler.clonedProjects.stream() - .filter(f -> !f.getName().contains("angel") - && !f.getName().equals("spring-cloud")) - .forEach(project -> { - then(Arrays.asList("spring-cloud-starter-build", - "spring-cloud-consul")) - .contains(pom(project).getArtifactId()); - then(new File("/tmp/executed_build")).exists(); - then(new File("/tmp/executed_deploy")).doesNotExist(); - then(new File("/tmp/executed_docs")).doesNotExist(); - }); - } - - @Test - public void should_not_clone_any_projects_when_they_are_on_list_of_projects_to_skip() - throws Exception { - Map versions = new HashMap<>(); - versions.put("spring-cloud-release", "Camden.BUILD-SNAPSHOT"); - versions.put("spring-cloud-consul", "1.1.2.BUILD-SNAPSHOT"); - SpringReleaser releaser = metaReleaser(versions); - this.releaserProperties.getMetaRelease().getProjectsToSkip() - .add("spring-cloud-release"); - this.releaserProperties.getMetaRelease().getProjectsToSkip() - .add("spring-cloud-consul"); - this.releaserProperties.getGit().setUpdateReleaseTrainWiki(false); - File temporaryDestination = this.tmp.newFolder(); - this.releaserProperties.getGit() - .setCloneDestinationDir(temporaryDestination.getAbsolutePath()); - - releaser.release(new OptionsBuilder().metaRelease(true).options()); - - then(temporaryDestination.list()).isEmpty(); - } - - @Test - public void should_perform_a_meta_release_of_consul_only_when_run_from_got_passed() - throws Exception { - // simulates an org - Map versions = new HashMap<>(); - versions.put("spring-cloud-release", "Camden.BUILD-SNAPSHOT"); - versions.put("spring-cloud-build", "1.1.2.BUILD-SNAPSHOT"); - versions.put("spring-cloud-consul", "1.1.2.BUILD-SNAPSHOT"); - SpringReleaser releaser = metaReleaser(versions); - - releaser.release(new OptionsBuilder().metaRelease(true) - .startFrom("spring-cloud-consul").options()); - - // consul - then(this.nonAssertingGitHandler.clonedProjects).hasSize(1); - this.nonAssertingGitHandler.clonedProjects.stream() - .filter(file -> file.getName().equals("spring-cloud-consul")) - .forEach(project -> { - then(pom(project).getArtifactId()).isEqualTo("spring-cloud-consul"); - then(new File("/tmp/executed_build")).exists(); - then(new File("/tmp/executed_deploy")).exists(); - then(new File("/tmp/executed_docs")).exists(); - }); - thenSaganWasCalled(); - thenDocumentationWasUpdated(); - thenWikiPageWasUpdated(); - } - - @Test - public void should_perform_a_meta_release_of_consul_only_when_task_names_got_passed() - throws Exception { - // simulates an org - Map versions = new HashMap<>(); - versions.put("spring-cloud-release", "Camden.BUILD-SNAPSHOT"); - versions.put("spring-cloud-build", "1.1.2.BUILD-SNAPSHOT"); - versions.put("spring-cloud-consul", "1.1.2.BUILD-SNAPSHOT"); - SpringReleaser releaser = metaReleaser(versions); - - releaser.release(new OptionsBuilder().metaRelease(true) - .taskNames(Collections.singletonList("spring-cloud-consul")).options()); - - // consul - then(this.nonAssertingGitHandler.clonedProjects).hasSize(1); - this.nonAssertingGitHandler.clonedProjects.stream() - .filter(file -> !file.getName().equals("spring-cloud")) - .forEach(project -> { - then(Collections.singletonList("spring-cloud-consul")) - .contains(pom(project).getArtifactId()); - then(new File("/tmp/executed_build")).exists(); - then(new File("/tmp/executed_deploy")).exists(); - then(new File("/tmp/executed_docs")).exists(); - }); - thenSaganWasCalled(); - thenDocumentationWasUpdated(); - thenWikiPageWasUpdated(); - } - - private void thenDocumentationWasUpdated() { - BDDMockito.then(this.documentationUpdater).should().updateDocsRepo( - BDDMockito.any(Projects.class), BDDMockito.any(ProjectVersion.class), - BDDMockito.anyString()); - } - - private void thenDocumentationWasNotUpdated() { - BDDMockito.then(this.documentationUpdater).shouldHaveNoInteractions(); - } - - private void thenWikiPageWasUpdated() { - BDDMockito.then(this.documentationUpdater).should() - .updateReleaseTrainWiki(BDDMockito.any(Projects.class)); - } - - // issue #74 - @Test - public void should_perform_a_release_of_sc_build() throws Exception { - GitTestUtils.openGitProject(file("/projects/spring-cloud-release/")).checkout() - .setName("vGreenwich.SR2").call(); - File origin = GitTestUtils.clonedProject(this.tmp.newFolder(), - new File(AcceptanceTests.class.getResource("/projects/spring-cloud-build") - .toURI())); - pomVersionIsEqualTo(origin, "1.3.7.BUILD-SNAPSHOT"); - pomParentVersionIsEqualTo(origin, "spring-cloud-build-dependencies", - "1.5.9.RELEASE"); - File project = GitTestUtils.clonedProject(this.tmp.newFolder(), - tmpFile("spring-cloud-build")); - GitTestUtils.setOriginOnProjectToTmp(origin, project); - SpringReleaser releaser = releaser(project, "spring-cloud-build", - "vGreenwich.SR2", "2.1.6.RELEASE"); - - releaser.release(); - - Iterable commits = listOfCommits(project); - Iterator iterator = commits.iterator(); - tagIsPresentInOrigin(origin, "v2.1.6.RELEASE"); - // we're running against camden sc-release - commitIsPresent(iterator, - "Bumping versions to 2.1.7.BUILD-SNAPSHOT after release"); - commitIsPresent(iterator, "Going back to snapshots"); - commitIsPresent(iterator, "Update SNAPSHOT to 2.1.6.RELEASE"); - pomVersionIsEqualTo(project, "2.1.7.BUILD-SNAPSHOT"); - pomParentVersionIsEqualTo(project, "spring-cloud-build-dependencies", - "2.1.6.RELEASE"); - then(this.gitHandler.closedMilestones).isTrue(); - then(emailTemplate()).exists(); - then(blogTemplate()).exists(); - then(releaseNotesTemplate()).exists(); - // once for updating GA - // second time to update SNAPSHOT - BDDMockito.then(this.saganClient).should(BDDMockito.times(2)) - .updateRelease(BDDMockito.eq("spring-cloud-build"), BDDMockito.anyList()); - BDDMockito.then(this.saganClient).should().deleteRelease("spring-cloud-build", - "2.1.6.BUILD-SNAPSHOT"); - then(this.gitHandler.issueCreatedInSpringGuides).isTrue(); - then(this.gitHandler.issueCreatedInStartSpringIo).isTrue(); - then(Files.readSymbolicLink( - new File(this.documentationFolder, "spring-cloud-build/current").toPath()) - .toString()).endsWith("5.3.11.RELEASE"); - then(Files - .readSymbolicLink(new File(this.documentationFolder, "current").toPath()) - .toString()).endsWith("Xitmars.SR4"); - } - - @Test - public void should_perform_a_release_of_consul_rc1() throws Exception { - File origin = GitTestUtils.clonedProject(this.tmp.newFolder(), - this.springCloudConsulProject); - pomVersionIsEqualTo(origin, "1.2.0.BUILD-SNAPSHOT"); - consulPomParentVersionIsEqualTo(origin, "1.2.0.BUILD-SNAPSHOT"); - File project = GitTestUtils.clonedProject(this.tmp.newFolder(), - tmpFile("spring-cloud-consul")); - GitTestUtils.setOriginOnProjectToTmp(origin, project); - Git git = GitTestUtils.openGitProject(file("/projects/spring-cloud-release/")); - git.reset().setMode(ResetCommand.ResetType.HARD).setRef("vDalston.RC1").call(); - git.checkout().setName("vDalston.RC1").call(); - SpringReleaser releaser = releaser(project, "spring-cloud-consul", "vDalston.RC1", - "1.2.0.RC1"); - - releaser.release(); - - Iterable commits = listOfCommits(project); - tagIsPresentInOrigin(origin, "v1.2.0.RC1"); - commitIsNotPresent(commits, - "Bumping versions to 1.2.1.BUILD-SNAPSHOT after release"); - Iterator iterator = listOfCommits(project).iterator(); - commitIsPresent(iterator, "Going back to snapshots"); - commitIsPresent(iterator, "Update SNAPSHOT to 1.2.0.RC1"); - pomVersionIsEqualTo(project, "1.2.0.BUILD-SNAPSHOT"); - consulPomParentVersionIsEqualTo(project, "1.2.0.BUILD-SNAPSHOT"); - then(this.gitHandler.closedMilestones).isTrue(); - then(emailTemplate()).exists(); - then(emailTemplateContents()).contains("Spring Cloud Dalston.RC1 available") - .contains("Spring Cloud Dalston RC1 Train release"); - then(blogTemplate()).exists(); - then(blogTemplateContents()) - .contains("I am pleased to announce that the Release Candidate 1 (RC1)"); - then(tweetTemplate()).exists(); - then(tweetTemplateContents()) - .contains("The Dalston.RC1 version of @springcloud has been released!"); - then(releaseNotesTemplate()).exists(); - then(releaseNotesTemplateContents()).contains("Dalston.RC1").contains( - "- Spring Cloud Build `1.3.1.RELEASE` ([issues](https://foo.bar.com/1.3.1.RELEASE))") - .contains( - "- Spring Cloud Bus `1.3.0.M1` ([issues](https://foo.bar.com/1.3.0.M1))"); - BDDMockito.then(this.saganClient).should().updateRelease( - BDDMockito.eq("spring-cloud-consul"), BDDMockito.anyList()); - BDDMockito.then(this.saganClient).should().deleteRelease("spring-cloud-consul", - "1.2.0.M8"); - BDDMockito.then(this.saganClient).should().deleteRelease("spring-cloud-consul", - "1.2.0.RC1"); - // we update guides only for SR / RELEASE - then(this.gitHandler.issueCreatedInSpringGuides).isFalse(); - then(this.gitHandler.issueCreatedInStartSpringIo).isFalse(); - // haven't even checked out the branch - then(new File(this.documentationFolder, "current/index.html")).doesNotExist(); - } - - @Test - public void should_generate_templates_only() throws Exception { - GitTestUtils.openGitProject(file("/projects/spring-cloud-release/")).checkout() - .setName("vDalston.RC1").call(); - File origin = GitTestUtils.clonedProject(this.tmp.newFolder(), - this.springCloudConsulProject); - pomVersionIsEqualTo(origin, "1.2.0.BUILD-SNAPSHOT"); - consulPomParentVersionIsEqualTo(origin, "1.2.0.BUILD-SNAPSHOT"); - File project = GitTestUtils.clonedProject(this.tmp.newFolder(), - tmpFile("spring-cloud-consul")); - GitTestUtils.setOriginOnProjectToTmp(origin, project); - SpringReleaser releaser = templateOnlyReleaser(project, "spring-cloud-consul", - "vDalston.RC1", "1.2.0.RC1"); - - releaser.release(); - - then(this.gitHandler.closedMilestones).isFalse(); - then(emailTemplate()).exists(); - then(emailTemplateContents()).contains("Spring Cloud Dalston.RC1 available") - .contains("Spring Cloud Dalston RC1 Train release"); - then(blogTemplate()).exists(); - then(blogTemplateContents()) - .contains("I am pleased to announce that the Release Candidate 1 (RC1)"); - then(tweetTemplate()).exists(); - then(tweetTemplateContents()) - .contains("The Dalston.RC1 version of @springcloud has been released!"); - then(releaseNotesTemplate()).exists(); - then(releaseNotesTemplateContents()).contains("Dalston.RC1").contains( - "- Spring Cloud Build `1.3.1.RELEASE` ([issues](https://foo.bar.com/1.3.1.RELEASE))") - .contains( - "- Spring Cloud Bus `1.3.0.M1` ([issues](https://foo.bar.com/1.3.0.M1)"); - BDDMockito.then(this.saganClient).should(BDDMockito.never()) - .updateRelease(BDDMockito.anyString(), BDDMockito.anyList()); - then(this.gitHandler.issueCreatedInSpringGuides).isFalse(); - then(this.gitHandler.issueCreatedInStartSpringIo).isFalse(); - } - - private Iterable listOfCommits(File project) throws GitAPIException { - return GitTestUtils.openGitProject(project).log().call(); - } - - private void pomParentVersionIsEqualTo(File project, String child, String expected) { - then(pom(new File(project, child)).getParent().getVersion()).isEqualTo(expected); - } - - private void consulPomParentVersionIsEqualTo(File project, String expected) { - pomParentVersionIsEqualTo(project, "spring-cloud-starter-consul", expected); - } - - private void pomVersionIsEqualTo(File project, String expected) { - then(pom(project).getVersion()).isEqualTo(expected); - } - - private void commitIsPresent(Iterator iterator, String expected) { - RevCommit commit = iterator.next(); - then(commit.getShortMessage()).isEqualTo(expected); - } - - private void commitIsNotPresent(Iterable commits, String expected) { - for (RevCommit commit : commits) { - then(commit.getShortMessage()).isNotEqualTo(expected); - } - } - - private void tagIsPresentInOrigin(File origin, String expectedTag) - throws GitAPIException { - then(GitTestUtils.openGitProject(origin).tagList().call().iterator().next() - .getName()).endsWith(expectedTag); - } - - private Model pom(File dir) { - return this.testPomReader.readPom(new File(dir, "pom.xml")); - } - - private File emailTemplate() { - return new File("target/email.txt"); - } - - private String emailTemplateContents() throws URISyntaxException, IOException { - return new String(Files.readAllBytes(emailTemplate().toPath())); - } - - private File blogTemplate() { - return new File("target/blog.md"); - } - - private File tweetTemplate() { - return new File("target/tweet.txt"); - } - - private File releaseNotesTemplate() { - return new File("target/notes.md"); - } - - private String blogTemplateContents() throws URISyntaxException, IOException { - return new String(Files.readAllBytes(blogTemplate().toPath())); - } - - private String tweetTemplateContents() throws URISyntaxException, IOException { - return new String(Files.readAllBytes(tweetTemplate().toPath())); - } - - private String releaseNotesTemplateContents() throws URISyntaxException, IOException { - return new String(Files.readAllBytes(releaseNotesTemplate().toPath())); - } - - private SpringReleaser releaser(File projectFile, String projectName, String branch, - String expectedVersion) throws Exception { - ReleaserProperties properties = releaserProperties(projectFile, branch); - return releaserWithFullDeployment(expectedVersion, projectName, properties); - } - - private SpringReleaser metaReleaser(Map versions) throws Exception { - ReleaserProperties properties = metaReleaserProperties(versions); - return metaReleaserWithFullDeployment(properties); - } - - private SpringReleaser metaReleaserDryRun(Map versions) - throws Exception { - ReleaserProperties properties = metaReleaserProperties(versions); - return metaReleaserWithDryRun(properties); - } - - private SpringReleaser releaserWithFullDeployment(String expectedVersion, - String projectName, ReleaserProperties properties) throws Exception { - Releaser releaser = defaultReleaser(expectedVersion, projectName, properties); - return new SpringReleaser(releaser, properties, new OptionsProcessor(releaser, - properties, this.applicationEventPublisher) { - @Override - String chosenOption() { - return "0"; - } - - @Override - void postReleaseOptions(Options options, Args defaultArgs) { - options.interactive = false; - super.postReleaseOptions(options, defaultArgs); - } - }, this.updater, this.applicationEventPublisher); - } - - private SpringReleaser metaReleaserWithFullDeployment(ReleaserProperties properties) - throws Exception { - Releaser releaser = defaultMetaReleaser(properties); - return new SpringReleaser(releaser, properties, new OptionsProcessor(releaser, - properties, this.applicationEventPublisher) { - @Override - String chosenOption() { - return "0"; - } - - @Override - void postReleaseOptions(Options options, Args defaultArgs) { - options.interactive = false; - super.postReleaseOptions(options, defaultArgs); - } - }, this.updater, this.applicationEventPublisher); - } - - private SpringReleaser metaReleaserWithDryRun(ReleaserProperties properties) - throws Exception { - Releaser releaser = defaultMetaReleaser(properties); - return new SpringReleaser(releaser, properties, new OptionsProcessor(releaser, - properties, this.applicationEventPublisher) { - @Override - String chosenOption() { - // meta release dry run - return String.valueOf(TaskUtils.indexOf(Tasks.META_RELEASE_DRY_RUN)); - } - - @Override - void postReleaseOptions(Options options, Args defaultArgs) { - options.interactive = false; - super.postReleaseOptions(options, defaultArgs); - } - }, this.updater, this.applicationEventPublisher); - } - - private SpringReleaser releaserWithSnapshotScRelease(File projectFile, - String projectName, String branch, String expectedVersion) throws Exception { - ReleaserProperties properties = snapshotScReleaseReleaserProperties(projectFile, - branch); - return releaserWithFullDeployment(expectedVersion, projectName, properties); - } - - private SpringReleaser templateOnlyReleaser(File projectFile, String projectName, - String branch, String expectedVersion) throws Exception { - ReleaserProperties properties = releaserProperties(projectFile, branch); - Releaser releaser = defaultReleaser(expectedVersion, projectName, properties); - return new SpringReleaser(releaser, properties, new OptionsProcessor(releaser, - properties, this.applicationEventPublisher) { - @Override - String chosenOption() { - return String.valueOf(TaskUtils.indexOf(Tasks.CREATE_TEMPLATES)); - } - - @Override - void postReleaseOptions(Options options, Args defaultArgs) { - options.interactive = true; - super.postReleaseOptions(options, defaultArgs); - } - }, this.updater, this.applicationEventPublisher); - } - - private Releaser defaultReleaser(String expectedVersion, String projectName, - ReleaserProperties properties) { - ProjectPomUpdater pomUpdater = new ProjectPomUpdater(properties, - bomParsers(properties)); - ProjectCommandExecutor projectCommandExecutor = new ProjectCommandExecutor( - properties); - ProjectGitHandler gitHandler = new ProjectGitHandler(properties); - TestProjectGitHubHandler githubHandler = new TestProjectGitHubHandler(properties, - expectedVersion, projectName); - TemplateGenerator templateGenerator = new TemplateGenerator(properties, - githubHandler); - GradleUpdater gradleUpdater = new GradleUpdater(properties); - SaganUpdater saganUpdater = new SaganUpdater(this.saganClient, - this.releaserProperties); - TestReleaseContentsUpdater testReleaseContentsUpdater = new TestReleaseContentsUpdater( - properties, gitHandler, templateGenerator); - DocumentationUpdater documentationUpdater = new TestDocumentationUpdater( - properties, - SpringCloudDocsAccessor.testUpdater(gitHandler, "Brixton.SR1"), - gitHandler, testReleaseContentsUpdater) { - @Override - public File updateDocsRepo(Projects projects, ProjectVersion currentProject, - String bomReleaseBranch) { - File file = super.updateDocsRepo(projects, currentProject, - bomReleaseBranch); - AcceptanceTests.this.documentationFolder = file; - return file; - } - }; - Releaser releaser = new Releaser(releaserProperties, pomUpdater, - projectCommandExecutor, gitHandler, githubHandler, templateGenerator, - gradleUpdater, saganUpdater, documentationUpdater, - this.postReleaseActions); - this.gitHandler = githubHandler; - return releaser; - } - - private Releaser defaultMetaReleaser(ReleaserProperties properties) { - ProjectPomUpdater pomUpdater = new ProjectPomUpdater(properties, - bomParsers(properties)); - ProjectCommandExecutor projectCommandExecutor = new ProjectCommandExecutor( - properties); - NonAssertingTestProjectGitHubHandler handler = new NonAssertingTestProjectGitHubHandler( - properties); - NonAssertingTestProjectGitHandler nonAssertingGitHandler = new NonAssertingTestProjectGitHandler( - properties); - TemplateGenerator templateGenerator = Mockito - .spy(new TemplateGenerator(properties, handler)); - GradleUpdater gradleUpdater = new GradleUpdater(properties); - SaganUpdater saganUpdater = Mockito - .spy(new SaganUpdater(this.saganClient, this.releaserProperties)); - DocumentationUpdater documentationUpdater = Mockito - .spy(new TestDocumentationUpdater(properties, - SpringCloudDocsAccessor.testUpdater(nonAssertingGitHandler, - "Brixton.SR1"), - nonAssertingGitHandler, new TestReleaseContentsUpdater(properties, - nonAssertingGitHandler, templateGenerator)) { - @Override - public File updateDocsRepo(Projects projects, - ProjectVersion currentProject, String bomReleaseBranch) { - File file = super.updateDocsRepo(projects, currentProject, - bomReleaseBranch); - AcceptanceTests.this.documentationFolder = file; - return file; - } - }); - Releaser releaser = Mockito - .spy(new Releaser(releaserProperties, pomUpdater, projectCommandExecutor, - nonAssertingGitHandler, handler, templateGenerator, gradleUpdater, - saganUpdater, documentationUpdater, this.postReleaseActions)); - this.nonAssertingGitHubHandler = handler; - this.nonAssertingGitHandler = nonAssertingGitHandler; - this.templateGenerator = templateGenerator; - this.saganUpdater = saganUpdater; - this.documentationUpdater = documentationUpdater; - return releaser; - } - - private List bomParsers(ReleaserProperties properties) { - return Collections - .singletonList(MavenBomParserAccessor.cloudMavenBomParser(properties)); - } - - private ReleaserProperties releaserProperties(File project, String branch) - throws URISyntaxException { - ReleaserProperties releaserProperties = new ReleaserProperties(); - releaserProperties.getGit().setReleaseTrainBomUrl( - file("/projects/spring-cloud-release/").toURI().toString()); - releaserProperties.getGit().setDocumentationUrl( - file("/projects/spring-cloud-static-angel/").toURI().toString()); - releaserProperties.getMaven().setBuildCommand("echo build"); - releaserProperties.getMaven().setDeployCommand("echo deploy"); - releaserProperties.getMaven() - .setPublishDocsCommands(new String[] { "echo docs" }); - releaserProperties.setWorkingDir(project.getPath()); - releaserProperties.getPom().setBranch(branch); - releaserProperties.getGit() - .setSpringProjectUrl(tmpFile("spring-cloud").getAbsolutePath() + "/"); - releaserProperties.getGit().setReleaseTrainWikiUrl( - tmpFile("spring-cloud-wiki").getAbsolutePath() + "/"); - releaserProperties.getGit().setRunUpdatedSamples(true); - releaserProperties.getGit().setUpdateSpringGuides(true); - releaserProperties.getGit().setUpdateStartSpringIo(true); - releaserProperties.getGit().setUpdateReleaseTrainWiki(true); - releaserProperties.getGit().setUpdateAllTestSamples(true); - releaserProperties.getGit().setUpdateDocumentationRepo(true); - releaserProperties.getGit().setUpdateReleaseTrainDocs(true); - releaserProperties.getSagan().setUpdateSagan(true); - URI initilizrUri = AcceptanceTests.class.getResource("/raw/initializr.yml") - .toURI(); - releaserProperties.getVersions().setAllVersionsFileUrl(initilizrUri.toString()); - this.releaserProperties = releaserProperties; - return releaserProperties; - } - - private ReleaserProperties metaReleaserProperties(Map versions) - throws URISyntaxException { - ReleaserProperties releaserProperties = new ReleaserProperties(); - Arrays.asList("spring-cloud-build", "spring-cloud-commons", "spring-cloud-stream", - "spring-cloud-task", "spring-cloud-function", "spring-cloud-aws", - "spring-cloud-bus", "spring-cloud-config", "spring-cloud-netflix", - "spring-cloud-cloudfoundry", "spring-cloud-gateway", - "spring-cloud-security", "spring-cloud-zookeeper", "spring-cloud-sleuth", - "spring-cloud-contract", "spring-cloud-vault") - .forEach(s -> releaserProperties.getMetaRelease().getProjectsToSkip() - .add(s)); - releaserProperties.getGit().setDocumentationUrl( - file("/projects/spring-cloud-static-angel/").toURI().toString()); - releaserProperties.getGit().setReleaseTrainBomUrl( - file("/projects/spring-cloud-release/").toURI().toString()); - releaserProperties.getMaven() - .setBuildCommand("echo '{{profiles}}' > /tmp/executed_build"); - releaserProperties.getMaven() - .setDeployCommand("echo '{{profiles}}' > /tmp/executed_deploy"); - releaserProperties.getMaven().setPublishDocsCommands( - new String[] { "echo '{{profiles}}' > /tmp/executed_docs" }); - releaserProperties.getMetaRelease() - .setGitOrgUrl("file://" + this.temporaryFolder.getAbsolutePath()); - releaserProperties.getMetaRelease().setEnabled(true); - releaserProperties.getGit() - .setSpringProjectUrl(tmpFile("spring-cloud").getAbsolutePath() + "/"); - releaserProperties.getGit().setReleaseTrainWikiUrl( - tmpFile("spring-cloud-wiki").getAbsolutePath() + "/"); - releaserProperties.setFixedVersions(versions); - releaserProperties.getGit().setRunUpdatedSamples(true); - releaserProperties.getGit().setUpdateSpringGuides(true); - releaserProperties.getGit().setUpdateStartSpringIo(true); - releaserProperties.getGit().setUpdateReleaseTrainWiki(true); - releaserProperties.getGit().setUpdateAllTestSamples(true); - releaserProperties.getGit().setUpdateDocumentationRepo(true); - releaserProperties.getGit().setUpdateReleaseTrainDocs(true); - URI initilizrUri = AcceptanceTests.class.getResource("/raw/initializr.yml") - .toURI(); - releaserProperties.getVersions().setAllVersionsFileUrl(initilizrUri.toString()); - this.releaserProperties = releaserProperties; - return releaserProperties; - } - - private ReleaserProperties snapshotScReleaseReleaserProperties(File project, - String branch) throws URISyntaxException { - ReleaserProperties releaserProperties = releaserProperties(project, branch); - releaserProperties.getGit().setReleaseTrainBomUrl( - file("/projects/spring-cloud-release-with-snapshot/").toURI().toString()); - releaserProperties.getGit().setDocumentationUrl( - file("/projects/spring-cloud-static/").toURI().toString()); - URI initilizrUri = AcceptanceTests.class.getResource("/raw/initializr.yml") - .toURI(); - releaserProperties.getVersions().setAllVersionsFileUrl(initilizrUri.toString()); - this.releaserProperties = releaserProperties; - return releaserProperties; - } - - private File tmpFile(String relativePath) { - return new File(this.temporaryFolder, relativePath); - } - - private File file(String relativePath) throws URISyntaxException { - return new File(AcceptanceTests.class.getResource(relativePath).toURI()); - } - - private String text(File file) throws IOException { - return new String(Files.readAllBytes(file.toPath())); - } - - class TestProjectGitHubHandler extends ProjectGitHubHandler { - - final String expectedVersion; - - final String projectName; - - boolean closedMilestones = false; - - boolean issueCreatedInSpringGuides = false; - - boolean issueCreatedInStartSpringIo = false; - - TestProjectGitHubHandler(ReleaserProperties properties, String expectedVersion, - String projectName) { - super(properties, Collections.singletonList( - SpringCloudGithubIssuesAccessor.springCloud(properties))); - this.expectedVersion = expectedVersion; - this.projectName = projectName; - } - - @Override - public void closeMilestone(ProjectVersion releaseVersion) { - then(releaseVersion.projectName).isEqualTo(this.projectName); - then(releaseVersion.version).isEqualTo(this.expectedVersion); - this.closedMilestones = true; - } - - @Override - public void createIssueInSpringGuides(Projects projects, ProjectVersion version) { - this.issueCreatedInSpringGuides = true; - } - - @Override - public void createIssueInStartSpringIo(Projects projects, - ProjectVersion version) { - this.issueCreatedInStartSpringIo = true; - } - - @Override - public String milestoneUrl(ProjectVersion releaseVersion) { - return "https://foo.bar.com/" + releaseVersion.toString(); - } - - } - - class NonAssertingTestProjectGitHubHandler extends ProjectGitHubHandler { - - boolean closedMilestones = false; - - boolean issueCreatedInSpringGuides = false; - - boolean issueCreatedInStartSpringIo = false; - - NonAssertingTestProjectGitHubHandler(ReleaserProperties properties) { - super(properties, Collections.singletonList( - SpringCloudGithubIssuesAccessor.springCloud(properties))); - } - - @Override - public void closeMilestone(ProjectVersion releaseVersion) { - this.closedMilestones = true; - } - - @Override - public void createIssueInSpringGuides(Projects projects, ProjectVersion version) { - this.issueCreatedInSpringGuides = true; - } - - @Override - public void createIssueInStartSpringIo(Projects projects, - ProjectVersion version) { - this.issueCreatedInStartSpringIo = true; - } - - @Override - public String milestoneUrl(ProjectVersion releaseVersion) { - return "https://foo.bar.com/" + releaseVersion.toString(); - } - - } - - class NonAssertingTestProjectGitHandler extends ProjectGitHandler { - - List clonedProjects = new ArrayList<>(); - - NonAssertingTestProjectGitHandler(ReleaserProperties properties) { - super(properties); - } - - @Override - public File cloneReleaseTrainProject() { - File file = super.cloneReleaseTrainProject(); - this.clonedProjects.add(file); - return file; - } - - @Override - public File cloneDocumentationProject() { - File file = super.cloneDocumentationProject(); - this.clonedProjects.add(file); - return file; - } - - @Override - public File cloneSpringDocProject() { - File file = super.cloneSpringDocProject(); - this.clonedProjects.add(file); - return file; - } - - @Override - public File cloneReleaseTrainDocumentationProject() { - File file = super.cloneReleaseTrainDocumentationProject(); - this.clonedProjects.add(file); - return file; - } - - @Override - public File cloneProjectFromOrg(String projectName) { - File file = super.cloneProjectFromOrg(projectName); - this.clonedProjects.add(file); - return file; - } - - } - -} diff --git a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/CompositeConsumerTests.java b/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/CompositeConsumerTests.java deleted file mode 100644 index 161e88d0..00000000 --- a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/CompositeConsumerTests.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright 2013-2018 the original author or authors. - * - * 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 - * - * https://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. - */ - -/* - * Copyright 2013-2019 the original author or authors. - * - * 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 - * - * https://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. - */ - -package org.springframework.cloud.release.internal.spring; - -import java.util.Arrays; - -import org.assertj.core.api.BDDAssertions; -import org.junit.Test; - -/** - * @author Marcin Grzejszczak - */ -public class CompositeConsumerTests { - - @Test - public void should_throw_exception_for_a_release_task() { - CompositeConsumer compositeConsumer = new CompositeConsumer( - Arrays.asList(new Task("foo", "foo", "foo", "foo", (args -> { - })), new Task("bar", "bar", "bar", "bar", (args -> { - throw new MyException(); - })))); - - BDDAssertions - .thenThrownBy(() -> compositeConsumer.accept(new Args(TaskType.RELEASE))) - .isInstanceOf(MyException.class); - } - -} - -class MyException extends RuntimeException { - -} diff --git a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/OptionsParserTests.java b/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/OptionsParserTests.java deleted file mode 100644 index 95bff8fa..00000000 --- a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/OptionsParserTests.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright 2013-2019 the original author or authors. - * - * 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 - * - * https://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. - */ - -package org.springframework.cloud.release.internal.spring; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.assertj.core.api.BDDAssertions; -import org.junit.Test; - -/** - * @author Marcin Grzejszczak - * @since - */ -public class OptionsParserTests { - - @Test - public void should_filter_provided_task_names() { - OptionsParser optionsParser = new OptionsParser(); - - List taskNames = optionsParser - .filterProvidedTaskNames(providedTaskNames(), allTaskNames(), true); - - BDDAssertions.then(taskNames).isEqualTo(providedTaskNames()); - } - - private List providedTaskNames() { - return new ArrayList<>(Arrays.asList("spring-cloud-config", - "spring-cloud-netflix", "spring-cloud-cloudfoundry", - "spring-cloud-openfeign", "spring-cloud-gateway", "spring-cloud-security", - "spring-cloud-sleuth", "spring-cloud-contract", "spring-cloud-vault", - "spring-cloud-release")); - } - - private List allTaskNames() { - return new ArrayList<>(Arrays.asList("spring-cloud-config", - "spring-cloud-netflix", "spring-cloud-cloudfoundry", - "spring-cloud-openfeign", "spring-cloud-gateway", "spring-cloud-security", - "spring-cloud-sleuth", "spring-cloud-contract", "spring-cloud-vault", - "spring-cloud-release", "spring-cloud-1", "spring-cloud-2", - "spring-cloud-3")); - } - -} diff --git a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/OptionsProcessorTests.java b/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/OptionsProcessorTests.java deleted file mode 100644 index 5a3015e9..00000000 --- a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/OptionsProcessorTests.java +++ /dev/null @@ -1,354 +0,0 @@ -/* - * Copyright 2013-2019 the original author or authors. - * - * 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 - * - * https://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. - */ - -package org.springframework.cloud.release.internal.spring; - -import java.util.Arrays; -import java.util.List; -import java.util.function.Consumer; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; - -import org.springframework.cloud.release.internal.Releaser; -import org.springframework.cloud.release.internal.ReleaserProperties; -import org.springframework.cloud.release.internal.options.Options; -import org.springframework.cloud.release.internal.options.OptionsBuilder; - -import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.api.BDDAssertions.thenThrownBy; - -/** - * @author Marcin Grzejszczak - */ -@RunWith(MockitoJUnitRunner.class) -@SuppressWarnings("unchecked") -public class OptionsProcessorTests { - - @Mock - Releaser releaser; - - FirstConsumer first = new FirstConsumer(); - - SecondConsumer second = new SecondConsumer(); - - ThirdConsumer third = new ThirdConsumer(); - - Task firstTask = task("first", "1", "", "", this.first); - - List tasks = Arrays - .asList(new Task[] { this.firstTask, task("second", "2", "", "", this.second), - task("third", "3", "", "", this.third) }); - - OptionsProcessor optionsProcessor; - - static Task task(String name, String shortName, String header, String description, - Consumer function) { - return new Task(name, shortName, header, description, function); - } - - @Before - public void setup() { - this.optionsProcessor = new OptionsProcessor(this.releaser, - new ReleaserProperties(), this.tasks); - Task.stepSkipper = () -> false; - } - - @After - public void clean() { - Task.stepSkipper = new ConsoleInputStepSkipper(); - } - - @Test - public void should_throw_exception_when_an_invalid_option_was_picked() { - Options options = nonInteractiveOpts().options(); - - thenThrownBy(() -> this.optionsProcessor.processOptions(options, args())) - .hasMessageContaining("You haven't picked any recognizable option"); - } - - @Test - public void should_execute_only_tasks_after_the_provided_one_using_full_name() { - Options options = nonInteractiveOpts().startFrom("second").options(); - - this.optionsProcessor.processOptions(options, args()); - - then(this.first.executed).isFalse(); - then(this.second.executed).isTrue(); - then(this.third.executed).isTrue(); - } - - @Test - public void should_execute_only_tasks_after_the_provided_one_using_short_name() { - Options options = nonInteractiveOpts().startFrom("2").options(); - - this.optionsProcessor.processOptions(options, args()); - - then(this.first.executed).isFalse(); - then(this.second.executed).isTrue(); - then(this.third.executed).isTrue(); - } - - @Test - public void should_execute_only_tasks_from_range_using_full_name() { - Options options = nonInteractiveOpts().range("second-third").options(); - - this.optionsProcessor.processOptions(options, args()); - - then(this.first.executed).isFalse(); - then(this.second.executed).isTrue(); - then(this.third.executed).isTrue(); - } - - @Test - public void should_execute_only_tasks_from_range_using_short_name() { - Options options = nonInteractiveOpts().range("2-3").options(); - - this.optionsProcessor.processOptions(options, args()); - - then(this.first.executed).isFalse(); - then(this.second.executed).isTrue(); - then(this.third.executed).isTrue(); - } - - @Test - public void should_execute_only_tasks_from_range_using_full_name_with_same_range() { - Options options = nonInteractiveOpts().range("second-second").options(); - - this.optionsProcessor.processOptions(options, args()); - - then(this.first.executed).isFalse(); - then(this.second.executed).isTrue(); - then(this.third.executed).isFalse(); - } - - @Test - public void should_execute_only_tasks_from_range_using_short_name_with_same_range() { - Options options = nonInteractiveOpts().range("2-2").options(); - - this.optionsProcessor.processOptions(options, args()); - - then(this.first.executed).isFalse(); - then(this.second.executed).isTrue(); - then(this.third.executed).isFalse(); - } - - @Test - public void should_execute_only_tasks_from_multi_using_full_name() { - Options options = nonInteractiveOpts().taskNames(list("first", "third")) - .options(); - - this.optionsProcessor.processOptions(options, args()); - - then(this.first.executed).isTrue(); - then(this.second.executed).isFalse(); - then(this.third.executed).isTrue(); - } - - @Test - public void should_execute_only_tasks_from_multi_using_short_name() { - Options options = nonInteractiveOpts().taskNames(list("1", "3")).options(); - - this.optionsProcessor.processOptions(options, args()); - - then(this.first.executed).isTrue(); - then(this.second.executed).isFalse(); - then(this.third.executed).isTrue(); - } - - @Test - public void should_execute_interactively_only_single_task() { - this.optionsProcessor = new OptionsProcessor(this.releaser, - new ReleaserProperties(), this.tasks) { - @Override - String chosenOption() { - return "0"; - } - }; - Options options = interactiveOpts().options(); - - this.optionsProcessor.processOptions(options, args()); - - then(this.first.executed).isTrue(); - then(this.second.executed).isFalse(); - then(this.third.executed).isFalse(); - } - - @Test - public void should_execute_interactively_range_of_tasks() { - this.optionsProcessor = new OptionsProcessor(this.releaser, - new ReleaserProperties(), this.tasks) { - @Override - String chosenOption() { - return "0-1"; - } - }; - Options options = interactiveOpts().options(); - - this.optionsProcessor.processOptions(options, args()); - - then(this.first.executed).isTrue(); - then(this.second.executed).isTrue(); - then(this.third.executed).isFalse(); - } - - @Test - public void should_execute_interactively_start_from() { - this.optionsProcessor = new OptionsProcessor(this.releaser, - new ReleaserProperties(), this.tasks) { - @Override - String chosenOption() { - return "1-"; - } - }; - Options options = interactiveOpts().options(); - - this.optionsProcessor.processOptions(options, args()); - - then(this.first.executed).isFalse(); - then(this.second.executed).isTrue(); - then(this.third.executed).isTrue(); - } - - @Test - public void should_execute_interactively_multi() { - this.optionsProcessor = new OptionsProcessor(this.releaser, - new ReleaserProperties(), this.tasks) { - @Override - String chosenOption() { - return "0,2"; - } - }; - Options options = interactiveOpts().options(); - - this.optionsProcessor.processOptions(options, args()); - - then(this.first.executed).isTrue(); - then(this.second.executed).isFalse(); - then(this.third.executed).isTrue(); - } - - @Test - public void should_execute_full_release() { - this.optionsProcessor = new OptionsProcessor(this.releaser, - new ReleaserProperties(), this.tasks) { - @Override - Task releaseTask() { - return OptionsProcessorTests.this.firstTask; - } - - @Override - String chosenOption() { - return "0"; - } - }; - Options options = nonInteractiveOpts().fullRelease(true).options(); - - this.optionsProcessor.processOptions(options, args()); - - then(this.first.executed).isTrue(); - then(this.second.executed).isFalse(); - then(this.third.executed).isFalse(); - } - - @Test - public void should_execute_full_verbose_release() { - this.optionsProcessor = new OptionsProcessor(this.releaser, - new ReleaserProperties(), this.tasks) { - @Override - Task releaseVerboseTask() { - return OptionsProcessorTests.this.firstTask; - } - - @Override - String chosenOption() { - return "0"; - } - }; - Options options = interactiveOpts().fullRelease(true).options(); - - this.optionsProcessor.processOptions(options, args()); - - then(this.first.executed).isTrue(); - then(this.second.executed).isFalse(); - then(this.third.executed).isFalse(); - } - - @Test - public void should_remove_single_quotes() { - Options options = interactiveOpts().fullRelease(true).range("'1-2'") - .startFrom("'c'").taskNames(Arrays.asList("'a'", "'b'")).options(); - - then(options.range).isEqualTo("1-2"); - then(options.startFrom).isEqualTo("c"); - then(options.taskNames).containsOnly("a", "b"); - } - - private OptionsBuilder interactiveOpts() { - return new OptionsBuilder(); - } - - private OptionsBuilder nonInteractiveOpts() { - return new OptionsBuilder().interactive(false); - } - - private Args args() { - return new Args(null, null, null, null, null, null, false, TaskType.RELEASE, - null); - } - - private List list(String... list) { - return Arrays.asList(list); - } - -} - -class FirstConsumer implements Consumer { - - boolean executed; - - @Override - public void accept(Args o) { - this.executed = true; - } - -} - -class SecondConsumer implements Consumer { - - boolean executed; - - @Override - public void accept(Args o) { - this.executed = true; - } - -} - -class ThirdConsumer implements Consumer { - - boolean executed; - - @Override - public void accept(Args o) { - this.executed = true; - } - -} diff --git a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/ReleaserApplicationEventTests.java b/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/ReleaserApplicationEventTests.java deleted file mode 100644 index 444b9e64..00000000 --- a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/ReleaserApplicationEventTests.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright 2013-2019 the original author or authors. - * - * 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 - * - * https://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. - */ - -package org.springframework.cloud.release.internal.spring; - -import org.assertj.core.api.BDDAssertions; -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.context.ApplicationEventPublisher; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = ReleaserApplicationEventTests.Config.class, - properties = "releaser.git.oauth-token=some-fake-token") -public class ReleaserApplicationEventTests { - - @Autowired - ApplicationEventPublisher publisher; - - @Test - public void should_throw_exceptions_when_at_least_one_task_is_failing() { - this.publisher.publishEvent( - new TaskCompleted(this, "foo", TaskAndException.skipped(Tasks.PUSH))); - this.publisher.publishEvent(new TaskCompleted(this, "foo", - TaskAndException.success(Tasks.CLOSE_MILESTONE))); - this.publisher.publishEvent(new TaskCompleted(this, "foo", - TaskAndException.failure(Tasks.DEPLOY, new RuntimeException("boom!")))); - - BDDAssertions.thenThrownBy(() -> { - this.publisher.publishEvent(new BuildCompleted(this)); - }).hasMessageContaining("[BUILD UNSTABLE] The following"); - } - - @Test - public void should_not_fail_when_all_tasks_not_failing() { - this.publisher.publishEvent( - new TaskCompleted(this, "foo", TaskAndException.skipped(Tasks.PUSH))); - this.publisher.publishEvent(new TaskCompleted(this, "foo", - TaskAndException.success(Tasks.CLOSE_MILESTONE))); - - this.publisher.publishEvent(new BuildCompleted(this)); - } - - @Configuration - @EnableAutoConfiguration - @ComponentScan({ "org.springframework.cloud.release.internal.options", - "org.springframework.cloud.release.cloud", - "org.springframework.cloud.release.internal.buildsystem", - "org.springframework.cloud.release.internal.sagan", - "org.springframework.cloud.release.internal.spring" }) - static class Config { - - } - -} diff --git a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/SpringReleaserTests.java b/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/SpringReleaserTests.java deleted file mode 100644 index 8b992b23..00000000 --- a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/SpringReleaserTests.java +++ /dev/null @@ -1,214 +0,0 @@ -/* - * Copyright 2013-2019 the original author or authors. - * - * 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 - * - * https://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. - */ - -package org.springframework.cloud.release.internal.spring; - -import java.io.File; -import java.net.URISyntaxException; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Queue; -import java.util.concurrent.LinkedBlockingQueue; - -import org.assertj.core.api.BDDAssertions; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.BDDMockito; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.springframework.cloud.release.internal.Releaser; -import org.springframework.cloud.release.internal.ReleaserProperties; -import org.springframework.cloud.release.internal.ReleaserPropertiesAware; -import org.springframework.cloud.release.internal.options.Options; -import org.springframework.cloud.release.internal.options.OptionsBuilder; -import org.springframework.cloud.release.internal.project.ProcessedProject; -import org.springframework.cloud.release.internal.project.ProjectVersion; -import org.springframework.cloud.release.internal.project.Projects; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationEventPublisher; - -/** - * @author Marcin Grzejszczak - */ -@RunWith(MockitoJUnitRunner.class) -public class SpringReleaserTests { - - private static final Logger log = LoggerFactory.getLogger(SpringReleaserTests.class); - - @Mock - Releaser releaser; - - ReleaserProperties properties = properties(); - - @Mock - OptionsProcessor optionsProcessor; - - @Mock - ApplicationContext context; - - Aware1 aware1 = new Aware1(); - - Aware2 aware2 = new Aware2(); - - ReleaserPropertiesUpdater updater; - - @Mock - ApplicationEventPublisher applicationEventPublisher; - - File releaserUpdater = new File(ReleaserPropertiesUpdaterTests.class - .getResource("/projects/releaser-updater/config/releaser.yml").toURI()); - - public SpringReleaserTests() throws URISyntaxException { - } - - @Before - public void setup() { - BDDMockito.given(this.releaser.clonedProjectFromOrg(BDDMockito.anyString())) - .willReturn(new File("/whatever")); - BDDMockito.given(this.context.getBeansOfType(ReleaserPropertiesAware.class)) - .willReturn(awareBeans()); - this.updater = new ReleaserPropertiesUpdater(this.context) { - - int counter = 0; - - @Override - File releaserConfig(File clonedProjectFromOrg) { - if (this.counter == 0) { - log.info("First run"); - this.counter = this.counter + 1; - return SpringReleaserTests.this.releaserUpdater; - } - log.info("Second run"); - return new File("does/not/exist"); - } - }; - } - - private Map awareBeans() { - Map aware = new HashMap<>(); - aware.put("aware1", this.aware1); - aware.put("aware2", this.aware2); - return aware; - } - - @Test - public void should_make_a_copy_of_properties() { - SpringReleaser releaser = stubbedSpringReleaser(); - - releaser.release(new OptionsBuilder().metaRelease(true).options()); - - assertBuildCommand(this.aware1.properties); - assertBuildCommand(this.aware2.properties); - } - - @Test - public void should_only_call_post_release() { - SpringReleaser releaser = stubbedSpringReleaser(); - this.properties.setPostReleaseTasksOnly(true); - - releaser.release(new OptionsBuilder().metaRelease(false).options()); - - thenOnlyCallsPostRelease(); - } - - private void thenOnlyCallsPostRelease() { - BDDMockito.then(this.optionsProcessor).should().postReleaseOptions( - BDDMockito.any(Options.class), BDDMockito.any(Args.class)); - BDDMockito.then(this.optionsProcessor).should(BDDMockito.never()).processOptions( - BDDMockito.any(Options.class), BDDMockito.any(Args.class)); - } - - private void assertBuildCommand(Queue properties) { - BDDAssertions.then(properties.poll().getMaven().getBuildCommand()) - .isEqualTo("./scripts/noIntegration.sh"); - BDDAssertions.then(properties.poll().getMaven().getBuildCommand()) - .isEqualTo("build"); - } - - private SpringReleaser stubbedSpringReleaser() { - return new SpringReleaser(this.releaser, this.properties, this.optionsProcessor, - this.updater, this.applicationEventPublisher) { - - @Override - Args postReleaseOptionsAgs(Options options, - ProjectsAndVersion projectsAndVersion, - List processedProjects) { - return new Args(TaskType.RELEASE); - } - - @Override - List metaReleaseProjects(Options options) { - return Arrays.asList("aware1", "aware2"); - } - - @Override - ProjectsAndVersion processProject(Options options, File project, - TaskType taskType) { - return new ProjectsAndVersion(sampleProjects(), - new ProjectVersion("spring-cloud-foo", "1.0.0.BUILD-SNAPSHOT")); - } - - @Override - ProjectVersion assertNoSnapshotsForANonSnapshotProject(File project, - Projects projectsToUpdate) { - return sampleVersion(); - } - }; - } - - private Projects sampleProjects() { - return new Projects(sampleVersion()); - } - - private ProjectVersion sampleVersion() { - return new ProjectVersion("spring-cloud-foo", "1.0.0.RELEASE"); - } - - private ReleaserProperties properties() { - ReleaserProperties properties = new ReleaserProperties(); - properties.getMaven().setBuildCommand("build"); - return properties; - } - -} - -class Aware1 implements ReleaserPropertiesAware { - - Queue properties = new LinkedBlockingQueue<>(); - - @Override - public void setReleaserProperties(ReleaserProperties properties) { - this.properties.add(properties); - } - -} - -class Aware2 implements ReleaserPropertiesAware { - - Queue properties = new LinkedBlockingQueue<>(); - - @Override - public void setReleaserProperties(ReleaserProperties properties) { - this.properties.add(properties); - } - -} diff --git a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/TaskTests.java b/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/TaskTests.java deleted file mode 100644 index 59ed5598..00000000 --- a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/TaskTests.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright 2013-2019 the original author or authors. - * - * 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 - * - * https://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. - */ - -package org.springframework.cloud.release.internal.spring; - -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.function.Consumer; - -import org.junit.Rule; -import org.junit.Test; - -import org.springframework.boot.test.rule.OutputCapture; - -import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.api.BDDAssertions.thenThrownBy; - -/** - * @author Marcin Grzejszczak - */ -public class TaskTests { - - @Rule - public OutputCapture capture = new OutputCapture(); - - @Test - public void should_successfully_execute_task() { - final AtomicBoolean someBool = new AtomicBoolean(); - Task task = new Task("foo", "bar", "baz", "descr", new Consumer() { - @Override - public void accept(Args args) { - someBool.set(true); - } - }); - - task.execute(new Args(TaskType.RELEASE)); - - then(someBool.get()).isTrue(); - } - - @Test - public void should_fail_with_nice_text_on_exception() { - final AtomicBoolean someBool = new AtomicBoolean(); - Task task = new Task("foo", "bar", "baz", "descr", args -> { - someBool.set(true); - throw new RuntimeException("foooooooo"); - }); - - thenThrownBy(() -> task.execute(new Args(TaskType.RELEASE))) - .isInstanceOf(RuntimeException.class); - then(someBool.get()).isTrue(); - then(this.capture.toString()).contains("BUILD FAILED!!!") - .contains("Exception occurred for project <> task ") - .contains("with description "); - } - -} diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/building-base.adoc b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/building-base.adoc deleted file mode 100644 index 7852718a..00000000 --- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/building-base.adoc +++ /dev/null @@ -1,86 +0,0 @@ -=== Basic Compile and Test - -To build the source you will need to install JDK {jdkversion}. - -Spring Cloud uses Maven for most build-related activities, and you -should be able to get off the ground quite quickly by cloning the -project you are interested in and typing - ----- -$ ./mvnw install ----- - -NOTE: You can also install Maven (>=3.3.3) yourself and run the `mvn` command -in place of `./mvnw` in the examples below. If you do that you also -might need to add `-P spring` if your local Maven settings do not -contain repository declarations for spring pre-release artifacts. - -NOTE: Be aware that you might need to increase the amount of memory -available to Maven by setting a `MAVEN_OPTS` environment variable with -a value like `-Xmx512m -XX:MaxPermSize=128m`. We try to cover this in -the `.mvn` configuration, so if you find you have to do it to make a -build succeed, please raise a ticket to get the settings added to -source control. - -For hints on how to build the project look in `.travis.yml` if there -is one. There should be a "script" and maybe "install" command. Also -look at the "services" section to see if any services need to be -running locally (e.g. mongo or rabbit). Ignore the git-related bits -that you might find in "before_install" since they're related to setting git -credentials and you already have those. - -The projects that require middleware generally include a -`docker-compose.yml`, so consider using -https://compose.docker.io/[Docker Compose] to run the middeware servers -in Docker containers. See the README in the -https://github.com/spring-cloud-samples/scripts[scripts demo -repository] for specific instructions about the common cases of mongo, -rabbit and redis. - -NOTE: If all else fails, build with the command from `.travis.yml` (usually -`./mvnw install`). - -=== Documentation - -The spring-cloud-build module has a "docs" profile, and if you switch -that on it will try to build asciidoc sources from -`src/main/asciidoc`. As part of that process it will look for a -`README.adoc` and process it by loading all the includes, but not -parsing or rendering it, just copying it to `${main.basedir}` -(defaults to `${basedir}`, i.e. the root of the project). If there are -any changes in the README it will then show up after a Maven build as -a modified file in the correct place. Just commit it and push the change. - -=== Working with the code -If you don't have an IDE preference we would recommend that you use -https://www.springsource.com/developer/sts[Spring Tools Suite] or -https://eclipse.org[Eclipse] when working with the code. We use the -https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools -should also work without issue as long as they use Maven 3.3.3 or better. - -==== Importing into eclipse with m2eclipse -We recommend the https://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with -eclipse. If you don't already have m2eclipse installed it is available from the "eclipse -marketplace". - -NOTE: Older versions of m2e do not support Maven 3.3, so once the -projects are imported into Eclipse you will also need to tell -m2eclipse to use the right profile for the projects. If you -see many different errors related to the POMs in the projects, check -that you have an up to date installation. If you can't upgrade m2e, -add the "spring" profile to your `settings.xml`. Alternatively you can -copy the repository settings from the "spring" profile of the parent -pom into your `settings.xml`. - -==== Importing into eclipse without m2eclipse -If you prefer not to use m2eclipse you can generate eclipse project metadata using the -following command: - -[indent=0] ----- - $ ./mvnw eclipse:eclipse ----- - -The generated eclipse projects can be imported by selecting `import existing projects` -from the `file` menu. - diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/code-of-conduct.adoc b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/code-of-conduct.adoc deleted file mode 100644 index a83c3dc0..00000000 --- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/code-of-conduct.adoc +++ /dev/null @@ -1,45 +0,0 @@ - -= Contributor Code of Conduct - -As contributors and maintainers of this project, and in the interest of fostering an open -and welcoming community, we pledge to respect all people who contribute through reporting -issues, posting feature requests, updating documentation, submitting pull requests or -patches, and other activities. - -We are committed to making participation in this project a harassment-free experience for -everyone, regardless of level of experience, gender, gender identity and expression, -sexual orientation, disability, personal appearance, body size, race, ethnicity, age, -religion, or nationality. - -Examples of unacceptable behavior by participants include: - -* The use of sexualized language or imagery -* Personal attacks -* Trolling or insulting/derogatory comments -* Public or private harassment -* Publishing other's private information, such as physical or electronic addresses, - without explicit permission -* Other unethical or unprofessional conduct - -Project maintainers have the right and responsibility to remove, edit, or reject comments, -commits, code, wiki edits, issues, and other contributions that are not aligned to this -Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors -that they deem inappropriate, threatening, offensive, or harmful. - -By adopting this Code of Conduct, project maintainers commit themselves to fairly and -consistently applying these principles to every aspect of managing this project. Project -maintainers who do not follow or enforce the Code of Conduct may be permanently removed -from the project team. - -This Code of Conduct applies both within project spaces and in public spaces when an -individual is representing the project or its community. - -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by -contacting a project maintainer at spring-code-of-conduct@pivotal.io . All complaints will -be reviewed and investigated and will result in a response that is deemed necessary and -appropriate to the circumstances. Maintainers are obligated to maintain confidentiality -with regard to the reporter of an incident. - -This Code of Conduct is adapted from the -https://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at -https://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/] \ No newline at end of file diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/contributing-docs.adoc b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/contributing-docs.adoc deleted file mode 100644 index 6851cced..00000000 --- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/contributing-docs.adoc +++ /dev/null @@ -1 +0,0 @@ -NOTE: Spring Cloud is released under the non-restrictive Apache 2.0 license. If you would like to contribute to this section of the documentation or if you find an error, please find the source code and issue trackers in the project at {docslink}[github]. \ No newline at end of file diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/docs/src/main/asciidoc/intro.adoc b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/docs/src/main/asciidoc/intro.adoc deleted file mode 100644 index 9a93848f..00000000 --- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/docs/src/main/asciidoc/intro.adoc +++ /dev/null @@ -1,7 +0,0 @@ -Spring Cloud Release Train is a curated set of dependencies across a -range of Spring Cloud projects. You consume it by using the -spring-cloud-dependencies POM to manage dependencies in Maven or -Gradle. The release trains have names, not versions, to avoid -confusion with the sub-projects. The names are an alphabetic sequence -(so you can sort them chronologically) with names of London Tube -stations ("Angel" is the first release, "Brixton" is the second). diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/docs/src/main/asciidoc/intro.adoc b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/docs/src/main/asciidoc/intro.adoc deleted file mode 100644 index 5ae66a35..00000000 --- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/docs/src/main/asciidoc/intro.adoc +++ /dev/null @@ -1,7 +0,0 @@ -Spring Cloud Release Train is a curated set of dependencies across a -range of Spring Cloud projects. You consume it by using the -spring-cloud-dependencies POM to manage dependencies in Maven or -Gradle. The release trains have names, not versions, to avoid -confusion with the sub-projects. The names are an alphabetic sequence -(so you can sort them chronologically) with names of London Tube -stations ("Angel" is the first release, "Brixton" is the second). \ No newline at end of file diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-wiki/Home.asciidoc b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-wiki/Home.asciidoc deleted file mode 100644 index 95165170..00000000 --- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-wiki/Home.asciidoc +++ /dev/null @@ -1,28 +0,0 @@ -Spring Cloud provides tools for developers to quickly build some of -the common patterns in distributed systems (e.g. configuration -management, service discovery, circuit breakers, intelligent routing, -micro-proxy, control bus, one-time tokens, global locks, leadership -election, distributed sessions, cluster state). Coordination of -distributed systems leads to boiler plate patterns, and using Spring -Cloud developers can quickly stand up services and applications that -implement those patterns. They will work well in any distributed -environment, including the developer's own laptop, bare metal data -centres, and managed platforms such as Cloud Foundry. - -See https://projects.spring.io/spring-cloud[projects.spring.io/spring-cloud] for details. - -== Release Notes - -See the following release notes for upgrade instructions and "new and noteworthy" features: - -- link:Spring-Cloud-Angel-Release-Notes[Angel] - -- link:Spring-Cloud-Brixton-Release-Notes[Brixton] - -- link:Spring-Cloud-Camden-Release-Notes[Camden] - -- link:Spring-Cloud-Dalston-Release-Notes[Dalston] - -- link:Spring-Cloud-Edgware-Release-Notes[Edgware] - -- link:Spring-Cloud-Finchley-Release-Notes[Finchley] diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml index 98fad09f..6197b67e 100644 --- a/src/checkstyle/checkstyle-suppressions.xml +++ b/src/checkstyle/checkstyle-suppressions.xml @@ -24,9 +24,9 @@ - - - - + + + +