Commit d5fe8e31 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents 89359689 7020a656

.gitignore

+1 −0
Original line number Diff line number Diff line 
# Maven

target

pom.xml.versionsBackup

*-pom.xml



# Eclipse

.project

pom.xml

+29 −10
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ 
			<groupId>org.junit.jupiter</groupId>

			<artifactId>junit-jupiter-engine</artifactId>

			<version>5.10.5</version>

			<scope>test</scope>

		</dependency>

		<dependency>

			<groupId>org.springframework</groupId>
@@ -189,16 +190,6 @@ 
				<artifactId>maven-assembly-plugin</artifactId>

				<version>3.7.1</version>

				<executions>

					<execution>

						<id>assemble-jar</id>

						<phase>package</phase>

						<goals><goal>single</goal></goals>

						<configuration>

							<descriptorRefs>

								<descriptorRef>jar-with-dependencies</descriptorRef>

							</descriptorRefs>

						</configuration>

					</execution>

					<execution>

						<id>package-stencil</id>

						<phase>package</phase>
@@ -223,6 +214,34 @@ 
					</execution>

				</executions>

			</plugin>

			<plugin>

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

				<version>3.6.0</version>

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

					</execution>

				</executions>

			</plugin>

			<plugin>

				<artifactId>maven-failsafe-plugin</artifactId>

				<configuration>