Merge branch 'develop' into stable

This commit is contained in:
Brian Long 2022-03-28 16:38:22 -04:00
commit 3a059d5ea9

11
pom.xml
View File

@ -161,8 +161,13 @@
<localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath> <localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
<mavenHome>${env.MAVEN_HOME}</mavenHome> <mavenHome>${env.MAVEN_HOME}</mavenHome>
<debug>true</debug> <debug>true</debug>
<skipInvocation>${skipTests}</skipInvocation>
<properties> <properties>
<project.main.basedir>${basedir}</project.main.basedir> <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> </properties>
</configuration> </configuration>
<executions> <executions>
@ -213,12 +218,6 @@
<goal>run</goal> <goal>run</goal>
</goals> </goals>
<configuration> <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> <pomIncludes>
<pomInclude>${run-it}/pom.xml</pomInclude> <pomInclude>${run-it}/pom.xml</pomInclude>
</pomIncludes> </pomIncludes>