Commit 41d01cf5 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents a19b82e5 b6af0654

pom.xml

+19 −9
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
    	

    	<rabbitmq.version>5.18.0</rabbitmq.version>

    	<activemq.version>5.18.7</activemq.version>

    	<activemq.jms.version>2.42.0</activemq.jms.version>

    	<activemq.jms.version>2.44.0</activemq.jms.version>

		<activemq.httpPort>8161</activemq.httpPort>

    </properties>
@@ -103,12 +103,20 @@ 
			<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>
@@ -120,6 +128,7 @@ 
			<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,11 @@ 
				</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>

			</plugins>

		</pluginManagement>
@@ -253,14 +263,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 +355,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 +366,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>