inteligr8/mq-activiti-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade APS to v26.x; more jakarta

Browse Source
This commit is contained in:
brian.long
2026-08-10 12:11:35 -04:00
parent bbf8476cc1
commit 5392fc9676
21 changed files with 124 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parent/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<groupId>com.inteligr8.activiti</groupId>
<artifactId>mq-activiti-ext-parent</artifactId>
<version>1.0-SNAPSHOT</version>
<version>1.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>MQ Activiti Extension Parent</name>
pom.xml
+78 -144
View File
@@ -6,12 +6,11 @@
<parent>
<groupId>com.inteligr8.activiti</groupId>
<artifactId>mq-activiti-ext-parent</artifactId>
<version>1.0-SNAPSHOT</version>
<version>1.1-SNAPSHOT</version>
<relativePath>parent/pom.xml</relativePath>
</parent>
<artifactId>mq-activiti-ext</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>MQ Activiti Extension</name>
@@ -22,28 +21,49 @@
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.release>11</maven.compiler.release>
<aps.docker-tag>docker.inteligr8.com/inteligr8/alfresco-process-services</aps.docker-tag>
<aps.version>25.1.1</aps.version>
<aps.version>26.2.0</aps.version>
<!-- see versions: https://mvnrepository.com/artifact/com.rabbitmq/amqp-client -->
<rabbitmq.version>5.34.0</rabbitmq.version>
<!-- see versions: https://mvnrepository.com/artifact/org.apache.activemq/activemq-client -->
<activemq.version>6.3.0</activemq.version>
<!-- see versions: https://mvnrepository.com/artifact/org.apache.activemq/artemis-jms-client -->
<activemq.jms.version>2.55.0</activemq.jms.version>
<!-- for testing only -->
<spring.version>6.2.5</spring.version>
<activiti.version>8.1.3</activiti.version>
<tomcat-rad.version>10-2.2</tomcat-rad.version>
<aps.docker-tag>docker.inteligr8.com/inteligr8/alfresco-process-services</aps.docker-tag>
<aps.tomcat.opts>-Dinteligr8.mq.connectors.docker-mq.url=failover:\(tcp://${project.artifactId}-mq:61616\)?timeout=3000 -Dinteligr8.mq.connectors.docker-mq.username=admin -Dinteligr8.mq.connectors.docker-mq.password=admin -Dvalidator.editor.dmn.espression=false -Dvalidator.editor.bpmn.disable.scripttask=false -Djavascript.secure-scripting.enabled=false -Djavascript.secure-scripting.enable-class-whitelisting=false -Dbeans.whitelisting.enabled=false -Del.whitelisting.enabled=false -Dshell.whitelisting.enabled=false</aps.tomcat.opts>
<activemq.httpPort>8161</activemq.httpPort>
<!-- reloads in APS are slower than a restart -->
<aps.hotswap.enabled>false</aps.hotswap.enabled>
<rabbitmq.version>5.18.0</rabbitmq.version>
<activemq.version>5.18.7</activemq.version>
<activemq.jms.version>2.52.0</activemq.jms.version>
<activemq.httpPort>8161</activemq.httpPort>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.activiti</groupId>
<artifactId>activiti-app-root</artifactId>
<version>${aps.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.activiti</groupId>
<artifactId>activiti-app</artifactId>
<version>${aps.version}</version>
<classifier>classes</classifier>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<!-- APS and Activiti -->
<dependency>
<groupId>com.activiti</groupId>
<artifactId>activiti-app-rest</artifactId>
<version>${aps.version}</version>
<scope>provided</scope>
<!-- none of these are needed for builds -->
@@ -58,26 +78,6 @@
<groupId>com.activiti</groupId>
<artifactId>aspose-transformation</artifactId>
</exclusion>
<exclusion>
<!-- avoiding log4j-api vulnerabilities -->
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
</exclusion>
<exclusion>
<!-- avoiding old spring-context-support -->
<groupId>com.ryantenney.metrics</groupId>
<artifactId>metrics-spring</artifactId>
</exclusion>
<exclusion>
<!-- avoiding old spring-* versions -->
<groupId>org.activiti</groupId>
<artifactId>activiti-spring</artifactId>
</exclusion>
<exclusion>
<!-- avoiding old tomcat-* versions -->
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- This can help with debugging in IDE; never do RAD or compile with it -->
@@ -85,15 +85,8 @@
<dependency>
<groupId>com.activiti</groupId>
<artifactId>activiti-app</artifactId>
<version>${aps.version}</version>
<classifier>classes</classifier>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
-->
@@ -103,46 +96,16 @@
<artifactId>amqp-client</artifactId>
<version>${rabbitmq.version}</version>
<scope>provided</scope>
<exclusions>
<!-- Use versions included in APS App -->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<version>${activemq.version}</version>
<exclusions>
<!-- Use versions included in APS App -->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.artemis</groupId>
<artifactId>artemis-jms-client</artifactId>
<version>${activemq.jms.version}</version>
<exclusions>
<!-- Use versions included in APS App -->
<exclusion>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>*</artifactId>
</exclusion>
<!-- Use its own shaded version of netty -->
</exclusions>
</dependency>
<!-- Testing only -->
@@ -193,6 +156,10 @@
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.5.4</version>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.7.1</version>
</plugin>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>3.6.1</version>
@@ -206,7 +173,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.7.1</version>
<executions>
<execution>
<id>package-stencil</id>
@@ -234,50 +200,29 @@
</plugin>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
<id>shade-deps</id>
<phase>package</phase>
<goals><goal>shade</goal></goals>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<relocations>
<relocation>
<shadedPattern>shaded.mq.</shadedPattern>
<excludes>
<!-- anything in the root directory of a JAR -->
<exclude>*</exclude>
<!-- anything in the META-INF directory of a JAR -->
<exclude>META-INF/**</exclude>
<!-- anything developed in this extension -->
<exclude>com.activiti.extension.**</exclude>
<exclude>com.inteligr8.activiti.mq.**</exclude>
</excludes>
</relocation>
</relocations>
</configuration>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<includes>
<include>**/*IT.java</include>
</includes>
</configuration>
</plugin>
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.41</version>
<version>2.45</version>
<extensions>true</extensions>
<configuration>
<tiles>
<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-aps-ext-rad-tile -->
<tile>com.inteligr8.ootbee:beedk-aps-ext-rad-tile:[1.1,1.2)</tile>
<tile>com.inteligr8.ootbee:beedk-aps-ext-rad-tile:1.1-SNAPSHOT</tile>
<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-aps-ext-it-tile -->
<tile>com.inteligr8.ootbee:beedk-aps-ext-it-tile:[1.1,1.2)</tile>
<tile>com.inteligr8.ootbee:beedk-aps-ext-it-tile:1.1-SNAPSHOT</tile>
</tiles>
</configuration>
</plugin>
@@ -345,53 +290,42 @@
<aps.timeout>90000</aps.timeout> <!-- tests do some delays -->
</properties>
</profile>
<profile>
<id>apidoc</id>
<build>
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
<fileset>
<directory>${basedir}/apidocs</directory>
</fileset>
</filesets>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.12.0</version>
<executions>
<execution>
<id>generate-doclet</id>
<phase>generate-resources</phase>
<goals><goal>javadoc</goal></goals>
<configuration>
<doclet>com.inteligr8.activiti.doclet.ActivitiDoclet</doclet>
<docletArtifact>
<groupId>com.inteligr8.activiti</groupId>
<artifactId>activiti-api-doclet</artifactId>
<version>1.1.1</version>
</docletArtifact>
<useStandardDocletOptions>false</useStandardDocletOptions>
<destDir>apidocs</destDir>
<reportOutputDirectory>${basedir}</reportOutputDirectory>
<additionalOptions>
<additionalOption>--title 'API Documentation'</additionalOption>
<additionalOption>--apiName '${project.name}</additionalOption>
</additionalOptions>
<profile>
<id>bundle</id>
<build>
<plugins>
<!-- This is required in maven-javadoc-plugin v3.5+ -->
<sourceFileIncludes>**/*.java</sourceFileIncludes>
</configuration>
</execution>
</executions>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<configuration>
<!-- this seems to do nothing; using `filters` -->
<artifactSet>
<excludes>
<exclude>commons-beanutils:commons-beanutils</exclude>
<exclude>commons-collections:commons-collections</exclude>
<exclude>commons-logging:commons-logging</exclude>
<exclude>org.slf4j:*</exclude>
</excludes>
</artifactSet>
<relocations>
<relocation>
<shadedPattern>shaded.mq.</shadedPattern>
<excludes>
<!-- anything in the root directory of a JAR -->
<exclude>*</exclude>
<!-- anything in the META-INF directory of a JAR -->
<exclude>META-INF/**</exclude>
<!-- anything developed in this extension -->
<exclude>com.activiti.extension.**</exclude>
<exclude>com.inteligr8.activiti.mq.**</exclude>
</excludes>
</relocation>
</relocations>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</plugins>
</build>
</profile>
</profiles>
<repositories>
src/main/java/com/inteligr8/activiti/mq/AbstractMqDelegate.java
+1 -1
View File
@@ -6,7 +6,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeoutException;
import javax.jms.JMSException;
import jakarta.jms.JMSException;
import org.activiti.engine.delegate.JavaDelegate;
import org.slf4j.Logger;
src/main/java/com/inteligr8/activiti/mq/ActivitiEntityEventMonitor.java
+2 -2
View File
@@ -2,8 +2,8 @@ package com.inteligr8.activiti.mq;
import java.util.List;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
import org.activiti.engine.ProcessEngine;
import org.activiti.engine.delegate.event.ActivitiEntityEvent;
src/main/java/com/inteligr8/activiti/mq/GenericDestination.java
+4 -4
View File
@@ -1,9 +1,9 @@
package com.inteligr8.activiti.mq;
import javax.jms.JMSException;
import javax.jms.Queue;
import javax.jms.Session;
import javax.jms.Topic;
import jakarta.jms.JMSException;
import jakarta.jms.Queue;
import jakarta.jms.Session;
import jakarta.jms.Topic;
public class GenericDestination {
src/main/java/com/inteligr8/activiti/mq/MqCommunicationService.java
+1 -1
View File
@@ -4,7 +4,7 @@ import java.net.URI;
import java.util.HashMap;
import java.util.Map;
import javax.jms.JMSException;
import jakarta.jms.JMSException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
src/main/java/com/inteligr8/activiti/mq/MqCommunicator.java
+1 -1
View File
@@ -3,7 +3,7 @@ package com.inteligr8.activiti.mq;
import java.io.IOException;
import java.util.concurrent.TimeoutException;
import javax.jms.JMSException;
import jakarta.jms.JMSException;
import com.inteligr8.activiti.mq.model.DeliveredMessage;
import com.inteligr8.activiti.mq.model.PreparedMessage;
src/main/java/com/inteligr8/activiti/mq/MqPublishDelegate.java
+1 -1
View File
@@ -3,7 +3,7 @@ package com.inteligr8.activiti.mq;
import java.io.IOException;
import java.util.concurrent.TimeoutException;
import javax.jms.JMSException;
import jakarta.jms.JMSException;
import org.activiti.engine.ProcessEngine;
import org.activiti.engine.delegate.BpmnError;
src/main/java/com/inteligr8/activiti/mq/MqSubscribeDelegate.java
+1 -1
View File
@@ -3,7 +3,7 @@ package com.inteligr8.activiti.mq;
import java.io.IOException;
import java.util.concurrent.TimeoutException;
import javax.jms.JMSException;
import jakarta.jms.JMSException;
import org.activiti.engine.ProcessEngine;
import org.activiti.engine.delegate.BpmnError;
src/main/java/com/inteligr8/activiti/mq/MqSubscribeReplyDelegate.java
+1 -1
View File
@@ -3,7 +3,7 @@ package com.inteligr8.activiti.mq;
import java.io.IOException;
import java.util.concurrent.TimeoutException;
import javax.jms.JMSException;
import jakarta.jms.JMSException;
import org.activiti.engine.ProcessEngine;
import org.activiti.engine.delegate.BpmnError;
src/main/java/com/inteligr8/activiti/mq/ProcessDefinitionRegistry.java
+1 -1
View File
@@ -6,7 +6,7 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.annotation.PostConstruct;
import jakarta.annotation.PostConstruct;
import org.activiti.bpmn.model.BpmnModel;
import org.activiti.bpmn.model.FlowElement;
src/main/java/com/inteligr8/activiti/mq/amqp/AmqpCommunicator.java
+1 -1
View File
@@ -8,7 +8,7 @@ import java.util.Collections;
import java.util.UUID;
import java.util.concurrent.TimeoutException;
import javax.jms.JMSException;
import jakarta.jms.JMSException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
src/main/java/com/inteligr8/activiti/mq/amqp/AmqpPreparedMessage.java
+1 -1
View File
@@ -6,7 +6,7 @@ import java.nio.channels.Channels;
import java.nio.channels.ReadableByteChannel;
import java.util.Date;
import javax.jms.DeliveryMode;
import jakarta.jms.DeliveryMode;
import org.apache.commons.io.IOUtils;
import org.jgroups.util.UUID;
src/main/java/com/inteligr8/activiti/mq/jms/BytesMessageInputStream.java
+2 -2
View File
@@ -3,8 +3,8 @@ package com.inteligr8.activiti.mq.jms;
import java.io.IOException;
import java.io.InputStream;
import javax.jms.BytesMessage;
import javax.jms.JMSException;
import jakarta.jms.BytesMessage;
import jakarta.jms.JMSException;
public class BytesMessageInputStream extends InputStream {
src/main/java/com/inteligr8/activiti/mq/jms/BytesMessageOutputStream.java
+2 -2
View File
@@ -3,8 +3,8 @@ package com.inteligr8.activiti.mq.jms;
import java.io.IOException;
import java.io.OutputStream;
import javax.jms.BytesMessage;
import javax.jms.JMSException;
import jakarta.jms.BytesMessage;
import jakarta.jms.JMSException;
public class BytesMessageOutputStream extends OutputStream {
src/main/java/com/inteligr8/activiti/mq/jms/JmsCommunicator.java
+6 -6
View File
@@ -3,12 +3,12 @@ package com.inteligr8.activiti.mq.jms;
import java.io.IOException;
import java.util.concurrent.TimeoutException;
import javax.jms.Connection;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
import javax.jms.Session;
import jakarta.jms.Connection;
import jakarta.jms.JMSException;
import jakarta.jms.Message;
import jakarta.jms.MessageConsumer;
import jakarta.jms.MessageProducer;
import jakarta.jms.Session;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.slf4j.Logger;
src/main/java/com/inteligr8/activiti/mq/jms/JmsDeliveredMessage.java
+8 -8
View File
@@ -7,14 +7,14 @@ import java.time.OffsetDateTime;
import java.time.ZoneOffset;
import java.util.Enumeration;
import javax.jms.BytesMessage;
import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.Queue;
import javax.jms.StreamMessage;
import javax.jms.TextMessage;
import javax.jms.Topic;
import jakarta.jms.BytesMessage;
import jakarta.jms.Destination;
import jakarta.jms.JMSException;
import jakarta.jms.Message;
import jakarta.jms.Queue;
import jakarta.jms.StreamMessage;
import jakarta.jms.TextMessage;
import jakarta.jms.Topic;
import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;
src/main/java/com/inteligr8/activiti/mq/jms/JmsPreparedMessage.java
+6 -6
View File
@@ -4,12 +4,12 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Map.Entry;
import javax.jms.BytesMessage;
import javax.jms.DeliveryMode;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.Session;
import javax.jms.StreamMessage;
import jakarta.jms.BytesMessage;
import jakarta.jms.DeliveryMode;
import jakarta.jms.JMSException;
import jakarta.jms.Message;
import jakarta.jms.Session;
import jakarta.jms.StreamMessage;
import org.apache.commons.io.IOUtils;
import org.jgroups.util.UUID;
src/main/java/com/inteligr8/activiti/mq/jms/StreamMessageInputStream.java
+2 -2
View File
@@ -3,8 +3,8 @@ package com.inteligr8.activiti.mq.jms;
import java.io.IOException;
import java.io.InputStream;
import javax.jms.JMSException;
import javax.jms.StreamMessage;
import jakarta.jms.JMSException;
import jakarta.jms.StreamMessage;
public class StreamMessageInputStream extends InputStream {
src/main/java/com/inteligr8/activiti/mq/jms/StreamMessageOutputStream.java
+2 -2
View File
@@ -3,8 +3,8 @@ package com.inteligr8.activiti.mq.jms;
import java.io.IOException;
import java.io.OutputStream;
import javax.jms.JMSException;
import javax.jms.StreamMessage;
import jakarta.jms.JMSException;
import jakarta.jms.StreamMessage;
public class StreamMessageOutputStream extends OutputStream {
src/test/java/com/inteligr8/activiti/mq/MQDockerIT.java
+2 -2
View File
@@ -5,8 +5,8 @@ import java.net.URI;
import java.time.OffsetDateTime;
import java.util.concurrent.TimeoutException;
import javax.annotation.PostConstruct;
import javax.jms.JMSException;
import jakarta.annotation.PostConstruct;
import jakarta.jms.JMSException;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;