From d1cb4e9e97b7f9fc90acdac5ee742de1610c2019 Mon Sep 17 00:00:00 2001 From: Glenn Renfro Date: Fri, 18 Oct 2024 08:01:20 -0400 Subject: [PATCH 01/15] Apply Locale.ROOT for string case change methods' locale --- .../cloud/task/repository/dao/JdbcTaskExecutionDao.java | 3 ++- .../database/support/AbstractSqlPagingQueryProvider.java | 3 ++- .../database/support/SqlPagingQueryProviderFactoryBean.java | 3 ++- .../task/repository/support/TaskRepositoryInitializer.java | 4 +++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/dao/JdbcTaskExecutionDao.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/dao/JdbcTaskExecutionDao.java index 5594b3ea..0aa3e186 100644 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/dao/JdbcTaskExecutionDao.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/dao/JdbcTaskExecutionDao.java @@ -26,6 +26,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.TreeSet; @@ -527,7 +528,7 @@ public class JdbcTaskExecutionDao implements TaskExecutionDao { if (sort != null) { for (Sort.Order sortOrder : sort) { - if (validSortColumns.contains(sortOrder.getProperty().toUpperCase())) { + if (validSortColumns.contains(sortOrder.getProperty().toUpperCase(Locale.ROOT))) { sortOrderMap.put(sortOrder.getProperty(), sortOrder.isAscending() ? Order.ASCENDING : Order.DESCENDING); } diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/database/support/AbstractSqlPagingQueryProvider.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/database/support/AbstractSqlPagingQueryProvider.java index 2daa6c60..631a47e6 100644 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/database/support/AbstractSqlPagingQueryProvider.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/database/support/AbstractSqlPagingQueryProvider.java @@ -19,6 +19,7 @@ package org.springframework.cloud.task.repository.database.support; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import javax.sql.DataSource; @@ -157,7 +158,7 @@ public abstract class AbstractSqlPagingQueryProvider implements PagingQueryProvi private String removeKeyWord(String keyWord, String clause) { String temp = clause.trim(); String keyWordString = keyWord + " "; - if (temp.toLowerCase().startsWith(keyWordString) && temp.length() > keyWordString.length()) { + if (temp.toLowerCase(Locale.ROOT).startsWith(keyWordString) && temp.length() > keyWordString.length()) { return temp.substring(keyWordString.length()); } else { diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/database/support/SqlPagingQueryProviderFactoryBean.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/database/support/SqlPagingQueryProviderFactoryBean.java index b9ce01ea..ad1daab7 100755 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/database/support/SqlPagingQueryProviderFactoryBean.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/database/support/SqlPagingQueryProviderFactoryBean.java @@ -17,6 +17,7 @@ package org.springframework.cloud.task.repository.database.support; import java.util.HashMap; +import java.util.Locale; import java.util.Map; import javax.sql.DataSource; @@ -135,7 +136,7 @@ public class SqlPagingQueryProviderFactoryBean implements FactoryBean Date: Tue, 12 Nov 2024 12:06:31 +0000 Subject: [PATCH 02/15] Bumping versions --- spring-cloud-task-samples/batch-events/pom.xml | 2 +- spring-cloud-task-samples/batch-job/pom.xml | 2 +- spring-cloud-task-samples/jpa-sample/pom.xml | 2 +- spring-cloud-task-samples/multiple-datasources/pom.xml | 2 +- spring-cloud-task-samples/partitioned-batch-job/pom.xml | 2 +- spring-cloud-task-samples/single-step-batch-job/pom.xml | 2 +- spring-cloud-task-samples/task-events/pom.xml | 2 +- spring-cloud-task-samples/task-observations/pom.xml | 2 +- spring-cloud-task-samples/taskprocessor/pom.xml | 2 +- spring-cloud-task-samples/tasksink/pom.xml | 2 +- spring-cloud-task-samples/timestamp/pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/spring-cloud-task-samples/batch-events/pom.xml b/spring-cloud-task-samples/batch-events/pom.xml index 52799789..db8874ea 100644 --- a/spring-cloud-task-samples/batch-events/pom.xml +++ b/spring-cloud-task-samples/batch-events/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.8 + 3.2.11 diff --git a/spring-cloud-task-samples/batch-job/pom.xml b/spring-cloud-task-samples/batch-job/pom.xml index f32529ea..c9a0d60f 100644 --- a/spring-cloud-task-samples/batch-job/pom.xml +++ b/spring-cloud-task-samples/batch-job/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.8 + 3.2.11 diff --git a/spring-cloud-task-samples/jpa-sample/pom.xml b/spring-cloud-task-samples/jpa-sample/pom.xml index af775538..d46c241a 100644 --- a/spring-cloud-task-samples/jpa-sample/pom.xml +++ b/spring-cloud-task-samples/jpa-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.8 + 3.2.11 diff --git a/spring-cloud-task-samples/multiple-datasources/pom.xml b/spring-cloud-task-samples/multiple-datasources/pom.xml index d85ff2eb..f04df8db 100644 --- a/spring-cloud-task-samples/multiple-datasources/pom.xml +++ b/spring-cloud-task-samples/multiple-datasources/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.8 + 3.2.11 diff --git a/spring-cloud-task-samples/partitioned-batch-job/pom.xml b/spring-cloud-task-samples/partitioned-batch-job/pom.xml index eb39771b..7ec1947f 100644 --- a/spring-cloud-task-samples/partitioned-batch-job/pom.xml +++ b/spring-cloud-task-samples/partitioned-batch-job/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.8 + 3.2.11 diff --git a/spring-cloud-task-samples/single-step-batch-job/pom.xml b/spring-cloud-task-samples/single-step-batch-job/pom.xml index dc1b7b14..08bb18d0 100644 --- a/spring-cloud-task-samples/single-step-batch-job/pom.xml +++ b/spring-cloud-task-samples/single-step-batch-job/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.8 + 3.2.11 diff --git a/spring-cloud-task-samples/task-events/pom.xml b/spring-cloud-task-samples/task-events/pom.xml index bce721d0..2f6b28a0 100644 --- a/spring-cloud-task-samples/task-events/pom.xml +++ b/spring-cloud-task-samples/task-events/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.8 + 3.2.11 diff --git a/spring-cloud-task-samples/task-observations/pom.xml b/spring-cloud-task-samples/task-observations/pom.xml index d3f774fe..4eb2f95f 100644 --- a/spring-cloud-task-samples/task-observations/pom.xml +++ b/spring-cloud-task-samples/task-observations/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.8 + 3.2.11 diff --git a/spring-cloud-task-samples/taskprocessor/pom.xml b/spring-cloud-task-samples/taskprocessor/pom.xml index 5590dccd..27c353ac 100644 --- a/spring-cloud-task-samples/taskprocessor/pom.xml +++ b/spring-cloud-task-samples/taskprocessor/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.8 + 3.2.11 diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml index b868453f..d5605653 100644 --- a/spring-cloud-task-samples/tasksink/pom.xml +++ b/spring-cloud-task-samples/tasksink/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.8 + 3.2.11 diff --git a/spring-cloud-task-samples/timestamp/pom.xml b/spring-cloud-task-samples/timestamp/pom.xml index eb09fff0..32d2a30b 100644 --- a/spring-cloud-task-samples/timestamp/pom.xml +++ b/spring-cloud-task-samples/timestamp/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.8 + 3.2.11 From a928d7f1567b61857e683ae6e2bb512d04bbba3e Mon Sep 17 00:00:00 2001 From: spring-builds Date: Sat, 16 Nov 2024 12:04:06 +0000 Subject: [PATCH 03/15] Bumping versions --- spring-cloud-task-samples/batch-events/pom.xml | 2 +- spring-cloud-task-samples/batch-job/pom.xml | 2 +- spring-cloud-task-samples/jpa-sample/pom.xml | 2 +- spring-cloud-task-samples/multiple-datasources/pom.xml | 2 +- spring-cloud-task-samples/partitioned-batch-job/pom.xml | 2 +- spring-cloud-task-samples/single-step-batch-job/pom.xml | 2 +- spring-cloud-task-samples/task-events/pom.xml | 2 +- spring-cloud-task-samples/task-observations/pom.xml | 2 +- spring-cloud-task-samples/taskprocessor/pom.xml | 2 +- spring-cloud-task-samples/tasksink/pom.xml | 2 +- spring-cloud-task-samples/timestamp/pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/spring-cloud-task-samples/batch-events/pom.xml b/spring-cloud-task-samples/batch-events/pom.xml index db8874ea..a900dc22 100644 --- a/spring-cloud-task-samples/batch-events/pom.xml +++ b/spring-cloud-task-samples/batch-events/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.11 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-task-samples/batch-job/pom.xml b/spring-cloud-task-samples/batch-job/pom.xml index c9a0d60f..faa9a8e7 100644 --- a/spring-cloud-task-samples/batch-job/pom.xml +++ b/spring-cloud-task-samples/batch-job/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.11 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-task-samples/jpa-sample/pom.xml b/spring-cloud-task-samples/jpa-sample/pom.xml index d46c241a..2d3466e9 100644 --- a/spring-cloud-task-samples/jpa-sample/pom.xml +++ b/spring-cloud-task-samples/jpa-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.11 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-task-samples/multiple-datasources/pom.xml b/spring-cloud-task-samples/multiple-datasources/pom.xml index f04df8db..b0acb473 100644 --- a/spring-cloud-task-samples/multiple-datasources/pom.xml +++ b/spring-cloud-task-samples/multiple-datasources/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.11 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-task-samples/partitioned-batch-job/pom.xml b/spring-cloud-task-samples/partitioned-batch-job/pom.xml index 7ec1947f..c1785d12 100644 --- a/spring-cloud-task-samples/partitioned-batch-job/pom.xml +++ b/spring-cloud-task-samples/partitioned-batch-job/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.11 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-task-samples/single-step-batch-job/pom.xml b/spring-cloud-task-samples/single-step-batch-job/pom.xml index 08bb18d0..a9c46257 100644 --- a/spring-cloud-task-samples/single-step-batch-job/pom.xml +++ b/spring-cloud-task-samples/single-step-batch-job/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.11 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-task-samples/task-events/pom.xml b/spring-cloud-task-samples/task-events/pom.xml index 2f6b28a0..0315304e 100644 --- a/spring-cloud-task-samples/task-events/pom.xml +++ b/spring-cloud-task-samples/task-events/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.11 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-task-samples/task-observations/pom.xml b/spring-cloud-task-samples/task-observations/pom.xml index 4eb2f95f..f7a2bf8d 100644 --- a/spring-cloud-task-samples/task-observations/pom.xml +++ b/spring-cloud-task-samples/task-observations/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.11 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-task-samples/taskprocessor/pom.xml b/spring-cloud-task-samples/taskprocessor/pom.xml index 27c353ac..99d95079 100644 --- a/spring-cloud-task-samples/taskprocessor/pom.xml +++ b/spring-cloud-task-samples/taskprocessor/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.11 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml index d5605653..f9fa9547 100644 --- a/spring-cloud-task-samples/tasksink/pom.xml +++ b/spring-cloud-task-samples/tasksink/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.11 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-task-samples/timestamp/pom.xml b/spring-cloud-task-samples/timestamp/pom.xml index 32d2a30b..a25bc1fd 100644 --- a/spring-cloud-task-samples/timestamp/pom.xml +++ b/spring-cloud-task-samples/timestamp/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.11 + 3.2.12-SNAPSHOT From b9541e0dbd1b9339f42838fa719fad735fc42929 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 26 Nov 2024 16:00:30 +0000 Subject: [PATCH 04/15] Update SNAPSHOT to 3.1.3 --- docs/pom.xml | 2 +- pom.xml | 6 +- .../pom.xml | 4 +- spring-cloud-starter-task/pom.xml | 2 +- spring-cloud-task-batch/pom.xml | 2 +- spring-cloud-task-core/pom.xml | 2 +- .../.flattened-pom.xml | 160 ++++++++++++++++++ spring-cloud-task-dependencies/pom.xml | 4 +- spring-cloud-task-integration-tests/pom.xml | 4 +- .../batch-events/pom.xml | 6 +- spring-cloud-task-samples/batch-job/pom.xml | 2 +- spring-cloud-task-samples/jpa-sample/pom.xml | 4 +- .../multiple-datasources/pom.xml | 4 +- .../partitioned-batch-job/pom.xml | 4 +- spring-cloud-task-samples/pom.xml | 2 +- .../single-step-batch-job/pom.xml | 4 +- spring-cloud-task-samples/task-events/pom.xml | 4 +- .../task-observations/pom.xml | 2 +- .../taskprocessor/pom.xml | 4 +- spring-cloud-task-samples/tasksink/pom.xml | 6 +- spring-cloud-task-samples/timestamp/pom.xml | 2 +- spring-cloud-task-stream/pom.xml | 2 +- 22 files changed, 196 insertions(+), 36 deletions(-) create mode 100644 spring-cloud-task-dependencies/.flattened-pom.xml diff --git a/docs/pom.xml b/docs/pom.xml index 8bd49a90..b07288bf 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3-SNAPSHOT + 3.1.3 jar Spring Cloud Task Docs diff --git a/pom.xml b/pom.xml index bee3714a..95593ee9 100755 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ org.springframework.cloud spring-cloud-build - 4.1.4-SNAPSHOT + 4.1.4 org.springframework.cloud spring-cloud-task-parent - 3.1.3-SNAPSHOT + 3.1.3 pom Spring Cloud Task Build Spring Cloud Task Build @@ -109,7 +109,7 @@ - 4.1.4-SNAPSHOT + 4.1.4 2.9.1 2.9.1 diff --git a/spring-cloud-starter-single-step-batch-job/pom.xml b/spring-cloud-starter-single-step-batch-job/pom.xml index 294ffd3b..81e4658a 100644 --- a/spring-cloud-starter-single-step-batch-job/pom.xml +++ b/spring-cloud-starter-single-step-batch-job/pom.xml @@ -3,14 +3,14 @@ spring-cloud-task-parent org.springframework.cloud - 3.1.3-SNAPSHOT + 3.1.3 4.0.0 spring-cloud-starter-single-step-batch-job - 4.1.5-SNAPSHOT + 4.1.5 diff --git a/spring-cloud-starter-task/pom.xml b/spring-cloud-starter-task/pom.xml index 6e781668..0ec46725 100644 --- a/spring-cloud-starter-task/pom.xml +++ b/spring-cloud-starter-task/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3-SNAPSHOT + 3.1.3 spring-cloud-starter-task diff --git a/spring-cloud-task-batch/pom.xml b/spring-cloud-task-batch/pom.xml index d5df7711..1de4d7ad 100644 --- a/spring-cloud-task-batch/pom.xml +++ b/spring-cloud-task-batch/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3-SNAPSHOT + 3.1.3 spring-cloud-task-batch diff --git a/spring-cloud-task-core/pom.xml b/spring-cloud-task-core/pom.xml index 049c0094..538da97f 100755 --- a/spring-cloud-task-core/pom.xml +++ b/spring-cloud-task-core/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3-SNAPSHOT + 3.1.3 spring-cloud-task-core diff --git a/spring-cloud-task-dependencies/.flattened-pom.xml b/spring-cloud-task-dependencies/.flattened-pom.xml new file mode 100644 index 00000000..215aa99c --- /dev/null +++ b/spring-cloud-task-dependencies/.flattened-pom.xml @@ -0,0 +1,160 @@ + + + 4.0.0 + + org.springframework.cloud + spring-cloud-dependencies-parent + 4.1.4 + + + org.springframework.cloud + spring-cloud-task-dependencies + 3.1.3 + pom + Spring Cloud Task Dependencies + Spring Cloud Task Dependencies + https://projects.spring.io/spring-cloud/spring-cloud-task-dependencies/ + + Pivotal Software, Inc. + https://www.spring.io + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0 + Copyright 2014-2021 the original author or authors. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + https://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. + + See the License for the specific language governing permissions and + limitations under the License. + + + + + dsyer + Dave Syer + dsyer at pivotal.io + Pivotal Software, Inc. + https://www.spring.io + + Project lead + + + + sgibb + Spencer Gibb + sgibb at pivotal.io + Pivotal Software, Inc. + https://www.spring.io + + Project lead + + + + + scm:git:git://github.com/spring-cloud/spring-cloud-build.git/spring-cloud-task-dependencies + scm:git:ssh://git@github.com/spring-cloud/spring-cloud-build.git/spring-cloud-task-dependencies + https://github.com/spring-cloud/spring-cloud-build/spring-cloud-task-dependencies + + + + repo.spring.io + Spring Release Repository + https://repo.spring.io/libs-release-local + + + repo.spring.io + Spring Snapshot Repository + https://repo.spring.io/libs-snapshot-local + + + spring-docs + https:/docs.spring.io/spring-cloud-dependencies-parent/docs/4.1.4/reference/html/spring-cloud-task-dependencies/ + + https://github.com/spring-cloud + + + + + org.springframework.cloud + spring-cloud-starter-task + ${project.version} + + + org.springframework.cloud + spring-cloud-task-core + ${project.version} + + + org.springframework.cloud + spring-cloud-task-batch + ${project.version} + + + org.springframework.cloud + spring-cloud-task-stream + ${project.version} + + + + + + spring + + + + true + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + + + false + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + + + false + + spring-releases + Spring Releases + https://repo.spring.io/release + + + + + + true + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + + + false + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + + + + diff --git a/spring-cloud-task-dependencies/pom.xml b/spring-cloud-task-dependencies/pom.xml index cac8ae07..c17dfb54 100644 --- a/spring-cloud-task-dependencies/pom.xml +++ b/spring-cloud-task-dependencies/pom.xml @@ -2,7 +2,7 @@ 4.0.0 spring-cloud-task-dependencies - 3.1.3-SNAPSHOT + 3.1.3 pom Spring Cloud Task Dependencies Spring Cloud Task Dependencies @@ -10,7 +10,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.1.4-SNAPSHOT + 4.1.4 diff --git a/spring-cloud-task-integration-tests/pom.xml b/spring-cloud-task-integration-tests/pom.xml index d1bed0e0..1031cdb9 100644 --- a/spring-cloud-task-integration-tests/pom.xml +++ b/spring-cloud-task-integration-tests/pom.xml @@ -3,7 +3,7 @@ spring-cloud-task-parent org.springframework.cloud - 3.1.3-SNAPSHOT + 3.1.3 4.0.0 Spring Cloud Task Integration Tests @@ -13,7 +13,7 @@ spring-cloud-task-integration-tests - 4.1.5-SNAPSHOT + 4.1.5 diff --git a/spring-cloud-task-samples/batch-events/pom.xml b/spring-cloud-task-samples/batch-events/pom.xml index a900dc22..ea41e2e1 100644 --- a/spring-cloud-task-samples/batch-events/pom.xml +++ b/spring-cloud-task-samples/batch-events/pom.xml @@ -13,15 +13,15 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 UTF-8 17 - 4.1.4-SNAPSHOT - 3.1.3-SNAPSHOT + 4.1.4 + 3.1.3 diff --git a/spring-cloud-task-samples/batch-job/pom.xml b/spring-cloud-task-samples/batch-job/pom.xml index faa9a8e7..be5cd41e 100644 --- a/spring-cloud-task-samples/batch-job/pom.xml +++ b/spring-cloud-task-samples/batch-job/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-task-samples/jpa-sample/pom.xml b/spring-cloud-task-samples/jpa-sample/pom.xml index 2d3466e9..7e948996 100644 --- a/spring-cloud-task-samples/jpa-sample/pom.xml +++ b/spring-cloud-task-samples/jpa-sample/pom.xml @@ -13,12 +13,12 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 - 4.1.5-SNAPSHOT + 4.1.5 UTF-8 17 diff --git a/spring-cloud-task-samples/multiple-datasources/pom.xml b/spring-cloud-task-samples/multiple-datasources/pom.xml index b0acb473..3956856d 100644 --- a/spring-cloud-task-samples/multiple-datasources/pom.xml +++ b/spring-cloud-task-samples/multiple-datasources/pom.xml @@ -14,12 +14,12 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 - 4.1.5-SNAPSHOT + 4.1.5 UTF-8 17 diff --git a/spring-cloud-task-samples/partitioned-batch-job/pom.xml b/spring-cloud-task-samples/partitioned-batch-job/pom.xml index c1785d12..531d5dbd 100644 --- a/spring-cloud-task-samples/partitioned-batch-job/pom.xml +++ b/spring-cloud-task-samples/partitioned-batch-job/pom.xml @@ -12,12 +12,12 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 - 4.1.5-SNAPSHOT + 4.1.5 UTF-8 17 2.8.3 diff --git a/spring-cloud-task-samples/pom.xml b/spring-cloud-task-samples/pom.xml index bd7cb0bd..8cdf0422 100644 --- a/spring-cloud-task-samples/pom.xml +++ b/spring-cloud-task-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3-SNAPSHOT + 3.1.3 diff --git a/spring-cloud-task-samples/single-step-batch-job/pom.xml b/spring-cloud-task-samples/single-step-batch-job/pom.xml index a9c46257..fd95ff23 100644 --- a/spring-cloud-task-samples/single-step-batch-job/pom.xml +++ b/spring-cloud-task-samples/single-step-batch-job/pom.xml @@ -13,12 +13,12 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 - 4.1.5-SNAPSHOT + 4.1.5 true diff --git a/spring-cloud-task-samples/task-events/pom.xml b/spring-cloud-task-samples/task-events/pom.xml index 0315304e..889a3202 100644 --- a/spring-cloud-task-samples/task-events/pom.xml +++ b/spring-cloud-task-samples/task-events/pom.xml @@ -13,14 +13,14 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 UTF-8 17 - 4.1.4-SNAPSHOT + 4.1.4 diff --git a/spring-cloud-task-samples/task-observations/pom.xml b/spring-cloud-task-samples/task-observations/pom.xml index f7a2bf8d..ba5da1e2 100644 --- a/spring-cloud-task-samples/task-observations/pom.xml +++ b/spring-cloud-task-samples/task-observations/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-task-samples/taskprocessor/pom.xml b/spring-cloud-task-samples/taskprocessor/pom.xml index 99d95079..f3cb4620 100644 --- a/spring-cloud-task-samples/taskprocessor/pom.xml +++ b/spring-cloud-task-samples/taskprocessor/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 UTF-8 true - 4.1.4-SNAPSHOT + 4.1.4 diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml index f9fa9547..1ee54214 100644 --- a/spring-cloud-task-samples/tasksink/pom.xml +++ b/spring-cloud-task-samples/tasksink/pom.xml @@ -15,15 +15,15 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 UTF-8 true - 4.1.4-SNAPSHOT - 3.1.3-SNAPSHOT + 4.1.4 + 3.1.3 2.9.0 diff --git a/spring-cloud-task-samples/timestamp/pom.xml b/spring-cloud-task-samples/timestamp/pom.xml index a25bc1fd..55bcd2b7 100644 --- a/spring-cloud-task-samples/timestamp/pom.xml +++ b/spring-cloud-task-samples/timestamp/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-task-stream/pom.xml b/spring-cloud-task-stream/pom.xml index 9918e14e..0163fd1a 100644 --- a/spring-cloud-task-stream/pom.xml +++ b/spring-cloud-task-stream/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3-SNAPSHOT + 3.1.3 From c2b1a39e260b59dc1669ca4e714a7a6a8051c7b7 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 26 Nov 2024 16:02:33 +0000 Subject: [PATCH 05/15] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 6 +- .../pom.xml | 4 +- spring-cloud-starter-task/pom.xml | 2 +- spring-cloud-task-batch/pom.xml | 2 +- spring-cloud-task-core/pom.xml | 2 +- .../.flattened-pom.xml | 160 ------------------ spring-cloud-task-dependencies/pom.xml | 4 +- spring-cloud-task-integration-tests/pom.xml | 4 +- .../batch-events/pom.xml | 6 +- spring-cloud-task-samples/batch-job/pom.xml | 2 +- spring-cloud-task-samples/jpa-sample/pom.xml | 4 +- .../multiple-datasources/pom.xml | 4 +- .../partitioned-batch-job/pom.xml | 4 +- spring-cloud-task-samples/pom.xml | 2 +- .../single-step-batch-job/pom.xml | 4 +- spring-cloud-task-samples/task-events/pom.xml | 4 +- .../task-observations/pom.xml | 2 +- .../taskprocessor/pom.xml | 4 +- spring-cloud-task-samples/tasksink/pom.xml | 6 +- spring-cloud-task-samples/timestamp/pom.xml | 2 +- spring-cloud-task-stream/pom.xml | 2 +- 22 files changed, 36 insertions(+), 196 deletions(-) delete mode 100644 spring-cloud-task-dependencies/.flattened-pom.xml diff --git a/docs/pom.xml b/docs/pom.xml index b07288bf..8bd49a90 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3 + 3.1.3-SNAPSHOT jar Spring Cloud Task Docs diff --git a/pom.xml b/pom.xml index 95593ee9..bee3714a 100755 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ org.springframework.cloud spring-cloud-build - 4.1.4 + 4.1.4-SNAPSHOT org.springframework.cloud spring-cloud-task-parent - 3.1.3 + 3.1.3-SNAPSHOT pom Spring Cloud Task Build Spring Cloud Task Build @@ -109,7 +109,7 @@ - 4.1.4 + 4.1.4-SNAPSHOT 2.9.1 2.9.1 diff --git a/spring-cloud-starter-single-step-batch-job/pom.xml b/spring-cloud-starter-single-step-batch-job/pom.xml index 81e4658a..294ffd3b 100644 --- a/spring-cloud-starter-single-step-batch-job/pom.xml +++ b/spring-cloud-starter-single-step-batch-job/pom.xml @@ -3,14 +3,14 @@ spring-cloud-task-parent org.springframework.cloud - 3.1.3 + 3.1.3-SNAPSHOT 4.0.0 spring-cloud-starter-single-step-batch-job - 4.1.5 + 4.1.5-SNAPSHOT diff --git a/spring-cloud-starter-task/pom.xml b/spring-cloud-starter-task/pom.xml index 0ec46725..6e781668 100644 --- a/spring-cloud-starter-task/pom.xml +++ b/spring-cloud-starter-task/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3 + 3.1.3-SNAPSHOT spring-cloud-starter-task diff --git a/spring-cloud-task-batch/pom.xml b/spring-cloud-task-batch/pom.xml index 1de4d7ad..d5df7711 100644 --- a/spring-cloud-task-batch/pom.xml +++ b/spring-cloud-task-batch/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3 + 3.1.3-SNAPSHOT spring-cloud-task-batch diff --git a/spring-cloud-task-core/pom.xml b/spring-cloud-task-core/pom.xml index 538da97f..049c0094 100755 --- a/spring-cloud-task-core/pom.xml +++ b/spring-cloud-task-core/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3 + 3.1.3-SNAPSHOT spring-cloud-task-core diff --git a/spring-cloud-task-dependencies/.flattened-pom.xml b/spring-cloud-task-dependencies/.flattened-pom.xml deleted file mode 100644 index 215aa99c..00000000 --- a/spring-cloud-task-dependencies/.flattened-pom.xml +++ /dev/null @@ -1,160 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-dependencies-parent - 4.1.4 - - - org.springframework.cloud - spring-cloud-task-dependencies - 3.1.3 - pom - Spring Cloud Task Dependencies - Spring Cloud Task Dependencies - https://projects.spring.io/spring-cloud/spring-cloud-task-dependencies/ - - Pivotal Software, Inc. - https://www.spring.io - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - Copyright 2014-2021 the original author or authors. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied. - - See the License for the specific language governing permissions and - limitations under the License. - - - - - dsyer - Dave Syer - dsyer at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - Project lead - - - - sgibb - Spencer Gibb - sgibb at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - Project lead - - - - - scm:git:git://github.com/spring-cloud/spring-cloud-build.git/spring-cloud-task-dependencies - scm:git:ssh://git@github.com/spring-cloud/spring-cloud-build.git/spring-cloud-task-dependencies - https://github.com/spring-cloud/spring-cloud-build/spring-cloud-task-dependencies - - - - repo.spring.io - Spring Release Repository - https://repo.spring.io/libs-release-local - - - repo.spring.io - Spring Snapshot Repository - https://repo.spring.io/libs-snapshot-local - - - spring-docs - https:/docs.spring.io/spring-cloud-dependencies-parent/docs/4.1.4/reference/html/spring-cloud-task-dependencies/ - - https://github.com/spring-cloud - - - - - org.springframework.cloud - spring-cloud-starter-task - ${project.version} - - - org.springframework.cloud - spring-cloud-task-core - ${project.version} - - - org.springframework.cloud - spring-cloud-task-batch - ${project.version} - - - org.springframework.cloud - spring-cloud-task-stream - ${project.version} - - - - - - spring - - - - true - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - - - false - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - - - false - - spring-releases - Spring Releases - https://repo.spring.io/release - - - - - - true - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - - - false - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - - - - diff --git a/spring-cloud-task-dependencies/pom.xml b/spring-cloud-task-dependencies/pom.xml index c17dfb54..cac8ae07 100644 --- a/spring-cloud-task-dependencies/pom.xml +++ b/spring-cloud-task-dependencies/pom.xml @@ -2,7 +2,7 @@ 4.0.0 spring-cloud-task-dependencies - 3.1.3 + 3.1.3-SNAPSHOT pom Spring Cloud Task Dependencies Spring Cloud Task Dependencies @@ -10,7 +10,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.1.4 + 4.1.4-SNAPSHOT diff --git a/spring-cloud-task-integration-tests/pom.xml b/spring-cloud-task-integration-tests/pom.xml index 1031cdb9..d1bed0e0 100644 --- a/spring-cloud-task-integration-tests/pom.xml +++ b/spring-cloud-task-integration-tests/pom.xml @@ -3,7 +3,7 @@ spring-cloud-task-parent org.springframework.cloud - 3.1.3 + 3.1.3-SNAPSHOT 4.0.0 Spring Cloud Task Integration Tests @@ -13,7 +13,7 @@ spring-cloud-task-integration-tests - 4.1.5 + 4.1.5-SNAPSHOT diff --git a/spring-cloud-task-samples/batch-events/pom.xml b/spring-cloud-task-samples/batch-events/pom.xml index ea41e2e1..a900dc22 100644 --- a/spring-cloud-task-samples/batch-events/pom.xml +++ b/spring-cloud-task-samples/batch-events/pom.xml @@ -13,15 +13,15 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12 + 3.2.12-SNAPSHOT UTF-8 17 - 4.1.4 - 3.1.3 + 4.1.4-SNAPSHOT + 3.1.3-SNAPSHOT diff --git a/spring-cloud-task-samples/batch-job/pom.xml b/spring-cloud-task-samples/batch-job/pom.xml index be5cd41e..faa9a8e7 100644 --- a/spring-cloud-task-samples/batch-job/pom.xml +++ b/spring-cloud-task-samples/batch-job/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-task-samples/jpa-sample/pom.xml b/spring-cloud-task-samples/jpa-sample/pom.xml index 7e948996..2d3466e9 100644 --- a/spring-cloud-task-samples/jpa-sample/pom.xml +++ b/spring-cloud-task-samples/jpa-sample/pom.xml @@ -13,12 +13,12 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12 + 3.2.12-SNAPSHOT - 4.1.5 + 4.1.5-SNAPSHOT UTF-8 17 diff --git a/spring-cloud-task-samples/multiple-datasources/pom.xml b/spring-cloud-task-samples/multiple-datasources/pom.xml index 3956856d..b0acb473 100644 --- a/spring-cloud-task-samples/multiple-datasources/pom.xml +++ b/spring-cloud-task-samples/multiple-datasources/pom.xml @@ -14,12 +14,12 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12 + 3.2.12-SNAPSHOT - 4.1.5 + 4.1.5-SNAPSHOT UTF-8 17 diff --git a/spring-cloud-task-samples/partitioned-batch-job/pom.xml b/spring-cloud-task-samples/partitioned-batch-job/pom.xml index 531d5dbd..c1785d12 100644 --- a/spring-cloud-task-samples/partitioned-batch-job/pom.xml +++ b/spring-cloud-task-samples/partitioned-batch-job/pom.xml @@ -12,12 +12,12 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12 + 3.2.12-SNAPSHOT - 4.1.5 + 4.1.5-SNAPSHOT UTF-8 17 2.8.3 diff --git a/spring-cloud-task-samples/pom.xml b/spring-cloud-task-samples/pom.xml index 8cdf0422..bd7cb0bd 100644 --- a/spring-cloud-task-samples/pom.xml +++ b/spring-cloud-task-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3 + 3.1.3-SNAPSHOT diff --git a/spring-cloud-task-samples/single-step-batch-job/pom.xml b/spring-cloud-task-samples/single-step-batch-job/pom.xml index fd95ff23..a9c46257 100644 --- a/spring-cloud-task-samples/single-step-batch-job/pom.xml +++ b/spring-cloud-task-samples/single-step-batch-job/pom.xml @@ -13,12 +13,12 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12 + 3.2.12-SNAPSHOT - 4.1.5 + 4.1.5-SNAPSHOT true diff --git a/spring-cloud-task-samples/task-events/pom.xml b/spring-cloud-task-samples/task-events/pom.xml index 889a3202..0315304e 100644 --- a/spring-cloud-task-samples/task-events/pom.xml +++ b/spring-cloud-task-samples/task-events/pom.xml @@ -13,14 +13,14 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12 + 3.2.12-SNAPSHOT UTF-8 17 - 4.1.4 + 4.1.4-SNAPSHOT diff --git a/spring-cloud-task-samples/task-observations/pom.xml b/spring-cloud-task-samples/task-observations/pom.xml index ba5da1e2..f7a2bf8d 100644 --- a/spring-cloud-task-samples/task-observations/pom.xml +++ b/spring-cloud-task-samples/task-observations/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-task-samples/taskprocessor/pom.xml b/spring-cloud-task-samples/taskprocessor/pom.xml index f3cb4620..99d95079 100644 --- a/spring-cloud-task-samples/taskprocessor/pom.xml +++ b/spring-cloud-task-samples/taskprocessor/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12 + 3.2.12-SNAPSHOT UTF-8 true - 4.1.4 + 4.1.4-SNAPSHOT diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml index 1ee54214..f9fa9547 100644 --- a/spring-cloud-task-samples/tasksink/pom.xml +++ b/spring-cloud-task-samples/tasksink/pom.xml @@ -15,15 +15,15 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12 + 3.2.12-SNAPSHOT UTF-8 true - 4.1.4 - 3.1.3 + 4.1.4-SNAPSHOT + 3.1.3-SNAPSHOT 2.9.0 diff --git a/spring-cloud-task-samples/timestamp/pom.xml b/spring-cloud-task-samples/timestamp/pom.xml index 55bcd2b7..a25bc1fd 100644 --- a/spring-cloud-task-samples/timestamp/pom.xml +++ b/spring-cloud-task-samples/timestamp/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-task-stream/pom.xml b/spring-cloud-task-stream/pom.xml index 0163fd1a..9918e14e 100644 --- a/spring-cloud-task-stream/pom.xml +++ b/spring-cloud-task-stream/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3 + 3.1.3-SNAPSHOT From d89b7152370e8daa97298fc5126627e6c92e878d Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 26 Nov 2024 16:02:34 +0000 Subject: [PATCH 06/15] Bumping versions to 3.1.4-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-starter-single-step-batch-job/pom.xml | 2 +- spring-cloud-starter-task/pom.xml | 2 +- spring-cloud-task-batch/pom.xml | 2 +- spring-cloud-task-core/pom.xml | 2 +- spring-cloud-task-dependencies/pom.xml | 2 +- spring-cloud-task-integration-tests/pom.xml | 2 +- spring-cloud-task-samples/batch-events/pom.xml | 2 +- spring-cloud-task-samples/pom.xml | 2 +- spring-cloud-task-samples/tasksink/pom.xml | 2 +- spring-cloud-task-stream/pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 8bd49a90..732bbec3 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT jar Spring Cloud Task Docs diff --git a/pom.xml b/pom.xml index bee3714a..d8df7d34 100755 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT pom Spring Cloud Task Build Spring Cloud Task Build diff --git a/spring-cloud-starter-single-step-batch-job/pom.xml b/spring-cloud-starter-single-step-batch-job/pom.xml index 294ffd3b..ebedeac4 100644 --- a/spring-cloud-starter-single-step-batch-job/pom.xml +++ b/spring-cloud-starter-single-step-batch-job/pom.xml @@ -3,7 +3,7 @@ spring-cloud-task-parent org.springframework.cloud - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT 4.0.0 diff --git a/spring-cloud-starter-task/pom.xml b/spring-cloud-starter-task/pom.xml index 6e781668..f512c60a 100644 --- a/spring-cloud-starter-task/pom.xml +++ b/spring-cloud-starter-task/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT spring-cloud-starter-task diff --git a/spring-cloud-task-batch/pom.xml b/spring-cloud-task-batch/pom.xml index d5df7711..f2d6f782 100644 --- a/spring-cloud-task-batch/pom.xml +++ b/spring-cloud-task-batch/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT spring-cloud-task-batch diff --git a/spring-cloud-task-core/pom.xml b/spring-cloud-task-core/pom.xml index 049c0094..56d88a6f 100755 --- a/spring-cloud-task-core/pom.xml +++ b/spring-cloud-task-core/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT spring-cloud-task-core diff --git a/spring-cloud-task-dependencies/pom.xml b/spring-cloud-task-dependencies/pom.xml index cac8ae07..b60df271 100644 --- a/spring-cloud-task-dependencies/pom.xml +++ b/spring-cloud-task-dependencies/pom.xml @@ -2,7 +2,7 @@ 4.0.0 spring-cloud-task-dependencies - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT pom Spring Cloud Task Dependencies Spring Cloud Task Dependencies diff --git a/spring-cloud-task-integration-tests/pom.xml b/spring-cloud-task-integration-tests/pom.xml index d1bed0e0..d42c83ca 100644 --- a/spring-cloud-task-integration-tests/pom.xml +++ b/spring-cloud-task-integration-tests/pom.xml @@ -3,7 +3,7 @@ spring-cloud-task-parent org.springframework.cloud - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT 4.0.0 Spring Cloud Task Integration Tests diff --git a/spring-cloud-task-samples/batch-events/pom.xml b/spring-cloud-task-samples/batch-events/pom.xml index a900dc22..ba2bcc7e 100644 --- a/spring-cloud-task-samples/batch-events/pom.xml +++ b/spring-cloud-task-samples/batch-events/pom.xml @@ -21,7 +21,7 @@ UTF-8 17 4.1.4-SNAPSHOT - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT diff --git a/spring-cloud-task-samples/pom.xml b/spring-cloud-task-samples/pom.xml index bd7cb0bd..0fae530c 100644 --- a/spring-cloud-task-samples/pom.xml +++ b/spring-cloud-task-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml index f9fa9547..c111d3a0 100644 --- a/spring-cloud-task-samples/tasksink/pom.xml +++ b/spring-cloud-task-samples/tasksink/pom.xml @@ -23,7 +23,7 @@ UTF-8 true 4.1.4-SNAPSHOT - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT 2.9.0 diff --git a/spring-cloud-task-stream/pom.xml b/spring-cloud-task-stream/pom.xml index 9918e14e..b381218e 100644 --- a/spring-cloud-task-stream/pom.xml +++ b/spring-cloud-task-stream/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT From e1358640b409493622083612af7f374b60fb0a96 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 26 Nov 2024 17:04:28 +0100 Subject: [PATCH 07/15] Update pom.xml --- docs/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/pom.xml b/docs/pom.xml index 732bbec3..d27d5e2a 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -26,6 +26,7 @@ .* ${maven.multiModuleProjectDirectory}/docs/modules/ROOT/partials/ + src/main/asciidoc From 1d59600aca4d6797de0428432fd7dba3a457781b Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 26 Nov 2024 16:17:18 +0000 Subject: [PATCH 08/15] Update SNAPSHOT to 3.1.3 --- docs/pom.xml | 2 +- pom.xml | 6 +- .../pom.xml | 4 +- spring-cloud-starter-task/pom.xml | 2 +- spring-cloud-task-batch/pom.xml | 2 +- spring-cloud-task-core/pom.xml | 2 +- .../.flattened-pom.xml | 160 ++++++++++++++++++ spring-cloud-task-dependencies/pom.xml | 4 +- spring-cloud-task-integration-tests/pom.xml | 4 +- .../batch-events/pom.xml | 6 +- spring-cloud-task-samples/batch-job/pom.xml | 2 +- spring-cloud-task-samples/jpa-sample/pom.xml | 4 +- .../multiple-datasources/pom.xml | 4 +- .../partitioned-batch-job/pom.xml | 4 +- spring-cloud-task-samples/pom.xml | 2 +- .../single-step-batch-job/pom.xml | 4 +- spring-cloud-task-samples/task-events/pom.xml | 4 +- .../task-observations/pom.xml | 2 +- .../taskprocessor/pom.xml | 4 +- spring-cloud-task-samples/tasksink/pom.xml | 6 +- spring-cloud-task-samples/timestamp/pom.xml | 2 +- spring-cloud-task-stream/pom.xml | 2 +- 22 files changed, 196 insertions(+), 36 deletions(-) create mode 100644 spring-cloud-task-dependencies/.flattened-pom.xml diff --git a/docs/pom.xml b/docs/pom.xml index d27d5e2a..41535e67 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.4-SNAPSHOT + 3.1.3 jar Spring Cloud Task Docs diff --git a/pom.xml b/pom.xml index d8df7d34..95593ee9 100755 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ org.springframework.cloud spring-cloud-build - 4.1.4-SNAPSHOT + 4.1.4 org.springframework.cloud spring-cloud-task-parent - 3.1.4-SNAPSHOT + 3.1.3 pom Spring Cloud Task Build Spring Cloud Task Build @@ -109,7 +109,7 @@ - 4.1.4-SNAPSHOT + 4.1.4 2.9.1 2.9.1 diff --git a/spring-cloud-starter-single-step-batch-job/pom.xml b/spring-cloud-starter-single-step-batch-job/pom.xml index ebedeac4..81e4658a 100644 --- a/spring-cloud-starter-single-step-batch-job/pom.xml +++ b/spring-cloud-starter-single-step-batch-job/pom.xml @@ -3,14 +3,14 @@ spring-cloud-task-parent org.springframework.cloud - 3.1.4-SNAPSHOT + 3.1.3 4.0.0 spring-cloud-starter-single-step-batch-job - 4.1.5-SNAPSHOT + 4.1.5 diff --git a/spring-cloud-starter-task/pom.xml b/spring-cloud-starter-task/pom.xml index f512c60a..0ec46725 100644 --- a/spring-cloud-starter-task/pom.xml +++ b/spring-cloud-starter-task/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.4-SNAPSHOT + 3.1.3 spring-cloud-starter-task diff --git a/spring-cloud-task-batch/pom.xml b/spring-cloud-task-batch/pom.xml index f2d6f782..1de4d7ad 100644 --- a/spring-cloud-task-batch/pom.xml +++ b/spring-cloud-task-batch/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.4-SNAPSHOT + 3.1.3 spring-cloud-task-batch diff --git a/spring-cloud-task-core/pom.xml b/spring-cloud-task-core/pom.xml index 56d88a6f..538da97f 100755 --- a/spring-cloud-task-core/pom.xml +++ b/spring-cloud-task-core/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.4-SNAPSHOT + 3.1.3 spring-cloud-task-core diff --git a/spring-cloud-task-dependencies/.flattened-pom.xml b/spring-cloud-task-dependencies/.flattened-pom.xml new file mode 100644 index 00000000..215aa99c --- /dev/null +++ b/spring-cloud-task-dependencies/.flattened-pom.xml @@ -0,0 +1,160 @@ + + + 4.0.0 + + org.springframework.cloud + spring-cloud-dependencies-parent + 4.1.4 + + + org.springframework.cloud + spring-cloud-task-dependencies + 3.1.3 + pom + Spring Cloud Task Dependencies + Spring Cloud Task Dependencies + https://projects.spring.io/spring-cloud/spring-cloud-task-dependencies/ + + Pivotal Software, Inc. + https://www.spring.io + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0 + Copyright 2014-2021 the original author or authors. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + https://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. + + See the License for the specific language governing permissions and + limitations under the License. + + + + + dsyer + Dave Syer + dsyer at pivotal.io + Pivotal Software, Inc. + https://www.spring.io + + Project lead + + + + sgibb + Spencer Gibb + sgibb at pivotal.io + Pivotal Software, Inc. + https://www.spring.io + + Project lead + + + + + scm:git:git://github.com/spring-cloud/spring-cloud-build.git/spring-cloud-task-dependencies + scm:git:ssh://git@github.com/spring-cloud/spring-cloud-build.git/spring-cloud-task-dependencies + https://github.com/spring-cloud/spring-cloud-build/spring-cloud-task-dependencies + + + + repo.spring.io + Spring Release Repository + https://repo.spring.io/libs-release-local + + + repo.spring.io + Spring Snapshot Repository + https://repo.spring.io/libs-snapshot-local + + + spring-docs + https:/docs.spring.io/spring-cloud-dependencies-parent/docs/4.1.4/reference/html/spring-cloud-task-dependencies/ + + https://github.com/spring-cloud + + + + + org.springframework.cloud + spring-cloud-starter-task + ${project.version} + + + org.springframework.cloud + spring-cloud-task-core + ${project.version} + + + org.springframework.cloud + spring-cloud-task-batch + ${project.version} + + + org.springframework.cloud + spring-cloud-task-stream + ${project.version} + + + + + + spring + + + + true + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + + + false + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + + + false + + spring-releases + Spring Releases + https://repo.spring.io/release + + + + + + true + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + + + false + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + + + + diff --git a/spring-cloud-task-dependencies/pom.xml b/spring-cloud-task-dependencies/pom.xml index b60df271..c17dfb54 100644 --- a/spring-cloud-task-dependencies/pom.xml +++ b/spring-cloud-task-dependencies/pom.xml @@ -2,7 +2,7 @@ 4.0.0 spring-cloud-task-dependencies - 3.1.4-SNAPSHOT + 3.1.3 pom Spring Cloud Task Dependencies Spring Cloud Task Dependencies @@ -10,7 +10,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.1.4-SNAPSHOT + 4.1.4 diff --git a/spring-cloud-task-integration-tests/pom.xml b/spring-cloud-task-integration-tests/pom.xml index d42c83ca..1031cdb9 100644 --- a/spring-cloud-task-integration-tests/pom.xml +++ b/spring-cloud-task-integration-tests/pom.xml @@ -3,7 +3,7 @@ spring-cloud-task-parent org.springframework.cloud - 3.1.4-SNAPSHOT + 3.1.3 4.0.0 Spring Cloud Task Integration Tests @@ -13,7 +13,7 @@ spring-cloud-task-integration-tests - 4.1.5-SNAPSHOT + 4.1.5 diff --git a/spring-cloud-task-samples/batch-events/pom.xml b/spring-cloud-task-samples/batch-events/pom.xml index ba2bcc7e..ea41e2e1 100644 --- a/spring-cloud-task-samples/batch-events/pom.xml +++ b/spring-cloud-task-samples/batch-events/pom.xml @@ -13,15 +13,15 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 UTF-8 17 - 4.1.4-SNAPSHOT - 3.1.4-SNAPSHOT + 4.1.4 + 3.1.3 diff --git a/spring-cloud-task-samples/batch-job/pom.xml b/spring-cloud-task-samples/batch-job/pom.xml index faa9a8e7..be5cd41e 100644 --- a/spring-cloud-task-samples/batch-job/pom.xml +++ b/spring-cloud-task-samples/batch-job/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-task-samples/jpa-sample/pom.xml b/spring-cloud-task-samples/jpa-sample/pom.xml index 2d3466e9..7e948996 100644 --- a/spring-cloud-task-samples/jpa-sample/pom.xml +++ b/spring-cloud-task-samples/jpa-sample/pom.xml @@ -13,12 +13,12 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 - 4.1.5-SNAPSHOT + 4.1.5 UTF-8 17 diff --git a/spring-cloud-task-samples/multiple-datasources/pom.xml b/spring-cloud-task-samples/multiple-datasources/pom.xml index b0acb473..3956856d 100644 --- a/spring-cloud-task-samples/multiple-datasources/pom.xml +++ b/spring-cloud-task-samples/multiple-datasources/pom.xml @@ -14,12 +14,12 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 - 4.1.5-SNAPSHOT + 4.1.5 UTF-8 17 diff --git a/spring-cloud-task-samples/partitioned-batch-job/pom.xml b/spring-cloud-task-samples/partitioned-batch-job/pom.xml index c1785d12..531d5dbd 100644 --- a/spring-cloud-task-samples/partitioned-batch-job/pom.xml +++ b/spring-cloud-task-samples/partitioned-batch-job/pom.xml @@ -12,12 +12,12 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 - 4.1.5-SNAPSHOT + 4.1.5 UTF-8 17 2.8.3 diff --git a/spring-cloud-task-samples/pom.xml b/spring-cloud-task-samples/pom.xml index 0fae530c..8cdf0422 100644 --- a/spring-cloud-task-samples/pom.xml +++ b/spring-cloud-task-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.4-SNAPSHOT + 3.1.3 diff --git a/spring-cloud-task-samples/single-step-batch-job/pom.xml b/spring-cloud-task-samples/single-step-batch-job/pom.xml index a9c46257..fd95ff23 100644 --- a/spring-cloud-task-samples/single-step-batch-job/pom.xml +++ b/spring-cloud-task-samples/single-step-batch-job/pom.xml @@ -13,12 +13,12 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 - 4.1.5-SNAPSHOT + 4.1.5 true diff --git a/spring-cloud-task-samples/task-events/pom.xml b/spring-cloud-task-samples/task-events/pom.xml index 0315304e..889a3202 100644 --- a/spring-cloud-task-samples/task-events/pom.xml +++ b/spring-cloud-task-samples/task-events/pom.xml @@ -13,14 +13,14 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 UTF-8 17 - 4.1.4-SNAPSHOT + 4.1.4 diff --git a/spring-cloud-task-samples/task-observations/pom.xml b/spring-cloud-task-samples/task-observations/pom.xml index f7a2bf8d..ba5da1e2 100644 --- a/spring-cloud-task-samples/task-observations/pom.xml +++ b/spring-cloud-task-samples/task-observations/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-task-samples/taskprocessor/pom.xml b/spring-cloud-task-samples/taskprocessor/pom.xml index 99d95079..f3cb4620 100644 --- a/spring-cloud-task-samples/taskprocessor/pom.xml +++ b/spring-cloud-task-samples/taskprocessor/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 UTF-8 true - 4.1.4-SNAPSHOT + 4.1.4 diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml index c111d3a0..1ee54214 100644 --- a/spring-cloud-task-samples/tasksink/pom.xml +++ b/spring-cloud-task-samples/tasksink/pom.xml @@ -15,15 +15,15 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 UTF-8 true - 4.1.4-SNAPSHOT - 3.1.4-SNAPSHOT + 4.1.4 + 3.1.3 2.9.0 diff --git a/spring-cloud-task-samples/timestamp/pom.xml b/spring-cloud-task-samples/timestamp/pom.xml index a25bc1fd..55bcd2b7 100644 --- a/spring-cloud-task-samples/timestamp/pom.xml +++ b/spring-cloud-task-samples/timestamp/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-task-stream/pom.xml b/spring-cloud-task-stream/pom.xml index b381218e..0163fd1a 100644 --- a/spring-cloud-task-stream/pom.xml +++ b/spring-cloud-task-stream/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.4-SNAPSHOT + 3.1.3 From 591b40754d5a6a2c0b191dd85a1e78a0a378bbfd Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 26 Nov 2024 16:19:11 +0000 Subject: [PATCH 09/15] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 6 +- .../pom.xml | 4 +- spring-cloud-starter-task/pom.xml | 2 +- spring-cloud-task-batch/pom.xml | 2 +- spring-cloud-task-core/pom.xml | 2 +- .../.flattened-pom.xml | 160 ------------------ spring-cloud-task-dependencies/pom.xml | 4 +- spring-cloud-task-integration-tests/pom.xml | 4 +- .../batch-events/pom.xml | 6 +- spring-cloud-task-samples/batch-job/pom.xml | 2 +- spring-cloud-task-samples/jpa-sample/pom.xml | 4 +- .../multiple-datasources/pom.xml | 4 +- .../partitioned-batch-job/pom.xml | 4 +- spring-cloud-task-samples/pom.xml | 2 +- .../single-step-batch-job/pom.xml | 4 +- spring-cloud-task-samples/task-events/pom.xml | 4 +- .../task-observations/pom.xml | 2 +- .../taskprocessor/pom.xml | 4 +- spring-cloud-task-samples/tasksink/pom.xml | 6 +- spring-cloud-task-samples/timestamp/pom.xml | 2 +- spring-cloud-task-stream/pom.xml | 2 +- 22 files changed, 36 insertions(+), 196 deletions(-) delete mode 100644 spring-cloud-task-dependencies/.flattened-pom.xml diff --git a/docs/pom.xml b/docs/pom.xml index 41535e67..d27d5e2a 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3 + 3.1.4-SNAPSHOT jar Spring Cloud Task Docs diff --git a/pom.xml b/pom.xml index 95593ee9..d8df7d34 100755 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ org.springframework.cloud spring-cloud-build - 4.1.4 + 4.1.4-SNAPSHOT org.springframework.cloud spring-cloud-task-parent - 3.1.3 + 3.1.4-SNAPSHOT pom Spring Cloud Task Build Spring Cloud Task Build @@ -109,7 +109,7 @@ - 4.1.4 + 4.1.4-SNAPSHOT 2.9.1 2.9.1 diff --git a/spring-cloud-starter-single-step-batch-job/pom.xml b/spring-cloud-starter-single-step-batch-job/pom.xml index 81e4658a..ebedeac4 100644 --- a/spring-cloud-starter-single-step-batch-job/pom.xml +++ b/spring-cloud-starter-single-step-batch-job/pom.xml @@ -3,14 +3,14 @@ spring-cloud-task-parent org.springframework.cloud - 3.1.3 + 3.1.4-SNAPSHOT 4.0.0 spring-cloud-starter-single-step-batch-job - 4.1.5 + 4.1.5-SNAPSHOT diff --git a/spring-cloud-starter-task/pom.xml b/spring-cloud-starter-task/pom.xml index 0ec46725..f512c60a 100644 --- a/spring-cloud-starter-task/pom.xml +++ b/spring-cloud-starter-task/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3 + 3.1.4-SNAPSHOT spring-cloud-starter-task diff --git a/spring-cloud-task-batch/pom.xml b/spring-cloud-task-batch/pom.xml index 1de4d7ad..f2d6f782 100644 --- a/spring-cloud-task-batch/pom.xml +++ b/spring-cloud-task-batch/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3 + 3.1.4-SNAPSHOT spring-cloud-task-batch diff --git a/spring-cloud-task-core/pom.xml b/spring-cloud-task-core/pom.xml index 538da97f..56d88a6f 100755 --- a/spring-cloud-task-core/pom.xml +++ b/spring-cloud-task-core/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3 + 3.1.4-SNAPSHOT spring-cloud-task-core diff --git a/spring-cloud-task-dependencies/.flattened-pom.xml b/spring-cloud-task-dependencies/.flattened-pom.xml deleted file mode 100644 index 215aa99c..00000000 --- a/spring-cloud-task-dependencies/.flattened-pom.xml +++ /dev/null @@ -1,160 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-dependencies-parent - 4.1.4 - - - org.springframework.cloud - spring-cloud-task-dependencies - 3.1.3 - pom - Spring Cloud Task Dependencies - Spring Cloud Task Dependencies - https://projects.spring.io/spring-cloud/spring-cloud-task-dependencies/ - - Pivotal Software, Inc. - https://www.spring.io - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - Copyright 2014-2021 the original author or authors. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied. - - See the License for the specific language governing permissions and - limitations under the License. - - - - - dsyer - Dave Syer - dsyer at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - Project lead - - - - sgibb - Spencer Gibb - sgibb at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - Project lead - - - - - scm:git:git://github.com/spring-cloud/spring-cloud-build.git/spring-cloud-task-dependencies - scm:git:ssh://git@github.com/spring-cloud/spring-cloud-build.git/spring-cloud-task-dependencies - https://github.com/spring-cloud/spring-cloud-build/spring-cloud-task-dependencies - - - - repo.spring.io - Spring Release Repository - https://repo.spring.io/libs-release-local - - - repo.spring.io - Spring Snapshot Repository - https://repo.spring.io/libs-snapshot-local - - - spring-docs - https:/docs.spring.io/spring-cloud-dependencies-parent/docs/4.1.4/reference/html/spring-cloud-task-dependencies/ - - https://github.com/spring-cloud - - - - - org.springframework.cloud - spring-cloud-starter-task - ${project.version} - - - org.springframework.cloud - spring-cloud-task-core - ${project.version} - - - org.springframework.cloud - spring-cloud-task-batch - ${project.version} - - - org.springframework.cloud - spring-cloud-task-stream - ${project.version} - - - - - - spring - - - - true - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - - - false - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - - - false - - spring-releases - Spring Releases - https://repo.spring.io/release - - - - - - true - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - - - false - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - - - - diff --git a/spring-cloud-task-dependencies/pom.xml b/spring-cloud-task-dependencies/pom.xml index c17dfb54..b60df271 100644 --- a/spring-cloud-task-dependencies/pom.xml +++ b/spring-cloud-task-dependencies/pom.xml @@ -2,7 +2,7 @@ 4.0.0 spring-cloud-task-dependencies - 3.1.3 + 3.1.4-SNAPSHOT pom Spring Cloud Task Dependencies Spring Cloud Task Dependencies @@ -10,7 +10,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.1.4 + 4.1.4-SNAPSHOT diff --git a/spring-cloud-task-integration-tests/pom.xml b/spring-cloud-task-integration-tests/pom.xml index 1031cdb9..d42c83ca 100644 --- a/spring-cloud-task-integration-tests/pom.xml +++ b/spring-cloud-task-integration-tests/pom.xml @@ -3,7 +3,7 @@ spring-cloud-task-parent org.springframework.cloud - 3.1.3 + 3.1.4-SNAPSHOT 4.0.0 Spring Cloud Task Integration Tests @@ -13,7 +13,7 @@ spring-cloud-task-integration-tests - 4.1.5 + 4.1.5-SNAPSHOT diff --git a/spring-cloud-task-samples/batch-events/pom.xml b/spring-cloud-task-samples/batch-events/pom.xml index ea41e2e1..ba2bcc7e 100644 --- a/spring-cloud-task-samples/batch-events/pom.xml +++ b/spring-cloud-task-samples/batch-events/pom.xml @@ -13,15 +13,15 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12 + 3.2.12-SNAPSHOT UTF-8 17 - 4.1.4 - 3.1.3 + 4.1.4-SNAPSHOT + 3.1.4-SNAPSHOT diff --git a/spring-cloud-task-samples/batch-job/pom.xml b/spring-cloud-task-samples/batch-job/pom.xml index be5cd41e..faa9a8e7 100644 --- a/spring-cloud-task-samples/batch-job/pom.xml +++ b/spring-cloud-task-samples/batch-job/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-task-samples/jpa-sample/pom.xml b/spring-cloud-task-samples/jpa-sample/pom.xml index 7e948996..2d3466e9 100644 --- a/spring-cloud-task-samples/jpa-sample/pom.xml +++ b/spring-cloud-task-samples/jpa-sample/pom.xml @@ -13,12 +13,12 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12 + 3.2.12-SNAPSHOT - 4.1.5 + 4.1.5-SNAPSHOT UTF-8 17 diff --git a/spring-cloud-task-samples/multiple-datasources/pom.xml b/spring-cloud-task-samples/multiple-datasources/pom.xml index 3956856d..b0acb473 100644 --- a/spring-cloud-task-samples/multiple-datasources/pom.xml +++ b/spring-cloud-task-samples/multiple-datasources/pom.xml @@ -14,12 +14,12 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12 + 3.2.12-SNAPSHOT - 4.1.5 + 4.1.5-SNAPSHOT UTF-8 17 diff --git a/spring-cloud-task-samples/partitioned-batch-job/pom.xml b/spring-cloud-task-samples/partitioned-batch-job/pom.xml index 531d5dbd..c1785d12 100644 --- a/spring-cloud-task-samples/partitioned-batch-job/pom.xml +++ b/spring-cloud-task-samples/partitioned-batch-job/pom.xml @@ -12,12 +12,12 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12 + 3.2.12-SNAPSHOT - 4.1.5 + 4.1.5-SNAPSHOT UTF-8 17 2.8.3 diff --git a/spring-cloud-task-samples/pom.xml b/spring-cloud-task-samples/pom.xml index 8cdf0422..0fae530c 100644 --- a/spring-cloud-task-samples/pom.xml +++ b/spring-cloud-task-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3 + 3.1.4-SNAPSHOT diff --git a/spring-cloud-task-samples/single-step-batch-job/pom.xml b/spring-cloud-task-samples/single-step-batch-job/pom.xml index fd95ff23..a9c46257 100644 --- a/spring-cloud-task-samples/single-step-batch-job/pom.xml +++ b/spring-cloud-task-samples/single-step-batch-job/pom.xml @@ -13,12 +13,12 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12 + 3.2.12-SNAPSHOT - 4.1.5 + 4.1.5-SNAPSHOT true diff --git a/spring-cloud-task-samples/task-events/pom.xml b/spring-cloud-task-samples/task-events/pom.xml index 889a3202..0315304e 100644 --- a/spring-cloud-task-samples/task-events/pom.xml +++ b/spring-cloud-task-samples/task-events/pom.xml @@ -13,14 +13,14 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12 + 3.2.12-SNAPSHOT UTF-8 17 - 4.1.4 + 4.1.4-SNAPSHOT diff --git a/spring-cloud-task-samples/task-observations/pom.xml b/spring-cloud-task-samples/task-observations/pom.xml index ba5da1e2..f7a2bf8d 100644 --- a/spring-cloud-task-samples/task-observations/pom.xml +++ b/spring-cloud-task-samples/task-observations/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-task-samples/taskprocessor/pom.xml b/spring-cloud-task-samples/taskprocessor/pom.xml index f3cb4620..99d95079 100644 --- a/spring-cloud-task-samples/taskprocessor/pom.xml +++ b/spring-cloud-task-samples/taskprocessor/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12 + 3.2.12-SNAPSHOT UTF-8 true - 4.1.4 + 4.1.4-SNAPSHOT diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml index 1ee54214..c111d3a0 100644 --- a/spring-cloud-task-samples/tasksink/pom.xml +++ b/spring-cloud-task-samples/tasksink/pom.xml @@ -15,15 +15,15 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12 + 3.2.12-SNAPSHOT UTF-8 true - 4.1.4 - 3.1.3 + 4.1.4-SNAPSHOT + 3.1.4-SNAPSHOT 2.9.0 diff --git a/spring-cloud-task-samples/timestamp/pom.xml b/spring-cloud-task-samples/timestamp/pom.xml index 55bcd2b7..a25bc1fd 100644 --- a/spring-cloud-task-samples/timestamp/pom.xml +++ b/spring-cloud-task-samples/timestamp/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12 + 3.2.12-SNAPSHOT diff --git a/spring-cloud-task-stream/pom.xml b/spring-cloud-task-stream/pom.xml index 0163fd1a..b381218e 100644 --- a/spring-cloud-task-stream/pom.xml +++ b/spring-cloud-task-stream/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3 + 3.1.4-SNAPSHOT From bc0cfa0d249e851495c09ad367382fed93d90781 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 26 Nov 2024 16:20:05 +0000 Subject: [PATCH 10/15] Bumping dependency versions after release --- pom.xml | 4 ++-- spring-cloud-starter-single-step-batch-job/pom.xml | 2 +- spring-cloud-task-dependencies/pom.xml | 2 +- spring-cloud-task-integration-tests/pom.xml | 2 +- spring-cloud-task-samples/batch-events/pom.xml | 4 ++-- spring-cloud-task-samples/batch-job/pom.xml | 2 +- spring-cloud-task-samples/jpa-sample/pom.xml | 4 ++-- spring-cloud-task-samples/multiple-datasources/pom.xml | 4 ++-- spring-cloud-task-samples/partitioned-batch-job/pom.xml | 4 ++-- spring-cloud-task-samples/single-step-batch-job/pom.xml | 4 ++-- spring-cloud-task-samples/task-events/pom.xml | 4 ++-- spring-cloud-task-samples/task-observations/pom.xml | 2 +- spring-cloud-task-samples/taskprocessor/pom.xml | 4 ++-- spring-cloud-task-samples/tasksink/pom.xml | 4 ++-- spring-cloud-task-samples/timestamp/pom.xml | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index d8df7d34..b87617d3 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-build - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT @@ -109,7 +109,7 @@ - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT 2.9.1 2.9.1 diff --git a/spring-cloud-starter-single-step-batch-job/pom.xml b/spring-cloud-starter-single-step-batch-job/pom.xml index ebedeac4..b01f2bb5 100644 --- a/spring-cloud-starter-single-step-batch-job/pom.xml +++ b/spring-cloud-starter-single-step-batch-job/pom.xml @@ -10,7 +10,7 @@ spring-cloud-starter-single-step-batch-job - 4.1.5-SNAPSHOT + 4.1.6-SNAPSHOT diff --git a/spring-cloud-task-dependencies/pom.xml b/spring-cloud-task-dependencies/pom.xml index b60df271..74b8e758 100644 --- a/spring-cloud-task-dependencies/pom.xml +++ b/spring-cloud-task-dependencies/pom.xml @@ -10,7 +10,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT diff --git a/spring-cloud-task-integration-tests/pom.xml b/spring-cloud-task-integration-tests/pom.xml index d42c83ca..2e301048 100644 --- a/spring-cloud-task-integration-tests/pom.xml +++ b/spring-cloud-task-integration-tests/pom.xml @@ -13,7 +13,7 @@ spring-cloud-task-integration-tests - 4.1.5-SNAPSHOT + 4.1.6-SNAPSHOT diff --git a/spring-cloud-task-samples/batch-events/pom.xml b/spring-cloud-task-samples/batch-events/pom.xml index ba2bcc7e..445f05ba 100644 --- a/spring-cloud-task-samples/batch-events/pom.xml +++ b/spring-cloud-task-samples/batch-events/pom.xml @@ -13,14 +13,14 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 UTF-8 17 - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT 3.1.4-SNAPSHOT diff --git a/spring-cloud-task-samples/batch-job/pom.xml b/spring-cloud-task-samples/batch-job/pom.xml index faa9a8e7..be5cd41e 100644 --- a/spring-cloud-task-samples/batch-job/pom.xml +++ b/spring-cloud-task-samples/batch-job/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-task-samples/jpa-sample/pom.xml b/spring-cloud-task-samples/jpa-sample/pom.xml index 2d3466e9..88d2095d 100644 --- a/spring-cloud-task-samples/jpa-sample/pom.xml +++ b/spring-cloud-task-samples/jpa-sample/pom.xml @@ -13,12 +13,12 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 - 4.1.5-SNAPSHOT + 4.1.6-SNAPSHOT UTF-8 17 diff --git a/spring-cloud-task-samples/multiple-datasources/pom.xml b/spring-cloud-task-samples/multiple-datasources/pom.xml index b0acb473..7218b3c8 100644 --- a/spring-cloud-task-samples/multiple-datasources/pom.xml +++ b/spring-cloud-task-samples/multiple-datasources/pom.xml @@ -14,12 +14,12 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 - 4.1.5-SNAPSHOT + 4.1.6-SNAPSHOT UTF-8 17 diff --git a/spring-cloud-task-samples/partitioned-batch-job/pom.xml b/spring-cloud-task-samples/partitioned-batch-job/pom.xml index c1785d12..c7aa2a0e 100644 --- a/spring-cloud-task-samples/partitioned-batch-job/pom.xml +++ b/spring-cloud-task-samples/partitioned-batch-job/pom.xml @@ -12,12 +12,12 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 - 4.1.5-SNAPSHOT + 4.1.6-SNAPSHOT UTF-8 17 2.8.3 diff --git a/spring-cloud-task-samples/single-step-batch-job/pom.xml b/spring-cloud-task-samples/single-step-batch-job/pom.xml index a9c46257..08e25f54 100644 --- a/spring-cloud-task-samples/single-step-batch-job/pom.xml +++ b/spring-cloud-task-samples/single-step-batch-job/pom.xml @@ -13,12 +13,12 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 - 4.1.5-SNAPSHOT + 4.1.6-SNAPSHOT true diff --git a/spring-cloud-task-samples/task-events/pom.xml b/spring-cloud-task-samples/task-events/pom.xml index 0315304e..ba586627 100644 --- a/spring-cloud-task-samples/task-events/pom.xml +++ b/spring-cloud-task-samples/task-events/pom.xml @@ -13,14 +13,14 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 UTF-8 17 - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT diff --git a/spring-cloud-task-samples/task-observations/pom.xml b/spring-cloud-task-samples/task-observations/pom.xml index f7a2bf8d..ba5da1e2 100644 --- a/spring-cloud-task-samples/task-observations/pom.xml +++ b/spring-cloud-task-samples/task-observations/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 diff --git a/spring-cloud-task-samples/taskprocessor/pom.xml b/spring-cloud-task-samples/taskprocessor/pom.xml index 99d95079..fd64720e 100644 --- a/spring-cloud-task-samples/taskprocessor/pom.xml +++ b/spring-cloud-task-samples/taskprocessor/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 UTF-8 true - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml index c111d3a0..6f3b4cc5 100644 --- a/spring-cloud-task-samples/tasksink/pom.xml +++ b/spring-cloud-task-samples/tasksink/pom.xml @@ -15,14 +15,14 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 UTF-8 true - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT 3.1.4-SNAPSHOT 2.9.0 diff --git a/spring-cloud-task-samples/timestamp/pom.xml b/spring-cloud-task-samples/timestamp/pom.xml index a25bc1fd..55bcd2b7 100644 --- a/spring-cloud-task-samples/timestamp/pom.xml +++ b/spring-cloud-task-samples/timestamp/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12-SNAPSHOT + 3.2.12 From b93e1fcbdf7cc4d67554bafc649199e6fb83e4e7 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Wed, 27 Nov 2024 01:20:59 +0000 Subject: [PATCH 11/15] Update SNAPSHOT to 3.1.3 --- docs/pom.xml | 2 +- pom.xml | 6 +- .../pom.xml | 4 +- spring-cloud-starter-task/pom.xml | 2 +- spring-cloud-task-batch/pom.xml | 2 +- spring-cloud-task-core/pom.xml | 2 +- .../.flattened-pom.xml | 160 ++++++++++++++++++ spring-cloud-task-dependencies/pom.xml | 4 +- spring-cloud-task-integration-tests/pom.xml | 4 +- .../batch-events/pom.xml | 4 +- spring-cloud-task-samples/jpa-sample/pom.xml | 2 +- .../multiple-datasources/pom.xml | 2 +- .../partitioned-batch-job/pom.xml | 2 +- spring-cloud-task-samples/pom.xml | 2 +- .../single-step-batch-job/pom.xml | 2 +- spring-cloud-task-samples/task-events/pom.xml | 2 +- .../taskprocessor/pom.xml | 2 +- spring-cloud-task-samples/tasksink/pom.xml | 4 +- spring-cloud-task-stream/pom.xml | 2 +- 19 files changed, 185 insertions(+), 25 deletions(-) create mode 100644 spring-cloud-task-dependencies/.flattened-pom.xml diff --git a/docs/pom.xml b/docs/pom.xml index d27d5e2a..41535e67 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.4-SNAPSHOT + 3.1.3 jar Spring Cloud Task Docs diff --git a/pom.xml b/pom.xml index b87617d3..95593ee9 100755 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ org.springframework.cloud spring-cloud-build - 4.1.5-SNAPSHOT + 4.1.4 org.springframework.cloud spring-cloud-task-parent - 3.1.4-SNAPSHOT + 3.1.3 pom Spring Cloud Task Build Spring Cloud Task Build @@ -109,7 +109,7 @@ - 4.1.5-SNAPSHOT + 4.1.4 2.9.1 2.9.1 diff --git a/spring-cloud-starter-single-step-batch-job/pom.xml b/spring-cloud-starter-single-step-batch-job/pom.xml index b01f2bb5..81e4658a 100644 --- a/spring-cloud-starter-single-step-batch-job/pom.xml +++ b/spring-cloud-starter-single-step-batch-job/pom.xml @@ -3,14 +3,14 @@ spring-cloud-task-parent org.springframework.cloud - 3.1.4-SNAPSHOT + 3.1.3 4.0.0 spring-cloud-starter-single-step-batch-job - 4.1.6-SNAPSHOT + 4.1.5 diff --git a/spring-cloud-starter-task/pom.xml b/spring-cloud-starter-task/pom.xml index f512c60a..0ec46725 100644 --- a/spring-cloud-starter-task/pom.xml +++ b/spring-cloud-starter-task/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.4-SNAPSHOT + 3.1.3 spring-cloud-starter-task diff --git a/spring-cloud-task-batch/pom.xml b/spring-cloud-task-batch/pom.xml index f2d6f782..1de4d7ad 100644 --- a/spring-cloud-task-batch/pom.xml +++ b/spring-cloud-task-batch/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.4-SNAPSHOT + 3.1.3 spring-cloud-task-batch diff --git a/spring-cloud-task-core/pom.xml b/spring-cloud-task-core/pom.xml index 56d88a6f..538da97f 100755 --- a/spring-cloud-task-core/pom.xml +++ b/spring-cloud-task-core/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.4-SNAPSHOT + 3.1.3 spring-cloud-task-core diff --git a/spring-cloud-task-dependencies/.flattened-pom.xml b/spring-cloud-task-dependencies/.flattened-pom.xml new file mode 100644 index 00000000..215aa99c --- /dev/null +++ b/spring-cloud-task-dependencies/.flattened-pom.xml @@ -0,0 +1,160 @@ + + + 4.0.0 + + org.springframework.cloud + spring-cloud-dependencies-parent + 4.1.4 + + + org.springframework.cloud + spring-cloud-task-dependencies + 3.1.3 + pom + Spring Cloud Task Dependencies + Spring Cloud Task Dependencies + https://projects.spring.io/spring-cloud/spring-cloud-task-dependencies/ + + Pivotal Software, Inc. + https://www.spring.io + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0 + Copyright 2014-2021 the original author or authors. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + https://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. + + See the License for the specific language governing permissions and + limitations under the License. + + + + + dsyer + Dave Syer + dsyer at pivotal.io + Pivotal Software, Inc. + https://www.spring.io + + Project lead + + + + sgibb + Spencer Gibb + sgibb at pivotal.io + Pivotal Software, Inc. + https://www.spring.io + + Project lead + + + + + scm:git:git://github.com/spring-cloud/spring-cloud-build.git/spring-cloud-task-dependencies + scm:git:ssh://git@github.com/spring-cloud/spring-cloud-build.git/spring-cloud-task-dependencies + https://github.com/spring-cloud/spring-cloud-build/spring-cloud-task-dependencies + + + + repo.spring.io + Spring Release Repository + https://repo.spring.io/libs-release-local + + + repo.spring.io + Spring Snapshot Repository + https://repo.spring.io/libs-snapshot-local + + + spring-docs + https:/docs.spring.io/spring-cloud-dependencies-parent/docs/4.1.4/reference/html/spring-cloud-task-dependencies/ + + https://github.com/spring-cloud + + + + + org.springframework.cloud + spring-cloud-starter-task + ${project.version} + + + org.springframework.cloud + spring-cloud-task-core + ${project.version} + + + org.springframework.cloud + spring-cloud-task-batch + ${project.version} + + + org.springframework.cloud + spring-cloud-task-stream + ${project.version} + + + + + + spring + + + + true + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + + + false + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + + + false + + spring-releases + Spring Releases + https://repo.spring.io/release + + + + + + true + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + + + false + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + + + + diff --git a/spring-cloud-task-dependencies/pom.xml b/spring-cloud-task-dependencies/pom.xml index 74b8e758..c17dfb54 100644 --- a/spring-cloud-task-dependencies/pom.xml +++ b/spring-cloud-task-dependencies/pom.xml @@ -2,7 +2,7 @@ 4.0.0 spring-cloud-task-dependencies - 3.1.4-SNAPSHOT + 3.1.3 pom Spring Cloud Task Dependencies Spring Cloud Task Dependencies @@ -10,7 +10,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.1.5-SNAPSHOT + 4.1.4 diff --git a/spring-cloud-task-integration-tests/pom.xml b/spring-cloud-task-integration-tests/pom.xml index 2e301048..1031cdb9 100644 --- a/spring-cloud-task-integration-tests/pom.xml +++ b/spring-cloud-task-integration-tests/pom.xml @@ -3,7 +3,7 @@ spring-cloud-task-parent org.springframework.cloud - 3.1.4-SNAPSHOT + 3.1.3 4.0.0 Spring Cloud Task Integration Tests @@ -13,7 +13,7 @@ spring-cloud-task-integration-tests - 4.1.6-SNAPSHOT + 4.1.5 diff --git a/spring-cloud-task-samples/batch-events/pom.xml b/spring-cloud-task-samples/batch-events/pom.xml index 445f05ba..ea41e2e1 100644 --- a/spring-cloud-task-samples/batch-events/pom.xml +++ b/spring-cloud-task-samples/batch-events/pom.xml @@ -20,8 +20,8 @@ UTF-8 17 - 4.1.5-SNAPSHOT - 3.1.4-SNAPSHOT + 4.1.4 + 3.1.3 diff --git a/spring-cloud-task-samples/jpa-sample/pom.xml b/spring-cloud-task-samples/jpa-sample/pom.xml index 88d2095d..7e948996 100644 --- a/spring-cloud-task-samples/jpa-sample/pom.xml +++ b/spring-cloud-task-samples/jpa-sample/pom.xml @@ -18,7 +18,7 @@ - 4.1.6-SNAPSHOT + 4.1.5 UTF-8 17 diff --git a/spring-cloud-task-samples/multiple-datasources/pom.xml b/spring-cloud-task-samples/multiple-datasources/pom.xml index 7218b3c8..3956856d 100644 --- a/spring-cloud-task-samples/multiple-datasources/pom.xml +++ b/spring-cloud-task-samples/multiple-datasources/pom.xml @@ -19,7 +19,7 @@ - 4.1.6-SNAPSHOT + 4.1.5 UTF-8 17 diff --git a/spring-cloud-task-samples/partitioned-batch-job/pom.xml b/spring-cloud-task-samples/partitioned-batch-job/pom.xml index c7aa2a0e..531d5dbd 100644 --- a/spring-cloud-task-samples/partitioned-batch-job/pom.xml +++ b/spring-cloud-task-samples/partitioned-batch-job/pom.xml @@ -17,7 +17,7 @@ - 4.1.6-SNAPSHOT + 4.1.5 UTF-8 17 2.8.3 diff --git a/spring-cloud-task-samples/pom.xml b/spring-cloud-task-samples/pom.xml index 0fae530c..8cdf0422 100644 --- a/spring-cloud-task-samples/pom.xml +++ b/spring-cloud-task-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.4-SNAPSHOT + 3.1.3 diff --git a/spring-cloud-task-samples/single-step-batch-job/pom.xml b/spring-cloud-task-samples/single-step-batch-job/pom.xml index 08e25f54..fd95ff23 100644 --- a/spring-cloud-task-samples/single-step-batch-job/pom.xml +++ b/spring-cloud-task-samples/single-step-batch-job/pom.xml @@ -18,7 +18,7 @@ - 4.1.6-SNAPSHOT + 4.1.5 true diff --git a/spring-cloud-task-samples/task-events/pom.xml b/spring-cloud-task-samples/task-events/pom.xml index ba586627..889a3202 100644 --- a/spring-cloud-task-samples/task-events/pom.xml +++ b/spring-cloud-task-samples/task-events/pom.xml @@ -20,7 +20,7 @@ UTF-8 17 - 4.1.5-SNAPSHOT + 4.1.4 diff --git a/spring-cloud-task-samples/taskprocessor/pom.xml b/spring-cloud-task-samples/taskprocessor/pom.xml index fd64720e..f3cb4620 100644 --- a/spring-cloud-task-samples/taskprocessor/pom.xml +++ b/spring-cloud-task-samples/taskprocessor/pom.xml @@ -21,7 +21,7 @@ UTF-8 true - 4.1.5-SNAPSHOT + 4.1.4 diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml index 6f3b4cc5..1ee54214 100644 --- a/spring-cloud-task-samples/tasksink/pom.xml +++ b/spring-cloud-task-samples/tasksink/pom.xml @@ -22,8 +22,8 @@ UTF-8 true - 4.1.5-SNAPSHOT - 3.1.4-SNAPSHOT + 4.1.4 + 3.1.3 2.9.0 diff --git a/spring-cloud-task-stream/pom.xml b/spring-cloud-task-stream/pom.xml index b381218e..0163fd1a 100644 --- a/spring-cloud-task-stream/pom.xml +++ b/spring-cloud-task-stream/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.4-SNAPSHOT + 3.1.3 From 81fe5432e8f39fb4d6ae9ca9028d9c57346f9c5b Mon Sep 17 00:00:00 2001 From: spring-builds Date: Wed, 27 Nov 2024 01:22:48 +0000 Subject: [PATCH 12/15] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 6 +- .../pom.xml | 4 +- spring-cloud-starter-task/pom.xml | 2 +- spring-cloud-task-batch/pom.xml | 2 +- spring-cloud-task-core/pom.xml | 2 +- .../.flattened-pom.xml | 160 ------------------ spring-cloud-task-dependencies/pom.xml | 4 +- spring-cloud-task-integration-tests/pom.xml | 4 +- .../batch-events/pom.xml | 4 +- spring-cloud-task-samples/jpa-sample/pom.xml | 2 +- .../multiple-datasources/pom.xml | 2 +- .../partitioned-batch-job/pom.xml | 2 +- spring-cloud-task-samples/pom.xml | 2 +- .../single-step-batch-job/pom.xml | 2 +- spring-cloud-task-samples/task-events/pom.xml | 2 +- .../taskprocessor/pom.xml | 2 +- spring-cloud-task-samples/tasksink/pom.xml | 4 +- spring-cloud-task-stream/pom.xml | 2 +- 19 files changed, 25 insertions(+), 185 deletions(-) delete mode 100644 spring-cloud-task-dependencies/.flattened-pom.xml diff --git a/docs/pom.xml b/docs/pom.xml index 41535e67..d27d5e2a 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3 + 3.1.4-SNAPSHOT jar Spring Cloud Task Docs diff --git a/pom.xml b/pom.xml index 95593ee9..b87617d3 100755 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ org.springframework.cloud spring-cloud-build - 4.1.4 + 4.1.5-SNAPSHOT org.springframework.cloud spring-cloud-task-parent - 3.1.3 + 3.1.4-SNAPSHOT pom Spring Cloud Task Build Spring Cloud Task Build @@ -109,7 +109,7 @@ - 4.1.4 + 4.1.5-SNAPSHOT 2.9.1 2.9.1 diff --git a/spring-cloud-starter-single-step-batch-job/pom.xml b/spring-cloud-starter-single-step-batch-job/pom.xml index 81e4658a..b01f2bb5 100644 --- a/spring-cloud-starter-single-step-batch-job/pom.xml +++ b/spring-cloud-starter-single-step-batch-job/pom.xml @@ -3,14 +3,14 @@ spring-cloud-task-parent org.springframework.cloud - 3.1.3 + 3.1.4-SNAPSHOT 4.0.0 spring-cloud-starter-single-step-batch-job - 4.1.5 + 4.1.6-SNAPSHOT diff --git a/spring-cloud-starter-task/pom.xml b/spring-cloud-starter-task/pom.xml index 0ec46725..f512c60a 100644 --- a/spring-cloud-starter-task/pom.xml +++ b/spring-cloud-starter-task/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3 + 3.1.4-SNAPSHOT spring-cloud-starter-task diff --git a/spring-cloud-task-batch/pom.xml b/spring-cloud-task-batch/pom.xml index 1de4d7ad..f2d6f782 100644 --- a/spring-cloud-task-batch/pom.xml +++ b/spring-cloud-task-batch/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3 + 3.1.4-SNAPSHOT spring-cloud-task-batch diff --git a/spring-cloud-task-core/pom.xml b/spring-cloud-task-core/pom.xml index 538da97f..56d88a6f 100755 --- a/spring-cloud-task-core/pom.xml +++ b/spring-cloud-task-core/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3 + 3.1.4-SNAPSHOT spring-cloud-task-core diff --git a/spring-cloud-task-dependencies/.flattened-pom.xml b/spring-cloud-task-dependencies/.flattened-pom.xml deleted file mode 100644 index 215aa99c..00000000 --- a/spring-cloud-task-dependencies/.flattened-pom.xml +++ /dev/null @@ -1,160 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-dependencies-parent - 4.1.4 - - - org.springframework.cloud - spring-cloud-task-dependencies - 3.1.3 - pom - Spring Cloud Task Dependencies - Spring Cloud Task Dependencies - https://projects.spring.io/spring-cloud/spring-cloud-task-dependencies/ - - Pivotal Software, Inc. - https://www.spring.io - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - Copyright 2014-2021 the original author or authors. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied. - - See the License for the specific language governing permissions and - limitations under the License. - - - - - dsyer - Dave Syer - dsyer at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - Project lead - - - - sgibb - Spencer Gibb - sgibb at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - Project lead - - - - - scm:git:git://github.com/spring-cloud/spring-cloud-build.git/spring-cloud-task-dependencies - scm:git:ssh://git@github.com/spring-cloud/spring-cloud-build.git/spring-cloud-task-dependencies - https://github.com/spring-cloud/spring-cloud-build/spring-cloud-task-dependencies - - - - repo.spring.io - Spring Release Repository - https://repo.spring.io/libs-release-local - - - repo.spring.io - Spring Snapshot Repository - https://repo.spring.io/libs-snapshot-local - - - spring-docs - https:/docs.spring.io/spring-cloud-dependencies-parent/docs/4.1.4/reference/html/spring-cloud-task-dependencies/ - - https://github.com/spring-cloud - - - - - org.springframework.cloud - spring-cloud-starter-task - ${project.version} - - - org.springframework.cloud - spring-cloud-task-core - ${project.version} - - - org.springframework.cloud - spring-cloud-task-batch - ${project.version} - - - org.springframework.cloud - spring-cloud-task-stream - ${project.version} - - - - - - spring - - - - true - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - - - false - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - - - false - - spring-releases - Spring Releases - https://repo.spring.io/release - - - - - - true - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - - - false - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - - - - diff --git a/spring-cloud-task-dependencies/pom.xml b/spring-cloud-task-dependencies/pom.xml index c17dfb54..74b8e758 100644 --- a/spring-cloud-task-dependencies/pom.xml +++ b/spring-cloud-task-dependencies/pom.xml @@ -2,7 +2,7 @@ 4.0.0 spring-cloud-task-dependencies - 3.1.3 + 3.1.4-SNAPSHOT pom Spring Cloud Task Dependencies Spring Cloud Task Dependencies @@ -10,7 +10,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.1.4 + 4.1.5-SNAPSHOT diff --git a/spring-cloud-task-integration-tests/pom.xml b/spring-cloud-task-integration-tests/pom.xml index 1031cdb9..2e301048 100644 --- a/spring-cloud-task-integration-tests/pom.xml +++ b/spring-cloud-task-integration-tests/pom.xml @@ -3,7 +3,7 @@ spring-cloud-task-parent org.springframework.cloud - 3.1.3 + 3.1.4-SNAPSHOT 4.0.0 Spring Cloud Task Integration Tests @@ -13,7 +13,7 @@ spring-cloud-task-integration-tests - 4.1.5 + 4.1.6-SNAPSHOT diff --git a/spring-cloud-task-samples/batch-events/pom.xml b/spring-cloud-task-samples/batch-events/pom.xml index ea41e2e1..445f05ba 100644 --- a/spring-cloud-task-samples/batch-events/pom.xml +++ b/spring-cloud-task-samples/batch-events/pom.xml @@ -20,8 +20,8 @@ UTF-8 17 - 4.1.4 - 3.1.3 + 4.1.5-SNAPSHOT + 3.1.4-SNAPSHOT diff --git a/spring-cloud-task-samples/jpa-sample/pom.xml b/spring-cloud-task-samples/jpa-sample/pom.xml index 7e948996..88d2095d 100644 --- a/spring-cloud-task-samples/jpa-sample/pom.xml +++ b/spring-cloud-task-samples/jpa-sample/pom.xml @@ -18,7 +18,7 @@ - 4.1.5 + 4.1.6-SNAPSHOT UTF-8 17 diff --git a/spring-cloud-task-samples/multiple-datasources/pom.xml b/spring-cloud-task-samples/multiple-datasources/pom.xml index 3956856d..7218b3c8 100644 --- a/spring-cloud-task-samples/multiple-datasources/pom.xml +++ b/spring-cloud-task-samples/multiple-datasources/pom.xml @@ -19,7 +19,7 @@ - 4.1.5 + 4.1.6-SNAPSHOT UTF-8 17 diff --git a/spring-cloud-task-samples/partitioned-batch-job/pom.xml b/spring-cloud-task-samples/partitioned-batch-job/pom.xml index 531d5dbd..c7aa2a0e 100644 --- a/spring-cloud-task-samples/partitioned-batch-job/pom.xml +++ b/spring-cloud-task-samples/partitioned-batch-job/pom.xml @@ -17,7 +17,7 @@ - 4.1.5 + 4.1.6-SNAPSHOT UTF-8 17 2.8.3 diff --git a/spring-cloud-task-samples/pom.xml b/spring-cloud-task-samples/pom.xml index 8cdf0422..0fae530c 100644 --- a/spring-cloud-task-samples/pom.xml +++ b/spring-cloud-task-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3 + 3.1.4-SNAPSHOT diff --git a/spring-cloud-task-samples/single-step-batch-job/pom.xml b/spring-cloud-task-samples/single-step-batch-job/pom.xml index fd95ff23..08e25f54 100644 --- a/spring-cloud-task-samples/single-step-batch-job/pom.xml +++ b/spring-cloud-task-samples/single-step-batch-job/pom.xml @@ -18,7 +18,7 @@ - 4.1.5 + 4.1.6-SNAPSHOT true diff --git a/spring-cloud-task-samples/task-events/pom.xml b/spring-cloud-task-samples/task-events/pom.xml index 889a3202..ba586627 100644 --- a/spring-cloud-task-samples/task-events/pom.xml +++ b/spring-cloud-task-samples/task-events/pom.xml @@ -20,7 +20,7 @@ UTF-8 17 - 4.1.4 + 4.1.5-SNAPSHOT diff --git a/spring-cloud-task-samples/taskprocessor/pom.xml b/spring-cloud-task-samples/taskprocessor/pom.xml index f3cb4620..fd64720e 100644 --- a/spring-cloud-task-samples/taskprocessor/pom.xml +++ b/spring-cloud-task-samples/taskprocessor/pom.xml @@ -21,7 +21,7 @@ UTF-8 true - 4.1.4 + 4.1.5-SNAPSHOT diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml index 1ee54214..6f3b4cc5 100644 --- a/spring-cloud-task-samples/tasksink/pom.xml +++ b/spring-cloud-task-samples/tasksink/pom.xml @@ -22,8 +22,8 @@ UTF-8 true - 4.1.4 - 3.1.3 + 4.1.5-SNAPSHOT + 3.1.4-SNAPSHOT 2.9.0 diff --git a/spring-cloud-task-stream/pom.xml b/spring-cloud-task-stream/pom.xml index 0163fd1a..b381218e 100644 --- a/spring-cloud-task-stream/pom.xml +++ b/spring-cloud-task-stream/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-task-parent - 3.1.3 + 3.1.4-SNAPSHOT From 0a402b34838fd69ce5b1e0c01ab6d617fc0f9b38 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 27 Nov 2024 17:57:32 +0100 Subject: [PATCH 13/15] Revert "Update pom.xml" This reverts commit e1358640b409493622083612af7f374b60fb0a96. --- docs/pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index d27d5e2a..732bbec3 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -26,7 +26,6 @@ .* ${maven.multiModuleProjectDirectory}/docs/modules/ROOT/partials/ - src/main/asciidoc From 95406386c51ee36982acb328b157ebedc78202b9 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Tue, 17 Dec 2024 14:52:34 -0500 Subject: [PATCH 14/15] Add the ability to disable configuration properties in docs pom --- docs/antora.yml | 2 +- docs/pom.xml | 32 ++++++++++++++++++++------------ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index a1c0b6b6..26780132 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -6,7 +6,7 @@ nav: ext: collector: run: - command: ./mvnw --no-transfer-progress -B process-resources -Pdocs -pl docs -Dantora-maven-plugin.phase=none -Dgenerate-docs.phase=none -Dgenerate-readme.phase=none -Dgenerate-cloud-resources.phase=none -Dmaven-dependency-plugin-for-docs.phase=none -Dmaven-dependency-plugin-for-docs-classes.phase=none -DskipTests + command: ./mvnw --no-transfer-progress -B process-resources -Pdocs -pl docs -Dantora-maven-plugin.phase=none -Dgenerate-docs.phase=none -Dgenerate-readme.phase=none -Dgenerate-cloud-resources.phase=none -Dmaven-dependency-plugin-for-docs.phase=none -Dmaven-dependency-plugin-for-docs-classes.phase=none -DskipTests --DdisableConfigurationProperties local: true scan: dir: ./target/classes/antora-resources/ diff --git a/docs/pom.xml b/docs/pom.xml index 732bbec3..a7ab3176 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -26,22 +26,30 @@ .* ${maven.multiModuleProjectDirectory}/docs/modules/ROOT/partials/ - - - ${project.groupId} - spring-cloud-starter-single-step-batch-job - ${project.version} - - - ${project.groupId} - spring-cloud-starter-task - ${project.version} - - src/main/asciidoc + + enable-configuration-properties + + + !disableConfigurationProperties + + + + + ${project.groupId} + spring-cloud-starter-single-step-batch-job + ${project.version} + + + ${project.groupId} + spring-cloud-starter-task + ${project.version} + + + docs From 4f1153ebd4eb1a2be6783f27b9c4b61749b2366d Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Tue, 17 Dec 2024 15:19:03 -0500 Subject: [PATCH 15/15] Fixing mvn command --- docs/antora.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/antora.yml b/docs/antora.yml index 26780132..dd6c7cff 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -6,7 +6,7 @@ nav: ext: collector: run: - command: ./mvnw --no-transfer-progress -B process-resources -Pdocs -pl docs -Dantora-maven-plugin.phase=none -Dgenerate-docs.phase=none -Dgenerate-readme.phase=none -Dgenerate-cloud-resources.phase=none -Dmaven-dependency-plugin-for-docs.phase=none -Dmaven-dependency-plugin-for-docs-classes.phase=none -DskipTests --DdisableConfigurationProperties + command: ./mvnw --no-transfer-progress -B process-resources -Pdocs -pl docs -Dantora-maven-plugin.phase=none -Dgenerate-docs.phase=none -Dgenerate-readme.phase=none -Dgenerate-cloud-resources.phase=none -Dmaven-dependency-plugin-for-docs.phase=none -Dmaven-dependency-plugin-for-docs-classes.phase=none -DskipTests -DdisableConfigurationProperties local: true scan: dir: ./target/classes/antora-resources/