Commit 66e90df9 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents 6010b21c bbf8476c

pom.xml

+10 −3
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.43.0</activemq.jms.version>

    	<activemq.jms.version>2.52.0</activemq.jms.version>

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

    </properties>
@@ -124,7 +124,7 @@ 
			</exclusions>

        </dependency>

        <dependency>

			<groupId>org.apache.activemq</groupId>

			<groupId>org.apache.artemis</groupId>

			<artifactId>artemis-jms-client</artifactId>

			<version>${activemq.jms.version}</version>

			<exclusions>
@@ -193,6 +193,14 @@ 
					<artifactId>maven-failsafe-plugin</artifactId>

					<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>

		<plugins>
@@ -226,7 +234,6 @@ 
			</plugin>

			<plugin>

				<artifactId>maven-shade-plugin</artifactId>

				<version>3.6.0</version>

				<executions>

					<execution>

						<id>shade-deps</id>