Commit 3a059d5e authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents 496a90e0 21def148

pom.xml

+5 −6
Original line number Diff line number Diff line
@@ -161,8 +161,13 @@ 
					<localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>

					<mavenHome>${env.MAVEN_HOME}</mavenHome>

					<debug>true</debug>

					<skipInvocation>${skipTests}</skipInvocation>

					<properties>

						<project.main.basedir>${basedir}</project.main.basedir>

						<aps-model.baseUrl>${aps-model.baseUrl}</aps-model.baseUrl>

						<aps-model.authType>${aps-model.authType}</aps-model.authType>

						<aps-model.basicAuth.mavenServerId>${aps-model.basicAuth.mavenServerId}</aps-model.basicAuth.mavenServerId>

						<aps-model.appName>${aps-model.appName}</aps-model.appName>

					</properties>

				</configuration>

				<executions>
@@ -213,12 +218,6 @@ 
									<goal>run</goal>

								</goals>

								<configuration>

									<properties>

										<aps-model.baseUrl>${aps-model.baseUrl}</aps-model.baseUrl>

										<aps-model.authType>${aps-model.authType}</aps-model.authType>

										<aps-model.basicAuth.mavenServerId>${aps-model.basicAuth.mavenServerId}</aps-model.basicAuth.mavenServerId>

										<aps-model.appName>${aps-model.appName}</aps-model.appName>

									</properties>

									<pomIncludes>

										<pomInclude>${run-it}/pom.xml</pomInclude>

									</pomIncludes>