From f3b4e91745bd06daa5bce2477f8ff7c4cc4c9356 Mon Sep 17 00:00:00 2001 From: tjq Date: Sun, 14 Mar 2021 19:24:15 +0800 Subject: [PATCH] feat: update container template --- .../powerjob-server-common/pom.xml | 1 - powerjob-server/powerjob-server-core/pom.xml | 1 - .../powerjob-server-extension/pom.xml | 1 - .../powerjob-server-migrate/pom.xml | 1 - .../powerjob-server-persistence/pom.xml | 1 - .../powerjob-server-remote/pom.xml | 1 - .../powerjob-server-starter/pom.xml | 1 - .../src/main/resources/banner.txt | 2 +- .../main/resources/oms-template-origin.zip | Bin 10743 -> 45581 bytes .../samples/mr/StaticSliceProcessor.java | 2 +- .../processors/StandaloneProcessorDemo.java | 1 - .../tester/AppendWorkflowContextTester.java | 1 - .../src/main/resources/oms-logback.xml | 26 ------------------ 13 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 powerjob-worker/src/main/resources/oms-logback.xml diff --git a/powerjob-server/powerjob-server-common/pom.xml b/powerjob-server/powerjob-server-common/pom.xml index 67679167..e47070d5 100644 --- a/powerjob-server/powerjob-server-common/pom.xml +++ b/powerjob-server/powerjob-server-common/pom.xml @@ -10,7 +10,6 @@ 4.0.0 - tech.powerjob powerjob-server-common 1.0.0 diff --git a/powerjob-server/powerjob-server-core/pom.xml b/powerjob-server/powerjob-server-core/pom.xml index 796c7865..230d1a44 100644 --- a/powerjob-server/powerjob-server-core/pom.xml +++ b/powerjob-server/powerjob-server-core/pom.xml @@ -10,7 +10,6 @@ 4.0.0 - tech.powerjob powerjob-server-core 1.0.0 diff --git a/powerjob-server/powerjob-server-extension/pom.xml b/powerjob-server/powerjob-server-extension/pom.xml index 5719a0f0..d08385ec 100644 --- a/powerjob-server/powerjob-server-extension/pom.xml +++ b/powerjob-server/powerjob-server-extension/pom.xml @@ -10,7 +10,6 @@ 4.0.0 - tech.powerjob powerjob-server-extension 1.0.0 diff --git a/powerjob-server/powerjob-server-migrate/pom.xml b/powerjob-server/powerjob-server-migrate/pom.xml index 08885792..30faa6de 100644 --- a/powerjob-server/powerjob-server-migrate/pom.xml +++ b/powerjob-server/powerjob-server-migrate/pom.xml @@ -10,7 +10,6 @@ 4.0.0 - tech.powerjob powerjob-server-migrate 1.0.0 diff --git a/powerjob-server/powerjob-server-persistence/pom.xml b/powerjob-server/powerjob-server-persistence/pom.xml index dc6cd63b..6a6dd646 100644 --- a/powerjob-server/powerjob-server-persistence/pom.xml +++ b/powerjob-server/powerjob-server-persistence/pom.xml @@ -10,7 +10,6 @@ 4.0.0 - tech.powerjob powerjob-server-persistence 1.0.0 diff --git a/powerjob-server/powerjob-server-remote/pom.xml b/powerjob-server/powerjob-server-remote/pom.xml index 9012b1d7..d28473f2 100644 --- a/powerjob-server/powerjob-server-remote/pom.xml +++ b/powerjob-server/powerjob-server-remote/pom.xml @@ -10,7 +10,6 @@ 4.0.0 - tech.powerjob powerjob-server-remote 1.0.0 diff --git a/powerjob-server/powerjob-server-starter/pom.xml b/powerjob-server/powerjob-server-starter/pom.xml index 6466ee90..7898019a 100644 --- a/powerjob-server/powerjob-server-starter/pom.xml +++ b/powerjob-server/powerjob-server-starter/pom.xml @@ -10,7 +10,6 @@ 4.0.0 - tech.powerjob powerjob-server-starter 1.0.0 diff --git a/powerjob-server/powerjob-server-starter/src/main/resources/banner.txt b/powerjob-server/powerjob-server-starter/src/main/resources/banner.txt index 228343eb..f3a81eb7 100644 --- a/powerjob-server/powerjob-server-starter/src/main/resources/banner.txt +++ b/powerjob-server/powerjob-server-starter/src/main/resources/banner.txt @@ -11,4 +11,4 @@ ${AnsiColor.BRIGHT_RED} * Maintainer: tengjiqi@gmail.com & Team PowerJob * OfficialWebsite: http://www.powerjob.tech/ * SourceCode: https://github.com/PowerJob/PowerJob -* PoweredBy: SpringBoot${spring-boot.formatted-version} & Akka (v2.6.12) +* PoweredBy: SpringBoot${spring-boot.formatted-version} & Akka (v2.6.12) & Vert.x (v4.0.2) diff --git a/powerjob-server/powerjob-server-starter/src/main/resources/oms-template-origin.zip b/powerjob-server/powerjob-server-starter/src/main/resources/oms-template-origin.zip index 790c49d92f5c9af5188fdbab02879d9bfc217508..95c9fc2c9d6afa17ae38f710c505df388a841006 100644 GIT binary patch literal 45581 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 f9)-rfMy5;kx5d}v6CLGrnjoJ@0t%IGro8( paramsMap = Splitter.on("&").withKeyValueSeparator("=").split(jobParams); diff --git a/powerjob-worker-samples/src/main/java/tech/powerjob/samples/processors/StandaloneProcessorDemo.java b/powerjob-worker-samples/src/main/java/tech/powerjob/samples/processors/StandaloneProcessorDemo.java index 3383bc65..06a96a90 100644 --- a/powerjob-worker-samples/src/main/java/tech/powerjob/samples/processors/StandaloneProcessorDemo.java +++ b/powerjob-worker-samples/src/main/java/tech/powerjob/samples/processors/StandaloneProcessorDemo.java @@ -11,7 +11,6 @@ import java.util.Collections; /** * 单机处理器 示例 - * com.github.kfcfans.powerjob.samples.processors.StandaloneProcessorDemo * * @author tjq * @since 2020/4/17 diff --git a/powerjob-worker-samples/src/main/java/tech/powerjob/samples/tester/AppendWorkflowContextTester.java b/powerjob-worker-samples/src/main/java/tech/powerjob/samples/tester/AppendWorkflowContextTester.java index b40bbfd2..f735b400 100644 --- a/powerjob-worker-samples/src/main/java/tech/powerjob/samples/tester/AppendWorkflowContextTester.java +++ b/powerjob-worker-samples/src/main/java/tech/powerjob/samples/tester/AppendWorkflowContextTester.java @@ -10,7 +10,6 @@ import java.util.Map; /** * 测试追加工作流上下文数据 - * com.github.kfcfans.powerjob.samples.tester.AppendWorkflowContextTester * * @author Echo009 * @since 2021/2/6 diff --git a/powerjob-worker/src/main/resources/oms-logback.xml b/powerjob-worker/src/main/resources/oms-logback.xml deleted file mode 100644 index 6f7b322c..00000000 --- a/powerjob-worker/src/main/resources/oms-logback.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - %d [%t] %-5level %logger{36}.%M\(%file:%line\) - %msg%n - - UTF-8 - - - - - - - - - - - - - - - -