From 519dd504f08c171406758b093cd8c4e7db237552 Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Thu, 12 Sep 2024 11:23:47 -0400 Subject: [PATCH 1/4] concord-sdk: add missing @Deprecated annotations --- sdk/src/main/java/com/walmartlabs/concord/sdk/Constants.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/src/main/java/com/walmartlabs/concord/sdk/Constants.java b/sdk/src/main/java/com/walmartlabs/concord/sdk/Constants.java index b5a1a1a71f..ab5db57701 100644 --- a/sdk/src/main/java/com/walmartlabs/concord/sdk/Constants.java +++ b/sdk/src/main/java/com/walmartlabs/concord/sdk/Constants.java @@ -206,6 +206,7 @@ public static class Request { * Container configuration. * @deprecated the container-per-process execution mode is deprecated. */ + @Deprecated public static final String CONTAINER = "container"; /** @@ -242,6 +243,7 @@ public static class Request { * Resume event name. Filled in for processes resumed after being suspended. * @deprecated see {@link #RESUME_EVENTS_KEY} */ + @Deprecated public static final String EVENT_NAME_KEY = "resumeEventName"; /** @@ -461,6 +463,7 @@ public static class Files { * File which contains process session token. * @deprecated use {@code ProcessConfiguration#sessionToken()} */ + @Deprecated public static final String SESSION_TOKEN_FILE_NAME = ".session_token"; /** From 7454917705d1ffac53abbb0872e8114695c6da5a Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Thu, 12 Sep 2024 11:27:48 -0400 Subject: [PATCH 2/4] smtp-tasks: remove redundant dependency maven-shade-plugin complained about overlapping classes between javax.activation-1.2.0.jar and activation-1.1.jar. --- plugins/tasks/smtp/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugins/tasks/smtp/pom.xml b/plugins/tasks/smtp/pom.xml index 1cf1c3f460..3358ff6536 100644 --- a/plugins/tasks/smtp/pom.xml +++ b/plugins/tasks/smtp/pom.xml @@ -36,6 +36,12 @@ com.sun.mail javax.mail + + + javax.activation + activation + + com.sun.activation From fffc68f8b7b28ce69860f00ec277caa7486607e2 Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Thu, 12 Sep 2024 11:38:06 -0400 Subject: [PATCH 3/4] runtime-v2: remove redundant dependency maven-share-plugin complained about overlapping classes between javax.activation-1.2.0.jar and javax.activation-api-1.2.0.jar. --- runtime/v2/runner/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/runtime/v2/runner/pom.xml b/runtime/v2/runner/pom.xml index 4d6d605993..baa33a717c 100644 --- a/runtime/v2/runner/pom.xml +++ b/runtime/v2/runner/pom.xml @@ -200,6 +200,12 @@ javax.xml.bind jaxb-api + + + javax.activation + javax.activation-api + + com.sun.xml.bind From 4e1dfa5f22cbf5423913fbea21e619dd43f0bc14 Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Sat, 14 Sep 2024 14:18:28 -0400 Subject: [PATCH 4/4] project: update README and NOTES --- NOTES.md | 30 ++++++++++++++++++++++++++++-- README.md | 8 ++++---- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/NOTES.md b/NOTES.md index a222773935..6d048742bd 100644 --- a/NOTES.md +++ b/NOTES.md @@ -5,5 +5,31 @@ Prefer explicit binding using `com.google.inject.Module` over `@Named` annotations. Use `@Named` for top-level modules and server plugins. -Some classes require explicit bindings using `Multibinder.newSetBinder`: -- com.walmartlabs.concord.server.sdk.ScheduledTask +Some classes require explicit binding using `Multibinder.newSetBinder`: +- ApiDescriptor +- AuditLogListener +- AuthenticationHandler +- BackgroundTask +- Component +- ContextHandlerConfigurator +- CustomEnqueueProcessor +- ExceptionMapper +- Filter +- FilterChainConfigurator +- FilterHolder +- GaugeProvider +- HttpServlet +- ModeProcessor +- PolicyApplier +- ProcessEventListener +- ProcessLogListener +- ProcessStatusListener +- ProcessWaitHandler +- Realm +- RepositoryRefreshListener +- RequestErrorHandler +- ScheduledTask +- SecretStore +- ServletContextListener +- ServletHolder +- UserInfoProvider \ No newline at end of file diff --git a/README.md b/README.md index ab2d1ab71a..518fe94b8d 100644 --- a/README.md +++ b/README.md @@ -103,15 +103,15 @@ See the [examples](examples) directory. ## How To Release New Versions -- perform the regular Maven release: +- perform a regular Maven release: ``` $ ./mvnw release:prepare release:perform ``` -- push the tags: +- push the new tag: ``` - $ git push --tags + $ git push origin RELEASE_TAG ``` -- sync to Central; +- sync to [Central](https://central.sonatype.com/); - build and push the Docker images: ``` $ git checkout RELEASE_TAG