Merge branch 'master' into ib/simplify-gh-event-processor

Author: ibodrov

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

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

docker-images/base/oss/debian/Dockerfile

@@ -32,7 +32,10 @@ ENV LANG en_US.UTF-8
 RUN virtualenv /usr/local/bin/concord_venv && \
     /usr/local/bin/concord_venv/bin/pip3 --no-cache-dir install dumb-init
 
-RUN groupadd -g 456 concord && useradd --no-log-init -u 456 -g concord -m -s /sbin/nologin concord
+RUN groupadd -g 456 concord && \
+    useradd --no-log-init -u 456 -g concord -m -s /sbin/nologin concord && \
+    echo "[safe]\n\tdirectory = *\n" > ~concord/.gitconfig && \
+    chown concord:concord ~concord/.gitconfig
 
 # Point /bin/sh to bash from dash
 RUN echo "dash dash/sh boolean false" | debconf-set-selections && \

plugins/tasks/smtp/pom.xml

@@ -36,6 +36,12 @@
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>javax.mail</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.activation</groupId>
+                    <artifactId>activation</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.sun.activation</groupId>

runtime/v2/runner/pom.xml

@@ -200,6 +200,12 @@
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.activation</groupId>
+                    <artifactId>javax.activation-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>

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";
 
         /**