Commit 1412e667 authored by Brian Long's avatar Brian Long
Browse files

configurable APS docker tag; APS default v2.4.6

parent 8a77c5a0
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@
				</property>
			</activation>
			<properties>
				<aps.version>2.4.1</aps.version>
				<aps.version>2.4.6</aps.version>
				<!-- add properties here -->
				<aps.tomcat.opts>-Dproperty-to-set=value</aps.tomcat.opts>
			</properties>
+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@
    	<maven.compiler.target>11</maven.compiler.target>
    	<maven.compiler.release>11</maven.compiler.release>

		<aps.version>2.4.1</aps.version>
		<aps.version>2.4.6</aps.version>
    </properties>

    <dependencies>
+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@
				
				<!-- versions -->
				<aps-postgres.version>12</aps-postgres.version>
				<aps.version>2.4.4</aps.version>
				<aps.version>2.4.6</aps.version>
				<tomcat-rad.version>9-2.1</tomcat-rad.version>

				<!-- results -->
+2 −1
Original line number Diff line number Diff line
@@ -53,7 +53,8 @@ The following properties are intended to be exposed by inheriting Public API Mav
| `aps.timeout`              |          | 60000           | The time to wait for the startup to complete, in milliseconds. |
| `alfresco.license.directory` |  | `${user.home}/alfresco/license` | The base path to search for Alfresco licenses. |
| `aps.license.directory`    |  | `${alfresco.license.directory}/aps` | The base path to search for an APS license. |
| `aps.version`              |          | 1.11.1.1        | The version of the [Process Services Docker container](https://hub.docker.com/r/alfresco/process-services). |
| `aps.docker-tag`           |  | `alfresco/process-services` | The Docker image tag for APS. |
| `aps.version`              |          | 2.4.6           | The version of the [Process Services Docker container](https://hub.docker.com/r/alfresco/process-services). |
| `aps-postgres.version`     |          | *not important* | The version of PostgreSQL to use in the integration testing infrastructure. |

### Other APIs
+3 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@
											</run>
										</image>
										<image>
											<name>alfresco/process-services:${aps.version}</name>
											<name>${aps.docker-tag}:${aps.version}</name>
											<alias>aps-app</alias>
											<run>
												<env>
@@ -111,7 +111,8 @@
				
				<!-- versions -->
				<aps-postgres.version>9.6</aps-postgres.version>
				<aps.version>1.11.1.1</aps.version>
				<aps.docker-tag>alfresco/process-services</aps.docker-tag>
				<aps.version>2.4.6</aps.version>
			</properties>
		</profile>
	</profiles>