Skip to content

Commit e57cb9a

Browse files
spring-buildsspring-builds
committed
Going back to snapshots
1 parent 0b36db2 commit e57cb9a

File tree

9 files changed

+16
-150
lines changed

9 files changed

+16
-150
lines changed

‎README.adoc

Lines changed: 2 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ credentials and you already have those.
281281

282282
The projects that require middleware generally include a
283283
`docker-compose.yml`, so consider using
284-
https://docs.docker.com/compose/[Docker Compose] to run the middeware servers
284+
https://compose.docker.io/[Docker Compose] to run the middeware servers
285285
in Docker containers. See the README in the
286286
https://github.com/spring-cloud-samples/scripts[scripts demo
287287
repository] for specific instructions about the common cases of mongo,
@@ -337,8 +337,6 @@ from the `file` menu.
337337

338338
== Contributing
339339

340-
:spring-cloud-build-branch: master
341-
342340
Spring Cloud is released under the non-restrictive Apache 2.0 license,
343341
and follows a very standard Github development process, using Github
344342
tracker for issues and merging pull requests into master. If you want
@@ -382,136 +380,4 @@ added after the original pull request but before a merge.
382380
other target branch in the main project).
383381
* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
384382
if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit
385-
message (where XXXX is the issue number).
386-
387-
=== Checkstyle
388-
389-
Spring Cloud Build comes with a set of checkstyle rules. You can find them in the `spring-cloud-build-tools` module. The most notable files under the module are:
390-
391-
.spring-cloud-build-tools/
392-
----
393-
└── src
394-
   ├── checkstyle
395-
   │   └── checkstyle-suppressions.xml <3>
396-
   └── main
397-
   └── resources
398-
   ├── checkstyle-header.txt <2>
399-
   └── checkstyle.xml <1>
400-
----
401-
<1> Default Checkstyle rules
402-
<2> File header setup
403-
<3> Default suppression rules
404-
405-
==== Checkstyle configuration
406-
407-
Checkstyle rules are *disabled by default*. To add checkstyle to your project just define the following properties and plugins.
408-
409-
.pom.xml
410-
----
411-
<properties>
412-
<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError> <1>
413-
<maven-checkstyle-plugin.failsOnViolation>true
414-
</maven-checkstyle-plugin.failsOnViolation> <2>
415-
<maven-checkstyle-plugin.includeTestSourceDirectory>true
416-
</maven-checkstyle-plugin.includeTestSourceDirectory> <3>
417-
</properties>
418-
419-
<build>
420-
<plugins>
421-
<plugin> <4>
422-
<groupId>io.spring.javaformat</groupId>
423-
<artifactId>spring-javaformat-maven-plugin</artifactId>
424-
</plugin>
425-
<plugin> <5>
426-
<groupId>org.apache.maven.plugins</groupId>
427-
<artifactId>maven-checkstyle-plugin</artifactId>
428-
</plugin>
429-
</plugins>
430-
431-
<reporting>
432-
<plugins>
433-
<plugin> <5>
434-
<groupId>org.apache.maven.plugins</groupId>
435-
<artifactId>maven-checkstyle-plugin</artifactId>
436-
</plugin>
437-
</plugins>
438-
</reporting>
439-
</build>
440-
----
441-
<1> Fails the build upon Checkstyle errors
442-
<2> Fails the build upon Checkstyle violations
443-
<3> Checkstyle analyzes also the test sources
444-
<4> Add the Spring Java Format plugin that will reformat your code to pass most of the Checkstyle formatting rules
445-
<5> Add checkstyle plugin to your build and reporting phases
446-
447-
If you need to suppress some rules (e.g. line length needs to be longer), then it's enough for you to define a file under `${project.root}/src/checkstyle/checkstyle-suppressions.xml` with your suppressions. Example:
448-
449-
.projectRoot/src/checkstyle/checkstyle-suppresions.xml
450-
----
451-
<?xml version="1.0"?>
452-
<!DOCTYPE suppressions PUBLIC
453-
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
454-
"https://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
455-
<suppressions>
456-
<suppress files=".*ConfigServerApplication\.java" checks="HideUtilityClassConstructor"/>
457-
<suppress files=".*ConfigClientWatch\.java" checks="LineLengthCheck"/>
458-
</suppressions>
459-
----
460-
461-
It's advisable to copy the `${spring-cloud-build.rootFolder}/.editorconfig` and `${spring-cloud-build.rootFolder}/.springformat` to your project. That way, some default formatting rules will be applied. You can do so by running this script:
462-
463-
```bash
464-
$ curl https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/.editorconfig -o .editorconfig
465-
$ touch .springformat
466-
```
467-
468-
=== IDE setup
469-
470-
==== Intellij IDEA
471-
472-
In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin.
473-
474-
.spring-cloud-build-tools/
475-
----
476-
└── src
477-
   ├── checkstyle
478-
   │   └── checkstyle-suppressions.xml <3>
479-
   └── main
480-
   └── resources
481-
   ├── checkstyle-header.txt <2>
482-
   ├── checkstyle.xml <1>
483-
   └── intellij
484-
      ├── Intellij_Project_Defaults.xml <4>
485-
      └── Intellij_Spring_Boot_Java_Conventions.xml <5>
486-
----
487-
<1> Default Checkstyle rules
488-
<2> File header setup
489-
<3> Default suppression rules
490-
<4> Project defaults for Intellij that apply most of Checkstyle rules
491-
<5> Project style conventions for Intellij that apply most of Checkstyle rules
492-
493-
.Code style
494-
495-
image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-code-style.png[Code style]
496-
497-
Go to `File` -> `Settings` -> `Editor` -> `Code style`. There click on the icon next to the `Scheme` section. There, click on the `Import Scheme` value and pick the `Intellij IDEA code style XML` option. Import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Spring_Boot_Java_Conventions.xml` file.
498-
499-
.Inspection profiles
500-
501-
image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-inspections.png[Code style]
502-
503-
Go to `File` -> `Settings` -> `Editor` -> `Inspections`. There click on the icon next to the `Profile` section. There, click on the `Import Profile` and import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Project_Defaults.xml` file.
504-
505-
.Checkstyle
506-
507-
To have Intellij work with Checkstyle, you have to install the `Checkstyle` plugin. It's advisable to also install the `Assertions2Assertj` to automatically convert the JUnit assertions
508-
509-
image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-checkstyle.png[Checkstyle]
510-
511-
Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on the `+` icon in the `Configuration file` section. There, you'll have to define where the checkstyle rules should be picked from. In the image above, we've picked the rules from the cloned Spring Cloud Build repository. However, you can point to the Spring Cloud Build's GitHub repository (e.g. for the `checkstyle.xml` : `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables:
512-
513-
- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL.
514-
- `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL.
515-
- `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`.
516-
517-
IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.
383+
message (where XXXX is the issue number).

‎docs/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springframework.cloud</groupId>
88
<artifactId>spring-cloud-config</artifactId>
9-
<version>1.4.7.RELEASE</version>
9+
<version>1.4.7.BUILD-SNAPSHOT</version>
1010
<relativePath>..</relativePath>
1111
</parent>
1212

‎pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.springframework.cloud</groupId>
55
<artifactId>spring-cloud-config</artifactId>
6-
<version>1.4.7.RELEASE</version>
6+
<version>1.4.7.BUILD-SNAPSHOT</version>
77
<packaging>pom</packaging>
88
<name>Spring Cloud Config</name>
99
<description>Spring Cloud Config</description>
1010
<url>https://projects.spring.io/spring-cloud/</url>
1111
<parent>
1212
<groupId>org.springframework.cloud</groupId>
1313
<artifactId>spring-cloud-build</artifactId>
14-
<version>1.3.12.RELEASE</version>
14+
<version>1.3.11.RELEASE</version>
1515
<relativePath/> <!-- lookup parent from repository -->
1616
</parent>
1717
<scm>
@@ -22,7 +22,7 @@
2222
</scm>
2323
<properties>
2424
<bintray.package>config</bintray.package>
25-
<spring-cloud-commons.version>1.3.6.RELEASE</spring-cloud-commons.version>
25+
<spring-cloud-commons.version>1.3.4.BUILD-SNAPSHOT</spring-cloud-commons.version>
2626
</properties>
2727
<modules>
2828
<module>spring-cloud-config-dependencies</module>

‎spring-cloud-config-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>org.springframework.cloud</groupId>
1212
<artifactId>spring-cloud-config</artifactId>
13-
<version>1.4.7.RELEASE</version>
13+
<version>1.4.7.BUILD-SNAPSHOT</version>
1414
<relativePath>..</relativePath>
1515
</parent>
1616

‎spring-cloud-config-dependencies/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<parent>
66
<artifactId>spring-cloud-dependencies-parent</artifactId>
77
<groupId>org.springframework.cloud</groupId>
8-
<version>1.3.12.RELEASE</version>
8+
<version>1.3.11.RELEASE</version>
99
<relativePath/>
1010
</parent>
1111
<artifactId>spring-cloud-config-dependencies</artifactId>
12-
<version>1.4.7.RELEASE</version>
12+
<version>1.4.7.BUILD-SNAPSHOT</version>
1313
<packaging>pom</packaging>
1414
<name>spring-cloud-config-dependencies</name>
1515
<description>Spring Cloud Config Dependencies</description>

‎spring-cloud-config-monitor/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
<parent>
66
<groupId>org.springframework.cloud</groupId>
77
<artifactId>spring-cloud-config</artifactId>
8-
<version>1.4.7.RELEASE</version>
8+
<version>1.4.7.BUILD-SNAPSHOT</version>
99
<relativePath>..</relativePath>
1010
</parent>
1111
<artifactId>spring-cloud-config-monitor</artifactId>
1212
<name>spring-cloud-config-monitor</name>
1313
<description>Spring Cloud Config Monitor</description>
1414
<properties>
1515
<main.basedir>${basedir}/../..</main.basedir>
16-
<spring-cloud-bus.version>1.3.5.RELEASE</spring-cloud-bus.version>
16+
<spring-cloud-bus.version>1.3.4.RELEASE</spring-cloud-bus.version>
1717
</properties>
1818
<dependencyManagement>
1919
<dependencies>

‎spring-cloud-config-sample/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.springframework.cloud</groupId>
1414
<artifactId>spring-cloud-config</artifactId>
15-
<version>1.4.7.RELEASE</version>
15+
<version>1.4.7.BUILD-SNAPSHOT</version>
1616
<relativePath>..</relativePath>
1717
</parent>
1818

‎spring-cloud-config-server/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.springframework.cloud</groupId>
1414
<artifactId>spring-cloud-config</artifactId>
15-
<version>1.4.7.RELEASE</version>
15+
<version>1.4.7.BUILD-SNAPSHOT</version>
1616
<relativePath>..</relativePath>
1717
</parent>
1818

@@ -90,7 +90,7 @@
9090

9191
<properties>
9292
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
93-
<spring-cloud.version>Edgware.SR6</spring-cloud.version>
93+
<spring-cloud.version>${project.version}</spring-cloud.version>
9494
<start-class>org.springframework.cloud.config.server.ConfigServerApplication</start-class>
9595
<java.version>1.7</java.version>
9696
</properties>

‎spring-cloud-starter-config/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<parent>
66
<groupId>org.springframework.cloud</groupId>
77
<artifactId>spring-cloud-config</artifactId>
8-
<version>1.4.7.RELEASE</version>
8+
<version>1.4.7.BUILD-SNAPSHOT</version>
99
</parent>
1010
<artifactId>spring-cloud-starter-config</artifactId>
11-
<version>1.4.7.RELEASE</version>
11+
<version>1.4.7.BUILD-SNAPSHOT</version>
1212
<name>spring-cloud-starter-config</name>
1313
<description>Spring Cloud Starter</description>
1414
<url>https://projects.spring.io/spring-cloud</url>

0 commit comments

Comments
 (0)