Compare commits

...
Author SHA1 Message Date
Ryan Baxter 7c82700143 2.2.2.RELEASE version changes 2020-02-12 10:45:38 -05:00
Spencer Gibb c6e0bc7a26 bumps groovy version 2020-01-27 12:28:43 -05:00
Spencer Gibb a8313feea7 Bumps boot version to 2.2.4 2020-01-27 11:51:02 -05:00
Spencer Gibb 2caeaee319 Skips bats tests.
See gh-150
2020-01-23 17:10:02 -05:00
Marcin Grzejszczak a579b7fb03 Externalized generated docs location 2020-01-04 18:28:27 +01:00
buildmaster 19044131d0 Bumping versions 2019-12-21 07:13:31 +00:00
Spencer Gibb a29ba7bc95 temporarily comment out nohttp-checkstyle.xml 2019-12-19 15:08:48 -05:00
buildmaster 0953f45189 Bumping versions 2019-12-19 07:12:42 +00:00
buildmaster e082a147a1 Bumping versions to 2.2.2.BUILD-SNAPSHOT after release 2019-12-18 13:42:52 +00:00
buildmaster c35c8b5742 Going back to snapshots 2019-12-18 13:42:51 +00:00
buildmaster e5d3206eab Update SNAPSHOT to 2.2.1.RELEASE 2019-12-18 13:41:17 +00:00
buildmaster ce0e50c1d9 Bumping versions 2019-12-18 13:19:01 +00:00
Spencer Gibb e2d73c63ad javadoc for java 13 2019-12-12 21:07:34 -05:00
buildmaster 03175d3e66 Bumping versions 2019-12-07 07:13:32 +00:00
Marcin Grzejszczak ac156c7c80 Made more attributes overridable 2019-12-06 10:12:59 +01:00
Ryan Baxter 5e5d2b67ac Configuring flatten plugin to keep central profile 2019-11-26 15:25:44 -05:00
Ryan Baxter 6c98d80678 Update issue templates 2019-11-19 16:28:21 -05:00
Ryan Baxter 9728af1d93 Creating security.md 2019-11-19 16:27:41 -05:00
buildmaster 2cd4391e49 Bumping versions to 2.2.1.BUILD-SNAPSHOT after release 2019-11-19 13:57:25 +00:00
buildmaster bb26542fc9 Going back to snapshots 2019-11-19 13:57:24 +00:00
buildmaster 70f7d413f3 Update SNAPSHOT to 2.2.0.RELEASE 2019-11-19 13:56:18 +00:00
Marcin Grzejszczak 94efa8767a Added missing javadocs
fixes gh-148
2019-11-19 13:57:47 +01:00
buildmaster 06f8a97e59 Bumping versions 2019-11-19 07:12:35 +00:00
Ryan Baxter 51c41e52f6 Bumping version to next release 2019-11-18 16:02:37 -05:00
Ryan Baxter b1a8036d3f Revert "Change versions for release"
This reverts commit a5be66e84f.
2019-11-18 15:59:13 -05:00
Ryan Baxter a5be66e84f Change versions for release 2019-11-18 15:56:03 -05:00
Marcin Grzejszczak 941bba5970 Merge branch '2.1.x' 2019-11-18 15:02:51 +01:00
Marcin Grzejszczak 1235c2153a Added gpg version 2019-11-18 15:02:17 +01:00
Marcin Grzejszczak 3312992760 Merge branch '2.1.x' 2019-11-18 14:50:59 +01:00
Marcin Grzejszczak 717978e9eb Added gpg version 2019-11-18 14:48:27 +01:00
buildmaster af4bc6f95c Bumping versions 2019-11-13 07:13:23 +00:00
Marcin Grzejszczak 1afb77ea41 Making all the attributes overridable 2019-11-12 14:01:35 +01:00
Ryan Baxter 33b42d3a4b Bumping version to 2.1.9 2019-11-11 11:39:54 -05:00
Ryan Baxter 079317a3fe Revert "Preparing for 2.1.8.RELEASE"
This reverts commit 5d8b1fa812.
2019-11-11 11:38:09 -05:00
Ryan Baxter 5d8b1fa812 Preparing for 2.1.8.RELEASE 2019-11-11 11:22:49 -05:00
Ryan Baxter c6a0a473ec Bumping boot to 2.1.10.RELEASE 2019-11-11 11:15:54 -05:00
buildmaster b167397c23 Going back to snapshots 2019-11-07 16:31:13 +00:00
buildmaster b02a62f33d Update SNAPSHOT to 2.2.0.RC2 2019-11-07 16:25:52 +00:00
Marcin Grzejszczak d810f71a84 Fixed the boms to be of flattenMode=bom 2019-11-07 15:07:41 +01:00
Marcin Grzejszczak cc07cbcde5 Bumped Boot to 2.2.1.RELEASE 2019-11-07 14:14:59 +01:00
Marcin Grzejszczak 9d88a2c0de Using the maven flatten plugin for published POMs
To avoid propagating build setup that is required to build a Spring Cloud project, the maven flatten plugin can be used. It has the advantage of letting you use whatever features you need while publishing "clean" pom to the repository.

fixes gh-89
2019-11-07 14:12:44 +01:00
buildmaster 8a3f69227e Going back to snapshots 2019-10-23 20:01:31 +00:00
buildmaster db5c07d175 Update SNAPSHOT to 2.2.0.RC1 2019-10-23 19:58:52 +00:00
Spencer Gibb c0b4f01f4e Adds buildCommand back 2019-10-23 15:56:36 -04:00
buildmaster 2e19f63b25 Bumping versions 2019-10-23 18:24:23 +00:00
Marcin Grzejszczak fc96d209c7 Added project-root var resolution in readme generation script 2019-10-23 15:49:54 +02:00
buildmaster c780d61513 Bumping versions 2019-10-18 07:13:15 +00:00
Ryan Baxter b1bfba6477 Merge remote-tracking branch 'origin/2.1.x' 2019-10-17 15:54:00 -04:00
Ryan Baxter a8f202ab85 Removing resource_class from circle config 2019-10-17 15:51:48 -04:00
Ryan Baxter 637a075b76 Update to Spring Boot 2.2.0.RELEASE 2019-10-17 15:44:13 -04:00
buildmaster 758e7241a2 Bumping versions 2019-10-05 07:13:05 +00:00
Marcin Grzejszczak 377f8ab000 Upgraded asciidoctor plugin to 1.5.8 2019-10-04 16:16:40 +02:00
Marcin Grzejszczak c71f50931b Lowered the precedense of project-root attribute 2019-10-04 14:04:04 +02:00
Marcin Grzejszczak 200efcb348 Added gitignore so that the unpacked sources are not added [don't have a better idea ATM] 2019-10-03 21:34:56 +02:00
Marcin Grzejszczak ed42b3a69a Revert "remove bats fixtures temporarily"
This reverts commit 6ece1d5969.
2019-10-03 21:25:01 +02:00
Marcin Grzejszczak 2a7cf5d7be We don't want to download sources of our own project 2019-10-03 21:24:58 +02:00
Spencer Gibb 3a6c453d61 Comment out release hack 2019-10-03 14:56:34 -04:00
Spencer Gibb 098dba54c2 skip tests 2019-10-03 14:43:15 -04:00
Spencer Gibb 9d8a2e134e Attempt to install build without deploying 2019-10-03 14:39:41 -04:00
Spencer Gibb 2a3797bdaa Revert "Updates to 2.2.0.M6"
This reverts commit 92c70e32
2019-10-03 12:31:16 -04:00
Spencer Gibb 92c70e3253 Updates to 2.2.0.M6 2019-10-03 12:28:25 -04:00
Spencer Gibb 6ece1d5969 remove bats fixtures temporarily 2019-10-03 12:08:06 -04:00
buildmaster f01646cffd Bumping versions 2019-10-03 13:46:18 +00:00
buildmaster ac503a0448 Bumping versions 2019-09-24 14:05:10 +00:00
buildmaster 46a0f7cd0c Bumping versions 2019-09-24 11:01:17 +00:00
buildmaster bf7db5e2dd Bumping versions 2019-09-24 07:50:35 +00:00
buildmaster 7d473e0ba2 Bumping versions 2019-09-24 07:13:02 +00:00
Spencer Gibb c011c51240 Revert "Bumping versions"
This reverts commit 3f62e003
2019-09-23 12:36:17 -04:00
buildmaster 3f62e003c0 Bumping versions 2019-09-21 07:13:06 +00:00
Spencer Gibb 6ed8684df3 Bumps boot to 2.2.0.M6... again 2019-09-20 17:02:43 -04:00
Ryan Baxter 1b2b6bfb2c Revert "2.2.0.M5 version changes"
This reverts commit dcf98e5632.
2019-09-18 12:10:48 -04:00
Ryan Baxter 1e7306187b Bumping version for next release 2019-09-05 20:55:23 -04:00
Ryan Baxter 3c6e1cfaa6 Revert "Prepping for 2.1.7.RELEASE"
This reverts commit 929f134f7f.
2019-09-05 20:54:13 -04:00
Ryan Baxter 929f134f7f Prepping for 2.1.7.RELEASE 2019-09-05 19:59:26 -04:00
Ryan Baxter 4fcaad3875 Bumping boot release 2019-09-05 16:46:33 -04:00
Marcin Grzejszczak 8c47c5fcf7 Added symbolic link of index.adoc 2019-07-29 14:23:40 +02:00
buildmaster 531b596883 Bumping versions to 2.1.7.BUILD-SNAPSHOT after release 2019-06-20 17:41:26 +00:00
buildmaster 0014bcb71f Going back to snapshots 2019-06-20 17:41:25 +00:00
buildmaster d16c66f632 Update SNAPSHOT to 2.1.6.RELEASE 2019-06-20 17:40:30 +00:00
Spencer Gibb dc6a2070e3 Bumps boot to 2.1.6.RELEASE 2019-06-19 12:04:52 -04:00
Spencer Gibb 5a691a5ede Updates to boot 2.1.6.BUILD-SNAPSHOT 2019-06-04 14:47:57 -04:00
Ryan Baxter 5512e6e613 Bumping to next release 2019-05-15 12:26:32 -04:00
Ryan Baxter 2cd5817a32 2.1.5.RELEASE changes 2019-05-15 12:13:51 -04:00
Ryan Baxter 62ce24f573 Bumping to boot 2.1.5 2019-05-15 12:03:40 -04:00
Spencer Gibb f0d77c65cb Update docker compose url 2019-04-01 12:41:28 -04:00
Ryan Baxter 93e0430a0c Merge pull request #119 from spring-operator/polish-urls-xml-2.1.x
URL Cleanup
2019-03-26 11:59:10 -04:00
Ryan Baxter 2c7d425bed Merge pull request #126 from spring-operator/polish-urls-remaining-2.1.x
URL Cleanup
2019-03-26 11:57:39 -04:00
Spring Operator 40a436a9a7 URL Cleanup
This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener).

# HTTP URLs that Could Not Be Fixed
These URLs were unable to be fixed. Please review them to see if they can be manually resolved.

* [ ] http://xslthl.sf.net (301) with 4 occurrences could not be migrated:
   ([https](https://xslthl.sf.net) result AnnotatedConnectException).
* [ ] http://exslt.org/common (404) with 1 occurrences could not be migrated:
   ([https](https://exslt.org/common) result SSLHandshakeException).

# Fixed URLs

## Fixed But Review Recommended
These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended.

* [ ] http://compose.docker.io/ (UnknownHostException) with 1 occurrences migrated to:
  https://compose.docker.io/ ([https](https://compose.docker.io/) result UnknownHostException).
* [ ] http://www.puppycrawl.com/dtds/suppressions_1_1.dtd (404) with 2 occurrences migrated to:
  https://www.puppycrawl.com/dtds/suppressions_1_1.dtd ([https](https://www.puppycrawl.com/dtds/suppressions_1_1.dtd) result 404).

## Fixed Success
These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended.

* [ ] http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html with 3 occurrences migrated to:
  https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html ([https](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) result 200).
* [ ] http://contributor-covenant.org with 1 occurrences migrated to:
  https://contributor-covenant.org ([https](https://contributor-covenant.org) result 301).
* [ ] http://contributor-covenant.org/version/1/3/0/ with 1 occurrences migrated to:
  https://contributor-covenant.org/version/1/3/0/ ([https](https://contributor-covenant.org/version/1/3/0/) result 301).
* [ ] http://plugins.jetbrains.com/plugin/6546 with 3 occurrences migrated to:
  https://plugins.jetbrains.com/plugin/6546 ([https](https://plugins.jetbrains.com/plugin/6546) result 301).
* [ ] http://eclipse.org with 1 occurrences migrated to:
  https://eclipse.org ([https](https://eclipse.org) result 302).
* [ ] http://eclipse.org/m2e/ with 2 occurrences migrated to:
  https://eclipse.org/m2e/ ([https](https://eclipse.org/m2e/) result 302).
* [ ] http://www.springsource.com/developer/sts with 1 occurrences migrated to:
  https://www.springsource.com/developer/sts ([https](https://www.springsource.com/developer/sts) result 302).

# Ignored
These URLs were intentionally ignored.

* http://docbook.org/ns/docbook with 4 occurrences
* http://docbook.sourceforge.net/xmlns/l10n/1.0 with 2 occurrences
* http://www.w3.org/1999/XSL/Format with 2 occurrences
* http://www.w3.org/1999/XSL/Transform with 6 occurrences
* http://www.w3.org/1999/xlink with 1 occurrences
2019-03-26 03:09:21 -05:00
Spring Operator 323b5f2678 URL Cleanup
This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener).

# HTTP URLs that Could Not Be Fixed
These URLs were unable to be fixed. Please review them to see if they can be manually resolved.

* [ ] http://xslthl.sf.net (301) with 1 occurrences could not be migrated:
   ([https](https://xslthl.sf.net) result AnnotatedConnectException).

# Fixed URLs

## Fixed But Review Recommended
These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended.

* [ ] http://www.puppycrawl.com/dtds/configuration_1_3.dtd (404) with 1 occurrences migrated to:
  https://www.puppycrawl.com/dtds/configuration_1_3.dtd ([https](https://www.puppycrawl.com/dtds/configuration_1_3.dtd) result 404).
* [ ] http://www.puppycrawl.com/dtds/suppressions_1_1.dtd (404) with 1 occurrences migrated to:
  https://www.puppycrawl.com/dtds/suppressions_1_1.dtd ([https](https://www.puppycrawl.com/dtds/suppressions_1_1.dtd) result 404).

## Fixed Success
These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended.

* [ ] http://asciidoctor.org with 1 occurrences migrated to:
  https://asciidoctor.org ([https](https://asciidoctor.org) result 200).
* [ ] http://sourceforge.net/projects/xslthl/ with 14 occurrences migrated to:
  https://sourceforge.net/projects/xslthl/ ([https](https://sourceforge.net/projects/xslthl/) result 200).
* [ ] http://www.w3.org/TR/CSS21/propidx.html with 1 occurrences migrated to:
  https://www.w3.org/TR/CSS21/propidx.html ([https](https://www.w3.org/TR/CSS21/propidx.html) result 200).

# Ignored
These URLs were intentionally ignored.

* http://maven.apache.org/POM/4.0.0 with 10 occurrences
* http://www.w3.org/2001/XMLSchema-instance with 5 occurrences
2019-03-25 23:50:27 -05:00
buildmaster 8d5da126d3 Bumping versions to 2.1.5.BUILD-SNAPSHOT after release 2019-03-25 13:58:32 +00:00
buildmaster af8ca0befb Going back to snapshots 2019-03-25 13:58:32 +00:00
buildmaster 6f6d6aa856 Update SNAPSHOT to 2.1.4.RELEASE 2019-03-25 13:52:46 +00:00
Spring Operator 0b737621f0 URL Cleanup (#106)
This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener).

# Fixed URLs

## Fixed Success
These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended.

* [ ] http://www.apache.org/licenses/ with 2 occurrences migrated to:
  https://www.apache.org/licenses/ ([https](https://www.apache.org/licenses/) result 200).
* [ ] http://www.apache.org/licenses/LICENSE-2.0 with 8 occurrences migrated to:
  https://www.apache.org/licenses/LICENSE-2.0 ([https](https://www.apache.org/licenses/LICENSE-2.0) result 200).
2019-03-22 10:52:25 +01:00
32 changed files with 301 additions and 147 deletions
-1
View File
@@ -10,7 +10,6 @@ jobs:
branches:
ignore:
- gh-pages # list of branches to ignore
resource_class: large
steps:
- checkout
- restore_cache:
+17
View File
@@ -0,0 +1,17 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''
---
**Describe the bug**
Please provide details of the problem, including the version of Spring Cloud that you
are using.
**Sample**
If possible, please provide a test case or sample application that reproduces
the problem. This makes it much easier for us to diagnose the problem and to verify that
we have fixed it.
+20
View File
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''
---
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
**Additional context**
Add any other context or screenshots about the feature request here.
+38 -19
View File
@@ -226,6 +226,24 @@ Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on t
IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.
== Flattening the POMs
To avoid propagating build setup that is required to build a Spring Cloud project, we're using the maven flatten plugin. It has the advantage of letting you use whatever features you need while publishing "clean" pom to the repository.
In order to add it, add the `org.codehaus.mojo:flatten-maven-plugin` to your `pom.xml`.
[source,xml]
----
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
----
== Reusing the documentation
Spring Cloud Build publishes its `spring-cloud-build-docs` module that contains
@@ -293,35 +311,36 @@ Spring Cloud Build Docs comes with a set of attributes for asciidoctor that you
<toc>left</toc>
<toc-levels>4</toc-levels>
<sectlinks>true</sectlinks>
<sources-root>${project.basedir}/src</sources-root>
<asciidoc-sources-root>${project.basedir}/src/main/asciidoc</asciidoc-sources-root>
<generated-resources-root>${project.basedir}/target/generated-resources
<sources-root>${project.basedir}/src@</sources-root>
<asciidoc-sources-root>${project.basedir}/src/main/asciidoc@</asciidoc-sources-root>
<generated-resources-root>${project.basedir}/target/generated-resources@
</generated-resources-root>
<!-- Use this attribute the reference code from another module -->
<project-root>${maven.multiModuleProjectDirectory}</project-root>
<!-- Note the @ at the end, lowering the precedence of the attribute -->
<project-root>${maven.multiModuleProjectDirectory}@</project-root>
<!-- It's mandatory for you to pass the docs.main property -->
<github-repo>${docs.main}</github-repo>
<github-repo>${docs.main}@</github-repo>
<github-raw>
https://raw.githubusercontent.com/spring-cloud/${docs.main}/${github-tag}
https://raw.githubusercontent.com/spring-cloud/${docs.main}/${github-tag}@
</github-raw>
<github-code>https://github.com/spring-cloud/${docs.main}/tree/${github-tag}
<github-code>https://github.com/spring-cloud/${docs.main}/tree/${github-tag}@
</github-code>
<github-issues>https://github.com/spring-cloud/${docs.main}/issues/</github-issues>
<github-wiki>https://github.com/spring-cloud/${docs.main}/wiki</github-wiki>
<github-master-code>https://github.com/spring-cloud/${docs.main}/tree/master
<github-issues>https://github.com/spring-cloud/${docs.main}/issues/@</github-issues>
<github-wiki>https://github.com/spring-cloud/${docs.main}/wiki@</github-wiki>
<github-master-code>https://github.com/spring-cloud/${docs.main}/tree/master@
</github-master-code>
<index-link>${index-link}</index-link>
<index-link>${index-link}@</index-link>
<!-- Spring Cloud specific -->
<!-- for backward compatibility -->
<spring-cloud-version>${project.version}</spring-cloud-version>
<project-version>${project.version}</project-version>
<github-tag>${github-tag}</github-tag>
<version-type>${version-type}</version-type>
<docs-url>${docs-url}</docs-url>
<raw-docs-url>${raw-docs-url}</raw-docs-url>
<project-version>${project.version}</project-version>
<project-name>${docs.main}</project-name>
<spring-cloud-version>${project.version}@</spring-cloud-version>
<project-version>${project.version}@</project-version>
<github-tag>${github-tag}@</github-tag>
<version-type>${version-type}@</version-type>
<docs-url>${docs-url}@</docs-url>
<raw-docs-url>${raw-docs-url}@</raw-docs-url>
<project-version>${project.version}@</project-version>
<project-name>${docs.main}@</project-name>
</attributes>
----
+5
View File
@@ -0,0 +1,5 @@
# Security Policy
## Reporting a Vulnerability
To report security vulnerabilities, please go to https://pivotal.io/security.
+4
View File
@@ -0,0 +1,4 @@
releaser:
maven:
buildCommand: ./scripts/build.sh {{systemProps}}
# deployCommand: echo "skip deploy"
+16 -3
View File
@@ -10,14 +10,18 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>2.2.0.M5</version>
<version>2.2.2.RELEASE</version>
</parent>
<properties>
<docs.main>spring-cloud-build</docs.main>
<!-- Comma separated list of whitelisted branches -->
<docs.whitelisted.branches>1.2.x,1.3.x,2.0.x,2.1.x</docs.whitelisted.branches>
<main.basedir>${basedir}/..</main.basedir>
<gmavenplus-plugin.version>1.6.1</gmavenplus-plugin.version>
<gmavenplus-plugin.version>1.8.1</gmavenplus-plugin.version>
<groovy.version>2.5.9</groovy.version>
<!-- We don't want to downloaded sources of our own project-->
<maven-dependency-plugin-for-docs.phase>none</maven-dependency-plugin-for-docs.phase>
<docs.resources.dir>${project.basedir}/src/main/</docs.resources.dir>
</properties>
<dependencies>
<!-- Script -->
@@ -52,6 +56,12 @@
<artifactId>groovy-json</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>${groovy.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
@@ -96,6 +106,9 @@
<goals>
<goal>compile</goal>
<goal>addSources</goal>
<goal>generateStubs</goal>
<goal>generateTestStubs</goal>
<goal>groovydoc-jar</goal>
</goals>
</execution>
</executions>
@@ -160,7 +173,7 @@
</goals>
<configuration>
<skip>${skipTests}</skip>
<!-- <skip>true</skip> -->
<skip>true</skip>
<executable>${basedir}/src/test/bash/run-bats.sh</executable>
</configuration>
</execution>
+2
View File
@@ -0,0 +1,2 @@
META-INF/
org/
+18
View File
@@ -42,6 +42,24 @@ $ mvn deploy -P central -DaltReleaseDeploymentRepository=sonatype-nexus-staging:
include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing.adoc[]
== Flattening the POMs
To avoid propagating build setup that is required to build a Spring Cloud project, we're using the maven flatten plugin. It has the advantage of letting you use whatever features you need while publishing "clean" pom to the repository.
In order to add it, add the `org.codehaus.mojo:flatten-maven-plugin` to your `pom.xml`.
[source,xml]
----
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
----
== Reusing the documentation
Spring Cloud Build publishes its `spring-cloud-build-docs` module that contains
View File
+4 -1
View File
@@ -17,7 +17,10 @@ end
file = ARGV[0] if ARGV.length>0
# Copied from https://github.com/asciidoctor/asciidoctor-extensions-lab/blob/master/scripts/asciidoc-coalescer.rb
doc = Asciidoctor.load_file file, safe: :unsafe, header_only: true, attributes: options[:attributes]
attributes = {}
attributes['project-root'] = File.expand_path("#{base_dir}/../")
doc = Asciidoctor.load_file file, safe: :unsafe, header_only: true, attributes: attributes
header_attr_names = (doc.instance_variable_get :@attributes_modified).to_a
header_attr_names.each {|k| doc.attributes[%(#{k}!)] = '' unless doc.attr? k }
attrs = doc.attributes
@@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.4.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
@@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.4.RELEASE</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
@@ -19,7 +19,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>Hoxton.BUILD-SNAPSHOT</spring-cloud.version>
<spring-cloud-contract.version>2.2.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
<spring-cloud-contract.version>2.2.2.BUILD-SNAPSHOT</spring-cloud-contract.version>
</properties>
<dependencies>
@@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.4.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
@@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.4.RELEASE</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
@@ -19,7 +19,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>Hoxton.BUILD-SNAPSHOT</spring-cloud.version>
<spring-cloud-contract.version>2.2.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
<spring-cloud-contract.version>2.2.2.BUILD-SNAPSHOT</spring-cloud-contract.version>
</properties>
<dependencies>
@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-parent</artifactId>
<version>Horsham.BUILD-SNAPSHOT</version>
<version>Horsham.SR1</version>
</parent>
<packaging>pom</packaging>
<name>spring-cloud-stream-core-docs</name>
@@ -4,12 +4,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-stream-parent</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.2.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.2.BUILD-SNAPSHOT</version>
<relativePath/>
</parent>
<scm>
@@ -28,7 +28,7 @@
<reactor.version>Californium-SR5</reactor.version>
<kryo-shaded.version>3.0.3</kryo-shaded.version>
<objenesis.version>2.1</objenesis.version>
<spring-cloud-function.version>3.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
<spring-cloud-function.version>3.0.1.RELEASE</spring-cloud-function.version>
<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
<maven-checkstyle-plugin.failsOnViolation>true</maven-checkstyle-plugin.failsOnViolation>
@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-parent</artifactId>
<version>Horsham.BUILD-SNAPSHOT</version>
<version>Horsham.SR1</version>
</parent>
<dependencies>
@@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-parent</artifactId>
<version>Horsham.BUILD-SNAPSHOT</version>
<version>Horsham.SR1</version>
</parent>
<dependencies>
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-parent</artifactId>
<version>Horsham.BUILD-SNAPSHOT</version>
<version>Horsham.SR1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -8,7 +8,7 @@
<parent>
<artifactId>spring-cloud-stream-parent</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>Horsham.BUILD-SNAPSHOT</version>
<version>Horsham.SR1</version>
</parent>
<dependencies>
@@ -5,7 +5,7 @@
<parent>
<artifactId>spring-cloud-stream-parent</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>Horsham.BUILD-SNAPSHOT</version>
<version>Horsham.SR1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-parent</artifactId>
<version>Horsham.BUILD-SNAPSHOT</version>
<version>Horsham.SR1</version>
</parent>
<artifactId>spring-cloud-stream-test-support-internal</artifactId>
<description>Set of classes and utility code that may assist in testing both
@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-parent</artifactId>
<version>Horsham.BUILD-SNAPSHOT</version>
<version>Horsham.SR1</version>
</parent>
<artifactId>spring-cloud-stream-test-support</artifactId>
<description>A set of classes to ease testing of Spring Cloud Stream modules.
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.2.BUILD-SNAPSHOT</version>
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.2.BUILD-SNAPSHOT</version>
<relativePath />
</parent>
@@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-parent</artifactId>
<version>Horsham.BUILD-SNAPSHOT</version>
<version>Horsham.SR1</version>
</parent>
<dependencies>
+75 -61
View File
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>2.2.0.M5</version>
<version>2.2.2.RELEASE</version>
<packaging>pom</packaging>
<name>Spring Cloud Parent</name>
<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
@@ -28,8 +28,8 @@
<maven.compiler.target>${java.version}</maven.compiler.target>
<main.basedir>${basedir}</main.basedir>
<docs.main>${project.artifactId}</docs.main>
<spring-boot.version>2.2.0.M6</spring-boot.version>
<spring-cloud-build.version>2.2.0.M5</spring-cloud-build.version>
<spring-boot.version>2.2.4.RELEASE</spring-boot.version>
<spring-cloud-build.version>2.2.2.RELEASE</spring-cloud-build.version>
<docs.resources.dir>${project.build.directory}/build-docs</docs.resources.dir>
<refdocs.build.directory>${project.build.directory}/refdocs/</refdocs.build.directory>
<spring-doc-resources.version>0.1.0.RELEASE</spring-doc-resources.version>
@@ -71,7 +71,7 @@
<maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
<asciidoctor-maven-plugin.version>1.5.7.1</asciidoctor-maven-plugin.version>
<asciidoctor-maven-plugin.version>1.5.8</asciidoctor-maven-plugin.version>
<build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
<artifactory-maven-plugin.version>2.2.1</artifactory-maven-plugin.version>
<license-maven-plugin.version>1.16</license-maven-plugin.version>
@@ -100,6 +100,11 @@
<ant-nodeps.version>1.8.1</ant-nodeps.version>
<configprops.path>${project.basedir}/src/main/asciidoc/_configprops.adoc</configprops.path>
<configprops.inclusionPattern>.*</configprops.inclusionPattern>
<maven-dependency-plugin-for-docs.phase>generate-resources</maven-dependency-plugin-for-docs.phase>
<maven-dependency-plugin-for-guides.phase>generate-resources</maven-dependency-plugin-for-guides.phase>
<generated-docs-multipage-output.dir>${project.build.directory}/generated-docs/reference/html</generated-docs-multipage-output.dir>
<generated-docs-singlepage-output.dir>${project.build.directory}/generated-docs/reference/htmlsingle</generated-docs-singlepage-output.dir>
<generated-docs-pdf-output.dir>${project.build.directory}/generated-docs/reference/pdf</generated-docs-pdf-output.dir>
</properties>
<dependencyManagement>
<dependencies>
@@ -251,42 +256,33 @@
</execution>
</executions>
</plugin>
<!--<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.0.0</version>
<inherited>true</inherited>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>oss</flattenMode>
<pomElements>
<parent>expand</parent>
<distributionManagement>remove</distributionManagement>
<repositories>remove</repositories>
</pomElements>
</configuration>
<executions>
&lt;!&ndash; enable flattening &ndash;&gt;
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
&lt;!&ndash; ensure proper cleanup &ndash;&gt;
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>-->
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<inherited>true</inherited>
<executions>
<execution>
<!-- Tidy up all POMs before they are published -->
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>oss</flattenMode>
<pomElements>
<parent>expand</parent>
<distributionManagement>remove</distributionManagement>
<repositories>remove</repositories>
</pomElements>
</configuration>
</execution>
</executions>
</plugin>
<!-- Apply more sensible defaults for user projects -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -801,7 +797,7 @@
<executions>
<execution>
<id>unpack-docs</id>
<phase>generate-resources</phase>
<phase>${maven-dependency-plugin-for-guides.phase}</phase>
<goals>
<goal>unpack</goal>
</goals>
@@ -865,6 +861,23 @@
</plugins>
</build>
</profile>
<profile>
<id>java11</id>
<activation>
<jdk>[1.11,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<!-- https://bugs.java.com/bugdatabase/view_bug.do?bug_id=8212233 -->
<source>8</source>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<!-- TODO: remove this (it's covered with checkstyle, but not all projects use that yet -->
<id>imports</id>
@@ -927,7 +940,7 @@
<executions>
<execution>
<id>unpack-docs</id>
<phase>generate-resources</phase>
<phase>${maven-dependency-plugin-for-docs.phase}</phase>
<goals>
<goal>unpack</goal>
</goals>
@@ -1068,35 +1081,36 @@
<toc>left</toc>
<toc-levels>4</toc-levels>
<sectlinks>true</sectlinks>
<sources-root>${project.basedir}/src</sources-root>
<asciidoc-sources-root>${project.basedir}/src/main/asciidoc</asciidoc-sources-root>
<generated-resources-root>${project.basedir}/target/generated-resources
<sources-root>${project.basedir}/src@</sources-root>
<asciidoc-sources-root>${project.basedir}/src/main/asciidoc@</asciidoc-sources-root>
<generated-resources-root>${project.basedir}/target/generated-resources@
</generated-resources-root>
<!-- Use this attribute the reference code from another module -->
<project-root>${maven.multiModuleProjectDirectory}</project-root>
<!-- Note the @ at the end, lowering the precedence of the attribute -->
<project-root>${maven.multiModuleProjectDirectory}@</project-root>
<!-- It's mandatory for you to pass the docs.main property -->
<github-repo>${docs.main}</github-repo>
<github-repo>${docs.main}@</github-repo>
<github-raw>
https://raw.githubusercontent.com/spring-cloud/${docs.main}/${github-tag}
https://raw.githubusercontent.com/spring-cloud/${docs.main}/${github-tag}@
</github-raw>
<github-code>https://github.com/spring-cloud/${docs.main}/tree/${github-tag}
<github-code>https://github.com/spring-cloud/${docs.main}/tree/${github-tag}@
</github-code>
<github-issues>https://github.com/spring-cloud/${docs.main}/issues/</github-issues>
<github-wiki>https://github.com/spring-cloud/${docs.main}/wiki</github-wiki>
<github-master-code>https://github.com/spring-cloud/${docs.main}/tree/master
<github-issues>https://github.com/spring-cloud/${docs.main}/issues/@</github-issues>
<github-wiki>https://github.com/spring-cloud/${docs.main}/wiki@</github-wiki>
<github-master-code>https://github.com/spring-cloud/${docs.main}/tree/master@
</github-master-code>
<index-link>${index-link}</index-link>
<index-link>${index-link}@</index-link>
<!-- Spring Cloud specific -->
<!-- for backward compatibility -->
<spring-cloud-version>${project.version}</spring-cloud-version>
<project-version>${project.version}</project-version>
<github-tag>${github-tag}</github-tag>
<version-type>${version-type}</version-type>
<docs-url>${docs-url}</docs-url>
<raw-docs-url>${raw-docs-url}</raw-docs-url>
<project-version>${project.version}</project-version>
<project-name>${docs.main}</project-name>
<spring-cloud-version>${project.version}@</spring-cloud-version>
<project-version>${project.version}@</project-version>
<github-tag>${github-tag}@</github-tag>
<version-type>${version-type}@</version-type>
<docs-url>${docs-url}@</docs-url>
<raw-docs-url>${raw-docs-url}@</raw-docs-url>
<project-version>${project.version}@</project-version>
<project-name>${docs.main}@</project-name>
</attributes>
<!-- end::attributes[] -->
<requires>
@@ -1116,7 +1130,7 @@
<sourceDocumentExtension>.adoc</sourceDocumentExtension>
<sourceDocumentExtension>.htmladoc</sourceDocumentExtension>
</sourceDocumentExtensions>
<outputDirectory>${project.build.directory}/generated-docs/reference/html
<outputDirectory>${generated-docs-multipage-output.dir}
</outputDirectory>
<sourceHighlighter>highlight.js</sourceHighlighter>
<doctype>book</doctype>
@@ -1150,7 +1164,7 @@
<sourceDocumentExtension>.htmlsingleadoc</sourceDocumentExtension>
</sourceDocumentExtensions>
<outputDirectory>
${project.build.directory}/generated-docs/reference/htmlsingle
${generated-docs-singlepage-output.dir}
</outputDirectory>
<sourceHighlighter>highlight.js</sourceHighlighter>
<doctype>book</doctype>
@@ -1176,7 +1190,7 @@
<sourceDocumentExtensions>
<sourceDocumentExtension>.pdfadoc</sourceDocumentExtension>
</sourceDocumentExtensions>
<outputDirectory>${project.build.directory}/generated-docs/reference/pdf
<outputDirectory>${generated-docs-pdf-output.dir}
</outputDirectory>
<resources>
<resource>
+4
View File
@@ -0,0 +1,4 @@
#!/bin/bash
./mvnw clean install -B -Pdocs ${@}
#./mvnw clean install -B -DskipTests ${@}
+40 -3
View File
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build-dependencies</artifactId>
<version>2.2.0.M5</version>
<version>2.2.2.RELEASE</version>
<name>spring-cloud-build-dependencies</name>
<packaging>pom</packaging>
<description>Spring Cloud Build Dependencies: an internal BOM for use with Spring
@@ -14,13 +14,49 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.2.0.M6</version>
<version>2.2.4.RELEASE</version>
<relativePath/>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.version>2.2.0.M6</spring-boot.version>
<spring-boot.version>2.2.4.RELEASE</spring-boot.version>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<inherited>false</inherited>
<executions>
<execution>
<!-- Flatten and simplify our own POM for install/deploy -->
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>bom</flattenMode>
<pomElements>
<parent>expand</parent>
<pluginManagement>keep</pluginManagement>
<properties>keep</properties>
<repositories>remove</repositories>
</pomElements>
</configuration>
</execution>
<execution>
<id>flatten-clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<distributionManagement>
<downloadUrl>https://github.com/spring-cloud</downloadUrl>
<site>
@@ -83,6 +119,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
+1 -1
View File
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>2.2.0.M5</version>
<version>2.2.2.RELEASE</version>
</parent>
<dependencies>
<dependency>
@@ -24,6 +24,6 @@
<!-- Configure checker to run on files with these extensions -->
<property name="fileExtensions" value=""/>
<!-- For detailed checkstyle configuration, see https://github.com/spring-io/nohttp/tree/master/nohttp-checkstyle -->
<module name="io.spring.nohttp.checkstyle.check.NoHttpCheck">
</module>
<!--<module name="io.spring.nohttp.checkstyle.check.NoHttpCheck">
</module>-->
</module>
+35 -36
View File
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<version>2.2.0.M5</version>
<version>2.2.2.RELEASE</version>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<packaging>pom</packaging>
<name>spring-cloud-dependencies-parent</name>
@@ -130,9 +130,43 @@
</distributionManagement>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<inherited>true</inherited>
<executions>
<execution>
<!-- Flatten and simplify our own POM for install/deploy -->
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>bom</flattenMode>
<pomElements>
<parent>expand</parent>
<pluginManagement>keep</pluginManagement>
<properties>keep</properties>
<repositories>remove</repositories>
<profiles>keep</profiles>
</pomElements>
</configuration>
</execution>
<execution>
<id>flatten-clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
@@ -195,41 +229,6 @@
</profile>
</profiles>
<build>
<plugins>
<!--<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.0.0</version>
<inherited>true</inherited>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>oss</flattenMode>
<pomElements>
<parent>expand</parent>
<distributionManagement>remove</distributionManagement>
<repositories>remove</repositories>
</pomElements>
</configuration>
<executions>
&lt;!&ndash; enable flattening &ndash;&gt;
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
&lt;!&ndash; ensure proper cleanup &ndash;&gt;
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>-->
</plugins>
<pluginManagement>
<plugins>
<plugin>