Commit 496a90e0 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents cb535931 3d353cf6

pom.xml

+16 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
		<dependency>

			<groupId>com.inteligr8.alfresco</groupId>

			<artifactId>aps-public-rest-api</artifactId>

			<version>1.2.0</version>

			<version>1.2.1</version>

			<classifier>aps1</classifier>

		</dependency>

		<dependency>
@@ -184,6 +184,7 @@ 
						<goals><goal>jar</goal></goals>

						<configuration>

							<show>public</show>

							<skip>true</skip>

						</configuration>

					</execution>

				</executions>
@@ -212,6 +213,12 @@ 
									<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>
@@ -224,6 +231,14 @@ 
		</profile>

	</profiles>

	

	<repositories>

		<repository>

			<id>inteligr8-releases</id>

			<name>Inteligr8 Releases</name>

			<url>https://repos.inteligr8.com/nexus/repository/inteligr8-public</url>

		</repository>

	</repositories>



	<distributionManagement>

		<repository>

			<id>inteligr8-releases</id>

src/it/deploy-app/pom.xml

+35 −7
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ 


	<name>Deploy App Plugin Tests</name>

	

	<properties>

		<aps.app>FORMS Core</aps.app>

	</properties>

	

	<build>

		<plugins>

			<plugin>
@@ -24,14 +20,46 @@ 
				<version>@pom.version@</version>

				<executions>

					<execution>

						<id>download-app</id>

						<phase>validate</phase>

						<id>download-unpack-app</id>

						<phase>generate-sources</phase>

						<goals>

							<goal>download-app</goal>

							<goal>unpack-app</goal>

						</goals>

						<configuration>

							<reformat>true</reformat>

							<normalize>true</normalize>

						</configuration>

					</execution>

					<execution>

						<id>translate-app</id>

						<phase>compile</phase>

						<goals>

							<goal>translate-app</goal>

						</goals>

						<configuration>

							<finalDirectory>${project.build.directory}/aps-dev</finalDirectory>

						</configuration>

					</execution>

					<execution>

						<id>pack-app</id>

						<phase>package</phase>

						<goals>

							<goal>pack-app</goal>

						</goals>

						<configuration>

							<unzipDirectory>${project.build.directory}/aps-dev</unzipDirectory>

							<zipDirectory>${project.build.directory}/aps-test</zipDirectory>

						</configuration>

					</execution>

					<execution>

						<id>deploy-app</id>

						<phase>package</phase>

						<goals>

							<goal>deploy-app</goal>

						</goals>

						<configuration>

							<apsAppName>${aps.app}</apsAppName>

							<zipDirectory>${project.build.directory}/aps-test</zipDirectory>

						</configuration>

					</execution>

				</executions>

src/it/download-app/pom.xml

+5 −13
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ 


	<name>Download App Plugin Tests</name>

	

	<properties>

		<aps.app>FORMS Core</aps.app>

	</properties>

	

	<build>

		<plugins>

			<plugin>
@@ -25,23 +21,19 @@ 
				<executions>

					<execution>

						<id>download-app</id>

						<phase>validate</phase>

						<phase>generate-sources</phase>

						<goals>

							<goal>download-app</goal>

						</goals>

						<configuration>

							<apsAppName>${aps.app}</apsAppName>

						</configuration>

					</execution>

					<execution>

						<id>download-app-other</id>

						<phase>validate</phase>

						<phase>generate-sources</phase>

						<goals>

							<goal>download-app</goal>

						</goals>

						<configuration>

							<apsAppName>${aps.app}</apsAppName>

							<targetDirectory>${basedir}/src/main/app</targetDirectory>

							<zipDirectory>${basedir}/src/main/aps</zipDirectory>

						</configuration>

					</execution>

				</executions>
@@ -57,8 +49,8 @@ 
							<rules>

								<requireFilesExist>

									<files>

										<file>${project.build.directory}/app/${aps.app}.zip</file>

										<file>${basedir}/src/main/app/${aps.app}.zip</file>

										<file>${project.build.directory}/aps/${aps-model.appName}.zip</file>

										<file>${basedir}/src/main/aps/${aps-model.appName}.zip</file>

									</files>

								</requireFilesExist>

							</rules>

src/it/pack-app/pom.xml

+5 −10
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ 


	<name>Pack App Plugin Tests</name>

	

	<properties>

		<aps.app>FORMS Core</aps.app>

	</properties>

	

	<build>

		<plugins>

			<plugin>
@@ -25,24 +21,23 @@ 
				<executions>

					<execution>

						<id>download-unpack-app</id>

						<phase>validate</phase>

						<phase>generate-sources</phase>

						<goals>

							<goal>download-app</goal>

							<goal>unpack-app</goal>

						</goals>

						<configuration>

							<apsAppName>${aps.app}</apsAppName>

							<normalize>true</normalize>

						</configuration>

					</execution>

					<execution>

						<id>pack-app</id>

						<phase>validate</phase>

						<phase>package</phase>

						<goals>

							<goal>pack-app</goal>

						</goals>

						<configuration>

							<apsAppName>${aps.app}</apsAppName>

							<targetDirectory>${basedir}/src/main/app</targetDirectory>

							<zipDirectory>${basedir}</zipDirectory>

						</configuration>

					</execution>

				</executions>
@@ -58,7 +53,7 @@ 
							<rules>

								<requireFilesExist>

									<files>

										<file>${basedir}/src/main/app/${aps.app}.zip</file>

										<file>${basedir}/${aps-model.appName}.zip</file>

									</files>

								</requireFilesExist>

							</rules>

src/it/translate-app/pom.xml

+6 −10
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ 


	<name>Translate App Plugin Tests</name>

	

	<properties>

		<aps.app>FORMS Core</aps.app>

	</properties>

	

	<build>

		<plugins>

			<plugin>
@@ -25,24 +21,24 @@ 
				<executions>

					<execution>

						<id>download-unpack-app</id>

						<phase>validate</phase>

						<phase>generate-sources</phase>

						<goals>

							<goal>download-app</goal>

							<goal>unpack-app</goal>

						</goals>

						<configuration>

							<apsAppName>${aps.app}</apsAppName>

							<normalize>true</normalize>

							<diffFriendly>true</diffFriendly>

						</configuration>

					</execution>

					<execution>

						<id>translate-app</id>

						<phase>validate</phase>

						<phase>compile</phase>

						<goals>

							<goal>translate-app</goal>

						</goals>

						<configuration>

							<apsAppName>${aps.app}</apsAppName>

							<targetDirectory>${basedir}/src/main/app</targetDirectory>

							<finalDirectory>${basedir}/src/main/aps/app</finalDirectory>

						</configuration>

					</execution>

				</executions>
@@ -58,7 +54,7 @@ 
							<rules>

								<requireFilesExist>

									<files>

										<file>${basedir}/src/main/app/${aps.app}/${aps.app}.json</file>

										<file>${basedir}/src/main/aps/app/${aps-model.appName}/${aps-model.appName}.json</file>

									</files>

								</requireFilesExist>

							</rules>