5 Commits
+37 -20
View File
@@ -23,18 +23,18 @@
<maven.compiler.release>11</maven.compiler.release>
<aps.docker-tag>docker.inteligr8.com/inteligr8/alfresco-process-services</aps.docker-tag>
<aps.version>2.4.6</aps.version>
<spring.version>5.3.31</spring.version>
<activiti.version>7.11.1</activiti.version>
<tomcat-rad.version>9-2.2</tomcat-rad.version>
<aps.version>25.1.1</aps.version>
<spring.version>6.2.5</spring.version>
<activiti.version>8.1.3</activiti.version>
<tomcat-rad.version>10-2.2</tomcat-rad.version>
<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>
<!-- 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.6</activemq.version>
<activemq.jms.version>2.31.2</activemq.jms.version>
<activemq.version>5.18.7</activemq.version>
<activemq.jms.version>2.52.0</activemq.jms.version>
<activemq.httpPort>8161</activemq.httpPort>
</properties>
@@ -103,12 +103,8 @@
<artifactId>amqp-client</artifactId>
<version>${rabbitmq.version}</version>
<scope>provided</scope>
</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>
@@ -117,9 +113,22 @@
</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>
@@ -132,6 +141,7 @@
<groupId>commons-beanutils</groupId>
<artifactId>*</artifactId>
</exclusion>
<!-- Use its own shaded version of netty -->
</exclusions>
</dependency>
@@ -168,7 +178,7 @@
<!-- avoids log4j dependency -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<version>3.14.1</version>
</plugin>
<!-- avoids struts and vulnerable jetty dependency -->
<plugin>
@@ -177,11 +187,19 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.2</version>
<version>3.5.4</version>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.5.2</version>
<version>3.5.4</version>
</plugin>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>3.6.1</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.4</version>
</plugin>
</plugins>
</pluginManagement>
@@ -216,7 +234,6 @@
</plugin>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<id>shade-deps</id>
@@ -253,14 +270,14 @@
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.40</version>
<version>2.41</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.1.999)</tile>
<tile>com.inteligr8.ootbee:beedk-aps-ext-rad-tile:[1.1,1.2)</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.1.999)</tile>
<tile>com.inteligr8.ootbee:beedk-aps-ext-it-tile:[1.1,1.2)</tile>
</tiles>
</configuration>
</plugin>
@@ -345,7 +362,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.8.0</version>
<version>3.12.0</version>
<executions>
<execution>
<id>generate-doclet</id>
@@ -356,7 +373,7 @@
<docletArtifact>
<groupId>com.inteligr8.activiti</groupId>
<artifactId>activiti-api-doclet</artifactId>
<version>1.1.0</version>
<version>1.1.1</version>
</docletArtifact>
<useStandardDocletOptions>false</useStandardDocletOptions>
<destDir>apidocs</destDir>