From 6a8dfa60d38fd1b461f1afedec993f8c972cc057 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 29 Jun 2023 10:26:50 +0000 Subject: [PATCH 01/15] Update SNAPSHOT to 3.1.8 --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-build-dependencies/pom.xml | 6 +++--- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 0028acc6..1c14cfcb 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 3.1.8-SNAPSHOT + 3.1.8 spring-cloud-build diff --git a/pom.xml b/pom.xml index 55511e93..ec99f142 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 3.1.8-SNAPSHOT + 3.1.8 pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -28,8 +28,8 @@ ${java.version} ${basedir} ${project.artifactId} - 2.6.14 - 3.1.8-SNAPSHOT + 2.6.15 + 3.1.8 ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 2ee0cf52..84efa996 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 3.1.8-SNAPSHOT + 3.1.8 spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring @@ -14,12 +14,12 @@ org.springframework.boot spring-boot-dependencies - 2.6.14 + 2.6.15 UTF-8 - 2.6.14 + 2.6.15 3.0.1 diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index a8ebefda..5003751c 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 3.1.8-SNAPSHOT + 3.1.8 diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 4c29d12f..6e77e9e5 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 3.1.8-SNAPSHOT + 3.1.8 spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 195ce4e753d7fee577279caade10743a5d35cd73 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 29 Jun 2023 10:28:09 +0000 Subject: [PATCH 02/15] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-build-dependencies/pom.xml | 6 +++--- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 1c14cfcb..0028acc6 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 3.1.8 + 3.1.8-SNAPSHOT spring-cloud-build diff --git a/pom.xml b/pom.xml index ec99f142..55511e93 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 3.1.8 + 3.1.8-SNAPSHOT pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -28,8 +28,8 @@ ${java.version} ${basedir} ${project.artifactId} - 2.6.15 - 3.1.8 + 2.6.14 + 3.1.8-SNAPSHOT ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 84efa996..2ee0cf52 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 3.1.8 + 3.1.8-SNAPSHOT spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring @@ -14,12 +14,12 @@ org.springframework.boot spring-boot-dependencies - 2.6.15 + 2.6.14 UTF-8 - 2.6.15 + 2.6.14 3.0.1 diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index 5003751c..a8ebefda 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 3.1.8 + 3.1.8-SNAPSHOT diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 6e77e9e5..4c29d12f 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 3.1.8 + 3.1.8-SNAPSHOT spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From a237137ed441e0687992fbf2329aaff77a6c22c4 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 29 Jun 2023 10:28:09 +0000 Subject: [PATCH 03/15] Bumping versions to 3.1.9-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-build-dependencies/pom.xml | 6 +++--- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 0028acc6..b7f4d2db 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 3.1.8-SNAPSHOT + 3.1.9-SNAPSHOT spring-cloud-build diff --git a/pom.xml b/pom.xml index 55511e93..4af760ad 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 3.1.8-SNAPSHOT + 3.1.9-SNAPSHOT pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -28,8 +28,8 @@ ${java.version} ${basedir} ${project.artifactId} - 2.6.14 - 3.1.8-SNAPSHOT + 2.6.15 + 3.1.9-SNAPSHOT ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 2ee0cf52..705b2c11 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 3.1.8-SNAPSHOT + 3.1.9-SNAPSHOT spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring @@ -14,12 +14,12 @@ org.springframework.boot spring-boot-dependencies - 2.6.14 + 2.6.15 UTF-8 - 2.6.14 + 2.6.15 3.0.1 diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index a8ebefda..e24c544d 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 3.1.8-SNAPSHOT + 3.1.9-SNAPSHOT diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 4c29d12f..69eec288 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 3.1.8-SNAPSHOT + 3.1.9-SNAPSHOT spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From c3995a08fa68c959fb62289111a1936d46639032 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 6 Jul 2023 06:34:30 +0000 Subject: [PATCH 04/15] Update SNAPSHOT to 4.0.4 --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-build-dependencies/pom.xml | 6 +++--- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 3b67f3cf..779b81f3 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.0.4-SNAPSHOT + 4.0.4 spring-cloud-build diff --git a/pom.xml b/pom.xml index f5e6ede8..98bf37c3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 4.0.4-SNAPSHOT + 4.0.4 pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -28,8 +28,8 @@ ${java.version} ${basedir} ${project.artifactId} - 3.0.7 - 4.0.4-SNAPSHOT + 3.0.8 + 4.0.4 ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index a282ae5f..1ee2e39a 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 4.0.4-SNAPSHOT + 4.0.4 spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring @@ -14,12 +14,12 @@ org.springframework.boot spring-boot-dependencies - 3.0.7 + 3.0.8 UTF-8 - 3.0.7 + 3.0.8 3.0.1 diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index af147bc7..2357eaed 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.0.4-SNAPSHOT + 4.0.4 diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 7369d0ed..244e0c8d 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 4.0.4-SNAPSHOT + 4.0.4 spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 00d08e83b0bf30ad6e7d398a3f61ff6f047eed9d Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 6 Jul 2023 06:36:03 +0000 Subject: [PATCH 05/15] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-build-dependencies/pom.xml | 6 +++--- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 779b81f3..3b67f3cf 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.0.4 + 4.0.4-SNAPSHOT spring-cloud-build diff --git a/pom.xml b/pom.xml index 98bf37c3..f5e6ede8 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 4.0.4 + 4.0.4-SNAPSHOT pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -28,8 +28,8 @@ ${java.version} ${basedir} ${project.artifactId} - 3.0.8 - 4.0.4 + 3.0.7 + 4.0.4-SNAPSHOT ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 1ee2e39a..a282ae5f 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 4.0.4 + 4.0.4-SNAPSHOT spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring @@ -14,12 +14,12 @@ org.springframework.boot spring-boot-dependencies - 3.0.8 + 3.0.7 UTF-8 - 3.0.8 + 3.0.7 3.0.1 diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index 2357eaed..af147bc7 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.0.4 + 4.0.4-SNAPSHOT diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 244e0c8d..7369d0ed 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 4.0.4 + 4.0.4-SNAPSHOT spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 413ada770c4e159004ad42865e58b7f3fc997266 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 6 Jul 2023 06:36:03 +0000 Subject: [PATCH 06/15] Bumping versions to 4.0.5-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-build-dependencies/pom.xml | 6 +++--- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 3b67f3cf..0da02b6e 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.0.4-SNAPSHOT + 4.0.5-SNAPSHOT spring-cloud-build diff --git a/pom.xml b/pom.xml index f5e6ede8..cf0f1a2d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 4.0.4-SNAPSHOT + 4.0.5-SNAPSHOT pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -28,8 +28,8 @@ ${java.version} ${basedir} ${project.artifactId} - 3.0.7 - 4.0.4-SNAPSHOT + 3.0.8 + 4.0.5-SNAPSHOT ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index a282ae5f..4b7bd7d0 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 4.0.4-SNAPSHOT + 4.0.5-SNAPSHOT spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring @@ -14,12 +14,12 @@ org.springframework.boot spring-boot-dependencies - 3.0.7 + 3.0.8 UTF-8 - 3.0.7 + 3.0.8 3.0.1 diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index af147bc7..0c1a499a 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.0.4-SNAPSHOT + 4.0.5-SNAPSHOT diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 7369d0ed..9914ea2b 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 4.0.4-SNAPSHOT + 4.0.5-SNAPSHOT spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 53f01d9804b7a11761a65ba63c8b6085bbcbf700 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 7 Jul 2023 04:11:30 +0000 Subject: [PATCH 07/15] Bumping versions --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-build-dependencies/pom.xml | 6 +++--- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 0da02b6e..3b67f3cf 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.0.5-SNAPSHOT + 4.0.4-SNAPSHOT spring-cloud-build diff --git a/pom.xml b/pom.xml index cf0f1a2d..f5e6ede8 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 4.0.5-SNAPSHOT + 4.0.4-SNAPSHOT pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -28,8 +28,8 @@ ${java.version} ${basedir} ${project.artifactId} - 3.0.8 - 4.0.5-SNAPSHOT + 3.0.7 + 4.0.4-SNAPSHOT ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 4b7bd7d0..a282ae5f 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 4.0.5-SNAPSHOT + 4.0.4-SNAPSHOT spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring @@ -14,12 +14,12 @@ org.springframework.boot spring-boot-dependencies - 3.0.8 + 3.0.7 UTF-8 - 3.0.8 + 3.0.7 3.0.1 diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index 0c1a499a..af147bc7 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.0.5-SNAPSHOT + 4.0.4-SNAPSHOT diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 9914ea2b..7369d0ed 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 4.0.5-SNAPSHOT + 4.0.4-SNAPSHOT spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 1b60c5b801e2073cc529f3e553bb6ac08a9c51f1 Mon Sep 17 00:00:00 2001 From: Olga MaciaszekSharma Date: Wed, 26 Jul 2023 16:46:13 +0200 Subject: [PATCH 08/15] Upgrade to Boot 3.0.9. --- pom.xml | 2 +- spring-cloud-build-dependencies/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index f5e6ede8..1fb65365 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ ${java.version} ${basedir} ${project.artifactId} - 3.0.7 + 3.0.9 4.0.4-SNAPSHOT ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index a282ae5f..ee021fec 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -14,12 +14,12 @@ org.springframework.boot spring-boot-dependencies - 3.0.7 + 3.0.9 UTF-8 - 3.0.7 + 3.0.9 3.0.1 From f20e58b49c6dae451d59b3a61e1b00f49c490898 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 27 Jul 2023 19:22:04 +0000 Subject: [PATCH 09/15] Update SNAPSHOT to 4.0.5 --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-build-dependencies/pom.xml | 2 +- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 3b67f3cf..8e5eeaf1 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.0.4-SNAPSHOT + 4.0.5 spring-cloud-build diff --git a/pom.xml b/pom.xml index 1fb65365..95d4a66c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 4.0.4-SNAPSHOT + 4.0.5 pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -29,7 +29,7 @@ ${basedir} ${project.artifactId} 3.0.9 - 4.0.4-SNAPSHOT + 4.0.5 ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index ee021fec..42da075c 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 4.0.4-SNAPSHOT + 4.0.5 spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index af147bc7..221a509f 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.0.4-SNAPSHOT + 4.0.5 diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 7369d0ed..7337ab9f 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 4.0.4-SNAPSHOT + 4.0.5 spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 7a6735ea04631280495a4efee5a0a1b0271d833f Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 27 Jul 2023 19:23:47 +0000 Subject: [PATCH 10/15] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-build-dependencies/pom.xml | 2 +- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 8e5eeaf1..3b67f3cf 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.0.5 + 4.0.4-SNAPSHOT spring-cloud-build diff --git a/pom.xml b/pom.xml index 95d4a66c..1fb65365 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 4.0.5 + 4.0.4-SNAPSHOT pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -29,7 +29,7 @@ ${basedir} ${project.artifactId} 3.0.9 - 4.0.5 + 4.0.4-SNAPSHOT ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 42da075c..ee021fec 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 4.0.5 + 4.0.4-SNAPSHOT spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index 221a509f..af147bc7 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.0.5 + 4.0.4-SNAPSHOT diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 7337ab9f..7369d0ed 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 4.0.5 + 4.0.4-SNAPSHOT spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From c53e18927af34dcc617a55e783ea4565d3f936de Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 27 Jul 2023 19:23:47 +0000 Subject: [PATCH 11/15] Bumping versions to 4.0.6-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-build-dependencies/pom.xml | 2 +- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 3b67f3cf..452966a3 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.0.4-SNAPSHOT + 4.0.6-SNAPSHOT spring-cloud-build diff --git a/pom.xml b/pom.xml index 1fb65365..db6beb59 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 4.0.4-SNAPSHOT + 4.0.6-SNAPSHOT pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -29,7 +29,7 @@ ${basedir} ${project.artifactId} 3.0.9 - 4.0.4-SNAPSHOT + 4.0.6-SNAPSHOT ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index ee021fec..880e53a5 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 4.0.4-SNAPSHOT + 4.0.6-SNAPSHOT spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index af147bc7..228f57f2 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.0.4-SNAPSHOT + 4.0.6-SNAPSHOT diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 7369d0ed..6e77b527 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 4.0.4-SNAPSHOT + 4.0.6-SNAPSHOT spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 10a19d7e3bd89b6e74f997b34ef7e3afa681f30c Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Fri, 8 Sep 2023 17:03:13 -0400 Subject: [PATCH 12/15] Update building-jdk8.adoc --- docs/src/main/asciidoc/building-jdk8.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/main/asciidoc/building-jdk8.adoc b/docs/src/main/asciidoc/building-jdk8.adoc index 056b67e5..dbcc86dd 100644 --- a/docs/src/main/asciidoc/building-jdk8.adoc +++ b/docs/src/main/asciidoc/building-jdk8.adoc @@ -1,3 +1,3 @@ -include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/building.adoc[] +include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/4.0.x/docs/src/main/asciidoc/building.adoc[] From f2de5d13026c1b1eb630a2db30de45d82d6d8590 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Wed, 20 Sep 2023 14:13:26 -0400 Subject: [PATCH 13/15] reference 4.0.x for docs --- docs/src/main/asciidoc/README.adoc | 4 ++-- docs/src/main/asciidoc/contributing.adoc | 4 ++-- docs/src/test/resources/README.adoc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index 2e23770d..1bc1fc53 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -1,4 +1,4 @@ -image::https://github.com/spring-cloud/spring-cloud-build/workflows/Build/badge.svg?branch=main&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-build/actions"] +image::https://github.com/spring-cloud/spring-cloud-build/workflows/Build/badge.svg?branch=4.0.x&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-build/actions"] Spring Cloud Build is a common utility project for Spring Cloud to use for plugin and dependency management. @@ -40,7 +40,7 @@ $ mvn deploy -P central -DaltReleaseDeploymentRepository=sonatype-nexus-staging: == Contributing -include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/contributing.adoc[] +include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/4.0.x/docs/src/main/asciidoc/contributing.adoc[] == Flattening the POMs diff --git a/docs/src/main/asciidoc/contributing.adoc b/docs/src/main/asciidoc/contributing.adoc index 71f8aab5..e8c58c08 100644 --- a/docs/src/main/asciidoc/contributing.adoc +++ b/docs/src/main/asciidoc/contributing.adoc @@ -15,7 +15,7 @@ author credit if we do. Active contributors might be asked to join the core tea given the ability to merge pull requests. === Code of Conduct -This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc[code of +This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/{spring-cloud-build-branch}/docs/src/main/asciidoc/code-of-conduct.adoc[code of conduct]. By participating, you are expected to uphold this code. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io. @@ -26,7 +26,7 @@ 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 - https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring + https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring Cloud Build] project. If using IntelliJ, you can use the https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin] to import the same file. diff --git a/docs/src/test/resources/README.adoc b/docs/src/test/resources/README.adoc index 6cc0baa9..97d7e55e 100644 --- a/docs/src/test/resources/README.adoc +++ b/docs/src/test/resources/README.adoc @@ -40,7 +40,7 @@ $ mvn deploy -P central -DaltReleaseDeploymentRepository=sonatype-nexus-staging: == Contributing -include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/contributing.adoc[] +include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/4.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/main/pom.xml[tags=attributes,indent=0] +include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/4.0.x/pom.xml[tags=attributes,indent=0] ---- == Updating the guides From b528877aab3257860f36a55c252b9a729fb00db7 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 21 Sep 2023 04:11:30 +0000 Subject: [PATCH 14/15] Bumping versions --- README.adoc | 46 +++------------------------------------------- 1 file changed, 3 insertions(+), 43 deletions(-) diff --git a/README.adoc b/README.adoc index c0a28ffa..e64d45b5 100644 --- a/README.adoc +++ b/README.adoc @@ -5,7 +5,7 @@ Edit the files in the src/main/asciidoc/ directory instead. //// -image::https://github.com/spring-cloud/spring-cloud-build/workflows/Build/badge.svg?branch=main&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-build/actions"] +image::https://github.com/spring-cloud/spring-cloud-build/workflows/Build/badge.svg?branch=4.0.x&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-build/actions"] Spring Cloud Build is a common utility project for Spring Cloud to use for plugin and dependency management. @@ -64,7 +64,7 @@ author credit if we do. Active contributors might be asked to join the core tea given the ability to merge pull requests. === Code of Conduct -This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc[code of +This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/{spring-cloud-build-branch}/docs/src/main/asciidoc/code-of-conduct.adoc[code of conduct]. By participating, you are expected to uphold this code. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io. @@ -75,7 +75,7 @@ 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 - https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring + https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring Cloud Build] project. If using IntelliJ, you can use the https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin] to import the same file. @@ -364,46 +364,6 @@ Spring Cloud Build Docs comes with a set of attributes for asciidoctor that you [source,xml] ---- - - shared - true - - left - 4 - true - ${project.basedir}/src@ - ${project.basedir}/src/main/asciidoc@ - ${project.basedir}/target/generated-resources@ - - - - ${maven.multiModuleProjectDirectory}@ - - ${docs.main}@ - https://github.com/spring-cloud/${docs.main}@ - - https://raw.githubusercontent.com/spring-cloud/${docs.main}/${github-tag}@ - - https://github.com/spring-cloud/${docs.main}/tree/${github-tag}@ - - https://github.com/spring-cloud/${docs.main}/issues/@ - https://github.com/spring-cloud/${docs.main}/wiki@ - https://github.com/spring-cloud/${docs.main}/tree/master@ - - ${index-link}@ - - - - ${project.version}@ - ${project.version}@ - ${github-tag}@ - ${version-type}@ - https://docs.spring.io/${docs.main}/docs/${project.version}@ - ${github-raw}@ - ${project.version}@ - ${docs.main}@ - highlight.js - ---- == Updating the guides From baca4d23cc2b70eedf58970a2f6145efebbe056c Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 25 Sep 2023 14:12:09 +0200 Subject: [PATCH 15/15] Migrates away from spring-docs-resource to spring-asciidoctor-backend; fixes gh-242 --- pom.xml | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index 4af760ad..65b7f37f 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes ${project.build.directory}/refdocs/ - 0.2.2.RELEASE + 0.0.7 0.6.0 0.6.0 @@ -89,7 +89,7 @@ true - master + main jar-with-dependencies @@ -1059,25 +1059,6 @@ - - unpack-docs-resources - ${unpack-docs-resources.phase} - - unpack - - - - - io.spring.docresources - spring-doc-resources - ${spring-doc-resources.version} - zip - true - ${refdocs.build.directory} - - - - @@ -1165,6 +1146,11 @@ asciidoctorj-diagram ${asciidoctorj-diagram.version} + + io.spring.asciidoctor.backends + spring-asciidoctor-backends + ${spring-asciidoctor-backends.version} + ${refdocs.build.directory} @@ -1230,7 +1216,7 @@ process-asciidoc - html5 + spring-html .adoc .htmladoc @@ -1265,7 +1251,7 @@ process-asciidoc - html5 + spring-html .htmlsingleadoc