diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/.settings.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/.settings.xml index 03645e8c..6c355129 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/.settings.xml +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/.settings.xml @@ -1,68 +1,66 @@ - - - repo.spring.io - ${env.CI_DEPLOY_USERNAME} - ${env.CI_DEPLOY_PASSWORD} - - - - - - spring - - true - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/libs-snapshot-local - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/libs-milestone-local - - false - - - - spring-releases - Spring Releases - https://repo.spring.io/release - - false - - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/libs-snapshot-local - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/libs-milestone-local - - false - - - - - + + + repo.spring.io + ${env.CI_DEPLOY_USERNAME} + ${env.CI_DEPLOY_PASSWORD} + + + + + + spring + true + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/libs-snapshot-local + + true + + + + spring-milestones + Spring Milestones + http://repo.spring.io/libs-milestone-local + + false + + + + spring-releases + Spring Releases + http://repo.spring.io/release + + false + + + + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/libs-snapshot-local + + true + + + + spring-milestones + Spring Milestones + http://repo.spring.io/libs-milestone-local + + false + + + + + diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/.travis.yml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/.travis.yml index 391e47cd..f8d83069 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/.travis.yml +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/.travis.yml @@ -8,19 +8,19 @@ before_install: - echo "https://$GH_TOKEN:@github.com" > .git/credentials - gem install asciidoctor install: - - ./mvnw install -P docs -q -U -DskipTests=true -Dmaven.test.redirectTestOutputToFile=true - - '[ "${MVN_GOAL}" == "deploy" ] && ./docs/src/main/asciidoc/ghpages.sh || echo "Not updating docs"' +- ./mvnw install -P docs -q -U -DskipTests=true -Dmaven.test.redirectTestOutputToFile=true +- '[ "${MVN_GOAL}" == "deploy" ] && ./docs/src/main/asciidoc/ghpages.sh || echo "Not updating docs"' script: - - './mvnw -s .settings.xml $MVN_GOAL $MVN_PROFILE -nsu -Dmaven.test.redirectTestOutputToFile=true' +- './mvnw -s .settings.xml $MVN_GOAL $MVN_PROFILE -nsu -Dmaven.test.redirectTestOutputToFile=true' env: global: - - GIT_NAME="Dave Syer" - - GIT_EMAIL=dsyer@pivotal.io - - CI_DEPLOY_USERNAME=buildmaster - - FEATURE_BRANCH=$(echo ${TRAVIS_BRANCH} | grep "^.*/.*$" && echo true || echo false) - - SPRING_CLOUD_BUILD=$(echo ${TRAVIS_REPO_SLUG} | grep -q "^spring-cloud/.*$" && echo true || echo false) - - MVN_GOAL=$([ "${TRAVIS_PULL_REQUEST}" == "false" -a "${TRAVIS_TAG}" == "" -a "${FEATURE_BRANCH}" == "false" -a "${SPRING_CLOUD_BUILD}" == "true" ] && echo deploy || echo install) - - VERSION=$(mvn validate | grep Building | head -1 | sed -e 's/.* //') - - MILESTONE=$(echo ${VERSION} | egrep 'M|RC' && echo true || echo false) - - MVN_PROFILE=$([ "${MILESTONE}" == "true" ] && echo -P milestone) - - secure: "KRJQg6soMWudREJ11ocGK8I4OuhIehvy/ehTjBxvyATEwL6rXA9dKPGfb0OAscEgIpNxW1cezH8vUSaSZGFhx6LF5VnJ9Mh39pi9uYm9GMjQ61B4d5GaRjbGj/fXBd8kGubDO8kmjkDGGgkjWXfYZa/WIQ4kVWCIB5dVV9XJ0Lw=" + - GIT_NAME="Dave Syer" + - GIT_EMAIL=dsyer@pivotal.io + - CI_DEPLOY_USERNAME=buildmaster + - FEATURE_BRANCH=$(echo ${TRAVIS_BRANCH} | grep "^.*/.*$" && echo true || echo false) + - SPRING_CLOUD_BUILD=$(echo ${TRAVIS_REPO_SLUG} | grep -q "^spring-cloud/.*$" && echo true || echo false) + - MVN_GOAL=$([ "${TRAVIS_PULL_REQUEST}" == "false" -a "${TRAVIS_TAG}" == "" -a "${FEATURE_BRANCH}" == "false" -a "${SPRING_CLOUD_BUILD}" == "true" ] && echo deploy || echo install) + - VERSION=$(mvn validate | grep Building | head -1 | sed -e 's/.* //') + - MILESTONE=$(echo ${VERSION} | egrep 'M|RC' && echo true || echo false) + - MVN_PROFILE=$([ "${MILESTONE}" == "true" ] && echo -P milestone) + - secure: "KRJQg6soMWudREJ11ocGK8I4OuhIehvy/ehTjBxvyATEwL6rXA9dKPGfb0OAscEgIpNxW1cezH8vUSaSZGFhx6LF5VnJ9Mh39pi9uYm9GMjQ61B4d5GaRjbGj/fXBd8kGubDO8kmjkDGGgkjWXfYZa/WIQ4kVWCIB5dVV9XJ0Lw=" diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/LICENSE.txt b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/LICENSE.txt index 62589edd..d6456956 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/LICENSE.txt +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/LICENSE.txt @@ -1,7 +1,7 @@ Apache License Version 2.0, January 2004 - https://www.apache.org/licenses/ + http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION @@ -193,7 +193,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 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/README.adoc b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/README.adoc index ebc0c7ce..ea497299 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/README.adoc +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/README.adoc @@ -2,7 +2,8 @@ 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 @@ -41,49 +42,57 @@ $ 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. -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 +* 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 - https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter + Cloud Build] project. If using IntelliJ, you can use the + http://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 http://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/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/pom.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/pom.xml index 3720c61e..ae5b14c7 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/pom.xml +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/docs/pom.xml @@ -1,6 +1,6 @@ - + 4.0.0 spring-cloud-build-docs spring-cloud-build-docs diff --git a/projects/spring-cloud/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 index 679b6505..27561297 100644 --- a/projects/spring-cloud/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,6 +1,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 @@ -43,8 +44,10 @@ 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 index 26bb9472..4f7c41f6 100644 --- 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 @@ -2,65 +2,79 @@ 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 +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: 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. +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. +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 +http://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. +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. +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. +http://www.springsource.com/developer/sts[Spring Tools Suite] or +http://eclipse.org[Eclipse] when working with the code. We use the +http://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 http://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". -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`. +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: +If you prefer not to use m2eclipse you can generate eclipse project metadata using the +following command: [indent=0] ---- diff --git a/projects/spring-cloud/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 index 6d0c4615..a06b6f9c 100644 --- a/projects/spring-cloud/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,9 +1,11 @@ ==== 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. +Spring Cloud uses http://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. [indent=0] ---- @@ -16,22 +18,16 @@ 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. -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! + 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/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 index acc29250..091e220b 100644 --- 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 @@ -1,8 +1,15 @@ + = 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. +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. +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: @@ -10,19 +17,29 @@ Examples of unacceptable behavior by participants include: * 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 +* 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. +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. +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. +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. +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 +http://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at +http://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 index 7fe88c27..6851cced 100644 --- 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 @@ -1,2 +1 @@ -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 +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/projects/spring-cloud/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 index 57dd491a..ac8bd575 100644 --- a/projects/spring-cloud/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,38 +1,44 @@ -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. -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 +* 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 - https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter + Cloud Build] project. If using IntelliJ, you can use the + http://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 http://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/projects/spring-cloud/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 index 68b8a1a1..09435af1 100755 --- a/projects/spring-cloud/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 @@ -49,7 +49,7 @@ function check_if_anything_to_sync() { function retrieve_current_branch() { # Code getting the name of the current branch. For master we want to publish as we did until now - # https://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch + # http://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch # If there is a branch already passed will reuse it - otherwise will try to find it CURRENT_BRANCH=${BRANCH} if [[ -z "${CURRENT_BRANCH}" ]] ; then @@ -168,7 +168,7 @@ function copy_docs_for_current_version() { COMMIT_CHANGES="yes" else echo -e "Current branch is [${CURRENT_BRANCH}]" - # https://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin + # http://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin if [[ ",${WHITELISTED_BRANCHES_VALUE}," = *",${CURRENT_BRANCH},"* ]] ; then mkdir -p ${ROOT_FOLDER}/${CURRENT_BRANCH} echo -e "Branch [${CURRENT_BRANCH}] is whitelisted! Will copy the current docs to the [${CURRENT_BRANCH}] folder" diff --git a/projects/spring-cloud/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 index 3850f8b9..ffefef72 100644 --- a/projects/spring-cloud/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 @@ -4,32 +4,32 @@ */ .hl-keyword { - color: #7F0055; - font-weight: bold; + color: #7F0055; + font-weight: bold; } .hl-comment { - color: #3F5F5F; - font-style: italic; + color: #3F5F5F; + font-style: italic; } .hl-multiline-comment { - color: #3F5FBF; - font-style: italic; + color: #3F5FBF; + font-style: italic; } .hl-tag { - color: #3F7F7F; + color: #3F7F7F; } .hl-attribute { - color: #7F007F; + color: #7F007F; } .hl-value { - color: #2A00FF; + color: #2A00FF; } .hl-string { - color: #2A00FF; + color: #2A00FF; } \ No newline at end of file diff --git a/projects/spring-cloud/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 index b790654b..0c484531 100644 --- a/projects/spring-cloud/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 @@ -1,7 +1,7 @@ @IMPORT url("manual.css"); body.firstpage { - background: url("../images/background.png") no-repeat center top; + background: url("../images/background.png") no-repeat center top; } div.part h1 { diff --git a/projects/spring-cloud/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 index 303192a8..4a7fd140 100644 --- a/projects/spring-cloud/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 @@ -1,6 +1,6 @@ @IMPORT url("manual.css"); body { - background: url("../images/background.png") no-repeat center top; + background: url("../images/background.png") no-repeat center top; } diff --git a/projects/spring-cloud/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 index 20cf07da..0ecbe2e8 100644 --- a/projects/spring-cloud/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 @@ -1,342 +1,344 @@ @IMPORT url("highlight.css"); html { - padding: 0pt; - margin: 0pt; + padding: 0pt; + margin: 0pt; } body { - color: #333333; - margin: 15px 30px; - font-family: Helvetica, Arial, Freesans, Clean, Sans-serif; - line-height: 1.6; - -webkit-font-smoothing: antialiased; + color: #333333; + margin: 15px 30px; + font-family: Helvetica, Arial, Freesans, Clean, Sans-serif; + line-height: 1.6; + -webkit-font-smoothing: antialiased; } code { - font-size: 16px; - font-family: Consolas, "Liberation Mono", Courier, monospace; + font-size: 16px; + font-family: Consolas, "Liberation Mono", Courier, monospace; } -:not(a) > code { - color: #6D180B; +:not(a)>code { + color: #6D180B; } -:not(pre) > code { - background-color: #F2F2F2; - border: 1px solid #CCCCCC; - border-radius: 4px; - padding: 1px 3px 0; - text-shadow: none; - white-space: nowrap; +:not(pre)>code { + background-color: #F2F2F2; + border: 1px solid #CCCCCC; + border-radius: 4px; + padding: 1px 3px 0; + text-shadow: none; + white-space: nowrap; } -body > *:first-child { - margin-top: 0 !important; +body>*:first-child { + margin-top: 0 !important; } div { - margin: 0pt; + margin: 0pt; } hr { - border: 1px solid #CCCCCC; - background: #CCCCCC; + border: 1px solid #CCCCCC; + background: #CCCCCC; } -h1, h2, h3, h4, h5, h6 { - color: #000000; - cursor: text; - font-weight: bold; - margin: 30px 0 10px; - padding: 0; +h1,h2,h3,h4,h5,h6 { + color: #000000; + cursor: text; + font-weight: bold; + margin: 30px 0 10px; + padding: 0; } -h1, h2, h3 { - margin: 40px 0 10px; +h1,h2,h3 { + margin: 40px 0 10px; } h1 { - margin: 70px 0 30px; - padding-top: 20px; + margin: 70px 0 30px; + padding-top: 20px; } div.part h1 { - border-top: 1px dotted #CCCCCC; + border-top: 1px dotted #CCCCCC; } -h1, h1 code { - font-size: 32px; +h1,h1 code { + font-size: 32px; } -h2, h2 code { - font-size: 24px; +h2,h2 code { + font-size: 24px; } -h3, h3 code { - font-size: 20px; +h3,h3 code { + font-size: 20px; } -h4, h1 code, h5, h5 code, h6, h6 code { - font-size: 18px; +h4,h1 code,h5,h5 code,h6,h6 code { + font-size: 18px; } -div.book, div.chapter, div.appendix, div.part, div.preface { - min-width: 300px; - max-width: 1200px; - margin: 0 auto; +div.book,div.chapter,div.appendix,div.part,div.preface { + min-width: 300px; + max-width: 1200px; + margin: 0 auto; } p.releaseinfo { - font-weight: bold; - margin-bottom: 40px; - margin-top: 40px; + font-weight: bold; + margin-bottom: 40px; + margin-top: 40px; } div.authorgroup { - line-height: 1; + line-height: 1; } p.copyright { - line-height: 1; - margin-bottom: -5px; + line-height: 1; + margin-bottom: -5px; } .legalnotice p { - font-style: italic; - font-size: 14px; - line-height: 1; + font-style: italic; + font-size: 14px; + line-height: 1; } -div.titlepage + p, div.titlepage + p { - margin-top: 0; +div.titlepage+p,div.titlepage+p { + margin-top: 0; } pre { - line-height: 1.0; - color: black; + line-height: 1.0; + color: black; } a { - color: #4183C4; - text-decoration: none; + color: #4183C4; + text-decoration: none; } p { - margin: 15px 0; - text-align: left; + margin: 15px 0; + text-align: left; } -ul, ol { - padding-left: 30px; +ul,ol { + padding-left: 30px; } li p { - margin: 0; + margin: 0; } div.table { - margin: 1em; - padding: 0.5em; - text-align: center; + margin: 1em; + padding: 0.5em; + text-align: center; } -div.table table, div.informaltable table { - display: table; - width: 100%; +div.table table,div.informaltable table { + display: table; + width: 100%; } div.table td { - padding-left: 7px; - padding-right: 7px; + padding-left: 7px; + padding-right: 7px; } .sidebar { - line-height: 1.4; - padding: 0 20px; - background-color: #F8F8F8; - border: 1px solid #CCCCCC; - border-radius: 3px 3px 3px 3px; + line-height: 1.4; + padding: 0 20px; + background-color: #F8F8F8; + border: 1px solid #CCCCCC; + border-radius: 3px 3px 3px 3px; } .sidebar p.title { - color: #6D180B; + color: #6D180B; } -pre.programlisting, pre.screen { - font-size: 15px; - padding: 6px 10px; - background-color: #F8F8F8; - border: 1px solid #CCCCCC; - border-radius: 3px 3px 3px 3px; - clear: both; - overflow: auto; - line-height: 1.4; - font-family: Consolas, "Liberation Mono", Courier, monospace; +pre.programlisting,pre.screen { + font-size: 15px; + padding: 6px 10px; + background-color: #F8F8F8; + border: 1px solid #CCCCCC; + border-radius: 3px 3px 3px 3px; + clear: both; + overflow: auto; + line-height: 1.4; + font-family: Consolas, "Liberation Mono", Courier, monospace; } table { - border-collapse: collapse; - border-spacing: 0; - border: 1px solid #DDDDDD !important; - border-radius: 4px !important; - border-collapse: separate !important; - line-height: 1.6; + border-collapse: collapse; + border-spacing: 0; + border: 1px solid #DDDDDD !important; + border-radius: 4px !important; + border-collapse: separate !important; + line-height: 1.6; } table thead { - background: #F5F5F5; + background: #F5F5F5; } table tr { - border: none; - border-bottom: none; + border: none; + border-bottom: none; } table th { - font-weight: bold; + font-weight: bold; } -table th, table td { - border: none !important; - padding: 6px 13px; +table th,table td { + border: none !important; + padding: 6px 13px; } table tr:nth-child(2n) { - background-color: #F8F8F8; + background-color: #F8F8F8; } td p { - margin: 0 0 15px 0; + margin: 0 0 15px 0; } div.table-contents td p { - margin: 0; + margin: 0; } -div.important *, div.note *, div.tip *, div.warning *, div.navheader *, div.navfooter *, div.calloutlist * { - border: none !important; - background: none !important; - margin: 0; +div.important *,div.note *,div.tip *,div.warning *,div.navheader *,div.navfooter *,div.calloutlist * + { + border: none !important; + background: none !important; + margin: 0; } -div.important p, div.note p, div.tip p, div.warning p { - color: #6F6F6F; - line-height: 1.6; +div.important p,div.note p,div.tip p,div.warning p { + color: #6F6F6F; + line-height: 1.6; } -div.important code, div.note code, div.tip code, div.warning code { - background-color: #F2F2F2 !important; - border: 1px solid #CCCCCC !important; - border-radius: 4px !important; - padding: 1px 3px 0 !important; - text-shadow: none !important; - white-space: nowrap !important; +div.important code,div.note code,div.tip code,div.warning code { + background-color: #F2F2F2 !important; + border: 1px solid #CCCCCC !important; + border-radius: 4px !important; + padding: 1px 3px 0 !important; + text-shadow: none !important; + white-space: nowrap !important; } -.note th, .tip th, .warning th { - display: none; +.note th,.tip th,.warning th { + display: none; } -.note tr:first-child td, .tip tr:first-child td, .warning tr:first-child td { - border-right: 1px solid #CCCCCC !important; - padding-top: 10px; +.note tr:first-child td,.tip tr:first-child td,.warning tr:first-child td + { + border-right: 1px solid #CCCCCC !important; + padding-top: 10px; } -div.calloutlist p, div.calloutlist td { - padding: 0; - margin: 0; +div.calloutlist p,div.calloutlist td { + padding: 0; + margin: 0; } -div.calloutlist > table > tbody > tr > td:first-child { - padding-left: 10px; - width: 30px !important; +div.calloutlist>table>tbody>tr>td:first-child { + padding-left: 10px; + width: 30px !important; } -div.important, div.note, div.tip, div.warning { - margin-left: 0px !important; - margin-right: 20px !important; - margin-top: 20px; - margin-bottom: 20px; - padding-top: 10px; - padding-bottom: 10px; +div.important,div.note,div.tip,div.warning { + margin-left: 0px !important; + margin-right: 20px !important; + margin-top: 20px; + margin-bottom: 20px; + padding-top: 10px; + padding-bottom: 10px; } div.toc { - line-height: 1.2; + line-height: 1.2; } -dl, dt { - margin-top: 1px; - margin-bottom: 0; +dl,dt { + margin-top: 1px; + margin-bottom: 0; } -div.toc > dl > dt { - font-size: 32px; - font-weight: bold; - margin: 30px 0 10px 0; - display: block; +div.toc>dl>dt { + font-size: 32px; + font-weight: bold; + margin: 30px 0 10px 0; + display: block; } -div.toc > dl > dd > dl > dt { - font-size: 24px; - font-weight: bold; - margin: 20px 0 10px 0; - display: block; +div.toc>dl>dd>dl>dt { + font-size: 24px; + font-weight: bold; + margin: 20px 0 10px 0; + display: block; } -div.toc > dl > dd > dl > dd > dl > dt { - font-weight: bold; - font-size: 20px; - margin: 10px 0 0 0; +div.toc>dl>dd>dl>dd>dl>dt { + font-weight: bold; + font-size: 20px; + margin: 10px 0 0 0; } tbody.footnotes * { - border: none !important; + border: none !important; } div.footnote p { - margin: 0; - line-height: 1; + margin: 0; + line-height: 1; } div.footnote p sup { - margin-right: 6px; - vertical-align: middle; + margin-right: 6px; + vertical-align: middle; } div.navheader { - border-bottom: 1px solid #CCCCCC; + border-bottom: 1px solid #CCCCCC; } div.navfooter { - border-top: 1px solid #CCCCCC; + border-top: 1px solid #CCCCCC; } .title { - margin-left: -1em; - padding-left: 1em; + margin-left: -1em; + padding-left: 1em; } -.title > a { - position: absolute; - visibility: hidden; - display: block; - font-size: 0.85em; - margin-top: 0.05em; - margin-left: -1em; - vertical-align: text-top; - color: black; +.title>a { + position: absolute; + visibility: hidden; + display: block; + font-size: 0.85em; + margin-top: 0.05em; + margin-left: -1em; + vertical-align: text-top; + color: black; } -.title > a:before { - content: "\00A7"; +.title>a:before { + content: "\00A7"; } -.title:hover > a, .title > a:hover, .title:hover > a:hover { - visibility: visible; +.title:hover>a,.title>a:hover,.title:hover>a:hover { + visibility: visible; } -.title:focus > a, .title > a:focus, .title:focus > a:focus { - outline: 0; +.title:focus>a,.title>a:focus,.title:focus>a:focus { + outline: 0; } diff --git a/projects/spring-cloud/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 index ddcd704c..157bf9d8 100644 --- a/projects/spring-cloud/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 @@ -9,7 +9,7 @@ "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 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an @@ -20,10 +20,10 @@ --> + xmlns:xslthl="http://xslthl.sf.net" + xmlns:d="http://docbook.org/ns/docbook" + exclude-result-prefixes="xslthl d" + version='1.0'> 1 diff --git a/projects/spring-cloud/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 index 10843f5f..031406ca 100644 --- a/projects/spring-cloud/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 @@ -9,7 +9,7 @@ to you 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 +http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an @@ -20,10 +20,10 @@ under the License. --> + xmlns:xslthl="http://xslthl.sf.net" + xmlns:d="http://docbook.org/ns/docbook" + exclude-result-prefixes="xslthl d" + version='1.0'> diff --git a/projects/spring-cloud/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 index 92170451..be9cc52d 100644 --- a/projects/spring-cloud/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 @@ -9,7 +9,7 @@ to you 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 +http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an @@ -39,12 +39,12 @@ under the License. - + - - + + diff --git a/projects/spring-cloud/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 index c7c0381b..6bd4ac81 100644 --- a/projects/spring-cloud/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 @@ -9,7 +9,7 @@ to you 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 +http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an diff --git a/projects/spring-cloud/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 index 9c9d8300..fd96f9a7 100644 --- a/projects/spring-cloud/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 @@ -9,7 +9,7 @@ to you 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 +http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an @@ -20,10 +20,10 @@ under the License. --> + xmlns:xslthl="http://xslthl.sf.net" + xmlns:d="http://docbook.org/ns/docbook" + exclude-result-prefixes="xslthl" + version='1.0'> @@ -35,7 +35,7 @@ under the License. 1 - + 120 images/callouts/ .png @@ -68,51 +68,35 @@ under the License. - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + diff --git a/projects/spring-cloud/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 index 26535dc0..77360a7b 100644 --- a/projects/spring-cloud/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 @@ -9,7 +9,7 @@ to you 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 +http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an @@ -22,7 +22,7 @@ under the License. @@ -308,9 +308,9 @@ under the License. Let's remove it, so this sucker can use our attribute-set only... --> + xsl:use-attribute-sets="chapter.titlepage.recto.style"> - + @@ -524,7 +524,7 @@ under the License. 1.5em - + 10pt bold false @@ -549,46 +549,34 @@ under the License. - - - + + + - - - + - - - + - - - + - - - + - - - + - - - + diff --git a/projects/spring-cloud/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 index 5aac4493..e4d677fc 100644 --- a/projects/spring-cloud/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 @@ -1,23 +1,23 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/projects/spring-cloud/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 index 959434e1..5478b1d6 100644 --- a/projects/spring-cloud/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 @@ -5,37 +5,37 @@ Syntax highlighting definition for AsciiDoc files --> - - //// - //// - - - // - - - - ^(={1,6} .+)$ - - MULTILINE - - - ^(\.[^\.\s].+)$ - - MULTILINE - - - ^(:!?\w.*?:) - - MULTILINE - - - ^(-|\*{1,5}|\d*\.{1,5})(?= .+$) - - MULTILINE - - - ^(\[.+\])$ - - MULTILINE - + + //// + //// + + + // + + + + ^(={1,6} .+)$ + + MULTILINE + + + ^(\.[^\.\s].+)$ + + MULTILINE + + + ^(:!?\w.*?:) + + MULTILINE + + + ^(-|\*{1,5}|\d*\.{1,5})(?= .+$) + + MULTILINE + + + ^(\[.+\])$ + + MULTILINE + diff --git a/projects/spring-cloud/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 index b98d756e..e2cd98d8 100644 --- a/projects/spring-cloud/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 @@ -4,7 +4,7 @@ Syntax highlighting definition for SH xslthl - XSLT Syntax Highlighting -https://sourceforge.net/projects/xslthl/ +http://sourceforge.net/projects/xslthl/ Copyright (C) 2010 Mathieu Malaterre This software is provided 'as-is', without any express or implied @@ -31,8 +31,8 @@ freely, subject to the following restrictions: ' " - - - + + " @@ -41,16 +41,16 @@ freely, subject to the following restrictions: ' \ - + 0x - + . - - + + diff --git a/projects/spring-cloud/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 index 7943634f..176cc379 100644 --- a/projects/spring-cloud/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 @@ -3,7 +3,7 @@ Syntax highlighting definition for C xslthl - XSLT Syntax Highlighting -https://sourceforge.net/projects/xslthl/ +http://sourceforge.net/projects/xslthl/ Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks This software is provided 'as-is', without any express or implied @@ -46,7 +46,7 @@ Michiel Hendriks # \ - + " @@ -62,18 +62,18 @@ Michiel Hendriks lu u l - + . - + e ul lu u f l - + auto diff --git a/projects/spring-cloud/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 index b0789e9d..ef83c4f5 100644 --- a/projects/spring-cloud/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 @@ -4,7 +4,7 @@ Syntax highlighting definition for C++ xslthl - XSLT Syntax Highlighting -https://sourceforge.net/projects/xslthl/ +http://sourceforge.net/projects/xslthl/ Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks This software is provided 'as-is', without any express or implied @@ -64,18 +64,18 @@ Michiel Hendriks lu u l - + . - + e ul lu u f l - + diff --git a/projects/spring-cloud/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 index 59ce58e7..d57e6310 100644 --- a/projects/spring-cloud/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 @@ -4,7 +4,7 @@ Syntax highlighting definition for C# xslthl - XSLT Syntax Highlighting -https://sourceforge.net/projects/xslthl/ +http://sourceforge.net/projects/xslthl/ Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks This software is provided 'as-is', without any express or implied @@ -62,7 +62,7 @@ Michiel Hendriks @" " \ - + " @@ -78,11 +78,11 @@ Michiel Hendriks lu u l - + . - + e ul lu @@ -91,7 +91,7 @@ Michiel Hendriks d m l - + abstract diff --git a/projects/spring-cloud/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 index b75f1e2c..164c48c3 100644 --- a/projects/spring-cloud/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 @@ -4,7 +4,7 @@ Syntax highlighting definition for CSS files xslthl - XSLT Syntax Highlighting -https://sourceforge.net/projects/xslthl/ +http://sourceforge.net/projects/xslthl/ Copyright (C) 2011-2012 Martin Hujer, Michiel Hendriks This software is provided 'as-is', without any express or implied @@ -26,151 +26,151 @@ freely, subject to the following restrictions: Martin Hujer Michiel Hendriks -Reference: https://www.w3.org/TR/CSS21/propidx.html +Reference: http://www.w3.org/TR/CSS21/propidx.html --> - - /* - */ - - + + /* + */ + + " - \ - - - + \ + + + ' \ - - - - . - - - - @charset - @import - @media - @page - - - - - - azimuth - background-attachment - background-color - background-image - background-position - background-repeat - background - border-collapse - border-color - border-spacing - border-style - border-top - border-right - border-bottom - border-left - border-top-color - border-right-color - border-bottom-color - border-left-color - border-top-style - border-right-style - border-bottom-style - border-left-style - border-top-width - border-right-width - border-bottom-width - border-left-width - border-width - border - bottom - caption-side - clear - clip - color - content - counter-increment - counter-reset - cue-after - cue-before - cue - cursor - direction - display - elevation - empty-cells - float - font-family - font-size - font-style - font-variant - font-weight - font - height - left - letter-spacing - line-height - list-style-image - list-style-position - list-style-type - list-style - margin-right - margin-left - margin-top - margin-bottom - margin - max-height - max-width - min-height - min-width - orphans - outline-color - outline-style - outline-width - outline - overflow - padding-top - padding-right - padding-bottom - padding-left - padding - page-break-after - page-break-before - page-break-inside - pause-after - pause-before - pause - pitch-range - pitch - play-during - position - quotes - richness - right - speak-header - speak-numeral - speak-punctuation - speak - speech-rate - stress - table-layout - text-align - text-decoration - text-indent - text-transform - top - unicode-bidi - vertical-align - visibility - voice-family - volume - white-space - widows - width - word-spacing - z-index - + + + + . + + + + @charset + @import + @media + @page + + + + - + azimuth + background-attachment + background-color + background-image + background-position + background-repeat + background + border-collapse + border-color + border-spacing + border-style + border-top + border-right + border-bottom + border-left + border-top-color + border-right-color + border-bottom-color + border-left-color + border-top-style + border-right-style + border-bottom-style + border-left-style + border-top-width + border-right-width + border-bottom-width + border-left-width + border-width + border + bottom + caption-side + clear + clip + color + content + counter-increment + counter-reset + cue-after + cue-before + cue + cursor + direction + display + elevation + empty-cells + float + font-family + font-size + font-style + font-variant + font-weight + font + height + left + letter-spacing + line-height + list-style-image + list-style-position + list-style-type + list-style + margin-right + margin-left + margin-top + margin-bottom + margin + max-height + max-width + min-height + min-width + orphans + outline-color + outline-style + outline-width + outline + overflow + padding-top + padding-right + padding-bottom + padding-left + padding + page-break-after + page-break-before + page-break-inside + pause-after + pause-before + pause + pitch-range + pitch + play-during + position + quotes + richness + right + speak-header + speak-numeral + speak-punctuation + speak + speech-rate + stress + table-layout + text-align + text-decoration + text-indent + text-transform + top + unicode-bidi + vertical-align + visibility + voice-family + volume + white-space + widows + width + word-spacing + z-index + diff --git a/projects/spring-cloud/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 index 82d04d3f..5b6761ba 100644 --- a/projects/spring-cloud/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 @@ -7,116 +7,116 @@ myxml-hl.xml - konfigurace zvyraznovace XML, ktera zvlast zvyrazni HTML elementy a XSL elementy - This file has been customized for the Asciidoctor project (https://asciidoctor.org). + This file has been customized for the Asciidoctor project (http://asciidoctor.org). --> - - - - a - abbr - address - area - article - aside - audio - b - base - bdi - blockquote - body - br - button - caption - canvas - cite - code - command - col - colgroup - dd - del - dialog - div - dl - dt - em - embed - fieldset - figcaption - figure - font - form - footer - h1 - h2 - h3 - h4 - h5 - h6 - head - header - hr - html - i - iframe - img - input - ins - kbd - label - legend - li - link - map - mark - menu - menu - meta - nav - noscript - object - ol - optgroup - option - p - param - pre - q - samp - script - section - select - small - source - span - strong - style - sub - summary - sup - table - tbody - td - textarea - tfoot - th - thead - time - title - tr - track - u - ul - var - video - wbr - xmp - - - - - xsl: - - + + + + a + abbr + address + area + article + aside + audio + b + base + bdi + blockquote + body + br + button + caption + canvas + cite + code + command + col + colgroup + dd + del + dialog + div + dl + dt + em + embed + fieldset + figcaption + figure + font + form + footer + h1 + h2 + h3 + h4 + h5 + h6 + head + header + hr + html + i + iframe + img + input + ins + kbd + label + legend + li + link + map + mark + menu + menu + meta + nav + noscript + object + ol + optgroup + option + p + param + pre + q + samp + script + section + select + small + source + span + strong + style + sub + summary + sup + table + tbody + td + textarea + tfoot + th + thead + time + title + tr + track + u + ul + var + video + wbr + xmp + + + + + xsl: + + diff --git a/projects/spring-cloud/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 index 6bd60b3e..34c10363 100644 --- a/projects/spring-cloud/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 @@ -4,7 +4,7 @@ Syntax highlighting definition for ini files xslthl - XSLT Syntax Highlighting -https://sourceforge.net/projects/xslthl/ +http://sourceforge.net/projects/xslthl/ Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks This software is provided 'as-is', without any express or implied diff --git a/projects/spring-cloud/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 index d39f7dad..f7bb1641 100644 --- a/projects/spring-cloud/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 @@ -4,7 +4,7 @@ Syntax highlighting definition for Java xslthl - XSLT Syntax Highlighting -https://sourceforge.net/projects/xslthl/ +http://sourceforge.net/projects/xslthl/ Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks This software is provided 'as-is', without any express or implied @@ -54,7 +54,7 @@ Michiel Hendriks 0x - + . @@ -62,7 +62,7 @@ Michiel Hendriks f d l - + abstract diff --git a/projects/spring-cloud/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 index 85710a0f..99b8a71e 100644 --- a/projects/spring-cloud/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 @@ -4,7 +4,7 @@ Syntax highlighting definition for JavaScript xslthl - XSLT Syntax Highlighting -https://sourceforge.net/projects/xslthl/ +http://sourceforge.net/projects/xslthl/ Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks This software is provided 'as-is', without any express or implied @@ -44,12 +44,12 @@ Michiel Hendriks 0x - + . e - + break diff --git a/projects/spring-cloud/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 index c13923c2..59b9c481 100644 --- a/projects/spring-cloud/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 @@ -20,7 +20,7 @@ f d l - + true diff --git a/projects/spring-cloud/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 index 65188210..73d71cc0 100644 --- a/projects/spring-cloud/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 @@ -4,7 +4,7 @@ Syntax highlighting definition for Perl xslthl - XSLT Syntax Highlighting -https://sourceforge.net/projects/xslthl/ +http://sourceforge.net/projects/xslthl/ Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks This software is provided 'as-is', without any express or implied @@ -47,12 +47,12 @@ Michiel Hendriks 0x - + . - - + + if diff --git a/projects/spring-cloud/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 index 72a9bd40..1da25b8c 100644 --- a/projects/spring-cloud/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 @@ -4,7 +4,7 @@ Syntax highlighting definition for PHP xslthl - XSLT Syntax Highlighting -https://sourceforge.net/projects/xslthl/ +http://sourceforge.net/projects/xslthl/ Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks This software is provided 'as-is', without any express or implied @@ -47,24 +47,24 @@ Michiel Hendriks " \ - + ' \ - + <<< 0x - + . e - + and @@ -142,7 +142,7 @@ Michiel Hendriks __NAMESPACE__ goto __DIR__ - + diff --git a/projects/spring-cloud/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 index 8205aac3..775f2f13 100644 --- a/projects/spring-cloud/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 @@ -4,7 +4,7 @@ Syntax highlighting definition for Java xslthl - XSLT Syntax Highlighting -https://sourceforge.net/projects/xslthl/ +http://sourceforge.net/projects/xslthl/ Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks This software is provided 'as-is', without any express or implied diff --git a/projects/spring-cloud/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 index fa1aeb6a..a4674432 100644 --- a/projects/spring-cloud/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 @@ -4,7 +4,7 @@ Syntax highlighting definition for Python xslthl - XSLT Syntax Highlighting -https://sourceforge.net/projects/xslthl/ +http://sourceforge.net/projects/xslthl/ Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks This software is provided 'as-is', without any express or implied @@ -38,11 +38,11 @@ Michiel Hendriks # """ - + ''' - + " @@ -55,14 +55,14 @@ Michiel Hendriks 0x l - + . - + e l - + and diff --git a/projects/spring-cloud/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 index bcef913b..d105640e 100644 --- a/projects/spring-cloud/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 @@ -4,7 +4,7 @@ Syntax highlighting definition for Ruby xslthl - XSLT Syntax Highlighting -https://sourceforge.net/projects/xslthl/ +http://sourceforge.net/projects/xslthl/ Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks This software is provided 'as-is', without any express or implied @@ -59,12 +59,12 @@ Michiel Hendriks 0x - + . e - + alias diff --git a/projects/spring-cloud/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 index 85dcd031..ac1d5d04 100644 --- a/projects/spring-cloud/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 @@ -4,7 +4,7 @@ Syntax highlighting definition for SQL:1999 xslthl - XSLT Syntax Highlighting -https://sourceforge.net/projects/xslthl/ +http://sourceforge.net/projects/xslthl/ Copyright (C) 2012 Michiel Hendriks, Martin Hujer, k42b3 This software is provided 'as-is', without any express or implied @@ -32,36 +32,36 @@ freely, subject to the following restrictions: ' - + U' ' - + B' ' - + N' ' - + X' ' - + . - + e - + - + A ABS diff --git a/projects/spring-cloud/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 index e678bad6..a28008ec 100644 --- a/projects/spring-cloud/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 @@ -20,7 +20,7 @@ f d l - + true diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/FETCH_HEAD b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/FETCH_HEAD new file mode 100644 index 00000000..b8528aed --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/FETCH_HEAD @@ -0,0 +1,19 @@ +8789ac642f97af8de17206ea825db592c27758f8 branch '1.3.x' of github.com:spring-cloud/spring-cloud-build +6d4a7e37e382cd8de6c4c6763e67968b83f2d49a not-for-merge branch '1.0.x' of github.com:spring-cloud/spring-cloud-build +ee0e96f18db8a9e0d27259a7b5c1017fbce54608 not-for-merge branch '1.1.x' of github.com:spring-cloud/spring-cloud-build +08a04fd22bf8320d48b5995a64d1a192a0892de1 not-for-merge branch '1.2.x' of github.com:spring-cloud/spring-cloud-build +538aebc1fa9b5628e2d9b7ffdb00ba44878e201b not-for-merge branch '2.0.x' of github.com:spring-cloud/spring-cloud-build +99e1cdfebde01c9878f5e094ef65ac6fbaf86e6b not-for-merge branch '2.1.x' of github.com:spring-cloud/spring-cloud-build +3a4d022702529aa892927ef765992b19a73b2052 not-for-merge branch '2.2.x' of github.com:spring-cloud/spring-cloud-build +e182637f0dacc7d2429d0c9f3be1807c22308267 not-for-merge branch '2.3.x' of github.com:spring-cloud/spring-cloud-build +3539937d2473e16ba496a71b5340e3b9da64bf93 not-for-merge branch '3-1-x' of github.com:spring-cloud/spring-cloud-build +58fe9dff85271a8927e93e7e41af5d9f07a1aabf not-for-merge branch '3.0.x' of github.com:spring-cloud/spring-cloud-build +6aaecc25b38f56736862a198d94b33ba831961b1 not-for-merge branch '3.1.x' of github.com:spring-cloud/spring-cloud-build +86830f715413a18e4a4c7f8e3c59e2857cfa428c not-for-merge branch '4.0.x' of github.com:spring-cloud/spring-cloud-build +5fb165b90020915ea57a7dbac527c329bddb9e49 not-for-merge branch 'antora' of github.com:spring-cloud/spring-cloud-build +feacd9f4dfbea37cfe352dcdc113886f25d75c3d not-for-merge branch 'disabling_default_deploy_for_docs' of github.com:spring-cloud/spring-cloud-build +69424b6ef146c5a499ed0f870d3794c5289e9f71 not-for-merge branch 'docs-build' of github.com:spring-cloud/spring-cloud-build +5e0ce9329331796425571cdfb14c17479b6e2b7a not-for-merge branch 'gh-pages' of github.com:spring-cloud/spring-cloud-build +bc9b9ea33965b66a0df3ea0612ac9c67b295186b not-for-merge branch 'main' of github.com:spring-cloud/spring-cloud-build +0d09a0ab298d716738287cf2b3f18bda807374b6 not-for-merge branch 'remove_lf_requirement' of github.com:spring-cloud/spring-cloud-build +86b02191d000f3f2d8e76e88a71d8ef3ae172c48 not-for-merge branch 'test-m2' of github.com:spring-cloud/spring-cloud-build diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/config b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/config index de73a9d2..ef543023 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/config +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/config @@ -14,3 +14,9 @@ [branch "1.3.x"] remote = origin merge = refs/heads/1.3.x +[branch "docs-build"] + remote = origin + merge = refs/heads/docs-build +[branch "main"] + remote = origin + merge = refs/heads/main diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/index b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/index index ae34b8fd..c52d8c14 100644 Binary files a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/index and b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/index differ diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/HEAD b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/HEAD index 899b5819..7aac536c 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/HEAD +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/HEAD @@ -4,3 +4,6 @@ a4d3ca059d1872050823d6518a4e5fc0f7ca4352 2578cdbfa95c501e489fd1dcd55dfdc0fdd4e6d f5a37ebb5050288b8d480e62db24aa7a6f76868c f5a37ebb5050288b8d480e62db24aa7a6f76868c Marcin Grzejszczak 1517562977 +0100 reset: moving to HEAD f5a37ebb5050288b8d480e62db24aa7a6f76868c f5a37ebb5050288b8d480e62db24aa7a6f76868c Marcin Grzejszczak 1517562980 +0100 reset: moving to f5a37eb f5a37ebb5050288b8d480e62db24aa7a6f76868c d4d5865c142f92aebb5dd1a7c9b745395e65873a Marcin Grzejszczak 1517564158 +0100 commit: preparing for tests +d4d5865c142f92aebb5dd1a7c9b745395e65873a 69424b6ef146c5a499ed0f870d3794c5289e9f71 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714574673 -0400 checkout: moving from 1.3.x to docs-build +69424b6ef146c5a499ed0f870d3794c5289e9f71 bc9b9ea33965b66a0df3ea0612ac9c67b295186b Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714574687 -0400 checkout: moving from docs-build to main +bc9b9ea33965b66a0df3ea0612ac9c67b295186b d4d5865c142f92aebb5dd1a7c9b745395e65873a Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714574832 -0400 checkout: moving from main to 1.3.x diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/heads/docs-build b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/heads/docs-build new file mode 100644 index 00000000..60e8abc6 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/heads/docs-build @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 69424b6ef146c5a499ed0f870d3794c5289e9f71 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714574673 -0400 branch: Created from origin/docs-build diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/heads/main b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/heads/main new file mode 100644 index 00000000..1be7734b --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/heads/main @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 bc9b9ea33965b66a0df3ea0612ac9c67b295186b Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714574687 -0400 branch: Created from origin/main diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/1.0.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/1.0.x new file mode 100644 index 00000000..72fb6923 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/1.0.x @@ -0,0 +1 @@ +0be4214508d2f8e55ebce9e3c9ebc0b620c8d2a4 6d4a7e37e382cd8de6c4c6763e67968b83f2d49a Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714574492 -0400 fetch origin: fast-forward diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/1.1.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/1.1.x new file mode 100644 index 00000000..f9460016 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/1.1.x @@ -0,0 +1 @@ +cbbaef88c9f146d5ad2aa555fb59b2a4f5207415 ee0e96f18db8a9e0d27259a7b5c1017fbce54608 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714574492 -0400 fetch origin: fast-forward diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/1.2.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/1.2.x new file mode 100644 index 00000000..b64a76d3 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/1.2.x @@ -0,0 +1 @@ +bc6b006ea1d9055f7ad58e066a503a9ff401a573 08a04fd22bf8320d48b5995a64d1a192a0892de1 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714574492 -0400 fetch origin: fast-forward diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/1.3.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/1.3.x new file mode 100644 index 00000000..ce7de89e --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/1.3.x @@ -0,0 +1 @@ +2578cdbfa95c501e489fd1dcd55dfdc0fdd4e6d2 8789ac642f97af8de17206ea825db592c27758f8 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714574492 -0400 fetch origin: fast-forward diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/2.0.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/2.0.x new file mode 100644 index 00000000..a7b26513 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/2.0.x @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 538aebc1fa9b5628e2d9b7ffdb00ba44878e201b Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714574492 -0400 fetch origin: storing head diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/2.1.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/2.1.x new file mode 100644 index 00000000..81976062 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/2.1.x @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 99e1cdfebde01c9878f5e094ef65ac6fbaf86e6b Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714574492 -0400 fetch origin: storing head diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/2.2.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/2.2.x new file mode 100644 index 00000000..38529555 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/2.2.x @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 3a4d022702529aa892927ef765992b19a73b2052 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714574492 -0400 fetch origin: storing head diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/2.3.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/2.3.x new file mode 100644 index 00000000..c889ca93 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/2.3.x @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 e182637f0dacc7d2429d0c9f3be1807c22308267 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714574492 -0400 fetch origin: storing head diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/3-1-x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/3-1-x new file mode 100644 index 00000000..d802e3a7 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/3-1-x @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 3539937d2473e16ba496a71b5340e3b9da64bf93 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714574492 -0400 fetch origin: storing head diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/3.0.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/3.0.x new file mode 100644 index 00000000..94ae3127 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/3.0.x @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 58fe9dff85271a8927e93e7e41af5d9f07a1aabf Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714574492 -0400 fetch origin: storing head diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/3.1.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/3.1.x new file mode 100644 index 00000000..8101e09a --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/3.1.x @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 6aaecc25b38f56736862a198d94b33ba831961b1 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714574492 -0400 fetch origin: storing head diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/4.0.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/4.0.x new file mode 100644 index 00000000..a033360c --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/4.0.x @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 86830f715413a18e4a4c7f8e3c59e2857cfa428c Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714574492 -0400 fetch origin: storing head diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/antora b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/antora new file mode 100644 index 00000000..14c560e2 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/antora @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 5fb165b90020915ea57a7dbac527c329bddb9e49 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714574492 -0400 fetch origin: storing head diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/disabling_default_deploy_for_docs b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/disabling_default_deploy_for_docs new file mode 100644 index 00000000..f59ebf07 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/disabling_default_deploy_for_docs @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 feacd9f4dfbea37cfe352dcdc113886f25d75c3d Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714574492 -0400 fetch origin: storing head diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/docs-build b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/docs-build new file mode 100644 index 00000000..9f289aa9 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/docs-build @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 69424b6ef146c5a499ed0f870d3794c5289e9f71 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714574492 -0400 fetch origin: storing head diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/gh-pages b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/gh-pages new file mode 100644 index 00000000..7adf6f78 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/gh-pages @@ -0,0 +1 @@ +719667afe8ec6f24a830eec31703fda86865d2c1 5e0ce9329331796425571cdfb14c17479b6e2b7a Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714574492 -0400 fetch origin: fast-forward diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/main b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/main new file mode 100644 index 00000000..44be4632 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/main @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 bc9b9ea33965b66a0df3ea0612ac9c67b295186b Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714574492 -0400 fetch origin: storing head diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/remove_lf_requirement b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/remove_lf_requirement new file mode 100644 index 00000000..a5f8c003 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/remove_lf_requirement @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 0d09a0ab298d716738287cf2b3f18bda807374b6 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714574492 -0400 fetch origin: storing head diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/test-m2 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/test-m2 new file mode 100644 index 00000000..5d9b97b9 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/logs/refs/remotes/origin/test-m2 @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 86b02191d000f3f2d8e76e88a71d8ef3ae172c48 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714574492 -0400 fetch origin: storing head diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/objects/pack/pack-fb946f6c21024420eb90132698939355b97430b5.idx b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/objects/pack/pack-fb946f6c21024420eb90132698939355b97430b5.idx new file mode 100644 index 00000000..8543204c Binary files /dev/null and b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/objects/pack/pack-fb946f6c21024420eb90132698939355b97430b5.idx differ diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/objects/pack/pack-fb946f6c21024420eb90132698939355b97430b5.pack b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/objects/pack/pack-fb946f6c21024420eb90132698939355b97430b5.pack new file mode 100644 index 00000000..b7be0eea Binary files /dev/null and b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/objects/pack/pack-fb946f6c21024420eb90132698939355b97430b5.pack differ diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/heads/docs-build b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/heads/docs-build new file mode 100644 index 00000000..512750ca --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/heads/docs-build @@ -0,0 +1 @@ +69424b6ef146c5a499ed0f870d3794c5289e9f71 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/heads/main b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/heads/main new file mode 100644 index 00000000..83f9b120 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/heads/main @@ -0,0 +1 @@ +bc9b9ea33965b66a0df3ea0612ac9c67b295186b diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/1.0.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/1.0.x new file mode 100644 index 00000000..29721958 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/1.0.x @@ -0,0 +1 @@ +6d4a7e37e382cd8de6c4c6763e67968b83f2d49a diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/1.1.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/1.1.x new file mode 100644 index 00000000..2f340676 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/1.1.x @@ -0,0 +1 @@ +ee0e96f18db8a9e0d27259a7b5c1017fbce54608 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/1.2.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/1.2.x new file mode 100644 index 00000000..a961ab86 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/1.2.x @@ -0,0 +1 @@ +08a04fd22bf8320d48b5995a64d1a192a0892de1 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/1.3.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/1.3.x new file mode 100644 index 00000000..9e581650 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/1.3.x @@ -0,0 +1 @@ +8789ac642f97af8de17206ea825db592c27758f8 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/2.0.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/2.0.x new file mode 100644 index 00000000..3c9c0d14 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/2.0.x @@ -0,0 +1 @@ +538aebc1fa9b5628e2d9b7ffdb00ba44878e201b diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/2.1.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/2.1.x new file mode 100644 index 00000000..4b21a3a4 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/2.1.x @@ -0,0 +1 @@ +99e1cdfebde01c9878f5e094ef65ac6fbaf86e6b diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/2.2.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/2.2.x new file mode 100644 index 00000000..d3584a50 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/2.2.x @@ -0,0 +1 @@ +3a4d022702529aa892927ef765992b19a73b2052 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/2.3.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/2.3.x new file mode 100644 index 00000000..2301769d --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/2.3.x @@ -0,0 +1 @@ +e182637f0dacc7d2429d0c9f3be1807c22308267 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/3-1-x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/3-1-x new file mode 100644 index 00000000..e6f77f8e --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/3-1-x @@ -0,0 +1 @@ +3539937d2473e16ba496a71b5340e3b9da64bf93 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/3.0.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/3.0.x new file mode 100644 index 00000000..b3b0429b --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/3.0.x @@ -0,0 +1 @@ +58fe9dff85271a8927e93e7e41af5d9f07a1aabf diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/3.1.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/3.1.x new file mode 100644 index 00000000..18253580 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/3.1.x @@ -0,0 +1 @@ +6aaecc25b38f56736862a198d94b33ba831961b1 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/4.0.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/4.0.x new file mode 100644 index 00000000..5f1600e7 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/4.0.x @@ -0,0 +1 @@ +86830f715413a18e4a4c7f8e3c59e2857cfa428c diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/antora b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/antora new file mode 100644 index 00000000..4bfb2661 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/antora @@ -0,0 +1 @@ +5fb165b90020915ea57a7dbac527c329bddb9e49 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/disabling_default_deploy_for_docs b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/disabling_default_deploy_for_docs new file mode 100644 index 00000000..e15ba55b --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/disabling_default_deploy_for_docs @@ -0,0 +1 @@ +feacd9f4dfbea37cfe352dcdc113886f25d75c3d diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/docs-build b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/docs-build new file mode 100644 index 00000000..512750ca --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/docs-build @@ -0,0 +1 @@ +69424b6ef146c5a499ed0f870d3794c5289e9f71 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/gh-pages b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/gh-pages new file mode 100644 index 00000000..6f74a609 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/gh-pages @@ -0,0 +1 @@ +5e0ce9329331796425571cdfb14c17479b6e2b7a diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/main b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/main new file mode 100644 index 00000000..83f9b120 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/main @@ -0,0 +1 @@ +bc9b9ea33965b66a0df3ea0612ac9c67b295186b diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/remove_lf_requirement b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/remove_lf_requirement new file mode 100644 index 00000000..9f560efd --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/remove_lf_requirement @@ -0,0 +1 @@ +0d09a0ab298d716738287cf2b3f18bda807374b6 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/test-m2 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/test-m2 new file mode 100644 index 00000000..90606a0a --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/refs/remotes/origin/test-m2 @@ -0,0 +1 @@ +86b02191d000f3f2d8e76e88a71d8ef3ae172c48 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/sourcetreeconfig b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/sourcetreeconfig new file mode 100644 index 00000000..16130d0b --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/git/sourcetreeconfig @@ -0,0 +1,8 @@ +autorefresh=1 +savedIncoming=48 +lastUsedView=1 +savedOutgoing=1 +showBuildStatus=1 +disablerecursiveoperations=0 +lastCheckedRemotes=2024-05-01 14:50:40 +0000 +autorefreshremotes=1 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/pom.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/pom.xml index d5a5a508..63c6a454 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/pom.xml +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-build/pom.xml @@ -1,6 +1,6 @@ - + 4.0.0 org.springframework.cloud spring-cloud-build @@ -57,21 +57,21 @@ Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0 - Copyright 2014-2015 the original author or authors. +Copyright 2014-2015 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 +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 + http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied. +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. +See the License for the specific language governing permissions and +limitations under the License. @@ -87,7 +87,7 @@ Dave Syer dsyer at pivotal.io Pivotal Software, Inc. - https://www.spring.io + http://www.spring.io lead @@ -97,7 +97,7 @@ Spencer Gibb sgibb at pivotal.io Pivotal Software, Inc. - https://www.spring.io + http://www.spring.io lead @@ -107,7 +107,7 @@ Marcin Grzejszczak mgrzejszczak at pivotal.io Pivotal Software, Inc. - https://www.spring.io + http://www.spring.io developer @@ -117,7 +117,7 @@ Ryan Baxter rbaxter at pivotal.io Pivotal Software, Inc. - https://www.spring.io + http://www.spring.io developer @@ -275,33 +275,33 @@ false - - org.apache.maven.plugins - maven-checkstyle-plugin - ${checkstyle.version} - - - org.springframework.cloud - spring-cloud-build-tools - ${spring-cloud-build.version} - - - - checkstyle.xml - LICENSE.txt - true - true - - - - validate - validate - - check - - - - + + org.apache.maven.plugins + maven-checkstyle-plugin + ${checkstyle.version} + + + org.springframework.cloud + spring-cloud-build-tools + ${spring-cloud-build.version} + + + + checkstyle.xml + LICENSE.txt + true + true + + + + validate + validate + + check + + + + pl.project13.maven git-commit-id-plugin @@ -317,8 +317,7 @@ true yyyy-MM-dd'T'HH:mm:ssZ true - ${project.build.outputDirectory}/git.properties - + ${project.build.outputDirectory}/git.properties @@ -371,22 +370,17 @@ - + META-INF/spring.handlers - + META-INF/spring.factories - + META-INF/spring.schemas - - + + ${start-class} @@ -451,9 +445,7 @@ https://github.com/spring-cloud spring-docs - - scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version} - + scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version} sonatype-nexus-staging @@ -764,8 +756,7 @@ ${docs.resources.dir}/docbook/xsl/pdf.xsl 1 1 - ${docs.resources.dir}/docbook/xsl/xslthl-config.xml - + ${docs.resources.dir}/docbook/xsl/xslthl-config.xml @@ -790,21 +781,20 @@ prepare-package - ${docs.resources.dir}/docbook/xsl/html-singlepage.xsl - + ${docs.resources.dir}/docbook/xsl/html-singlepage.xsl ${basedir}/target/docbook/htmlsingle - + - - - - + + + + @@ -817,8 +807,7 @@ prepare-package - ${docs.resources.dir}/docbook/xsl/html-multipage.xsl - + ${docs.resources.dir}/docbook/xsl/html-multipage.xsl ${basedir}/target/docbook/html multi_ @@ -826,15 +815,15 @@ - + - - - - + + + + @@ -927,19 +916,19 @@ - :nofooter: - :linkcss: - :stylesdir: css - :stylesheet: manual-singlepage.css +:nofooter: +:linkcss: +:stylesdir: css +:stylesheet: manual-singlepage.css - = {docs-main} += {docs-main} - {spring-cloud-version} +{spring-cloud-version} - == Pick The Documentation Option +== Pick The Documentation Option - - link:single/{docs-main}.html[Single HTML] - - link:multi/multi_{docs-main}.html[Multi HTML] +- link:single/{docs-main}.html[Single HTML] +- link:multi/multi_{docs-main}.html[Multi HTML] @@ -975,22 +964,22 @@ + replace="\1" /> + replace="MILESTONE" /> + replace="MILESTONE" /> + replace="SNAPSHOT" /> + input="${github-tag}" regexp=".*SNAPSHOT" replace="master" /> diff --git a/projects/spring-cloud/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 index 5835e449..17e2ccf4 100644 --- a/projects/spring-cloud/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 @@ -1,16 +1,14 @@ - + 4.0.0 org.springframework.cloud spring-cloud-build-dependencies 1.3.7.BUILD-SNAPSHOT spring-cloud-build-tools pom - Spring Cloud Build Dependencies: an internal BOM for use with Spring Cloud projects. Use as a BOM or by - inheriting from the spring-cloud build parent. - + Spring Cloud Build Dependencies: an internal BOM for use with Spring Cloud projects. Use as a BOM or by inheriting from the spring-cloud build parent. org.springframework.boot spring-boot-dependencies @@ -45,9 +43,8 @@ https://github.com/spring-cloud spring-docs - - scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version} - + scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version} + repo.spring.io diff --git a/projects/spring-cloud/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 index f9feb1ec..118a963f 100644 --- a/projects/spring-cloud/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 @@ -1,7 +1,7 @@ - + 4.0.0 org.springframework.cloud spring-cloud-build-tools @@ -20,5 +20,5 @@ 7.6 - + diff --git a/projects/spring-cloud/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-build/spring-cloud-build-tools/src/main/resources/LICENSE.txt index 62589edd..d6456956 100644 --- a/projects/spring-cloud/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-build/spring-cloud-build-tools/src/main/resources/LICENSE.txt @@ -1,7 +1,7 @@ Apache License Version 2.0, January 2004 - https://www.apache.org/licenses/ + http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION @@ -193,7 +193,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 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/projects/spring-cloud/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 index 699548ba..79233ddb 100644 --- a/projects/spring-cloud/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 @@ -1,7 +1,7 @@ + "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"> @@ -15,10 +15,10 @@ - + - + diff --git a/projects/spring-cloud/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 index 4e81d9f4..0ffc7973 100644 --- a/projects/spring-cloud/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,3 +1,4 @@ // 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/projects/spring-cloud/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 index 1a73d56f..b6057671 100644 --- a/projects/spring-cloud/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 @@ -1,398 +1,296 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/projects/spring-cloud/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 index cd17b4e5..748525c5 100644 --- a/projects/spring-cloud/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 @@ -1,6 +1,6 @@ - + 4.0.0 org.springframework.cloud 1.3.7.BUILD-SNAPSHOT @@ -18,21 +18,21 @@ Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0 - Copyright 2014-2015 the original author or authors. +Copyright 2014-2015 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 +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 + http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied. +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. +See the License for the specific language governing permissions and +limitations under the License. @@ -48,7 +48,7 @@ Dave Syer dsyer at pivotal.io Pivotal Software, Inc. - https://www.spring.io + http://www.spring.io Project lead @@ -58,7 +58,7 @@ Spencer Gibb sgibb at pivotal.io Pivotal Software, Inc. - https://www.spring.io + http://www.spring.io Project lead @@ -74,9 +74,8 @@ https://github.com/spring-cloud spring-docs - - scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version} - + scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version} + repo.spring.io diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/.gitignore b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/.gitignore index bd9bb4ce..8db262c5 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/.gitignore +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/.gitignore @@ -13,4 +13,4 @@ _site/ *.ipr .factorypath *.swp -/consul +/consul \ No newline at end of file diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/FETCH_HEAD b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/FETCH_HEAD new file mode 100644 index 00000000..a137374d --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/FETCH_HEAD @@ -0,0 +1,19 @@ +301f86a8da89f4c542c35f65f937e4aaba9b1f8d not-for-merge branch '1.0.x' of https://github.com/spring-cloud/spring-cloud-consul +f44090486e3cf14282b2587ee24d83f60506a75e not-for-merge branch '1.1.x' of https://github.com/spring-cloud/spring-cloud-consul +1dd53e9db053298d36257d589f114f44c8eb3d4e not-for-merge branch '1.2.x' of https://github.com/spring-cloud/spring-cloud-consul +f238a84fb0362603d8a1bad508f5151e78084511 not-for-merge branch '1.3.x' of https://github.com/spring-cloud/spring-cloud-consul +9186067cc595b161bc384a593cbb7b4e095ab32d not-for-merge branch '2.0.x' of https://github.com/spring-cloud/spring-cloud-consul +522a1af8fbab92852612569627823b01af089b2d not-for-merge branch '2.1.x' of https://github.com/spring-cloud/spring-cloud-consul +bbdff2365a491d2e371e5a1e469f7dafc30493bf not-for-merge branch '2.2.x' of https://github.com/spring-cloud/spring-cloud-consul +6bc96797faab7f6de2f4cea25a6e4c94532ebd92 not-for-merge branch '3.0.x' of https://github.com/spring-cloud/spring-cloud-consul +d81f4db6544791bfbc411f1d76413b05d3c80ad8 not-for-merge branch '3.1.x' of https://github.com/spring-cloud/spring-cloud-consul +cdb965119d7db6b37e1570498e7db18992a07359 not-for-merge branch '4.0.x' of https://github.com/spring-cloud/spring-cloud-consul +ade1c7401a25d06c52c90e68ac96d23b980254a1 not-for-merge branch 'add-consul-hints' of https://github.com/spring-cloud/spring-cloud-consul +bc6fab5966474602c95f5c8f35f405643e025b9a not-for-merge branch 'antora' of https://github.com/spring-cloud/spring-cloud-consul +2c7799c2962c3c6a2e4904cb0deda14fc0316cd1 not-for-merge branch 'configdata-multiple-registrations' of https://github.com/spring-cloud/spring-cloud-consul +b0c1bf1cd592ccb7b20f74fcf4df16acb9f47172 not-for-merge branch 'dependabot/maven/spring-cloud-consul-binder/com.github.tomakehurst-wiremock-jre8-standalone-2.35.1' of https://github.com/spring-cloud/spring-cloud-consul +f6e6bd986b8f445c4ca77d0c06dae6f1fef62623 not-for-merge branch 'discovery-disabled-parity' of https://github.com/spring-cloud/spring-cloud-consul +bf90641942a884ced73fbc9dfaf17a3a49b25aed not-for-merge branch 'docs-build' of https://github.com/spring-cloud/spring-cloud-consul +728bd25c25f83fa99dfd52d28a0d19e4b463bf6a not-for-merge branch 'gh-pages' of https://github.com/spring-cloud/spring-cloud-consul +025229690f2b61c4230384a21e705b58cf29a3a7 not-for-merge branch 'hcl' of https://github.com/spring-cloud/spring-cloud-consul +5de87a5b39dc5a67bf7b4ca095a37a0a9b8c6d53 not-for-merge branch 'main' of https://github.com/spring-cloud/spring-cloud-consul diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/index b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/index index 4203f4e5..8184cb81 100644 Binary files a/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/index and b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/index differ diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/logs/HEAD b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/logs/HEAD index f2d72e08..8099e219 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/logs/HEAD +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/logs/HEAD @@ -1,2 +1,10 @@ 0000000000000000000000000000000000000000 2e289de071592d4d361957e59cc0485c5e1941a0 Marcin Grzejszczak 1489136624 +0100 commit (initial): Initial commit 2e289de071592d4d361957e59cc0485c5e1941a0 386e26ed81099e05b791bbea27a0236abc42a455 Marcin Grzejszczak 1489413813 +0100 commit: Removed deployer +386e26ed81099e05b791bbea27a0236abc42a455 5de87a5b39dc5a67bf7b4ca095a37a0a9b8c6d53 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714572264 -0400 checkout: moving from master to main +5de87a5b39dc5a67bf7b4ca095a37a0a9b8c6d53 bf90641942a884ced73fbc9dfaf17a3a49b25aed Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714572296 -0400 checkout: moving from main to docs-build +bf90641942a884ced73fbc9dfaf17a3a49b25aed 5de87a5b39dc5a67bf7b4ca095a37a0a9b8c6d53 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714572342 -0400 checkout: moving from docs-build to main +5de87a5b39dc5a67bf7b4ca095a37a0a9b8c6d53 386e26ed81099e05b791bbea27a0236abc42a455 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714572353 -0400 checkout: moving from main to master +386e26ed81099e05b791bbea27a0236abc42a455 5de87a5b39dc5a67bf7b4ca095a37a0a9b8c6d53 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714572371 -0400 checkout: moving from master to main +5de87a5b39dc5a67bf7b4ca095a37a0a9b8c6d53 386e26ed81099e05b791bbea27a0236abc42a455 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714572385 -0400 checkout: moving from main to master +386e26ed81099e05b791bbea27a0236abc42a455 5de87a5b39dc5a67bf7b4ca095a37a0a9b8c6d53 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714572426 -0400 checkout: moving from master to main +5de87a5b39dc5a67bf7b4ca095a37a0a9b8c6d53 386e26ed81099e05b791bbea27a0236abc42a455 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714572445 -0400 checkout: moving from main to master diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/logs/refs/heads/docs-build b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/logs/refs/heads/docs-build new file mode 100644 index 00000000..014d4d02 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/logs/refs/heads/docs-build @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 bf90641942a884ced73fbc9dfaf17a3a49b25aed Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714572296 -0400 branch: Created from Upstream/docs-build diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/logs/refs/heads/main b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/logs/refs/heads/main new file mode 100644 index 00000000..a2dd4d57 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/logs/refs/heads/main @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 5de87a5b39dc5a67bf7b4ca095a37a0a9b8c6d53 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714572264 -0400 branch: Created from Upstream/main diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/objects/pack/pack-576e05d3f7fcfa5b7d7952ed0517e097955924ed.idx b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/objects/pack/pack-576e05d3f7fcfa5b7d7952ed0517e097955924ed.idx new file mode 100644 index 00000000..cf9ddb41 Binary files /dev/null and b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/objects/pack/pack-576e05d3f7fcfa5b7d7952ed0517e097955924ed.idx differ diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/objects/pack/pack-576e05d3f7fcfa5b7d7952ed0517e097955924ed.pack b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/objects/pack/pack-576e05d3f7fcfa5b7d7952ed0517e097955924ed.pack new file mode 100644 index 00000000..a49b9af8 Binary files /dev/null and b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/objects/pack/pack-576e05d3f7fcfa5b7d7952ed0517e097955924ed.pack differ diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/packed-refs b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/packed-refs new file mode 100644 index 00000000..250f1873 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/packed-refs @@ -0,0 +1 @@ +# pack-refs with: peeled fully-peeled sorted diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/refs/heads/docs-build b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/refs/heads/docs-build new file mode 100644 index 00000000..e3962fa0 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/refs/heads/docs-build @@ -0,0 +1 @@ +bf90641942a884ced73fbc9dfaf17a3a49b25aed diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/refs/heads/main b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/refs/heads/main new file mode 100644 index 00000000..525552f4 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/refs/heads/main @@ -0,0 +1 @@ +5de87a5b39dc5a67bf7b4ca095a37a0a9b8c6d53 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/sourcetreeconfig b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/sourcetreeconfig new file mode 100644 index 00000000..eac6a8da --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/git/sourcetreeconfig @@ -0,0 +1,8 @@ +autorefresh=1 +savedIncoming=0 +lastUsedView=1 +savedOutgoing=0 +showBuildStatus=1 +disablerecursiveoperations=0 +lastCheckedRemotes=2024-05-01 14:09:43 +0000 +autorefreshremotes=1 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/pom.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/pom.xml index 2fa67e0b..14e930a3 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/pom.xml +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-consul/pom.xml @@ -1,7 +1,7 @@ - + 4.0.0 org.springframework.cloud @@ -26,7 +26,7 @@ 1.3.0.BUILD-SNAPSHOT Chelsea.BUILD-SNAPSHOT 2.3.1 - 4.5.13 + 4.5.2 4.4.5 2.7 diff --git a/projects/spring-cloud/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 index cd1e7895..3fe60ad8 100644 --- a/projects/spring-cloud/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 @@ -1,6 +1,6 @@ - + 4.0.0 org.springframework.cloud diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/FETCH_HEAD b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/FETCH_HEAD index 367ecb43..18b9353c 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/FETCH_HEAD +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/FETCH_HEAD @@ -1 +1,49 @@ -6e3fe942d6d8e2bedc298097b06f944ff8613fa3 branch '2022.0.x' of github.com:spring-cloud/spring-cloud-release +3c340cb0fda1406905eb91a26b6ad37f3a228e65 branch 'main' of github.com:spring-cloud/spring-cloud-release +fb730db9b3999e45c350015c6cf83be35910a159 not-for-merge branch '1.0.0.M2' of github.com:spring-cloud/spring-cloud-release +474b03693496665434ab2615d6500bbb0b575a5b not-for-merge branch '1.0.0.M3' of github.com:spring-cloud/spring-cloud-release +7fdc875cb2b1620e8bc87ef8a27da2858eef7cd1 not-for-merge branch '1.0.0.RC1' of github.com:spring-cloud/spring-cloud-release +75d0bc7cc0995ac76b6cfad962ea54d05262a664 not-for-merge branch '1.0.0.RELEASE' of github.com:spring-cloud/spring-cloud-release +8e8a2d41b4beb8985919bc5a2bca2aa66374bdbb not-for-merge branch '1.0.1.RELEASE' of github.com:spring-cloud/spring-cloud-release +59414747ee8c095753a0b8c5641b328f80d47d33 not-for-merge branch '1.0.2.RELEASE' of github.com:spring-cloud/spring-cloud-release +73ec179d7ce96d5a98c2acd5697cd81c49dfd7d5 not-for-merge branch '1.0.x' of github.com:spring-cloud/spring-cloud-release +9f0690abd67176c5307abd28542ddd7a07354518 not-for-merge branch '2020.0.x' of github.com:spring-cloud/spring-cloud-release +a7bf2822bdd28181e760e06b53311bc95b3143a3 not-for-merge branch '2021.0.x' of github.com:spring-cloud/spring-cloud-release +87aa845d3c58807283dda7295e0c02c7640dfc13 not-for-merge branch '2022.0.x' of github.com:spring-cloud/spring-cloud-release +08c95747e807212c605d758bbb360f6d671b2932 not-for-merge branch 'Angel.SR3' of github.com:spring-cloud/spring-cloud-release +793378513959416478453f7fbd789302348290d1 not-for-merge branch 'Brixton' of github.com:spring-cloud/spring-cloud-release +7745834b138ffe1f647b14dd3c7d4d71eee8aac3 not-for-merge branch 'Brixton.M1' of github.com:spring-cloud/spring-cloud-release +f2036f13515dc6aa997cc15827919acec634eaae not-for-merge branch 'Brixton.M2' of github.com:spring-cloud/spring-cloud-release +6fa5d0230b513ecb2e796baf7a778b68c7b90e89 not-for-merge branch 'Camden' of github.com:spring-cloud/spring-cloud-release +b2477bb56130e85244813d1fe1ff6fc3835d44d9 not-for-merge branch 'Camden.RC1' of github.com:spring-cloud/spring-cloud-release +e112ef52996d7b564d90e9436b50e6d1bd2af740 not-for-merge branch 'Dalston' of github.com:spring-cloud/spring-cloud-release +df9f8dd8313f3b5d9a2a75ffb737bf328c6ca00d not-for-merge branch 'Edgware' of github.com:spring-cloud/spring-cloud-release +d939787f38d3c3a08f8c8e31e17d142aeffbe426 not-for-merge branch 'Edgware.SR5' of github.com:spring-cloud/spring-cloud-release +f3fa9e830bcf486accf364eb3fb874dd663f2b49 not-for-merge branch 'Finchley' of github.com:spring-cloud/spring-cloud-release +cbbe80df445961eb193635e63394a3998243281b not-for-merge branch 'Greenwich' of github.com:spring-cloud/spring-cloud-release +77315dbd9adb166b299e4c3ed336d53a62931a15 not-for-merge branch 'Hoxton' of github.com:spring-cloud/spring-cloud-release +2b7f449fa7d0e04a786ff097c6b1bfe3f322a28d not-for-merge branch 'Jenkins' of github.com:spring-cloud/spring-cloud-release +911fb79b2526a750d60c857d758dfbb834d3860a not-for-merge branch 'dependabot/maven/commons-io-commons-io-2.8.0' of github.com:spring-cloud/spring-cloud-release +6d60e974c9f0e454e6c11da99a61bd4cdcfcdea9 not-for-merge branch 'doc-as-pom' of github.com:spring-cloud/spring-cloud-release +75b4bfe286e37d0ac4ee2b08215b5fc0bc5823a7 not-for-merge branch 'docs-build' of github.com:spring-cloud/spring-cloud-release +3d7d639afa258af09c5c08fd70322d43c95e4f03 not-for-merge branch 'fix-pom' of github.com:spring-cloud/spring-cloud-release +4b562d1f115d48170198e75d0bd592579d267a2c not-for-merge branch 'forHoxton.SR5' of github.com:spring-cloud/spring-cloud-release +1d3ec9b883f8b6c894ff0631d061e7df8f704e5f not-for-merge branch 'functionForStreamRelease' of github.com:spring-cloud/spring-cloud-release +3dc7bc208faf65ac6eb29031d8d01439f4e08511 not-for-merge branch 'functionForStreamRelease_3.0.x' of github.com:spring-cloud/spring-cloud-release +3b1a1270cc2a01012f663519fb7d4a1c7a26d394 not-for-merge branch 'functionForStreamRelease_4.0.x' of github.com:spring-cloud/spring-cloud-release +5f745590cb3f5ed43e9505515760a50075b4a61e not-for-merge branch 'gh-pages' of github.com:spring-cloud/spring-cloud-release +c7605514ca7be3e19247ff3b784e48f32eb3b60e not-for-merge branch 'jenkins-releaser-config' of github.com:spring-cloud/spring-cloud-release +b603d412da7e68611e6701926be8a37694e43bd3 not-for-merge branch 'netflix4-eureka2' of github.com:spring-cloud/spring-cloud-release +8d9248d5a509a1df16f15074a73a2022697128e6 not-for-merge branch 'release/e-scc1355' of github.com:spring-cloud/spring-cloud-release +fbf3b6368c26bc96b9958036156f37055f69ebf3 not-for-merge branch 'release/f-scc1355' of github.com:spring-cloud/spring-cloud-release +787d6414e5a3a574b5928d2041668c96f6b903c7 not-for-merge branch 'release/g-scc1355' of github.com:spring-cloud/spring-cloud-release +72d23f1d5fb5778921b2a9b31bff41d3148c271f not-for-merge branch 'release/sca-0-1-2' of github.com:spring-cloud/spring-cloud-release +467683cd796c15b79cf55da47ab88ee9e6352d36 not-for-merge branch 'release/sca-0-2-2' of github.com:spring-cloud/spring-cloud-release +156792a985a3a1227d79c62be957e6f86a3e2787 not-for-merge branch 'release/sca-0-9-0' of github.com:spring-cloud/spring-cloud-release +962c8772485240a19429740e929ce4ce5f833435 not-for-merge branch 'release/scbuild-3-0-0-M3' of github.com:spring-cloud/spring-cloud-release +74e070c7815baddd4d0fbd058f91ec4255aa0abe not-for-merge branch 'release/scbuild-Hoxton.SR7' of github.com:spring-cloud/spring-cloud-release +00cc7687ea4d7589ce6cc5face7f5c35ee53dc39 not-for-merge branch 'release/scnetflix-2.1.6.RELEASE' of github.com:spring-cloud/spring-cloud-release +5da0e1458e208283eac360832a9121775b822608 not-for-merge branch 'releaser-config-hoxton_sr3' of github.com:spring-cloud/spring-cloud-release +7e67958f4620556fe05e2f6e19f1e40e97a90576 not-for-merge branch 'render_train_docs' of github.com:spring-cloud/spring-cloud-release +8aa3cb92a11adedbc5acfb300e721e0c7c7cd875 not-for-merge branch 'scBuild214' of github.com:spring-cloud/spring-cloud-release +da994d5600c15389f7fc7aa15f0414660d5343e1 not-for-merge branch 'springCloudBuildRelease' of github.com:spring-cloud/spring-cloud-release +eedb764786313401e1058a8eda4e653d7eb89e01 not-for-merge branch 'unzipping' of github.com:spring-cloud/spring-cloud-release diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/config b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/config index 084e458b..7833157b 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/config +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/config @@ -15,3 +15,6 @@ [branch "2022.0.x"] remote = origin merge = refs/heads/2022.0.x +[branch "docs-build"] + remote = origin + merge = refs/heads/docs-build diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/index b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/index index 1789bb72..7c935283 100644 Binary files a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/index and b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/index differ diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/HEAD b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/HEAD index 63845d72..2cf29775 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/HEAD +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/HEAD @@ -57,3 +57,5 @@ ecbeb68df64f1dcd9a45cd7dac70e857e2cde8a0 5812dd9ca14d6d61a76632662000c7a93c051c7 6e3fe942d6d8e2bedc298097b06f944ff8613fa3 310b20cbb6f7fca74695b3ff6dc43cf4b3d4ba6a Marcin Grzejszczak 1686912330 +0200 checkout: moving from 2022.0.x to main 310b20cbb6f7fca74695b3ff6dc43cf4b3d4ba6a 217e46bc4aa6df83f3a131c344d53bf02dd28a9c Marcin Grzejszczak 1686912332 +0200 merge 2022.0.x: Merge made by the 'ort' strategy. 217e46bc4aa6df83f3a131c344d53bf02dd28a9c 0686dad89dadf285c219841468fdfec6e6dc67ba Marcin Grzejszczak 1688124894 +0200 commit: WIP +0686dad89dadf285c219841468fdfec6e6dc67ba 75b4bfe286e37d0ac4ee2b08215b5fc0bc5823a7 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714589675 -0400 checkout: moving from main to docs-build +75b4bfe286e37d0ac4ee2b08215b5fc0bc5823a7 0686dad89dadf285c219841468fdfec6e6dc67ba Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714589683 -0400 checkout: moving from docs-build to main diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/docs-build b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/docs-build new file mode 100644 index 00000000..ccc3ac8d --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/docs-build @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 75b4bfe286e37d0ac4ee2b08215b5fc0bc5823a7 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714589675 -0400 branch: Created from origin/docs-build diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/2021.0.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/2021.0.x index 9d236ac1..9039abe2 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/2021.0.x +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/2021.0.x @@ -13,3 +13,4 @@ aa33294e96817a1720f181e49688004a455f989b 063650255846b01168f6397c7ccd341915e950d 790dd20d1945dd321f87167071a5ae089158e59f 55f92ff863c185caf81f474702d37b73992f7156 Marcin Grzejszczak 1675782967 +0100 pull: fast-forward 55f92ff863c185caf81f474702d37b73992f7156 dd371879d6786a9ce4b85c23e1f7564fe251e499 Marcin Grzejszczak 1675784264 +0100 update by push dd371879d6786a9ce4b85c23e1f7564fe251e499 36f2070ea645c75fbf26bc660245b29cdc863e25 Marcin Grzejszczak 1686912310 +0200 pull: fast-forward +36f2070ea645c75fbf26bc660245b29cdc863e25 a7bf2822bdd28181e760e06b53311bc95b3143a3 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714588991 -0400 fetch origin: fast-forward diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/2022.0.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/2022.0.x index ddc144c3..ac007dc1 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/2022.0.x +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/2022.0.x @@ -1 +1,2 @@ 0000000000000000000000000000000000000000 6e3fe942d6d8e2bedc298097b06f944ff8613fa3 Marcin Grzejszczak 1686912310 +0200 pull: storing head +6e3fe942d6d8e2bedc298097b06f944ff8613fa3 87aa845d3c58807283dda7295e0c02c7640dfc13 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714588991 -0400 fetch origin: fast-forward diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/docs-build b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/docs-build new file mode 100644 index 00000000..8fa3f0bc --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/docs-build @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 75b4bfe286e37d0ac4ee2b08215b5fc0bc5823a7 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714588991 -0400 fetch origin: storing head diff --git a/projects/spring-cloud/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 index 79181f2c..55f9eee4 100644 --- a/projects/spring-cloud/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 @@ -4,3 +4,4 @@ d2601d8c1eefd01a506c54c2f8cb6ed4492c95c4 60847c1d46bf8fc761b73337455105765d04496 60847c1d46bf8fc761b73337455105765d044965 4241e281e15c11b769a20606c5973a753c3f9151 Marcin Grzejszczak 1655207117 +0200 pull: fast-forward 4241e281e15c11b769a20606c5973a753c3f9151 04b6612cbeaf621808db2a0a66d6b78cc3bfbe34 Marcin Grzejszczak 1675782967 +0100 pull: fast-forward 04b6612cbeaf621808db2a0a66d6b78cc3bfbe34 c3deede8ccf0d1f58e84159c7e8d0748db104669 Marcin Grzejszczak 1686912310 +0200 pull: fast-forward +c3deede8ccf0d1f58e84159c7e8d0748db104669 c7605514ca7be3e19247ff3b784e48f32eb3b60e Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714588991 -0400 fetch origin: fast-forward diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/main b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/main index fe55546d..f604f941 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/main +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/logs/refs/remotes/origin/main @@ -12,3 +12,4 @@ acccdd1f0d6020fc598fb6ea3c1f660790a3c916 ecbeb68df64f1dcd9a45cd7dac70e857e2cde8a ecbeb68df64f1dcd9a45cd7dac70e857e2cde8a0 5812dd9ca14d6d61a76632662000c7a93c051c79 Marcin Grzejszczak 1675784325 +0100 update by push 5812dd9ca14d6d61a76632662000c7a93c051c79 310b20cbb6f7fca74695b3ff6dc43cf4b3d4ba6a Marcin Grzejszczak 1686912310 +0200 pull: fast-forward 310b20cbb6f7fca74695b3ff6dc43cf4b3d4ba6a 217e46bc4aa6df83f3a131c344d53bf02dd28a9c Marcin Grzejszczak 1686912337 +0200 update by push +217e46bc4aa6df83f3a131c344d53bf02dd28a9c 3c340cb0fda1406905eb91a26b6ad37f3a228e65 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714588991 -0400 fetch origin: fast-forward diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/pack/pack-adf981ae298cd53125042aa2fd6f3c6a225a1032.idx b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/pack/pack-adf981ae298cd53125042aa2fd6f3c6a225a1032.idx new file mode 100644 index 00000000..6e6cc7d3 Binary files /dev/null and b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/pack/pack-adf981ae298cd53125042aa2fd6f3c6a225a1032.idx differ diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/pack/pack-adf981ae298cd53125042aa2fd6f3c6a225a1032.pack b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/pack/pack-adf981ae298cd53125042aa2fd6f3c6a225a1032.pack new file mode 100644 index 00000000..e4b69939 Binary files /dev/null and b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/objects/pack/pack-adf981ae298cd53125042aa2fd6f3c6a225a1032.pack differ diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/heads/docs-build b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/heads/docs-build new file mode 100644 index 00000000..92ed97d8 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/heads/docs-build @@ -0,0 +1 @@ +75b4bfe286e37d0ac4ee2b08215b5fc0bc5823a7 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/2021.0.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/2021.0.x index 93692ab6..ce3ccf5c 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/2021.0.x +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/2021.0.x @@ -1 +1 @@ -36f2070ea645c75fbf26bc660245b29cdc863e25 +a7bf2822bdd28181e760e06b53311bc95b3143a3 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/2022.0.x b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/2022.0.x index e09fe659..4ff3b2e6 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/2022.0.x +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/2022.0.x @@ -1 +1 @@ -6e3fe942d6d8e2bedc298097b06f944ff8613fa3 +87aa845d3c58807283dda7295e0c02c7640dfc13 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/docs-build b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/docs-build new file mode 100644 index 00000000..92ed97d8 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/docs-build @@ -0,0 +1 @@ +75b4bfe286e37d0ac4ee2b08215b5fc0bc5823a7 diff --git a/projects/spring-cloud/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 index 69c3f422..56c40c3a 100644 --- a/projects/spring-cloud/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 @@ -1 +1 @@ -c3deede8ccf0d1f58e84159c7e8d0748db104669 +c7605514ca7be3e19247ff3b784e48f32eb3b60e diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/main b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/main index fbe1186b..7beef763 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/main +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/remotes/origin/main @@ -1 +1 @@ -217e46bc4aa6df83f3a131c344d53bf02dd28a9c +3c340cb0fda1406905eb91a26b6ad37f3a228e65 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/v2021.0.8 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/v2021.0.8 new file mode 100644 index 00000000..e277a081 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/v2021.0.8 @@ -0,0 +1 @@ +38f575e838aa2c0ba73a78417f4e8a21f53d7b99 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/v2021.0.9 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/v2021.0.9 new file mode 100644 index 00000000..f171e11e --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/v2021.0.9 @@ -0,0 +1 @@ +9280f091c62282a6692c5f3d5cf9fcb4d8c54086 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/v2022.0.5 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/v2022.0.5 new file mode 100644 index 00000000..a65ad3cd --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/v2022.0.5 @@ -0,0 +1 @@ +6116fe28807cbbdbe5b89fd680e2076e9baf7d59 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/v2023.0.0 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/v2023.0.0 new file mode 100644 index 00000000..b57a10dd --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/v2023.0.0 @@ -0,0 +1 @@ +35d8d1274a53b7ea1e653a341832e6e54a3ffd34 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/v2023.0.0-M1 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/v2023.0.0-M1 new file mode 100644 index 00000000..c0a6b056 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/v2023.0.0-M1 @@ -0,0 +1 @@ +0756d102b5308e61cecd3619ae644173993f4769 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/v2023.0.0-M2 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/v2023.0.0-M2 new file mode 100644 index 00000000..187343fc --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/v2023.0.0-M2 @@ -0,0 +1 @@ +f1edcf02504d885b1af68ba8f74f313df136c90a diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/v2023.0.0-RC1 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/v2023.0.0-RC1 new file mode 100644 index 00000000..d85dd89a --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/v2023.0.0-RC1 @@ -0,0 +1 @@ +2bdd9034608f8d3a210faf8cc0ef486e7b560230 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/v2023.0.1 b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/v2023.0.1 new file mode 100644 index 00000000..11afd360 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/refs/tags/v2023.0.1 @@ -0,0 +1 @@ +cdcbc95cf766f87f76b8c2a3eef3cad01f93fc14 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/sourcetreeconfig b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/sourcetreeconfig new file mode 100644 index 00000000..386f275c --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/git/sourcetreeconfig @@ -0,0 +1,8 @@ +autorefresh=1 +savedIncoming=35 +lastUsedView=1 +savedOutgoing=1 +showBuildStatus=1 +disablerecursiveoperations=0 +lastCheckedRemotes=2024-05-01 20:38:41 +0000 +autorefreshremotes=1 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-wiki/Home.asciidoc b/projects/spring-cloud/src/test/resources/projects/spring-cloud-wiki/Home.asciidoc index f3483b9e..60dd6e5e 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-cloud-wiki/Home.asciidoc +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-wiki/Home.asciidoc @@ -1,3 +1,12 @@ +# NOTICE + +This wiki is no longer updated and is here for historical purposes. + +Please see +https://github.com/spring-cloud/spring-cloud-release/wiki for up to date information. + +--- + 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. @@ -6,7 +15,7 @@ See https://projects.spring.io/spring-cloud[projects.spring.io/spring-cloud] for == Release Notes -See the following release notes for upgrade instructions and "new and noteworthy" features: +See the following release notes for upgrade instructions and "new and noteworthy" features (newer release trains at the end): - link:Spring-Cloud-Angel-Release-Notes[Angel] @@ -19,3 +28,9 @@ See the following release notes for upgrade instructions and "new and noteworthy - link:Spring-Cloud-Edgware-Release-Notes[Edgware] - link:Spring-Cloud-Finchley-Release-Notes[Finchley] + +- link:Spring-Cloud-Greenwich-Release-Notes[Greenwich] + +- link:https://github.com/spring-cloud/spring-cloud-release/wiki/Spring-Cloud-Hoxton-Release-Notes[Hoxton] + +- link:https://github.com/spring-cloud/spring-cloud-release/wiki/Spring-Cloud-2020.0-Release-Notes[2020.0 (code name ilford)] diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-wiki/Spring-Cloud-Edgware-Release-Notes.md b/projects/spring-cloud/src/test/resources/projects/spring-cloud-wiki/Spring-Cloud-Edgware-Release-Notes.md index 8d77c2f1..6a346863 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-cloud-wiki/Spring-Cloud-Edgware-Release-Notes.md +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-wiki/Spring-Cloud-Edgware-Release-Notes.md @@ -19,6 +19,35 @@ A number of starters did not follow normal Spring Cloud naming conventions. In E | spring-cloud-starter-turbine-stream | spring-cloud-starter-netflix-turbine-stream | | spring-cloud-starter-zuul | spring-cloud-starter-netflix-zuul | + + +# Edgware.SR6 + +2019-05-23 + + - Spring Cloud Starter `Edgware.SR6` + - Spring Cloud Release `Edgware.SR6` + - Spring Cloud Security `1.2.4.RELEASE` + - Spring Cloud Bus `1.3.5.RELEASE` + - Spring Cloud Stream `Ditmars.SR5` + - Spring Cloud Task `1.2.4.RELEASE` + - Spring Cloud Netflix `1.4.7.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-netflix/issues?q=is%3Aclosed+milestone%3A1.4.7.RELEASE)) + - Spring Cloud Sleuth `1.3.6.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-sleuth/issues?q=is%3Aclosed+milestone%3A1.3.6.RELEASE)) + - Spring Cloud Config `1.4.7.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-config/milestone/56?closed=1)) + - Spring Cloud `Edgware.SR6` + - Spring Cloud Dependencies `Edgware.SR6` + - Spring Cloud Commons `1.3.6.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-commons/milestone/56?closed=1)) + - Spring Cloud Build `1.3.13.RELEASE` + - Spring Cloud Vault `1.1.3.RELEASE` (upgraded to Vault 1.1.3) + - Spring Cloud Zookeeper `1.2.3.RELEASE` + - Spring Cloud Contract `1.2.7.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-contract/issues?q=is%3Aclosed+milestone%3A1.2.7.RELEASE)) + - Spring Cloud Aws `1.2.4.RELEASE` + - Spring Cloud Consul `1.3.6.RELEASE` + - Spring Cloud Cloudfoundry `1.1.3.RELEASE` + - Spring Cloud Function `1.0.2.RELEASE` + - Spring Cloud Gateway `1.0.3.RELEASE` + + # Edgware.SR5 2018-10-16 @@ -145,4 +174,3 @@ A number of starters did not follow normal Spring Cloud naming conventions. In E - Spring Cloud Vault `1.1.0.M1` ([issues](https://github.com/spring-cloud/spring-cloud-vault/milestone/5?closed=1)) - Spring Cloud Gateway `1.0.0.M1` ([issues](https://github.com/spring-cloud/spring-cloud-gateway/milestone/2?closed=1)) - diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-wiki/Spring-Cloud-Finchley-Release-Notes.md b/projects/spring-cloud/src/test/resources/projects/spring-cloud-wiki/Spring-Cloud-Finchley-Release-Notes.md index f8174569..b6d8bdb8 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-cloud-wiki/Spring-Cloud-Finchley-Release-Notes.md +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-wiki/Spring-Cloud-Finchley-Release-Notes.md @@ -1,5 +1,65 @@ Spring Cloud Finchley builds on Spring Boot 2.0.x and is not compatible with 1.x.y. + + + + +# Finchley.SR4 + +2019-06-08 + + - Spring Cloud Commons `2.0.4.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-commons/milestone/60?closed=1)) + - Spring Cloud Openfeign `2.0.4.RELEASE` + - Spring Cloud Dependencies `Finchley.SR4` + - Spring Cloud Release `Finchley.SR4` + - Spring Cloud Starter `Finchley.SR4` + - Spring Cloud Stream `Elmhurst.SR3` + - Spring Cloud Cloudfoundry `2.0.2.RELEASE` + - Spring Cloud Task `2.0.2.RELEASE` + - Spring Cloud Build `2.0.6.RELEASE` + - Spring Cloud Vault `2.0.4.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-vault/milestone/32?closed=1)) + - Spring Cloud Zookeeper `2.0.2.RELEASE` + - Spring Cloud Config `2.0.5.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-config/milestone/65?closed=1)) + - Spring Cloud Aws `2.0.3.RELEASE` + - Spring Cloud Bus `2.0.2.RELEASE` + - Spring Cloud `Finchley.SR4` + - Spring Cloud Security `2.0.2.RELEASE` + - Spring Cloud Gateway `2.0.4.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-gateway/milestone/23?closed=1)) + - Spring Cloud Netflix `2.0.4.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-netflix/milestone/78?closed=1)) + - Spring Cloud Sleuth `2.0.4.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-sleuth/milestone/61?closed=1)) + - Spring Cloud Consul `2.0.3.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-consul/milestone/36?closed=1)) + - Spring Cloud Contract `2.0.4.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-contract/milestone/52?closed=1)) + - Spring Cloud Function `1.0.2.RELEASE` + + +# Finchley.SR3 + +2019-02-22 + + - Spring Cloud Config `2.0.3.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-config/milestone/57?closed=1)) + - Spring Cloud Function `1.0.0.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-function/milestone/7?closed=1)) + - Spring Cloud Starter `Finchley.SR3` + - Spring Cloud Release `Finchley.SR3` + - Spring Cloud Stream `Elmhurst.SR2` + - Spring Cloud Sleuth `2.0.3.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-sleuth/milestone/60?closed=1)) + - Spring Cloud Cloudfoundry `2.0.1.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-cloudfoundry/milestone/10?closed=1)) + - Spring Cloud Zookeeper `2.0.1.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-zookeeper/milestone/25?closed=1)) + - Spring Cloud Aws `2.0.2.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-aws/milestone/25?closed=1)) + - Spring Cloud Task `2.0.1.RELEASE` + - Spring Cloud Commons `2.0.3.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-commons/milestone/55?closed=1)) + - Spring Cloud Build `2.0.5.RELEASE` + - Spring Cloud Openfeign `2.0.3.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-openfeign/milestone/8?closed=1)) + - Spring Cloud Vault `2.0.3.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-vault/milestone/26?closed=1)) + - Spring Cloud `Finchley.SR3` + - Spring Cloud Security `2.0.1.RELEASE` + - Spring Cloud Bus `2.0.1.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-bus/milestone/33?closed=1)) + - Spring Cloud Contract `2.0.3.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-contract/milestone/44?closed=1)) + - Spring Cloud Consul `2.0.2.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-consul/milestone/36?closed=1)) + - Spring Cloud Gateway `2.0.3.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-gateway/milestone/19?closed=1)) + - Spring Cloud Dependencies `Finchley.SR3` + - Spring Cloud Netflix `2.0.3.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-netflix/milestone/72?closed=1)) + + # Finchley.SR2 2018-10-23 @@ -213,4 +273,4 @@ Spring Cloud Finchley builds on Spring Boot 2.0.x and is not compatible with 1.x - Spring Cloud Task `2.0.0.M1` ([issues](https://github.com/spring-cloud/spring-cloud-task/milestone/18?closed=1)) - Spring Cloud Vault `2.0.0.M3` ([issues](https://github.com/spring-cloud/spring-cloud-vault/milestone/11?closed=1)) - Spring Cloud Zookeeper `2.0.0.M2` - - Spring Cloud Commons `2.0.0.M3` ([issues](https://github.com/spring-cloud/spring-cloud-commons/milestone/34?closed=1)) + - Spring Cloud Commons `2.0.0.M3` ([issues](https://github.com/spring-cloud/spring-cloud-commons/milestone/34?closed=1)) \ No newline at end of file diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-wiki/Spring-Cloud-Greenwich-Release-Notes.md b/projects/spring-cloud/src/test/resources/projects/spring-cloud-wiki/Spring-Cloud-Greenwich-Release-Notes.md new file mode 100644 index 00000000..04fd25d6 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-wiki/Spring-Cloud-Greenwich-Release-Notes.md @@ -0,0 +1,308 @@ + + + +# Greenwich.SR6 + +2020-05-15 + +[All Issues](https://github.com/orgs/spring-cloud/projects/39) + + - Spring Cloud Config `2.1.8.RELEASE` + - Spring Cloud Commons `2.1.6.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-commons/milestone/74?closed=1)) + + +# Greenwich.SR5 + +2020-02-01 + + - Spring Cloud Build `2.1.10.RELEASE` + - Spring Cloud Sleuth `2.1.7.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-sleuth/milestone/71?closed=1)) + - Spring Cloud Consul `2.1.5.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-consul/milestone/45?closed=1)) + - Spring Cloud Gateway `2.1.5.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-gateway/milestone/33?closed=1)) + - Spring Cloud Contract `2.1.5.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-contract/milestone/60?closed=1)) + - Spring Cloud Netflix `2.1.5.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-netflix/milestone/87?closed=1)) + - Spring Cloud Gcp `1.1.5.RELEASE` + - Spring Cloud Config `2.1.6.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-config/milestone/73?closed=1)) + - Spring Cloud Starter Build `Greenwich.SR5` + - Spring Cloud Openfeign `2.1.5.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-openfeign/milestone/20?closed=1)) + - Spring Cloud Commons `2.1.5.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-commons/milestone/69?closed=1)) + - Spring Cloud Aws `2.1.4.RELEASE` + - Spring Cloud Vault `2.1.5.RELEASE` + - Spring Cloud Bus `2.1.4.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-bus/milestone/41?closed=1)) + - Spring Cloud Kubernetes `1.0.5.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-kubernetes/milestone/17?closed=1)) + + +# Greenwich.SR4 + +2019-11-18 + + - Spring Cloud Security `2.1.5.RELEASE` + - Spring Cloud Starter `Greenwich.SR4` + - Spring Cloud Kubernetes `1.0.4.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-kubernetes/milestone/16?closed=1)) + - Spring Cloud Commons `2.1.4.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-commons/milestone/65?closed=1)) + - Spring Cloud Openfeign `2.1.4.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-openfeign/milestone/17?closed=1)) + - Spring Cloud Dependencies Parent `2.1.9.RELEASE` + - Spring Cloud Stream `Fishtown.SR4` + - Spring Cloud Contract `2.1.4.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-contract/milestone/56?closed=1)) + - Spring Cloud Consul `2.1.4.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-consul/milestone/43?closed=1)) + - Spring Cloud Vault `2.1.4.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-vault/milestone/34?closed=1)) + - Spring Cloud Dependencies `Greenwich.SR4` + - Spring Cloud Zookeeper `2.1.4.RELEASE` + - Spring Cloud Task `2.1.3.RELEASE` + - Spring Cloud Bus `2.1.4.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-bus/milestone/41?closed=1)) + - Spring Cloud Release `Greenwich.SR4` + - Spring Cloud Cloudfoundry `2.1.4.RELEASE` + - Spring Cloud Build `2.1.9.RELEASE` + - Spring Cloud Netflix `2.1.4.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-netflix/milestone/83?closed=1)) + - Spring Cloud `Greenwich.SR4` + - Spring Cloud Sleuth `2.1.6.RELEASE` + - Spring Cloud Config `2.1.5.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-config/milestone/70?closed=1)) + - Spring Cloud Gateway `2.1.4.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-gateway/milestone/28?closed=1)) + - Spring Cloud Function `2.0.2.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-function/milestone/18?closed=1)) + - Spring Cloud Gcp `1.1.4.RELEASE` + - Spring Cloud Starter Parent `Greenwich.SR4` + - Spring Cloud Aws `2.1.4.RELEASE` + + +# Greenwich.SR3 + +2019-09-10 + + - Spring Cloud Commons `2.1.3.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-commons/milestone/62?closed=1)) + - Spring Cloud Openfeign `2.1.3.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-openfeign/milestone/14?closed=1)) + - Spring Cloud Security `2.1.4.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-security/milestone/22?closed=1)) + - Spring Cloud Stream `Fishtown.SR4` + - Spring Cloud Kubernetes `1.0.3.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-kubernetes/milestone/13?closed=1)) + - Spring Cloud Build `2.1.7.RELEASE` + - Spring Cloud Zookeeper `2.1.3.RELEASE` + - Spring Cloud Gateway `2.1.3.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-gateway/milestone/26?closed=1)) + - Spring Cloud Dependencies `Greenwich.SR3` + - Spring Cloud Netflix `2.1.3.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-netflix/milestone/81?closed=1)) + - Spring Cloud Bus `2.1.3.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-bus/milestone/40?closed=1)) + - Spring Cloud Dependencies Parent `2.1.7.RELEASE` + - Spring Cloud Task `2.1.3.RELEASE` + - Spring Cloud Starter `Greenwich.SR3` + - Spring Cloud Cloudfoundry `2.1.3.RELEASE` + - Spring Cloud `Greenwich.SR3` + - Spring Cloud Vault `2.1.3.RELEASE` + - Spring Cloud Config `2.1.4.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-config/milestone/68?closed=1)) + - Spring Cloud Release `Greenwich.SR3` + - Spring Cloud Function `2.0.2.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-function/milestone/18?closed=1)) + - Spring Cloud Consul `2.1.3.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-consul/milestone/42?closed=1)) + - Spring Cloud Starter Parent `Greenwich.SR3` + - Spring Cloud Gcp `1.1.3.RELEASE` + - Spring Cloud Sleuth `2.1.3.RELEASE` + - Spring Cloud Aws `2.1.3.RELEASE` + - Spring Cloud Contract `2.1.3.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-contract/milestone/53?closed=1)) + + +# Greenwich.SR2 + +2019-06-21 + + - Spring Cloud Task `2.1.2.RELEASE` + - Spring Cloud Config `2.1.3.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-config/milestone/66?closed=1)) + - Spring Cloud Stream `Fishtown.SR3` ([issues](https://github.com/spring-cloud/spring-cloud-stream/milestone/60?closed=1)) + - Spring Cloud `Greenwich.SR2` + - Spring Cloud Sleuth `2.1.2.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-sleuth/milestone/62?closed=1)) + - Spring Cloud Commons `2.1.2.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-commons/milestone/61?closed=1)) + - Spring Cloud Openfeign `2.1.2.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-openfeign/milestone/12?closed=1)) + - Spring Cloud Release `Greenwich.SR2` + - Spring Cloud Kubernetes `1.0.2.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-kubernetes/milestone/11?closed=1)) + - Spring Cloud Aws `2.1.2.RELEASE` + - Spring Cloud Vault `2.1.2.RELEASE` + - Spring Cloud Function `2.0.2.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-function/milestone/18?closed=1)) + - Spring Cloud Bus `2.1.2.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-bus/milestone/37?closed=1)) + - Spring Cloud Build `2.1.6.RELEASE` + - Spring Cloud Zookeeper `2.1.2.RELEASE` + - Spring Cloud Dependencies `Greenwich.SR2` + - Spring Cloud Gcp `1.1.2.RELEASE` + - Spring Cloud Contract `2.1.2.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-contract/milestone/51?closed=1)) + - Spring Cloud Consul `2.1.2.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-consul/milestone/41?closed=1)) + - Spring Cloud Security `2.1.3.RELEASE` + - Spring Cloud Gateway `2.1.2.RELEASE` + - Spring Cloud Cloudfoundry `2.1.2.RELEASE` + - Spring Cloud Netflix `2.1.2.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-netflix/milestone/76?closed=1)) + - Spring Cloud Starter `Greenwich.SR2` + + +# Greenwich.SR1 + +2019-03-05 + + - Spring Cloud Netflix `2.1.1.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-netflix/milestone/75?closed=1)) + - Spring Cloud Stream `Fishtown.SR2` + - Spring Cloud Gcp `1.1.1.RELEASE` + - Spring Cloud Cloudfoundry `2.1.1.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-cloudfoundry/milestone/12?closed=1)) + - Spring Cloud Build `2.1.3.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-build/milestone/24?closed=1)) + - Spring Cloud Commons `2.1.1.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-commons/milestone/58?closed=1)) + - Spring Cloud `Greenwich.SR1` + - Spring Cloud Openfeign `2.1.1.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-openfeign/milestone/11?closed=1)) + - Spring Cloud Task `2.1.1.RELEASE` + - Spring Cloud Sleuth `2.1.1.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-sleuth/milestone/59?closed=1)) + - Spring Cloud Aws `2.1.1.RELEASE` + - Spring Cloud Release `Greenwich.SR1` + - Spring Cloud Zookeeper `2.1.1.RELEASE` + - Spring Cloud Bus `2.1.1.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-bus/milestone/36?closed=1)) + - Spring Cloud Vault `2.1.1.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-vault/milestone/30?closed=1)) + - Spring Cloud Kubernetes `1.0.1.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-kubernetes/milestone/10?closed=1)) + - Spring Cloud Dependencies `Greenwich.SR1` + - Spring Cloud Contract `2.1.1.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-contract/milestone/49?closed=1)) + - Spring Cloud Consul `2.1.1.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-consul/milestone/38?closed=1)) + - Spring Cloud Gateway `2.1.1.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-gateway/milestone/22?closed=1)) + - Spring Cloud Function `2.0.1.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-function/milestone/17?closed=1)) + - Spring Cloud Starter `Greenwich.SR1` + - Spring Cloud Config `2.1.1.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-config/milestone/61?closed=1)) + - Spring Cloud Security `2.1.2.RELEASE` ([2.1.1 issues + documentation fixes](https://github.com/spring-cloud/spring-cloud-security/issues?q=is%3Aclosed+milestone%3A2.1.1.RELEASE)) + + +# Greenwich.RELEASE + +2019-01-22 + +Spring Cloud Greenwich builds on Spring Boot 2.1.x + +For a complete list of the issues resolved in this release see the [Greenwich.RELEASE GitHub Project](https://github.com/orgs/spring-cloud/projects/19). + + - Spring Cloud Sleuth `2.1.0.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-sleuth/milestone/58?closed=1)) + - Spring Cloud Gcp `1.1.0.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-gcp/milestone/9?closed=1)) + - Spring Cloud Netflix `2.1.0.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-netflix/milestone/74?closed=1)) + - Spring Cloud Consul `2.1.0.RELEASE` + - Spring Cloud Gateway `2.1.0.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-gateway/milestone/21?closed=1)) + - Spring Cloud Function `2.0.0.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-function/milestone/14?closed=1)) + - Spring Cloud Stream `Fishtown.RELEASE` ([Announcement](https://spring.io/blog/2019/01/08/announcing-general-availability-of-spring-cloud-stream-fishtown-release-2-1-0-release)) + - Spring Cloud Zookeeper `2.1.0.RELEASE` + - Spring Cloud Cloudfoundry `2.1.0.RELEASE` + - Spring Cloud Aws `2.1.0.RELEASE` + - Spring Cloud Task `2.1.0.RELEASE` ([Announcement](https://spring.io/blog/2019/01/22/spring-cloud-task-2-1-0-ga-is-now-available)) + - Spring Cloud Kubernetes `1.0.0.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-kubernetes/milestone/9?closed=1)) + - Spring Cloud Contract `2.1.0.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-contract/milestone/48?closed=1)) + - Spring Cloud Security `2.1.0.RELEASE` + - Spring Cloud Bus `2.1.0.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-bus/milestone/35?closed=1)) + - Spring Cloud Config `2.1.0.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-config/milestone/60?closed=1)) + - Spring Cloud Vault `2.1.0.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-vault/milestone/29?closed=1)) + - Spring Cloud Openfeign `2.1.0.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-openfeign/milestone/10?closed=1)) + - Spring Cloud Commons `2.1.0.RELEASE` + + +# Greenwich.RC2 + +2018-12-21 + +See all issues assigned to Greenwich.RC2 at the [Github Project](https://github.com/orgs/spring-cloud/projects/12) + + - Spring Cloud Security `2.1.0.RC3` ([issues](https://github.com/spring-cloud/spring-cloud-security/issues?q=is%3Aclosed+milestone%3A2.1.0.RC3)) + - Spring Cloud Vault `2.1.0.RC1` + - Spring Cloud Contract `2.1.0.RC3` ([issues](https://github.com/spring-cloud/spring-cloud-contract/milestone/46?closed=1)) + - Spring Cloud Kubernetes `1.0.0.RC2` ([issues](https://github.com/spring-cloud/spring-cloud-kubernetes/milestone/8?closed=1)) + - Spring Cloud Commons `2.1.0.RC2` + - Spring Cloud Zookeeper `2.1.0.RC2` + - Spring Cloud Openfeign `2.1.0.RC3` ([issues](https://github.com/spring-cloud/spring-cloud-openfeign/issues?q=is%3Aclosed+milestone%3A2.1.0.RC3)) + - Spring Cloud Aws `2.1.0.RC1` + - Spring Cloud Starter `Greenwich.RC2` + - Spring Cloud Bus `2.1.0.RC3` + - Spring Cloud Sleuth `2.1.0.RC3` ([issues](https://github.com/spring-cloud/spring-cloud-sleuth/issues?q=is%3Aclosed+milestone%3A2.1.0.RC3)) + - Spring Cloud Netflix `2.1.0.RC3` ([issues](https://github.com/spring-cloud/spring-cloud-netflix/milestone/73?closed=1)) + - Spring Cloud Stream `Fishtown.RC4` + - Spring Cloud Gcp `1.1.0.RC2` + - Spring Cloud Cloudfoundry `2.1.0.RC2` + - Spring Cloud Build `2.1.0.RC3` ([issues](https://github.com/spring-cloud/spring-cloud-build/milestone/21?closed=1)) + - Spring Cloud Dependencies `Greenwich.RC2` + - Spring Cloud Task `2.1.0.M2` + - Spring Cloud Release `Greenwich.RC2` + - Spring Cloud Function `2.0.0.RC3` ([issues](https://github.com/spring-cloud/spring-cloud-function/milestone/15?closed=1)) + - Spring Cloud `Greenwich.RC2` + - Spring Cloud Consul `2.1.0.RC3` ([issues](https://github.com/spring-cloud/spring-cloud-consul/milestone/37?closed=1)) + - Spring Cloud Config `2.1.0.RC3` ([issues](https://github.com/spring-cloud/spring-cloud-config/milestone/59?closed=1)) + - Spring Cloud Gateway `2.1.0.RC3` ([issues](https://github.com/spring-cloud/spring-cloud-gateway/milestone/20?closed=1)) + +# Greenwich.RC1 + +Spring Cloud Greenwich builds on Spring Boot 2.1.x and is not compatible with 2.0.x or 1.x.y. + +See all issues assigned to Greenwich.RC1 at the [Github Project](https://github.com/orgs/spring-cloud/projects/18) + +2018-12-12 + + - Spring Cloud Kubernetes `1.0.0.RC1` ([issues](https://github.com/spring-cloud/spring-cloud-kubernetes/issues?q=is%3Aclosed+milestone%3A1.0.0.RC1)) + - Spring Cloud Security `2.1.0.RC2` + - Spring Cloud Vault `2.1.0.RC1` ([issues](https://github.com/spring-cloud/spring-cloud-vault/milestone/27?closed=1)) + - Spring Cloud Commons `2.1.0.RC2` ([issues](https://github.com/spring-cloud/spring-cloud-commons/issues?q=is%3Aclosed+milestone%3A2.1.0.RC1)) + - Spring Cloud Contract `2.1.0.RC2` ([issues](https://github.com/spring-cloud/spring-cloud-contract/issues?q=is%3Aclosed+milestone%3A2.1.0.RC1)) + - Spring Cloud Openfeign `2.1.0.RC2` ([issues](https://github.com/spring-cloud/spring-cloud-openfeign/issues?q=is%3Aclosed+milestone%3A2.1.0.RC1)) + - Spring Cloud Zookeeper `2.1.0.RC2` ([issues](https://github.com/spring-cloud/spring-cloud-zookeeper/issues?q=is%3Aclosed+milestone%3A2.1.0.RC1)) + - Spring Cloud Stream `Fishtown.RC2` + - Spring Cloud Starter `Greenwich.RC1` + - Spring Cloud Aws `2.0.1.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-aws/milestone/24?closed=1)) + - Spring Cloud Sleuth `2.1.0.RC2` ([issues](https://github.com/spring-cloud/spring-cloud-sleuth/issues?q=is%3Aclosed+milestone%3A2.1.0.RC1)) + - Spring Cloud Bus `2.1.0.RC2` ([issues](https://github.com/spring-cloud/spring-cloud-bus/issues?q=is%3Aclosed+milestone%3A2.1.0.RC1)) + - Spring Cloud Netflix `2.1.0.RC2` ([issues](https://github.com/spring-cloud/spring-cloud-netflix/issues?q=is%3Aclosed+milestone%3A2.1.0.RC1)) + - Spring Cloud Gcp `1.1.0.RC1` ([issues](https://github.com/spring-cloud/spring-cloud-gcp/milestone/10?closed=1)) + - Spring Cloud Cloudfoundry `2.1.0.RC2` + - Spring Cloud Build `2.1.0.RC3` + - Spring Cloud Dependencies `Greenwich.RC1` + - Spring Cloud Function `2.0.0.RC2` ([issues](https://github.com/spring-cloud/spring-cloud-function/milestone/13?closed=1)) + - Spring Cloud Task `2.1.0.M1` ([issues](https://github.com/spring-cloud/spring-cloud-task/milestone/29?closed=1)) + - Spring Cloud Release `Greenwich.RC1` + - Spring Cloud Consul `2.1.0.RC2` ([issues](https://github.com/spring-cloud/spring-cloud-config/milestone/59?closed=1)) + - Spring Cloud Config `2.1.0.RC2` ([issues](https://github.com/spring-cloud/spring-cloud-config/issues?q=is%3Aclosed+milestone%3A2.1.0.RC1)) + - Spring Cloud Gateway `2.1.0.RC2` ([issues](https://github.com/spring-cloud/spring-cloud-config/issues?q=is%3Aclosed+milestone%3A2.1.0.RC1)) + - Spring Cloud `Greenwich.RC1` + +# Greenwich.M3 + +2018-11-19 + + - Spring Cloud `Greenwich.M3` + - Spring Cloud Zookeeper `2.1.0.M1` + - Spring Cloud Gateway `2.1.0.M3` + - Spring Cloud Bus `2.1.0.M2` ([issues](https://github.com/spring-cloud/spring-cloud-bus/milestone/31?closed=1)) + - Spring Cloud Consul `2.1.0.M2` + - Spring Cloud Stream `Fishtown.RC2` + - Spring Cloud Aws `2.0.1.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-aws/milestone/24?closed=1)) + - Spring Cloud Release `Greenwich.M3` + - Spring Cloud Commons `2.1.0.M2` + - Spring Cloud Vault `2.1.0.M2` + - Spring Cloud Netflix `2.1.0.M3` + - Spring Cloud Openfeign `2.1.0.M2` + - Spring Cloud Kubernetes `1.0.0.M2` ([issues](https://github.com/spring-cloud/spring-cloud-kubernetes/milestone/6?closed=1)) + - Spring Cloud Gcp `1.1.0.M3` + - Spring Cloud Config `2.1.0.M3` + - Spring Cloud Dependencies `Greenwich.M3` + - Spring Cloud Contract `2.1.0.M2` ([issues](https://github.com/spring-cloud/spring-cloud-contract/milestone/38?closed=1)) + - Spring Cloud Sleuth `2.1.0.M2` ([issues](https://github.com/spring-cloud/spring-cloud-sleuth/milestone/54?closed=1)) + - Spring Cloud Build `2.1.0.RC2` + - Spring Cloud Security `2.1.0.M1` + - Spring Cloud Function `2.0.0.RC2` ([issues](https://github.com/spring-cloud/spring-cloud-function/milestone/13?closed=1)) + - Spring Cloud Task `2.1.0.M1` ([issues](https://github.com/spring-cloud/spring-cloud-task/milestone/29?closed=1)) + - Spring Cloud Cloudfoundry `2.1.0.M1` + - Spring Cloud Starter `Greenwich.M3` + +# Greenwich.M2 + +2018-11-18 + + - Spring Cloud Zookeeper `2.1.0.M1` + - Spring Cloud Bus `2.1.0.M2` ([issues](https://github.com/spring-cloud/spring-cloud-bus/milestone/31?closed=1)) + - Spring Cloud Consul `2.1.0.M2` + - Spring Cloud Gateway `2.1.0.M2` + - Spring Cloud Stream `Fishtown.RC1` + - Spring Cloud Aws `2.0.1.RELEASE` ([issues](https://github.com/spring-cloud/spring-cloud-aws/milestone/24?closed=1)) + - Spring Cloud Commons `2.1.0.M2` + - Spring Cloud `Greenwich.M2` + - Spring Cloud Release `Greenwich.M2` + - Spring Cloud Vault `2.1.0.M2` + - Spring Cloud Netflix `2.1.0.M2` ([issues](https://github.com/spring-cloud/spring-cloud-netflix/milestone/70?closed=1)) + - Spring Cloud Openfeign `2.1.0.M2` + - Spring Cloud Kubernetes `1.0.0.M2` ([issues](https://github.com/spring-cloud/spring-cloud-kubernetes/milestone/6?closed=1)) + - Spring Cloud Dependencies `2.1.0.RC2` + - Spring Cloud Gcp `1.1.0.M3` + - Spring Cloud Config `2.1.0.M2` + - Spring Cloud Contract `2.1.0.M2` ([issues](https://github.com/spring-cloud/spring-cloud-contract/milestone/38?closed=1)) + - Spring Cloud Sleuth `2.1.0.M2` ([issues](https://github.com/spring-cloud/spring-cloud-sleuth/milestone/54?closed=1)) + - Spring Cloud Build `2.1.0.RC2` + - Spring Cloud Security `2.1.0.M1` + - Spring Cloud Task `2.1.0.M1` ([issues](https://github.com/spring-cloud/spring-cloud-task/milestone/29?closed=1)) + - Spring Cloud Function `2.0.0.RC1` ([issues](https://github.com/spring-cloud/spring-cloud-function/milestone/12?closed=1)) + - Spring Cloud Cloudfoundry `2.1.0.M1` + - Spring Cloud Starter `Greenwich.M2` \ No newline at end of file diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-wiki/Spring-Cloud-Hoxton-Release-Notes.md b/projects/spring-cloud/src/test/resources/projects/spring-cloud-wiki/Spring-Cloud-Hoxton-Release-Notes.md new file mode 100644 index 00000000..670063c5 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-wiki/Spring-Cloud-Hoxton-Release-Notes.md @@ -0,0 +1 @@ +The Hoxton Release Notes have moved to https://github.com/spring-cloud/spring-cloud-release/wiki/Spring-Cloud-Hoxton-Release-Notes \ No newline at end of file diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-wiki/Spring-IO-Platform-Compatibility.md b/projects/spring-cloud/src/test/resources/projects/spring-cloud-wiki/Spring-IO-Platform-Compatibility.md index 3d425956..96dc7774 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-cloud-wiki/Spring-IO-Platform-Compatibility.md +++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-wiki/Spring-IO-Platform-Compatibility.md @@ -3,3 +3,5 @@ | Athens | 1.4.x | Camden | | Brussels | 1.5.x | Dalston & Edgware | | Cairo | 2.0.x | Finchley | + +The Spring IO Platform has been discontinued in favor of Spring Boot. \ No newline at end of file