From 9971062ab83e625de4408be0eb74774bee26ee4a Mon Sep 17 00:00:00 2001 From: photowey Date: Mon, 8 Apr 2024 01:16:17 +0800 Subject: [PATCH 1/3] feat: Update version to v1.2(3.7.0.1.2); remove Spring Boot parent. Signed-off-by: photowey --- kafka-plus-autoconfigure/pom.xml | 2 +- kafka-plus-core/pom.xml | 2 +- kafka-plus-engine/pom.xml | 2 +- kafka-plus-jackson/pom.xml | 2 +- kafka-plus-runtime/pom.xml | 2 +- kafkaplus-spring-boot-starter/pom.xml | 11 ++++++++++- kafkaplus-spring-boot3-starter/pom.xml | 25 ++++++++++++++++++++++++- pom.xml | 16 +++++++++------- 8 files changed, 48 insertions(+), 14 deletions(-) diff --git a/kafka-plus-autoconfigure/pom.xml b/kafka-plus-autoconfigure/pom.xml index 892becf..a858913 100644 --- a/kafka-plus-autoconfigure/pom.xml +++ b/kafka-plus-autoconfigure/pom.xml @@ -7,7 +7,7 @@ io.github.photowey kafka-plus - 3.7.0.1.1 + 3.7.0.1.2-SNAPSHOT kafka-plus-autoconfigure diff --git a/kafka-plus-core/pom.xml b/kafka-plus-core/pom.xml index 35dbdaf..7ba71a7 100644 --- a/kafka-plus-core/pom.xml +++ b/kafka-plus-core/pom.xml @@ -7,7 +7,7 @@ io.github.photowey kafka-plus - 3.7.0.1.1 + 3.7.0.1.2-SNAPSHOT kafka-plus-core diff --git a/kafka-plus-engine/pom.xml b/kafka-plus-engine/pom.xml index 94907b4..2f688a5 100644 --- a/kafka-plus-engine/pom.xml +++ b/kafka-plus-engine/pom.xml @@ -7,7 +7,7 @@ io.github.photowey kafka-plus - 3.7.0.1.1 + 3.7.0.1.2-SNAPSHOT kafka-plus-engine diff --git a/kafka-plus-jackson/pom.xml b/kafka-plus-jackson/pom.xml index af3da9a..00944c3 100644 --- a/kafka-plus-jackson/pom.xml +++ b/kafka-plus-jackson/pom.xml @@ -7,7 +7,7 @@ io.github.photowey kafka-plus - 3.7.0.1.1 + 3.7.0.1.2-SNAPSHOT kafka-plus-jackson diff --git a/kafka-plus-runtime/pom.xml b/kafka-plus-runtime/pom.xml index b24e823..eebe9b2 100644 --- a/kafka-plus-runtime/pom.xml +++ b/kafka-plus-runtime/pom.xml @@ -7,7 +7,7 @@ io.github.photowey kafka-plus - 3.7.0.1.1 + 3.7.0.1.2-SNAPSHOT kafka-plus-runtime diff --git a/kafkaplus-spring-boot-starter/pom.xml b/kafkaplus-spring-boot-starter/pom.xml index afbf638..2cb8ca1 100644 --- a/kafkaplus-spring-boot-starter/pom.xml +++ b/kafkaplus-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ io.github.photowey kafka-plus - 3.7.0.1.1 + 3.7.0.1.2-SNAPSHOT kafkaplus-spring-boot-starter @@ -26,6 +26,10 @@ kafka-plus-autoconfigure + + org.springframework.boot + spring-boot-starter + org.springframework.boot spring-boot-autoconfigure @@ -38,6 +42,11 @@ + + org.springframework.boot + spring-boot-starter + ${spring-boot.version} + org.springframework.boot spring-boot-autoconfigure diff --git a/kafkaplus-spring-boot3-starter/pom.xml b/kafkaplus-spring-boot3-starter/pom.xml index 04e9df9..865cd7b 100644 --- a/kafkaplus-spring-boot3-starter/pom.xml +++ b/kafkaplus-spring-boot3-starter/pom.xml @@ -7,7 +7,7 @@ io.github.photowey kafka-plus - 3.7.0.1.1 + 3.7.0.1.2-SNAPSHOT kafkaplus-spring-boot3-starter @@ -26,6 +26,10 @@ kafka-plus-autoconfigure + + org.springframework.boot + spring-boot-starter + org.springframework.boot spring-boot-autoconfigure @@ -38,6 +42,11 @@ + + org.springframework.boot + spring-boot-starter + ${spring-boot-v3.version} + org.springframework.boot spring-boot-autoconfigure @@ -51,4 +60,18 @@ + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 17 + 17 + ${project.build.sourceEncoding} + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index c5518ab..d41cf37 100644 --- a/pom.xml +++ b/pom.xml @@ -4,16 +4,10 @@ 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.7.5 - - io.github.photowey kafka-plus - 3.7.0.1.1 + 3.7.0.1.2-SNAPSHOT pom ${project.groupId}:${project.artifactId} @@ -82,6 +76,8 @@ 2.7.5 3.2.4 + 5.8.2 + https://github.com/photowey/kafka-plus @@ -146,6 +142,12 @@ jackson-datatype-jsr310 ${jackson.version} + + + org.junit.jupiter + junit-jupiter-api + ${junit-jupiter-api.version} + From e63d01ff92fbaa33d990f286d05b69cba7ee6d32 Mon Sep 17 00:00:00 2001 From: photowey Date: Mon, 8 Apr 2024 01:26:16 +0800 Subject: [PATCH 2/3] refactor: Update maven git-commit-id-plugin version Signed-off-by: photowey --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d41cf37..deec4fe 100644 --- a/pom.xml +++ b/pom.xml @@ -298,7 +298,7 @@ limitations under the License. pl.project13.maven git-commit-id-plugin - ${git-commit-id-plugin.version} + ${maven-git-commit-id-plugin.version} git From 020189e59861386a78ec65339b117b4bd5fec2cc Mon Sep 17 00:00:00 2001 From: photowey Date: Mon, 8 Apr 2024 01:27:43 +0800 Subject: [PATCH 3/3] refactor: release v1.2(3.7.0.1.2) Signed-off-by: photowey --- kafka-plus-autoconfigure/pom.xml | 2 +- kafka-plus-core/pom.xml | 2 +- kafka-plus-engine/pom.xml | 2 +- kafka-plus-jackson/pom.xml | 2 +- kafka-plus-runtime/pom.xml | 2 +- kafkaplus-spring-boot-starter/pom.xml | 2 +- kafkaplus-spring-boot3-starter/pom.xml | 2 +- pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/kafka-plus-autoconfigure/pom.xml b/kafka-plus-autoconfigure/pom.xml index a858913..c845881 100644 --- a/kafka-plus-autoconfigure/pom.xml +++ b/kafka-plus-autoconfigure/pom.xml @@ -7,7 +7,7 @@ io.github.photowey kafka-plus - 3.7.0.1.2-SNAPSHOT + 3.7.0.1.2 kafka-plus-autoconfigure diff --git a/kafka-plus-core/pom.xml b/kafka-plus-core/pom.xml index 7ba71a7..fc1f6c9 100644 --- a/kafka-plus-core/pom.xml +++ b/kafka-plus-core/pom.xml @@ -7,7 +7,7 @@ io.github.photowey kafka-plus - 3.7.0.1.2-SNAPSHOT + 3.7.0.1.2 kafka-plus-core diff --git a/kafka-plus-engine/pom.xml b/kafka-plus-engine/pom.xml index 2f688a5..7f347e9 100644 --- a/kafka-plus-engine/pom.xml +++ b/kafka-plus-engine/pom.xml @@ -7,7 +7,7 @@ io.github.photowey kafka-plus - 3.7.0.1.2-SNAPSHOT + 3.7.0.1.2 kafka-plus-engine diff --git a/kafka-plus-jackson/pom.xml b/kafka-plus-jackson/pom.xml index 00944c3..3fc5a7f 100644 --- a/kafka-plus-jackson/pom.xml +++ b/kafka-plus-jackson/pom.xml @@ -7,7 +7,7 @@ io.github.photowey kafka-plus - 3.7.0.1.2-SNAPSHOT + 3.7.0.1.2 kafka-plus-jackson diff --git a/kafka-plus-runtime/pom.xml b/kafka-plus-runtime/pom.xml index eebe9b2..49420d6 100644 --- a/kafka-plus-runtime/pom.xml +++ b/kafka-plus-runtime/pom.xml @@ -7,7 +7,7 @@ io.github.photowey kafka-plus - 3.7.0.1.2-SNAPSHOT + 3.7.0.1.2 kafka-plus-runtime diff --git a/kafkaplus-spring-boot-starter/pom.xml b/kafkaplus-spring-boot-starter/pom.xml index 2cb8ca1..8744d2e 100644 --- a/kafkaplus-spring-boot-starter/pom.xml +++ b/kafkaplus-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ io.github.photowey kafka-plus - 3.7.0.1.2-SNAPSHOT + 3.7.0.1.2 kafkaplus-spring-boot-starter diff --git a/kafkaplus-spring-boot3-starter/pom.xml b/kafkaplus-spring-boot3-starter/pom.xml index 865cd7b..b3c34eb 100644 --- a/kafkaplus-spring-boot3-starter/pom.xml +++ b/kafkaplus-spring-boot3-starter/pom.xml @@ -7,7 +7,7 @@ io.github.photowey kafka-plus - 3.7.0.1.2-SNAPSHOT + 3.7.0.1.2 kafkaplus-spring-boot3-starter diff --git a/pom.xml b/pom.xml index deec4fe..a96de4f 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ io.github.photowey kafka-plus - 3.7.0.1.2-SNAPSHOT + 3.7.0.1.2 pom ${project.groupId}:${project.artifactId}