Compare commits

..
35 Commits
Author SHA1 Message Date
Dave Syer 44308608fa Update to RC2 2018-03-01 11:39:29 +00:00
Dave Syer 62c6abd991 Revert Boot to snapshots as well 2018-02-27 11:51:09 +00:00
Dave Syer 27d1e79004 Revert to snapshots 2018-02-23 16:39:32 +00:00
Dave Syer 79da5e764f RC1 -> Boot 2.0.0.RC2 2018-02-23 16:38:43 +00:00
Spencer Gibb 3cf83c46ab Move to Spring Boot RC2 in anticipation of Spring Cloud milestone. 2018-02-22 11:47:42 -05:00
Spencer Gibb 0193cebef6 Fix copy and paste name. 2018-02-20 11:23:23 -05:00
Marcin Grzejszczak 434aac7f68 Fails the build if generated HTML contains Unresolved (#68)
fixes #67
2018-02-12 17:11:11 +01:00
Spencer Gibb 10d29409e5 Merge remote-tracking branch 'origin/master' 2018-02-09 20:17:17 -05:00
Spencer Gibb 70db998312 Updates to Spring Boot 2.0.0.BUILD-SNAPSHOT 2018-02-09 20:17:09 -05:00
Ryan Baxter 679cbad438 Fixing links 2018-02-07 14:38:16 -05:00
Spencer Gibb 5555a5b804 Updates to Spring Boot 2.0.0.RC1 2018-02-03 19:09:03 -05:00
Dave Syer 6c706834b6 Revert to snapshots 2018-02-03 14:30:01 +00:00
Dave Syer 4a9a6b5a03 Update to 2.0.0.M7 2018-02-03 14:29:14 +00:00
Spencer Gibb a4d3ca059d Updates to Spring Boot 2.0.0.RC1 2018-01-31 14:04:15 -05:00
Dave Syer 51db058ec5 Switch to Boot snapshots 2018-01-11 13:52:04 +00:00
Ryan Baxter 73deaf4f00 Merge pull request #64 from ryanjbaxter/github-templates
GitHub Templates
2017-12-20 14:28:15 -05:00
Ryan Baxter e515f33d6c Customizing for Spring Cloud 2017-12-06 20:02:18 -08:00
Ryan Baxter 6c037307c7 Adding contributing file 2017-12-05 15:07:00 -08:00
Ryan Baxter 253dcf4852 GitHub issue template 2017-12-05 14:17:22 -08:00
buildmaster da52405878 Going back to snapshots 2017-12-01 21:32:42 +00:00
buildmaster c3f1d40a1a Update SNAPSHOT to 2.0.0.M6 2017-12-01 21:32:10 +00:00
Spencer Gibb 015bc38d38 Update boot to 2.0.0.M7 2017-11-30 13:08:37 -05:00
Spencer Gibb 33357b5a8e Merge branch '1.3.x' 2017-11-28 12:20:25 -05:00
Spencer Gibb f4c22a5151 Fix docs whitelist branch 2017-11-28 12:20:09 -05:00
Spencer Gibb c48f0debbb Merge branch '1.3.x' 2017-11-27 22:42:20 -05:00
Spencer Gibb b382dd1420 Update to Spring Boot 2.0.0.BUILD-SNAPSHOT 2017-11-22 10:52:19 -05:00
buildmaster 34aaa7e1f1 Bumping versions to 1.3.7.BUILD-SNAPSHOT after release 2017-11-20 10:34:54 +00:00
buildmaster e9ef6a7e53 Going back to snapshots 2017-11-20 10:34:54 +00:00
buildmaster 203d35ed0a Update SNAPSHOT to 1.3.6.RELEASE 2017-11-20 10:34:16 +00:00
Spencer Gibb 4409eeb36c Going back to snapshots 2017-11-14 16:44:39 -05:00
Spencer Gibb 2847052243 Update SNAPSHOT to 2.0.0.M5 2017-11-14 16:44:08 -05:00
Spencer Gibb da45237da3 Update to Spring Boot 2.0.0.M6 2017-11-07 12:15:37 -05:00
Spencer Gibb 69c64d1b32 Update to Spring Boot 2.0.0.BUILD-SNAPSHOT 2017-10-30 15:54:49 -04:00
Spencer Gibb b1475df241 Update to Spring Boot 1.5.8.RELEASE 2017-10-30 15:53:30 -04:00
Spencer Gibb 9884f0d3d4 Back to SNAPSHOTS 2017-10-17 19:56:23 -04:00
7 changed files with 94 additions and 10 deletions
+45
View File
@@ -0,0 +1,45 @@
# Contributing
Spring Cloud is released under the non-restrictive Apache 2.0 license,
and follows a very standard Github development process, using Github
tracker for issues and merging pull requests into master. If you want
to contribute even something trivial please do not hesitate, but
follow the guidelines below.
## Sign the Contributor License Agreement
Before we accept a non-trivial patch or pull request we will need you to sign the
[Contributor License Agreement](https://cla.pivotal.io/sign/spring).
Signing the contributor's agreement does not grant anyone commit rights to the main
repository, but it does mean that we can accept your contributions, and you will get an
author credit if we do. Active contributors might be asked to join the core team, and
given the ability to merge pull requests.
## Code of Conduct
This project adheres to the Contributor Covenant [code of
conduct](https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc). By participating, you are expected to uphold this code. Please report
unacceptable behavior to spring-code-of-conduct@pivotal.io.
## Code Conventions and Housekeeping
None of these is essential for a pull request, but they will all help. They can also be
added after the original pull request but before a merge.
* Use the Spring Framework code format conventions. If you use Eclipse
you can import formatter settings using the
`eclipse-code-formatter.xml` file from the
[Spring Cloud Build](https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml) project. If using IntelliJ, you can use the
[Eclipse Code Formatter Plugin](http://plugins.jetbrains.com/plugin/6546) to import the same file.
* Make sure all new `.java` files to have a simple Javadoc class comment with at least an
`@author` tag identifying you, and preferably at least a paragraph on what the class is
for.
* Add the ASF license header comment to all new `.java` files (copy from existing files
in the project)
* Add yourself as an `@author` to the .java files that you modify substantially (more
than cosmetic changes).
* Add some Javadocs and, if you change the namespace, some XSD doc elements.
* A few unit tests would help a lot as well -- someone has to do it.
* If no-one else is using your branch, please rebase it against the current master (or
other target branch in the main project).
* When writing a commit message please follow [these conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html),
if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit
message (where XXXX is the issue number).
+20
View File
@@ -0,0 +1,20 @@
<!--
Thanks for raising a Spring Cloud issue. What sort of issue are you raising?
Question
Please ask questions about how to use something, or to understand why something isn't
working as you expect it to, on Stack Overflow using the spring-cloud tag.
Bug report
Please provide details of the problem, including the version of Spring Cloud that you
are using. 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.
Enhancement
Please start by describing the problem that you are trying to solve. There may already
be a solution, or there may be a way to solve it that you hadn't considered.
-->
+2 -2
View File
@@ -9,12 +9,12 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>2.0.0.M4</version>
<version>2.0.0.RC2</version>
</parent>
<properties>
<docs.main>spring-cloud-build</docs.main>
<!-- Comma separated list of whitelisted branches -->
<docs.whitelisted.branches>1.2.x,2.0.x</docs.whitelisted.branches>
<docs.whitelisted.branches>1.2.x,1.3.x</docs.whitelisted.branches>
<main.basedir>${basedir}/..</main.basedir>
<docs.resources.dir>${basedir}/src/main</docs.resources.dir>
</properties>
+22 -3
View File
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>2.0.0.M4</version>
<version>2.0.0.RC2</version>
<packaging>pom</packaging>
<name>Spring Cloud Parent</name>
<description>Spring Cloud parent pom, managing plugins and dependencies for Spring Cloud projects</description>
@@ -27,8 +27,8 @@
<maven.compiler.target>${java.version}</maven.compiler.target>
<main.basedir>${basedir}</main.basedir>
<docs.main>${project.artifactId}</docs.main>
<spring-boot.version>2.0.0.M5</spring-boot.version>
<spring-cloud-build.version>2.0.0.M4</spring-cloud-build.version>
<spring-boot.version>2.0.0.RELEASE</spring-boot.version>
<spring-cloud-build.version>2.0.0.RC2</spring-cloud-build.version>
<docs.resources.dir>${project.build.directory}/build-docs</docs.resources.dir>
<!-- Sonar -->
@@ -909,6 +909,25 @@ limitations under the License.
</target>
</configuration>
</execution>
<execution>
<id>assert-no-unresolved-links</id>
<phase>prepare-package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<fileset id="unresolved.file" dir="${basedir}/target/contents/reference/" includes="**/*.html">
<contains text="Unresolved"/>
</fileset>
<fail message="[Unresolved] Found...failing">
<condition>
<resourcecount when="greater" count="0" refid="unresolved.file" />
</condition>
</fail>
</target>
</configuration>
</execution>
<execution>
<id>setup-maven-properties</id>
<phase>validate</phase>
+3 -3
View File
@@ -5,14 +5,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build-dependencies</artifactId>
<version>2.0.0.M4</version>
<name>spring-cloud-build-tools</name>
<version>2.0.0.RC2</version>
<name>spring-cloud-build-dependencies</name>
<packaging>pom</packaging>
<description>Spring Cloud Build Dependencies: an internal BOM for use with Spring Cloud projects. Use as a BOM or by inheriting from the spring-cloud build parent.</description>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.0.M5</version>
<version>2.0.0.RELEASE</version>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+1 -1
View File
@@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>2.0.0.M4</version>
<version>2.0.0.RC2</version>
</parent>
<dependencies>
<dependency>
+1 -1
View File
@@ -3,7 +3,7 @@
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>
<groupId>org.springframework.cloud</groupId>
<version>2.0.0.M4</version>
<version>2.0.0.RC2</version>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<packaging>pom</packaging>
<name>spring-cloud-dependencies-parent</name>