bcgov · sophia-aot · Jun 14, 2023 · Jul 13, 2023 · Jul 13, 2023 · Jul 14, 2023
diff --git a/apps/forms-flow-ai/README.md b/apps/forms-flow-ai/README.md
@@ -66,7 +66,7 @@ The following files are slated to be removed because we can leverage the open so
 
 ### **Required files:**
 
-- `pom-docker.xml`
+- `pom-docker.xml` (renamed pom.xml with v5.1.0 upgrade)
     - Needed for redis dependency; otherwise, the dependencies are largely identical to open source.
 - `src/main/resources/application.yaml`
     - Useful to have application.yaml in this repo as it is used for customizing camunda.
@@ -186,7 +186,7 @@ Upon a new release of open source, care should be taken to keep all the files al
 - All files under `src` folder.
 
 *forms-flow-bpm*
-- `pom-docker.xml`
+- `pom-docker.xml` (renamed pom.xml with v5.1.0 upgrade)
     - Java dependencies' versions may be different.
 - `application.yaml`
     - should be checked for updates as well but not all changes are applicable to service BC. Changes should be done on a case by case basis based on Changelog documentation.

diff --git a/apps/forms-flow-ai/forms-flow-bpm/Dockerfile b/apps/forms-flow-ai/forms-flow-bpm/Dockerfile
@@ -1,38 +1,47 @@
 # Modified by Yichun Zhao and Walter Moar
 
 # Maven build
-FROM artifacts.developer.gov.bc.ca/docker-remote/maven:3.6.1-jdk-11-slim AS MAVEN_TOOL_CHAIN
+# FROM artifacts.developer.gov.bc.ca/docker-remote/maven:3.8.1-openjdk-17-slim AS MAVEN_TOOL_CHAIN
+FROM maven:3.8.1-openjdk-17-slim AS MAVEN_TOOL_CHAIN
 
 RUN apt-get update \
     && apt-get install -y git
 
 RUN git clone -b ${FORMIO_SOURCE_REPO_BRANCH} ${FORMIO_SOURCE_REPO_URL} /bpm/
 
-#RUN cp /bpm/forms-flow-bpm/pom-docker.xml /tmp/pom.xml
-RUN cp /bpm/forms-flow-bpm/settings-docker.xml /usr/share/maven/ref/
-COPY ./pom-docker.xml /tmp/pom.xml
+# RUN cp /bpm/forms-flow-bpm/pom.xml /tmp/pom.xml
+# RUN cp /bpm/forms-flow-bpm/settings-docker.xml /usr/share/maven/ref/
+# COPY ./pom.xml /tmp/pom.xml
+# COPY ./pom-default.xml /tmp/pom-default.xml
+COPY ./pom*.xml /tmp/
+COPY ./settings-docker.xml /usr/share/maven/ref/
 # COPY ./settings-docker.xml /usr/share/maven/ref/
 
-WORKDIR /tmp/
+WORKDIR /tmp
 
 # This allows Docker to cache most of the maven dependencies
 RUN mvn -s /usr/share/maven/ref/settings-docker.xml dependency:resolve-plugins dependency:resolve dependency:go-offline -B
-RUN cp -r /bpm/forms-flow-bpm/src/ /tmp/src/
+RUN cp -rf /bpm/forms-flow-bpm/src/ /tmp/src/
 
-ARG CUSTOM_SRC_DIR=src/
+
+
+ARG CUSTOM_SRC_DIR=src
 
 # Override these files they have custom changes in the sbc_divapps directory
 COPY ./${CUSTOM_SRC_DIR}/  /tmp/${CUSTOM_SRC_DIR}/
-RUN mvn -s /usr/share/maven/ref/settings-docker.xml package
+RUN mvn -s /usr/share/maven/ref/settings-docker.xml package -P default
+# RUN mvn -s /usr/share/maven/ref/settings-docker.xml package
+
 
 
 
 # Final custom slim java image (for apk command see jdk-11.0.3_7-alpine-slim)
-FROM artifacts.developer.gov.bc.ca/docker-remote/adoptopenjdk/openjdk11:jdk-11.0.3_7-alpine
+# FROM artifacts.developer.gov.bc.ca/docker-remote/openjdk:17-jdk-alpine
+FROM openjdk:17-jdk-alpine
 
-ENV JAVA_VERSION jdk-11.0.3+7
-ENV JAVA_HOME=/opt/java/openjdk \
-    PATH="/opt/java/openjdk/bin:$PATH"
+ENV JAVA_VERSION=17-ea+14
+ENV JAVA_HOME=/opt/java/openjdk-17 \
+    PATH="/opt/java/openjdk-17/bin:$PATH"
 
 EXPOSE 8080
 # OpenShift has /app in the image, but it's missing when doing local development - Create it when missing
@@ -43,4 +52,5 @@ COPY --from=MAVEN_TOOL_CHAIN /tmp/target/forms-flow-bpm.jar ./app
 RUN chmod a+rwx -R /app
 WORKDIR /app
 VOLUME /tmp
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app/forms-flow-bpm.jar"]
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app/forms-flow-bpm.jar"]
+# ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom", "-Dpolyglot.js.nashorn-compat=true", "-Dpolyglot.engine.WarnInterpreterOnly=false", "-jar","/app/forms-flow-bpm.jar"]
diff --git a/apps/forms-flow-ai/forms-flow-bpm/pom-default.xml b/apps/forms-flow-ai/forms-flow-bpm/pom-default.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.camunda.bpm.extension</groupId>
+        <artifactId>formsflow-bpm</artifactId>
+        <version>5.1.0</version>
+        <relativePath>pom.xml</relativePath>
+    </parent>
+
+    <artifactId>default</artifactId>
+
+    <dependencies>
+    </dependencies>
+</project>
diff --git a/...rms-flow-ai/forms-flow-bpm/pom-docker.xml → apps/forms-flow-ai/forms-flow-bpm/pom.xml b/...rms-flow-ai/forms-flow-bpm/pom-docker.xml → apps/forms-flow-ai/forms-flow-bpm/pom.xml
@@ -4,39 +4,41 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.camunda.bpm</groupId>
-	<artifactId>extension</artifactId>
-	<version>2.0.0</version>
+	<groupId>org.camunda.bpm.extension</groupId>
+	<artifactId>formsflow-bpm</artifactId>
+	<version>5.1.0</version>
+    <packaging>pom</packaging>
 
 	<name>Forms flow BPM Extension</name>
 	<description>Forms flow BPM Extension</description>
 
 	<properties>
-		<version.java>11</version.java>
-		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.target>11</maven.compiler.target>
+		<version.java>17</version.java>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
 		<encoding>UTF-8</encoding>
 		<project.build.sourceEncoding>${encoding}</project.build.sourceEncoding>
 		<project.build.resourceEncoding>${encoding}</project.build.resourceEncoding>
 		<failOnMissingWebXml>false</failOnMissingWebXml>
 
 		<!-- versions -->
-		<version.camunda>7.15.0</version.camunda>
-		<version.camundaSpringBoot>7.15.0</version.camundaSpringBoot>
-		<version.camundaConnect>1.2.2</version.camundaConnect><!-- 1.5.0 -->
-		<version.camundaMail>1.2.0</version.camundaMail><!-- 1.3.0 -->
-		<version.springBoot>2.6.4</version.springBoot><!-- 2.4.2 - 2.4.8 -->
-		<version.springSecurityOauth2>2.6.4</version.springSecurityOauth2><!-- 2.4.2 - 2.4.8 -->
-		<version.jackson>2.13.3</version.jackson>
-		<version.camundaKeycloak>2.2.3</version.camundaKeycloak>
+        <version.camundaKeycloak>2.2.3</version.camundaKeycloak>
+		<version.camunda>7.17.0</version.camunda>
+	   	<version.camundaConnect>1.5.0</version.camundaConnect><!-- 1.5.0 -->
+		<version.camundaMail>1.3.0</version.camundaMail><!-- 1.3.0 -->
+		<version.springBoot>2.6.6</version.springBoot><!-- 2.4.2 - 2.4.8 - 2.6.6-->
+		<version.springSecurityOauth2>2.6.6</version.springSecurityOauth2><!-- 
+			2.4.8 - 2.6.6 -->
+		<version.jackson>2.14.0</version.jackson>
+
 	</properties>
 
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
 				<groupId>com.h2database</groupId>
 				<artifactId>h2</artifactId>
-				<version>2.0.206</version>
+		 		<version>2.0.206</version>
 			</dependency>
 			<dependency>
 				<groupId>org.camunda.bpm</groupId>
@@ -71,13 +73,18 @@
 		<dependency>
 			<groupId>org.camunda.bpm.springboot</groupId>
 			<artifactId>camunda-bpm-spring-boot-starter-webapp</artifactId>
-			<version>${version.camundaSpringBoot}</version>
+			<version>${version.camunda}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.camunda.bpm.springboot</groupId>
 			<artifactId>camunda-bpm-spring-boot-starter-rest</artifactId>
-			<version>${version.camundaSpringBoot}</version>
+			<version>${version.camunda}</version>
+		</dependency>
+
+        <dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-hateoas</artifactId>
 		</dependency>
 
 		<dependency>
@@ -116,7 +123,7 @@
 			<artifactId>spring-security-oauth2-jose</artifactId>
 		</dependency>
 
-		<!-- Keycloak Identity Prover Plugin  -->
+		<!-- Keycloak Identity Prover Plugin -->
 		<dependency>
 			<groupId>org.camunda.bpm.extension</groupId>
 			<artifactId>camunda-bpm-identity-keycloak</artifactId>
@@ -179,8 +186,8 @@
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
-			<!--version>9.4-1205-jdbc41</version-->
-			<version>42.2.5</version>
+			<!--version>9.4-1205-jdbc41</version -->
+			<version>42.4.3</version>
 		</dependency>
 
 		<dependency>
@@ -249,7 +256,7 @@
 		<dependency>
 			<groupId>org.jsoup</groupId>
 			<artifactId>jsoup</artifactId>
-			<version>1.13.1</version>
+			<version>1.15.3</version>
 		</dependency>
 
 		<dependency>
@@ -290,15 +297,33 @@
 		<dependency>	
 			<groupId>org.springframework</groupId>	
 			<artifactId>spring-websocket</artifactId>	
-			<version>5.3.4</version>	
+			<version>5.3.20</version>	
 		</dependency>
 
 		<dependency>	
 			<groupId>org.springframework</groupId>	
 			<artifactId>spring-messaging</artifactId>	
-			<version>5.3.4</version>	
+			<version>5.3.20</version>	
+		</dependency>
+
+		<dependency>
+			<groupId>org.graalvm.js</groupId>
+			<artifactId>js-scriptengine</artifactId>
+			<version>22.1.0.1</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.graalvm.js</groupId>
+			<artifactId>js</artifactId>
+			<version>22.1.0.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-jersey</artifactId>
+		</dependency>
+
+		<!-- Adding Redis Config for web sockets -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-redis-reactive</artifactId>
@@ -325,12 +350,12 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.0.0-M5</version>
+				<version>3.0.0-M7</version>
 			</plugin>
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.7</version>
+				<version>0.8.8</version>
 				<configuration>
 					<outputDirectory>target/jacoco-ut</outputDirectory>
 					<excludes>
@@ -349,6 +374,18 @@
 						<exclude>org/camunda/bpm/extension/commons/connector/auth/FormioContext.class</exclude>
 						<exclude>org/camunda/bpm/extension/commons/connector/*.class</exclude>
 						<exclude>org/camunda/bpm/extension/CamundaApplication.class</exclude>
+                        <exclude>org/camunda/bpm/extension/commons/exceptions/*.class</exclude>
+						<exclude>org/camunda/bpm/extension/commons/utils/*.class</exclude>
+						<exclude>org/camunda/bpm/extension/hooks/controllers/mapper/*.class</exclude>
+						<exclude>org/camunda/bpm/extension/hooks/exceptions/*.class</exclude>
+						<exclude>org/camunda/bpm/extension/hooks/listeners/execution/FormAccessTokenCacheListener.class</exclude>
+						<exclude>org/camunda/bpm/extension/hooks/rest/exception/*.class</exclude>
+						<exclude>org/camunda/bpm/extension/commons/exceptions/*.class</exclude>
+						<exclude>org/camunda/bpm/extension/commons/config/*.class</exclude>
+						<exclude>org/camunda/bpm/extension/hooks/rest/constant/*.class</exclude>
+						<exclude>org/camunda/bpm/extension/hooks/services/IMessageEvent.class</exclude>
+						<exclude>org/camunda/bpm/extension/hooks/rest/dto/*.class</exclude>
+						<exclude>org/camunda/bpm/extension/hooks/rest/impl/*.class</exclude>
 					</excludes>
 				</configuration>
 				<executions>
@@ -365,6 +402,7 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<version>${version.springBoot}</version>
 				<configuration>
+                    <mainClass>org.camunda.bpm.extension.CamundaApplication</mainClass>
 					<layout>ZIP</layout>
 				</configuration>
 				<executions>
@@ -389,37 +427,13 @@
 	<profiles>
 		<profile>
 			<id>default</id>
+            <modules>
+				<module>pom-default.xml</module>
+			</modules>
 			<activation>
 				<activeByDefault>true</activeByDefault>
 			</activation>
-			<dependencies>
-			</dependencies>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<version>3.0.0-M5</version>
-					</plugin>
-					<plugin>
-						<groupId>org.jacoco</groupId>
-						<artifactId>jacoco-maven-plugin</artifactId>
-						<version>0.8.7</version>
-						<configuration>
-							<outputDirectory>target/jacoco-ut</outputDirectory>
-						</configuration>
-						<executions>
-							<execution>
-								<goals>
-									<goal>prepare-agent</goal>
-									<goal>report</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-
+  		</profile>
 	</profiles>
-</project>
+
+</project>
diff --git a/apps/forms-flow-ai/forms-flow-bpm/settings-docker.xml b/apps/forms-flow-ai/forms-flow-bpm/settings-docker.xml
@@ -0,0 +1,27 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                        http://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+    <!-- Maven Settings for Docker Build -->
+    <!--
+    <servers>
+		<server>
+			<id>camunda-bpm-ee</id>
+			<username>xxxxxx</username>
+			<password>xxxxxx</password>
+		</server>
+    </servers>
+	-->
+
+    <!-- default profile -->
+    <profiles>
+        <profile>
+          <id>defaultProfile</id>
+          <activation>
+            <activeByDefault>true</activeByDefault>
+          </activation>
+        </profile>
+    </profiles> 
+
+</settings>