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

Merge branch 'develop' into stable

parents ec90d5c4 6fc66409

beedk-aps-ext-it-tile/tile.xml

+8 −4
Original line number Diff line number Diff line
@@ -117,6 +117,10 @@ 
											<CATALINA_OPTS>--add-opens java.base/java.net=ALL-UNNAMED \

												-Djava.awt.headless=true \

												-Ddatasource.driver=org.postgresql.Driver -Ddatasource.url=jdbc:postgresql://${project.artifactId}-aps-db:5432/activiti \

												-Dhibernate.dialect=org.hibernate.dialect.PostgreSQLDialect \

												-Dvalidator.editor.dmn.expression=false \

												-Dvalidator.editor.bpmn.disable.scripttask=false \

												-Dvalidator.editor.bpmn.disable.scripttask.groovy=false \

												-Djavascript.secure-scripting.enabled=false -Djavascript.secure-scripting.enable-class-whitelisting=false \

												-Dbeans.whitelisting.enabled=false \

												-Del.whitelisting.enabled=false \
@@ -153,7 +157,7 @@ 
											<http>

												<url>http://admin%40app.activiti.com:admin@localhost:${aps.port}/activiti-app/api/management/engine</url>

												<method>GET</method>

												<status>200</status>

												<status>200..399</status>

											</http>

											<time>${aps.timeout}</time>

										</wait>
@@ -226,9 +230,9 @@ 
				<aps.debugger.port>8000</aps.debugger.port>

				

				<!-- versions -->

				<aps-postgres.version>12</aps-postgres.version>

				<aps.version>2.4.6</aps.version>

				<tomcat-rad.version>9-2.2</tomcat-rad.version>

				<aps-postgres.version>15</aps-postgres.version>

				<aps.version>25.1.1</aps.version>

				<tomcat-rad.version>10-2.2</tomcat-rad.version>



				<!-- results -->

				<project.build.warFile>${project.build.warDirectory}/${aps.war.artifactId}-${aps.war.version}.war</project.build.warFile>

beedk-aps-ext-rad-tile/tile.xml

+4 −1
Original line number Diff line number Diff line
@@ -123,6 +123,9 @@ 
														-Djava.awt.headless=true \

														-Ddatasource.driver=org.postgresql.Driver -Ddatasource.url=jdbc:postgresql://${project.artifactId}-aps-db:5432/activiti \

														-Dhibernate.dialect=org.hibernate.dialect.PostgreSQLDialect \

														-Dvalidator.editor.dmn.expression=false \

														-Dvalidator.editor.bpmn.disable.scripttask=false \

														-Dvalidator.editor.bpmn.disable.scripttask.groovy=false \

														-Djavascript.secure-scripting.enabled=false -Djavascript.secure-scripting.enable-class-whitelisting=false \

														-Dbeans.whitelisting.enabled=false \

														-Del.whitelisting.enabled=false \
@@ -215,7 +218,7 @@ 
				<aps.debugger.port>8000</aps.debugger.port>

				

				<!-- versions -->

				<aps-postgres.version>12</aps-postgres.version>

				<aps-postgres.version>15</aps-postgres.version>

				<aps.version>25.1.1</aps.version>

				<tomcat-rad.version>10-2.2</tomcat-rad.version>

beedk-aps-rad-tile/tile.xml

+2 −2
Original line number Diff line number Diff line
@@ -113,9 +113,9 @@ 
				<aps.port>8080</aps.port>

				

				<!-- versions -->

				<aps-postgres.version>9.6</aps-postgres.version>

				<aps-postgres.version>15</aps-postgres.version>

				<aps.docker-tag>alfresco/process-services</aps.docker-tag>

				<aps.version>2.4.6</aps.version>

				<aps.version>24.4.2</aps.version>

			</properties>

		</profile>

	</profiles>