Compare commits

..
Author SHA1 Message Date
Artem Bilan 0d09a0ab29 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-02 13:58:44 -05:00
buildmaster b94c72ea30 Bumping versions 2022-01-26 08:13:45 +00:00
buildmaster d9bdd101ac Going back to snapshots 2022-01-25 17:44:45 +00:00
buildmaster 41669f2cc5 Update SNAPSHOT to 4.0.0-M1 2022-01-25 17:43:30 +00:00
Glenn Renfro 0afa19a2e1 Updated version for the various components.
Was unable to update asciidoctor-maven-plugin from 2.1.0 -> 2.2.1 because of build failure.
Need to investigate for M2
2022-01-24 11:48:17 -05:00
Marcin Grzejszczak d135092150 Update maven.yml 2022-01-17 10:38:32 +01:00
Ryan Baxter 4b3c5c511c Bump jacoco plugin to 0.8.7 2022-01-12 11:12:14 -05:00
spencergibb e0ad557de9 Updates sdkman to java 17 temurin 2022-01-03 14:25:20 -05:00
spencergibb eb0d694c4e Merge branch '3.1.x' 2022-01-03 14:17:19 -05:00
spencergibb ad3ddefa16 Adds .sdkmanrc 2022-01-03 14:16:50 -05:00
spencergibb c55d97d47c Updates to version 4.0.0-SNAPSHOT and boot 3.0.0 2022-01-03 14:14:44 -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 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
12 changed files with 199 additions and 72 deletions
+2 -6
View File
@@ -14,16 +14,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: ["8", "11", "16"]
steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 17
- name: Cache local Maven repository
uses: actions/cache@v2
with:
+1 -2
View File
@@ -18,5 +18,4 @@ _site/
.factorypath
.vscode/
.flattened-pom.xml
.DS_Store
.sdkmanrc
.DS_Store
+1 -1
View File
@@ -1,2 +1,2 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+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=17.0.1-tem
+51
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.
+1 -1
View File
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>3.1.0-RC1</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<properties>
<docs.main>spring-cloud-build</docs.main>
+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>
----
+76 -24
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-RC1</version>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Spring Cloud Parent</name>
<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
@@ -19,7 +19,7 @@
</modules>
<url>https://spring.io/spring-cloud</url>
<properties>
<java.version>1.8</java.version>
<java.version>17</java.version>
<resource.delimiter>@
</resource.delimiter> <!-- delimiter that doesn't clash with Spring ${} placeholders -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -28,22 +28,22 @@
<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-RC1</spring-boot.version>
<spring-cloud-build.version>3.1.0-RC1</spring-cloud-build.version>
<spring-boot.version>3.0.0-SNAPSHOT</spring-boot.version>
<spring-cloud-build.version>4.0.0-SNAPSHOT</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>
<spring-doc-resources.version>0.2.2.RELEASE</spring-doc-resources.version>
<spring-doc-resources.version>0.2.4</spring-doc-resources.version>
<spring-asciidoctor-extensions-boot.version>0.6.0
</spring-asciidoctor-extensions-boot.version>
<spring-asciidoctor-extensions-block.version>0.6.0
</spring-asciidoctor-extensions-block.version>
<asciidoctorj-pdf.version>1.6.0</asciidoctorj-pdf.version>
<asciidoctorj-pdf.version>1.6.2</asciidoctorj-pdf.version>
<asciidoctorj-diagram.version>2.1.2</asciidoctorj-diagram.version>
<guides-project.version>${project.version}</guides-project.version>
<guides-update.phase>deploy</guides-update.phase>
<revision>${project.version}</revision>
<asciidoctorj.version>2.5.1</asciidoctorj.version>
<asciidoctorj.version>2.5.3</asciidoctorj.version>
<jruby-complete.version>9.2.19.0</jruby-complete.version>
<!-- Sonar -->
@@ -54,35 +54,35 @@
<sonar.language>java</sonar.language>
<!-- Plugins -->
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven-compiler-plugin.version>3.9.0</maven-compiler-plugin.version>
<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
<!-- for backwards compatibility, use maven-checkstyle-plugin.version -->
<checkstyle.version>${maven-checkstyle-plugin.version}</checkstyle.version>
<puppycrawl-tools-checkstyle.version>8.43</puppycrawl-tools-checkstyle.version>
<spring-javaformat.version>0.0.26</spring-javaformat.version>
<puppycrawl-tools-checkstyle.version>9.2.1</puppycrawl-tools-checkstyle.version>
<spring-javaformat.version>0.0.29</spring-javaformat.version>
<maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
<maven-javadoc-plugin.version>3.3.0</maven-javadoc-plugin.version>
<maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
<maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
<maven-surefire-report-plugin.version>2.22.2</maven-surefire-report-plugin.version>
<maven-war-plugin.version>3.3.1</maven-war-plugin.version>
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
<exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
<maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
<git-commit-id-plugin.version>4.0.5</git-commit-id-plugin.version>
<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
<maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
<maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version><!-- @releaser:version-check-off -->
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
<maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version><!-- @releaser:version-check-off -->
<maven-gpg-plugin.version>3.2.0</maven-gpg-plugin.version>
<maven-dependency-plugin.version>3.2.0</maven-dependency-plugin.version>
<asciidoctor-maven-plugin.version>2.1.0</asciidoctor-maven-plugin.version>
<build-helper-maven-plugin.version>3.2.0</build-helper-maven-plugin.version>
<artifactory-maven-plugin.version>3.2.0</artifactory-maven-plugin.version>
<artifactory-maven-plugin.version>3.2.3</artifactory-maven-plugin.version>
<license-maven-plugin.version>2.0.0</license-maven-plugin.version>
<spring-javaformat-checkstyle.version>0.0.26</spring-javaformat-checkstyle.version>
<spring-javaformat-checkstyle.version>0.0.29</spring-javaformat-checkstyle.version>
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
<pitest-maven.version>1.6.7</pitest-maven.version>
<pitest-junit5-plugin.version>0.14</pitest-junit5-plugin.version>
<pitest-maven.version>1.7.3</pitest-maven.version>
<pitest-junit5-plugin.version>0.15</pitest-junit5-plugin.version>
<disable.checks>false</disable.checks>
<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
<maven-checkstyle-plugin.failOnViolation>true
@@ -100,7 +100,7 @@
<checkstyle.additional.suppressions.file>
${maven.multiModuleProjectDirectory}/src/checkstyle/checkstyle-suppressions.xml
</checkstyle.additional.suppressions.file>
<nohttp-checkstyle.version>0.0.7</nohttp-checkstyle.version>
<nohttp-checkstyle.version>0.0.10</nohttp-checkstyle.version>
<disable.nohttp.checks>true</disable.nohttp.checks>
<antelopetasks.version>3.2.10</antelopetasks.version>
<ant-nodeps.version>1.8.1</ant-nodeps.version>
@@ -121,6 +121,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.1</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 +660,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 +745,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>
@@ -1476,7 +1528,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.5</version>
<version>0.8.7</version>
<configuration>
<destFile>${sonar.jacoco.reportPath}</destFile>
<append>true</append>
+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-RC1</version>
<version>4.0.0-SNAPSHOT</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-RC1</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.version>2.6.0-RC1</spring-boot.version>
<spring-boot.version>3.0.0-SNAPSHOT</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-RC1</version>
<version>4.0.0-SNAPSHOT</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-RC1</version>
<version>4.0.0-SNAPSHOT</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>