Compare commits

...
10 Commits
Author SHA1 Message Date
Ryan Baxter 58fe9dff85 Fixing pointers to correct branch 2022-02-10 10:28:49 -05:00
Ryan Baxter cc3685b5ff Merge branch '3.0.x' of github.com:spring-cloud/spring-cloud-build into 3.0.x 2021-12-14 10:49:19 -05:00
Ryan Baxter 99e4ee2791 Using Boot 2.4.13 2021-12-14 10:48:31 -05:00
buildmaster 7960973422 Bumping versions to 3.0.6-SNAPSHOT after release 2021-12-10 20:11:41 +00:00
buildmaster 9bf8bd0547 Going back to snapshots 2021-12-10 20:11:41 +00:00
buildmaster e9d2b4a5bb Update SNAPSHOT to 3.0.5 2021-12-10 20:10:21 +00:00
Spencer Gibb 5a44935cb1 Removes nexus staging plugin (#222) 2021-12-09 15:10:39 -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 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
9 changed files with 22 additions and 46 deletions
+1 -1
View File
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>3.0.4</version>
<version>3.0.6-SNAPSHOT</version>
</parent>
<properties>
<docs.main>spring-cloud-build</docs.main>
+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.0.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.0.x/pom.xml[tags=attributes,indent=0]
----
== Updating the guides
+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.0.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.0.x/docs/src/main/asciidoc/building-base.adoc[]
+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.0.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.0.x/pom.xml[tags=attributes,indent=0]
----
== Updating the guides
+4 -4
View File
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>3.0.4</version>
<version>3.0.6-SNAPSHOT</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.4.10</spring-boot.version>
<spring-cloud-build.version>3.0.4</spring-cloud-build.version>
<spring-boot.version>2.4.13</spring-boot.version>
<spring-cloud-build.version>3.0.6-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>
@@ -692,7 +692,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>
+6 -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.0.4</version>
<version>3.0.6-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,12 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.4.10</version>
<version>2.4.13</version>
<relativePath/>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.version>2.4.10</spring-boot.version>
<spring-boot.version>2.4.13</spring-boot.version>
</properties>
<build>
<plugins>
@@ -62,7 +62,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 +87,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.0.4</version>
<version>3.0.6-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
+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.0.4</version>
<version>3.0.6-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>