Compare commits

..
79 Commits
Author SHA1 Message Date
buildmaster 71ee1e08f7 Update SNAPSHOT to 3.1.4 2022-09-06 18:58:55 +00:00
buildmaster 480c02c009 Bumping versions 2022-09-03 21:35:00 +00:00
buildmaster f59d853039 Bumping versions 2022-09-02 21:35:02 +00:00
buildmaster c344ca06b8 Bumping versions to 3.1.5-SNAPSHOT after release 2022-09-02 20:32:28 +00:00
buildmaster a38b36105b Going back to snapshots 2022-09-02 20:32:28 +00:00
buildmaster b103fbd43f Update SNAPSHOT to 3.1.4 2022-09-02 20:31:14 +00:00
buildmaster 71103bacea Bumping versions 2022-08-31 21:35:06 +00:00
Ryan Baxter 528b03b71f Moving to boot 2.6.11 2022-08-31 10:43:16 -04:00
buildmaster 8cf0076cfc Bumping versions 2022-08-22 21:35:16 +00:00
Tomaz Fernandes 84b9735bac Fix Syntax Highlighting for Documentations (#233)
Resolves GH-232

Syntax highlighting was not being added to code snippets in documentation for projects that inherit from this project.
2022-08-22 12:51:58 +02:00
buildmaster 059b52a282 Bumping versions 2022-08-17 21:35:05 +00:00
Ryan Baxter db0f4d7157 Merge pull request #230 from RobertRad/patch-1
Escape special characters for config Asciidoc
2022-06-29 14:07:15 -04:00
RobertRad 8c8f591c99 Escape special characters for config Asciidoc 2022-06-29 15:43:49 +02:00
buildmaster 08e3b24a27 Bumping versions 2022-06-14 21:35:05 +00:00
spencergibb 317da7a4e4 Updates to next snapshot version 2022-05-27 12:30:19 -04:00
buildmaster eca70fe4cc Update SNAPSHOT to 3.1.3 2022-05-27 12:27:28 -04:00
Marcin Grzejszczak 7e9df7fd7c Allows to disable default deploy by manipulating the phase (#229) 2022-05-26 10:12:51 -04:00
Marcin Grzejszczak 82a1cf794b Update maven.yml 2022-05-19 16:34:51 +02:00
buildmaster 7108146aba Bumping versions to 3.1.3-SNAPSHOT after release 2022-04-27 08:56:14 +00:00
buildmaster 8e81876fd3 Going back to snapshots 2022-04-27 08:56:14 +00:00
buildmaster 95b5890066 Update SNAPSHOT to 3.1.2 2022-04-27 08:54:53 +00:00
Olga Maciaszek-Sharma 63bd653948 Revert "Update SNAPSHOT to 3.1.2"
This reverts commit c3ffb0a5dc.
2022-04-27 10:49:56 +02:00
Olga Maciaszek-Sharma cae59ec9fd Revert "Going back to snapshots"
This reverts commit f4fa5e62cf.
2022-04-27 10:49:52 +02:00
Olga Maciaszek-Sharma 009fee7f44 Revert "Bumping versions to 3.1.3-SNAPSHOT after release"
This reverts commit 119006d160.
2022-04-27 10:49:45 +02:00
Olga Maciaszek-Sharma 63aa041bbb Revert "Bumping versions"
This reverts commit a8d9426206.
2022-04-27 10:49:38 +02:00
Olga Maciaszek-Sharma 83e6e42e54 Revert "Update SNAPSHOT to 3.1.2"
This reverts commit ea265749fa.
2022-04-27 10:49:34 +02:00
Olga Maciaszek-Sharma 13262df844 Revert "Going back to snapshots"
This reverts commit 5dc46d26bb.
2022-04-27 10:49:29 +02:00
Olga Maciaszek-Sharma b83f87423b Revert "Bumping versions to 3.1.3-SNAPSHOT after release"
This reverts commit 769c5e1989.
2022-04-27 10:49:18 +02:00
buildmaster 769c5e1989 Bumping versions to 3.1.3-SNAPSHOT after release 2022-04-27 08:18:32 +00:00
buildmaster 5dc46d26bb Going back to snapshots 2022-04-27 08:18:32 +00:00
buildmaster ea265749fa Update SNAPSHOT to 3.1.2 2022-04-27 08:17:13 +00:00
buildmaster a8d9426206 Bumping versions 2022-04-26 21:35:11 +00:00
buildmaster 119006d160 Bumping versions to 3.1.3-SNAPSHOT after release 2022-04-26 14:55:47 +00:00
buildmaster f4fa5e62cf Going back to snapshots 2022-04-26 14:55:47 +00:00
buildmaster c3ffb0a5dc Update SNAPSHOT to 3.1.2 2022-04-26 14:54:07 +00:00
Ryan Baxter fba352a8af Bumping spring-boot-dependencies 2.6.7 2022-04-21 17:25:26 -04:00
Ryan Baxter ad0826c3e3 Bumping Boot version to 2.6.7 2022-04-21 10:12:01 -04:00
buildmaster 8ff3564115 Bumping versions 2022-03-31 21:06:22 +00:00
buildmaster d04bc15599 Bumping versions to 3.1.2-SNAPSHOT after release 2022-02-14 21:27:38 +00:00
buildmaster f39e225856 Going back to snapshots 2022-02-14 21:27:38 +00:00
buildmaster 4aa9d8cce4 Update SNAPSHOT to 3.1.1 2022-02-14 21:19:54 +00:00
spencergibb 2bb8d61d7d Fixes asciidoc includes for 3.1.x 2022-02-04 14:14:07 -05:00
Artem Bilan 711fbce9ba Remove lf from NewlineAtEndOfFileCheck
Different OSs may check out files with different line separators.
So, to better support other development environments it would be great to just require any end of file, not just Linux-specific.
2022-02-04 11:21:59 -05:00
spencergibb 84ecff1ac8 Updates boot version to 2.6.3 2022-02-04 11:21:22 -05:00
spencergibb 0e31343b92 move comment 2022-02-04 11:20:01 -05:00
spencergibb ad3ddefa16 Adds .sdkmanrc 2022-01-03 14:16:50 -05:00
spencergibb cdda8827b8 Merge branch '3.0.x' 2021-12-09 15:12:47 -05:00
Spencer Gibb 5a44935cb1 Removes nexus staging plugin (#222) 2021-12-09 15:10:39 -05:00
buildmaster e6b1048b95 Bumping versions 2021-12-02 08:12:42 +00:00
buildmaster cd07e0a1e0 Bumping versions 2021-11-30 08:13:07 +00:00
buildmaster 8f44088dab Bumping versions to 3.1.1-SNAPSHOT after release 2021-11-29 18:44:44 +00:00
buildmaster bee859195e Going back to snapshots 2021-11-29 18:44:43 +00:00
buildmaster e5d07102d3 Update SNAPSHOT to 3.1.0 2021-11-29 18:42:36 +00:00
spencergibb fb3f9dac01 Adds maven-gpg-plugin.version to dependencies pom 2021-11-29 12:54:46 -05:00
spencergibb b52e6489fa Merge remote-tracking branch 'origin/main'
# Conflicts:
#	pom.xml
2021-11-29 12:04:29 -05:00
buildmaster b91b10a197 Bumping versions 2021-11-29 17:01:00 +00:00
buildmaster ee66ee4791 Bumping versions 2021-11-26 08:12:59 +00:00
Olga Maciaszek-Sharma 4493fa05ea Add duplicate finder (#220)
* Add duplicate finder to plugins and executions.

* Add duplicate finder to plugins and executions.

* Fix docs.
2021-11-26 08:41:00 +01:00
spencergibb e0c89da706 Merge branch '3.0.x' 2021-11-23 15:28:56 -05:00
Marcin Grzejszczak 74842d8a7f Uses nexus staging plugin to deploy to central (#216)
* Uses nexus staging plugin to deploy to central

* Don't automatically close
2021-11-23 15:25:26 -05:00
buildmaster e874b69be7 Bumping versions 2021-11-19 19:30:30 +00:00
buildmaster b8132405ba Bumping versions 2021-11-03 19:18:16 +00:00
buildmaster 604011cb50 Going back to snapshots 2021-11-01 18:54:48 +00:00
buildmaster 036039ae77 Update SNAPSHOT to 3.1.0-RC1 2021-11-01 18:53:40 +00:00
buildmaster af34adfc11 Bumping versions 2021-10-22 15:25:08 +00:00
buildmaster 2741145bf3 Going back to snapshots 2021-10-14 14:58:32 +00:00
buildmaster 8902fd634c Update SNAPSHOT to 3.1.0-M3 2021-10-14 14:55:50 +00:00
buildmaster 3a21352bc6 Bumping versions 2021-10-06 17:12:36 +00:00
Jonatan Ivanov f27797c8ac Merge pull request #218 from robertmcnees/gh_217
Removed .travis and scripts reference from documentation
2021-09-27 12:21:43 -07:00
buildmaster e5fa41b0db Going back to snapshots 2021-09-27 16:26:31 +00:00
Robert McNeesandJonatan Ivanov bfc8b98a21 Update docs/src/main/asciidoc/building-base.adoc
Co-authored-by: Jonatan Ivanov <jonatan.ivanov@gmail.com>
2021-09-27 11:06:00 -04:00
Robert McNees e331da87fa Removed .travis and scripts reference from documentation 2021-09-22 07:38:59 -04:00
buildmaster 3e6b8144b6 Bumping versions to 3.0.5-SNAPSHOT after release 2021-09-20 14:09:33 +00:00
buildmaster b2b9e8fa90 Going back to snapshots 2021-09-20 14:09:33 +00:00
buildmaster e52df5d684 Update SNAPSHOT to 3.0.4 2021-09-20 14:07:37 +00:00
Olga MaciaszekSharma 5a19120508 Upgrade Boot to 2.4.10. 2021-09-20 15:05:57 +02:00
spencergibb d6ba904dcc Updates boot to 2.4.10-SNAPSHOT
fix for spring-amqp spring-integration version mismatch
2021-07-26 17:49:15 -04:00
spencergibb c154f40cdf Updates boot to 2.4.9 2021-07-26 12:56:48 -04:00
Marcin Grzejszczak ad51c6b78f Bumping boot to 2.4.8 2021-07-20 16:37:38 +02:00
17 changed files with 203 additions and 74 deletions
+2 -2
View File
@@ -5,9 +5,9 @@ name: Build
on:
push:
branches: [ main ]
branches: [ main, 3.1.x ]
pull_request:
branches: [ main ]
branches: [ main, 3.1.x ]
jobs:
build:
+1 -2
View File
@@ -18,5 +18,4 @@ _site/
.factorypath
.vscode/
.flattened-pom.xml
.DS_Store
.sdkmanrc
.DS_Store
+3
View File
@@ -0,0 +1,3 @@
# Enable auto-env through the sdkman_auto_env config
# Add key=value pairs of SDKs to use below
java=8.0.292.hs-adpt
+52
View File
@@ -227,6 +227,57 @@ 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.
=== Duplicate Finder
Spring Cloud Build brings along the `basepom:duplicate-finder-maven-plugin`, that enables flagging duplicate and conflicting classes and resources on the java classpath.
==== Duplicate Finder configuration
Duplicate finder is *enabled by default* and will run in the `verify` phase of your Maven build, but it will only take effect in your project if you add the `duplicate-finder-maven-plugin` to the `build` section of the projecst's `pom.xml`.
.pom.xml
[source,xml]
----
<build>
<plugins>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
----
For other properties, we have set defaults as listed in the https://github.com/basepom/duplicate-finder-maven-plugin/wiki[plugin documentation].
You can easily override them but setting the value of the selected property prefixed with `duplicate-finder-maven-plugin`. For example, set `duplicate-finder-maven-plugin.skip` to `true` in order to skip duplicates check in your build.
If you need to add `ignoredClassPatterns` or `ignoredResourcePatterns` to your setup, make sure to add them in the plugin configuration section of your project:
[source,xml]
----
<build>
<plugins>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<configuration>
<ignoredClassPatterns>
<ignoredClassPattern>org.joda.time.base.BaseDateTime</ignoredClassPattern>
<ignoredClassPattern>.*module-info</ignoredClassPattern>
</ignoredClassPatterns>
<ignoredResourcePatterns>
<ignoredResourcePattern>changelog.txt</ignoredResourcePattern>
</ignoredResourcePatterns>
</configuration>
</plugin>
</plugins>
</build>
----
== 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.
@@ -351,6 +402,7 @@ Spring Cloud Build Docs comes with a set of attributes for asciidoctor that you
<raw-docs-url>${github-raw}@</raw-docs-url>
<project-version>${project.version}@</project-version>
<project-name>${docs.main}@</project-name>
<source-highlighter>highlight.js</source-highlighter>
</attributes>
----
+3 -1
View File
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>3.1.0-M2</version>
<version>3.1.4</version>
</parent>
<properties>
<docs.main>spring-cloud-build</docs.main>
@@ -20,6 +20,8 @@
<maven-dependency-plugin-for-docs-classes.phase>none</maven-dependency-plugin-for-docs-classes.phase>
<docs.resources.dir>${project.basedir}/src/main/</docs.resources.dir>
<upload-docs-zip.phase>deploy</upload-docs-zip.phase>
<!-- Don't upload docs jar to central / repo.spring.io -->
<maven-deploy-plugin-default.phase>none</maven-deploy-plugin-default.phase>
<!-- We don't want to reference plugin classpath of ourselves -->
<readme.class.path>maven.compile.classpath</readme.class.path>
</properties>
+2 -2
View File
@@ -40,7 +40,7 @@ $ mvn deploy -P central -DaltReleaseDeploymentRepository=sonatype-nexus-staging:
== Contributing
include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing.adoc[]
include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/docs/src/main/asciidoc/contributing.adoc[]
== Flattening the POMs
@@ -128,7 +128,7 @@ Spring Cloud Build Docs comes with a set of attributes for asciidoctor that you
[source,xml]
----
include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/pom.xml[tags=attributes,indent=0]
include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/pom.xml[tags=attributes,indent=0]
----
== Updating the guides
+2 -16
View File
@@ -22,23 +22,9 @@ the `.mvn` configuration, so if you find you have to do it to make a
build succeed, please raise a ticket to get the settings added to
source control.
For hints on how to build the project look in `.travis.yml` if there
is one. There should be a "script" and maybe "install" command. Also
look at the "services" section to see if any services need to be
running locally (e.g. mongo or rabbit). Ignore the git-related bits
that you might find in "before_install" since they're related to setting git
credentials and you already have those.
The projects that require middleware (i.e. Redis) for testing generally
require that a local instance of [Docker](https://www.docker.com/get-started) is installed and running.
The projects that require middleware generally include a
`docker-compose.yml`, so consider using
https://docs.docker.com/compose/[Docker Compose] to run the middeware servers
in Docker containers. See the README in the
https://github.com/spring-cloud-samples/scripts[scripts demo
repository] for specific instructions about the common cases of mongo,
rabbit and redis.
NOTE: If all else fails, build with the command from `.travis.yml` (usually
`./mvnw install`).
=== Documentation
+1 -1
View File
@@ -1,4 +1,4 @@
:jdkversion: 1.8
include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/building-base.adoc[]
include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/docs/src/main/asciidoc/building-base.adoc[]
+1 -1
View File
@@ -1,3 +1,3 @@
:jdkversion: 1.8
include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/building-base.adoc[]
include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/docs/src/main/asciidoc/building-base.adoc[]
+51
View File
@@ -177,3 +177,54 @@ Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on t
- `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`.
IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.
=== Duplicate Finder
Spring Cloud Build brings along the `basepom:duplicate-finder-maven-plugin`, that enables flagging duplicate and conflicting classes and resources on the java classpath.
==== Duplicate Finder configuration
Duplicate finder is *enabled by default* and will run in the `verify` phase of your Maven build, but it will only take effect in your project if you add the `duplicate-finder-maven-plugin` to the `build` section of the projecst's `pom.xml`.
.pom.xml
[source,xml]
----
<build>
<plugins>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
----
For other properties, we have set defaults as listed in the https://github.com/basepom/duplicate-finder-maven-plugin/wiki[plugin documentation].
You can easily override them but setting the value of the selected property prefixed with `duplicate-finder-maven-plugin`. For example, set `duplicate-finder-maven-plugin.skip` to `true` in order to skip duplicates check in your build.
If you need to add `ignoredClassPatterns` or `ignoredResourcePatterns` to your setup, make sure to add them in the plugin configuration section of your project:
[source,xml]
----
<build>
<plugins>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<configuration>
<ignoredClassPatterns>
<ignoredClassPattern>org.joda.time.base.BaseDateTime</ignoredClassPattern>
<ignoredClassPattern>.*module-info</ignoredClassPattern>
</ignoredClassPatterns>
<ignoredResourcePatterns>
<ignoredResourcePattern>changelog.txt</ignoredResourcePattern>
</ignoredResourcePatterns>
</configuration>
</plugin>
</plugins>
</build>
----
@@ -144,7 +144,7 @@ public class Main {
}
public String toString() {
return "|" + name + " | " + (StringUtils.hasText(defaultValue) ? ("`" + defaultValue + "`") : "") + " | " + description;
return "|" + name + " | " + (StringUtils.hasText(defaultValue) ? ("`+++" + defaultValue + "+++`") : "") + " | " + description;
}
}
+2 -2
View File
@@ -40,7 +40,7 @@ $ mvn deploy -P central -DaltReleaseDeploymentRepository=sonatype-nexus-staging:
== Contributing
include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing.adoc[]
include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/docs/src/main/asciidoc/contributing.adoc[]
== Flattening the POMs
@@ -128,7 +128,7 @@ Spring Cloud Build Docs comes with a set of attributes for asciidoctor that you
[source,xml]
----
include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/pom.xml[tags=attributes,indent=0]
include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/pom.xml[tags=attributes,indent=0]
----
== Updating the guides
+69 -8
View File
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>3.1.0-M2</version>
<version>3.1.4</version>
<packaging>pom</packaging>
<name>Spring Cloud Parent</name>
<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
@@ -20,16 +20,16 @@
<url>https://spring.io/spring-cloud</url>
<properties>
<java.version>1.8</java.version>
<resource.delimiter>@
</resource.delimiter> <!-- delimiter that doesn't clash with Spring ${} placeholders -->
<!-- delimiter that doesn't clash with Spring ${} placeholders -->
<resource.delimiter>@</resource.delimiter>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<main.basedir>${basedir}</main.basedir>
<docs.main>${project.artifactId}</docs.main>
<spring-boot.version>2.6.0-M2</spring-boot.version>
<spring-cloud-build.version>3.1.0-M2</spring-cloud-build.version>
<spring-boot.version>2.6.11</spring-boot.version>
<spring-cloud-build.version>3.1.4</spring-cloud-build.version>
<docs.resources.dir>${project.build.directory}/build-docs</docs.resources.dir>
<docs.classes.dir>${project.build.directory}/build-docs-classes</docs.classes.dir>
<refdocs.build.directory>${project.build.directory}/refdocs/</refdocs.build.directory>
@@ -114,6 +114,7 @@
<generated-docs-pdf-output.dir>${project.build.directory}/generated-docs/reference/pdf</generated-docs-pdf-output.dir>
<javadoc.failOnError>false</javadoc.failOnError>
<javadoc.failOnWarnings>false</javadoc.failOnWarnings>
<maven-deploy-plugin-default.phase>deploy</maven-deploy-plugin-default.phase>
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
<maven-deploy-plugin.deployZipRepositoryId>repo.spring.io</maven-deploy-plugin.deployZipRepositoryId>
<maven-deploy-plugin.deployZipUrl>https://repo.spring.io/libs-snapshot-local</maven-deploy-plugin.deployZipUrl>
@@ -121,6 +122,24 @@
<readme.main.classpath>${docs.classes.dir}</readme.main.classpath>
<readme.class.path>readme.class.path</readme.class.path>
<sonar-jacoco-listeners.version>5.14.0.18788</sonar-jacoco-listeners.version>
<duplicate-finder-maven-plugin.version>1.5.0</duplicate-finder-maven-plugin.version>
<duplicate-finder-maven-plugin.printEqualFiles>false</duplicate-finder-maven-plugin.printEqualFiles>
<duplicate-finder-maven-plugin.failBuildInCaseOfDifferentContentConflict>false</duplicate-finder-maven-plugin.failBuildInCaseOfDifferentContentConflict>
<duplicate-finder-maven-plugin.failBuildInCaseOfEqualContentConflict>false</duplicate-finder-maven-plugin.failBuildInCaseOfEqualContentConflict>
<duplicate-finder-maven-plugin.failBuildInCaseOfConflict>true</duplicate-finder-maven-plugin.failBuildInCaseOfConflict>
<duplicate-finder-maven-plugin.checkCompileClasspath>true</duplicate-finder-maven-plugin.checkCompileClasspath>
<duplicate-finder-maven-plugin.checkRuntimeClasspath>true</duplicate-finder-maven-plugin.checkRuntimeClasspath>
<duplicate-finder-maven-plugin.checkTestClasspath>true</duplicate-finder-maven-plugin.checkTestClasspath>
<duplicate-finder-maven-plugin.skip>false</duplicate-finder-maven-plugin.skip>
<duplicate-finder-maven-plugin.quiet>false</duplicate-finder-maven-plugin.quiet>
<duplicate-finder-maven-plugin.preferLocal>true</duplicate-finder-maven-plugin.preferLocal>
<duplicate-finder-maven-plugin.useResultFile>true</duplicate-finder-maven-plugin.useResultFile>
<duplicate-finder-maven-plugin.resultFileMinClasspathCount>2</duplicate-finder-maven-plugin.resultFileMinClasspathCount>
<duplicate-finder-maven-plugin.resultFile>${project.build.directory}/duplicate-finder-result.xml</duplicate-finder-maven-plugin.resultFile>
<duplicate-finder-maven-plugin.includeBootClasspath>false</duplicate-finder-maven-plugin.includeBootClasspath>
<duplicate-finder-maven-plugin.bootClasspathProperty>sun.boot.class.path</duplicate-finder-maven-plugin.bootClasspathProperty>
<duplicate-finder-maven-plugin.useDefaultResourceIgnoreList>true</duplicate-finder-maven-plugin.useDefaultResourceIgnoreList>
<duplicate-finder-maven-plugin.includePomProjects>false</duplicate-finder-maven-plugin.includePomProjects>
</properties>
<dependencyManagement>
<dependencies>
@@ -642,6 +661,40 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<version>${duplicate-finder-maven-plugin.version}</version>
<executions>
<execution>
<id>duplicate-validation</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<configuration>
<printEqualFiles>${duplicate-finder-maven-plugin.printEqualFiles}</printEqualFiles>
<failBuildInCaseOfDifferentContentConflict>${duplicate-finder-maven-plugin.failBuildInCaseOfDifferentContentConflict}</failBuildInCaseOfDifferentContentConflict>
<failBuildInCaseOfEqualContentConflict>${duplicate-finder-maven-plugin.failBuildInCaseOfEqualContentConflict}</failBuildInCaseOfEqualContentConflict>
<failBuildInCaseOfConflict>${duplicate-finder-maven-plugin.failBuildInCaseOfConflict}</failBuildInCaseOfConflict>
<checkCompileClasspath>${duplicate-finder-maven-plugin.checkCompileClasspath}</checkCompileClasspath>
<checkRuntimeClasspath>${duplicate-finder-maven-plugin.checkRuntimeClasspath}</checkRuntimeClasspath>
<checkTestClasspath>${duplicate-finder-maven-plugin.checkTestClasspath}</checkTestClasspath>
<skip>${duplicate-finder-maven-plugin.skip}</skip>
<quiet>${duplicate-finder-maven-plugin.quiet}</quiet>
<preferLocal>${duplicate-finder-maven-plugin.preferLocal}</preferLocal>
<useResultFile>${duplicate-finder-maven-plugin.useResultFile}</useResultFile>
<resultFileMinClasspathCount>${duplicate-finder-maven-plugin.resultFileMinClasspathCount}</resultFileMinClasspathCount>
<resultFile>${duplicate-finder-maven-plugin.resultFile}</resultFile>
<includeBootClasspath>${duplicate-finder-maven-plugin.includeBootClasspath}</includeBootClasspath>
<bootClasspathProperty>${duplicate-finder-maven-plugin.bootClasspathProperty}</bootClasspathProperty>
<useDefaultResourceIgnoreList>${duplicate-finder-maven-plugin.useDefaultResourceIgnoreList}</useDefaultResourceIgnoreList>
<includePomProjects>${duplicate-finder-maven-plugin.includePomProjects}</includePomProjects>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
@@ -693,7 +746,7 @@
<repository>
<id>sonatype-nexus-staging</id>
<name>Nexus Release Repository</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
<snapshotRepository>
<id>repo.spring.io</id>
@@ -1155,6 +1208,7 @@
<raw-docs-url>${github-raw}@</raw-docs-url>
<project-version>${project.version}@</project-version>
<project-name>${docs.main}@</project-name>
<source-highlighter>highlight.js</source-highlighter>
</attributes>
<!-- end::attributes[] -->
<requires>
@@ -1187,7 +1241,7 @@
<highlightjs-theme>github</highlightjs-theme>
<imagesdir>./images</imagesdir>
<attribute-missing>warn</attribute-missing>
<sourceHighlighter>highlight.js</sourceHighlighter>
<source-highlighter>highlight.js</source-highlighter>
</attributes>
<logHandler>
<outputToConsole>true</outputToConsole>
@@ -1211,9 +1265,9 @@
<outputDirectory>
${generated-docs-singlepage-output.dir}
</outputDirectory>
<sourceHighlighter>highlight.js</sourceHighlighter>
<doctype>book</doctype>
<attributes>
<source-highlighter>highlight.js</source-highlighter>
<docinfo>shared</docinfo>
<stylesdir>css/</stylesdir>
<stylesheet>spring.css</stylesheet>
@@ -1414,6 +1468,13 @@
<artifactId>maven-deploy-plugin</artifactId>
<version>${maven-deploy-plugin.version}</version>
<executions>
<execution>
<id>default-deploy</id>
<phase>${maven-deploy-plugin-default.phase}</phase>
<goals>
<goal>deploy</goal>
</goals>
</execution>
<execution>
<id>upload-docs-zip</id>
<phase>${upload-docs-zip.phase}</phase>
+7 -18
View File
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build-dependencies</artifactId>
<version>3.1.0-M2</version>
<version>3.1.4</version>
<name>spring-cloud-build-dependencies</name>
<packaging>pom</packaging>
<description>Spring Cloud Build Dependencies: an internal BOM for use with Spring
@@ -14,12 +14,13 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.6.0-M2</version>
<version>2.6.11</version>
<relativePath/>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.version>2.6.0-M2</spring-boot.version>
<spring-boot.version>2.6.11</spring-boot.version>
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
</properties>
<build>
<plugins>
@@ -62,7 +63,7 @@
<site>
<id>spring-docs</id>
<url>
scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version}
https:/docs.spring.io/${project.artifactId}/docs/${project.version}/reference/html/
</url>
</site>
<repository>
@@ -87,30 +88,18 @@
</repository>
</distributionManagement>
</profile>
<profile>
<id>bintray</id>
<distributionManagement>
<repository>
<id>bintray</id>
<name>Jcenter Repository</name>
<url>
https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package}
</url>
</repository>
</distributionManagement>
</profile>
<profile>
<id>central</id>
<distributionManagement>
<snapshotRepository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>sonatype-nexus-staging</id>
<name>Nexus Release Repository</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
</url>
</repository>
</distributionManagement>
+1 -1
View File
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>3.1.0-M2</version>
<version>3.1.4</version>
</parent>
<dependencies>
<dependency>
@@ -20,9 +20,7 @@
<property name="headerFile" value="${checkstyle.header.file}"/>
<property name="fileExtensions" value="java,groovy"/>
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck">
<property name="lineSeparator" value="lf"/>
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck"/>
<!-- TreeWalker Checks -->
<module name="com.puppycrawl.tools.checkstyle.TreeWalker">
+4 -16
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>3.1.0-M2</version>
<version>3.1.4</version>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<packaging>pom</packaging>
<name>spring-cloud-dependencies-parent</name>
@@ -76,7 +76,7 @@
<site>
<id>spring-docs</id>
<url>
scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version}
https:/docs.spring.io/${project.artifactId}/docs/${project.version}/reference/html/
</url>
</site>
<repository>
@@ -101,30 +101,18 @@
</repository>
</distributionManagement>
</profile>
<profile>
<id>bintray</id>
<distributionManagement>
<repository>
<id>bintray</id>
<name>Jcenter Repository</name>
<url>
https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package}
</url>
</repository>
</distributionManagement>
</profile>
<profile>
<id>central</id>
<distributionManagement>
<snapshotRepository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>sonatype-nexus-staging</id>
<name>Nexus Release Repository</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
</url>
</repository>
</distributionManagement>