Revert "Onboarding for Approval Decision to Axon-ivy market (#4)"

This reverts commit b2ca37d.
axonivy-market · Apr 4, 2024 · 8fe7a22 · 8fe7a22
1 parent b2ca37d
commit 8fe7a22
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 34 deletions.
diff --git a/approval-decision-utils-demo/config/databases.yaml b/approval-decision-utils-demo/config/databases.yaml
@@ -1,9 +1,6 @@
-# yaml-language-server: $schema=https://json-schema.axonivy.com/app/0.0.1/databases.json
 Databases:
   approval-decision-utils:
     Url: jdbc:sqlserver://localhost;databaseName=approval-decision-utils
     Driver: com.microsoft.sqlserver.jdbc.SQLServerDriver
     UserName: ricoh
     Password: ${decrypt:\u00BD\u0049\u0080\u003A\u0083\u00CD\u0084\u000A\u0055\u001E\u008C\u0014\u0035\u006B\u0012\u0018\u00CE\u00AE\u0009\u007C\u00C2\u0089\u00B8\u00A3\u0096\u0000\u0074\u001D\u0048\u00E3\u0090\u006B}
-    Properties:
-      trustServerCertificate: 'true'
diff --git a/approval-decision-utils-demo/pom.xml b/approval-decision-utils-demo/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.axonivy.utils.approvaldecision</groupId>
 	<artifactId>approval-decision-utils-demo</artifactId>
-	<version>10.0.18-SNAPSHOT</version>
+	<version>10.0.14-SNAPSHOT</version>
 	<packaging>iar</packaging>
 
 	<dependencies>
@@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>com.axonivy.utils.approvaldecision</groupId>
 			<artifactId>approval-decision-utils</artifactId>
-			<version>${project.version}</version>
+			<version>10.0.14-SNAPSHOT</version>
 			<type>iar</type>
 		</dependency>
 	</dependencies>
@@ -37,8 +37,8 @@
 	</repositories>
 
 	<properties>
-		<ivy.engine.version>10.0.18</ivy.engine.version>
-		<build.plugin.version>10.0.16</build.plugin.version>
+		<ivy.engine.version>10.0.14</ivy.engine.version>
+		<build.plugin.version>10.0.14</build.plugin.version>
 	</properties>
 
 	<build>

diff --git a/approval-decision-utils-product/pom.xml b/approval-decision-utils-product/pom.xml
@@ -2,6 +2,6 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.utils.approvaldecision</groupId>
   <artifactId>approval-decision-utils-product</artifactId>
-  <version>10.0.18-SNAPSHOT</version>
+  <version>10.0.14-SNAPSHOT</version>
   <packaging>pom</packaging>
 </project>
diff --git a/approval-decision-utils-test/config/databases.yaml b/approval-decision-utils-test/config/databases.yaml
@@ -1,9 +1 @@
-# yaml-language-server: $schema=https://json-schema.axonivy.com/app/0.0.1/databases.json
 Databases:
-  approval_decision_utils_test:
-    Url: jdbc:hsqldb:mem:approval-decision-utils
-    Driver: org.hsqldb.jdbc.JDBCDriver
-    UserName: approval-decision-utils
-    Password: ${decrypt:\u00FC\u00D7\u00BB\u00B0\u0088\u002A\u004C\u0077\u003D\u0033\u00F4\u007B\u0057\u00F9\u0024\u0050\u00B2\u00FF\u00F7\u008E\u0024\u00AA\u0054\u0078\u00D1\u00A1\u0005\u0056\u008F\u00B5\u00C9\u008B\u00CD\u00F7\u00E6\u008E\u005F\u00EE\u008C\u0096\u0082\u00E6\u0094\u00F7\u0002\u000A\u00AB\u005C\u00FC\u004D\u00DD\u0084\u0057\u0069\u00AC\u0069\u0064\u009A\u002A\u004D\u00C4\u0029\u00F9\u009D\u008F\u0078\u0004\u0064\u0015\u00C2\u0043\u0066\u0011\u003B\u0005\u00C4\u00DE\u0042\u000A\u0021\u00FD\u006D\u0020\u00E1\u00F2\u002D\u0003\u0092\u00AE\u00C8\u00ED\u00E2\u001C\u0064\u006F\u005D\u001A\u0071\u00F1\u00D8\u0095\u0032\u003A\u007E\u0029\u00AD\u002D\u00A5\u002B\u008C\u00E3\u00DD\u009A\u0022\u00C3\u0052\u0092\u0083\u00AF\u00D1\u005B\u00F3\u008B\u00DE\u0000\u000D\u001E\u00AB\u0030\u006F\u0069\u002F\u0016\u000D\u0060\u0030\u00CA\u00DD\u004D\u00B4\u00FC\u0054\u00AE\u0037}
-    Properties:
-      trustServerCertificate: 'true'
diff --git a/approval-decision-utils-test/pom.xml b/approval-decision-utils-test/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.utils.approvaldecision</groupId>
   <artifactId>approval-decision-utils-test</artifactId>
-  <version>10.0.18-SNAPSHOT</version>
+  <version>10.0.14-SNAPSHOT</version>
   <packaging>iar-integration-test</packaging>
   <dependencies>
     <dependency>
@@ -22,29 +22,23 @@
     <dependency>
     	<groupId>com.axonivy.ivy.test</groupId>
     	<artifactId>unit-tester</artifactId>
-    	 <version>11.2.1</version>
+    	<version>10.0.14</version>
     	<scope>test</scope>
     </dependency>
     <dependency>
     	<groupId>com.axonivy.ivy.webtest</groupId>
     	<artifactId>web-tester</artifactId>
-    	<version>11.2.1</version>
+    	<version>10.0.14</version>
     	<scope>test</scope>
     </dependency>
   </dependencies>
-
-<properties>
-	<ivy.engine.version>10.0.18</ivy.engine.version>
-	<build.plugin.version>10.0.16</build.plugin.version>
-</properties>
-
   <build>
     <testSourceDirectory>src_test</testSourceDirectory>
     <plugins>
       <plugin>
         <groupId>com.axonivy.ivy.ci</groupId>
         <artifactId>project-build-plugin</artifactId>
-        <version>${build.plugin.version}</version>
+        <version>10.0.14</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>

diff --git a/...-utils-test/src_test/com/axonivy/utils/approvaldecision/test/ApprovalDecisionIvyTest.java b/...-utils-test/src_test/com/axonivy/utils/approvaldecision/test/ApprovalDecisionIvyTest.java
@@ -0,0 +1,19 @@
+package com.axonivy.utils.approvaldecision.test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+import ch.ivyteam.ivy.environment.Ivy;
+import ch.ivyteam.ivy.environment.IvyTest;
+
+@IvyTest
+public class ApprovalDecisionIvyTest {
+
+	@Test
+	public void useIvy() {
+		Ivy.log().info("hi from JUnit");
+		assertThat(true).as("I can use Ivy API facade in tests").isEqualTo(true);
+	}
+
+}
diff --git a/...-utils-test/src_test/com/axonivy/utils/approvaldecision/test/ApprovalDecisionWebTest.java b/...-utils-test/src_test/com/axonivy/utils/approvaldecision/test/ApprovalDecisionWebTest.java
@@ -16,7 +16,7 @@
 import com.axonivy.ivy.webtest.primeui.widget.Table;
 import com.codeborne.selenide.Selenide;
 
-@IvyWebTest()
+@IvyWebTest
 public class ApprovalDecisionWebTest {
 
 	private static final String DECISION_OPTION_FORWARD_TO = "Forward to";
@@ -33,9 +33,9 @@ void startProcess() {
 
 	@Test
 	public void checkButtonsExists() {
-		$(By.id("content-form:cancel")).shouldBe(visible);
-		$(By.id("content-form:save-button")).shouldBe(visible);
-		$(By.id("content-form:complete-button")).shouldBe(visible);
+		$(By.id("content-form:cancel")).shouldBe(visible).click();
+		$(By.id("content-form:save-button")).shouldBe(visible).click();
+		$(By.id("content-form:complete-button")).shouldBe(visible).click();
 	}
 
 	@Test

diff --git a/approval-decision-utils/pom.xml b/approval-decision-utils/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.axonivy.utils.approvaldecision</groupId>
 	<artifactId>approval-decision-utils</artifactId>
-	<version>10.0.18-SNAPSHOT</version>
+	<version>10.0.14-SNAPSHOT</version>
 	<packaging>iar</packaging>
 
 	<dependencies>
@@ -31,8 +31,8 @@
 	</repositories>
 
 	<properties>
-		<ivy.engine.version>10.0.18</ivy.engine.version>
-		<build.plugin.version>10.0.16</build.plugin.version>
+		<ivy.engine.version>10.0.14</ivy.engine.version>
+		<build.plugin.version>10.0.14</build.plugin.version>
 	</properties>
 
 	<build>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <groupId>com.axonivy.utils.approvaldecision</groupId>
   <name>approval-decision-utils</name>
   <artifactId>approval-decision-utils-modules</artifactId>
-  <version>10.0.18-SNAPSHOT</version>
+  <version>10.0.14-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>