MARP-653: convert to Ivy Designer 11.3 (#17)

axonivy-market · Jul 24, 2024 · 5bfe11d · 5bfe11d
1 parent f6e39cc
commit 5bfe11d
Show file tree

Hide file tree

Showing 19 changed files with 87 additions and 86 deletions.
diff --git a/cronjob-demo/.classpath b/cronjob-demo/.classpath
@@ -5,12 +5,7 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**/*.ivyClass|**/*.p.json|**/*.rddescriptor|**/*.xhtml" kind="src" path="src_hd">
-		<attributes>
-			<attribute name="optional" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="src_wsproc">
+		<classpathentry kind="src" path="src_wsproc">
 		<attributes>
 			<attribute name="optional" value="true"/>
 		</attributes>

diff --git a/cronjob-demo/.project b/cronjob-demo/.project
@@ -25,6 +25,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>ch.ivyteam.ivy.dialog.form.build.ivyDialogFormBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder</name>
 			<arguments>

diff --git a/cronjob-demo/.settings/ch.ivyteam.ivy.designer.prefs b/cronjob-demo/.settings/ch.ivyteam.ivy.designer.prefs
@@ -1,5 +1,5 @@
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.utils.cronjobutils.automated.process.start.utils.demo.Data
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.utils.cronjobutils.automated.process.start.utils.demo
-ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
-ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000
-eclipse.preferences.version=1
+ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
+ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=113000
+eclipse.preferences.version=1
diff --git a/cronjob-demo/.settings/org.eclipse.wst.common.component b/cronjob-demo/.settings/org.eclipse.wst.common.component
@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="cronjob-demo">
-        <wb-resource deploy-path="/" source-path="/webContent" tag="defaultRootSource"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src_hd"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src_wsproc"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src_dataClasses"/>
-        <property name="context-root" value="cronjob-demo"/>
-        <property name="java-output-path" value="/cronjob-demo/target/classes"/>
-    </wb-module>
-</project-modules>
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="cronjob-demo">
+        <wb-resource deploy-path="/" source-path="/webContent" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src_wsproc"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src_dataClasses"/>
+        <property name="context-root" value="cronjob-demo"/>
+        <property name="java-output-path" value="/cronjob-demo/target/classes"/>
+    </wb-module>
+</project-modules>
diff --git a/cronjob-demo/pom.xml b/cronjob-demo/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.utils.cronjob</groupId>
   <artifactId>cronjob-demo</artifactId>
-  <version>11.2.0-SNAPSHOT</version>
+  <version>11.3.0-SNAPSHOT</version>
   <packaging>iar</packaging>
   <dependencies>
     <dependency>
@@ -15,21 +15,20 @@
     </dependency>
   </dependencies>
   <pluginRepositories>
-    <!-- Snapshot releases are available via sonatype.org -->
     <pluginRepository>
-      <id>sonatype</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
       <snapshots>
         <updatePolicy>always</updatePolicy>
       </snapshots>
+      <id>sonatype</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
     </pluginRepository>
-  </pluginRepositories>  
+  </pluginRepositories>
   <build>
     <plugins>
       <plugin>
         <groupId>com.axonivy.ivy.ci</groupId>
         <artifactId>project-build-plugin</artifactId>
-        <version>11.2.0-SNAPSHOT</version>
+        <version>11.3.0</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>

diff --git a/cronjob-demo/processes/Demo.p.json b/cronjob-demo/processes/Demo.p.json
@@ -1,5 +1,5 @@
 {
-  "format" : "10.0.0",
+  "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
   "id" : "185E888E5E4EFBE2",
   "config" : {
     "data" : "com.axonivy.utils.cronjob.demo.DemoData"
@@ -15,14 +15,19 @@
       "type" : "ProgramStart",
       "name" : "Start Cron Job Utils",
       "config" : {
-        "beanConfig" : "demoStartCronPattern",
-        "outerBean" : "com.axonivy.utils.cronjob.CronByGlobalVariableTriggerStartEventBean"
+        "javaClass" : "com.axonivy.utils.cronjob.CronByGlobalVariableTriggerStartEventBean",
+        "userConfig" : {
+          "converted" : "demoStartCronPattern"
+        },
+        "link" : "eventLink.ivp"
       },
       "visual" : {
         "at" : { "x" : 96, "y" : 160 },
         "labelOffset" : { "x" : 13, "y" : 33 }
       },
-      "connect" : { "id" : "f7", "to" : "f4" }
+      "connect" : [
+        { "id" : "f7", "to" : "f4" }
+      ]
     }, {
       "id" : "f4",
       "type" : "Script",
@@ -46,6 +51,8 @@
       "visual" : {
         "at" : { "x" : 280, "y" : 160 }
       },
-      "connect" : { "id" : "f6", "to" : "f1" }
+      "connect" : [
+        { "id" : "f6", "to" : "f1" }
+      ]
     } ]
 }
diff --git a/cronjob-product/pom.xml b/cronjob-product/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.utils.cronjob</groupId>
   <artifactId>cronjob-product</artifactId>
-  <version>11.2.0-SNAPSHOT</version>
+  <version>11.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <build>

diff --git a/cronjob-test/.classpath b/cronjob-test/.classpath
@@ -5,12 +5,7 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**/*.ivyClass|**/*.p.json|**/*.rddescriptor|**/*.xhtml" kind="src" path="src_hd">
-		<attributes>
-			<attribute name="optional" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="src_wsproc">
+		<classpathentry kind="src" path="src_wsproc">
 		<attributes>
 			<attribute name="optional" value="true"/>
 		</attributes>

diff --git a/cronjob-test/.project b/cronjob-test/.project
@@ -25,6 +25,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>ch.ivyteam.ivy.dialog.form.build.ivyDialogFormBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder</name>
 			<arguments>

diff --git a/cronjob-test/.settings/ch.ivyteam.ivy.designer.prefs b/cronjob-test/.settings/ch.ivyteam.ivy.designer.prefs
@@ -1,5 +1,5 @@
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.utils.cronjobutils.test.Data
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.utils.cronjobutils.test
-ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
-ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000
-eclipse.preferences.version=1
+ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
+ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=113000
+eclipse.preferences.version=1
diff --git a/cronjob-test/.settings/org.eclipse.wst.common.component b/cronjob-test/.settings/org.eclipse.wst.common.component
@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="cronjob-test">
-        <wb-resource deploy-path="/" source-path="/webContent" tag="defaultRootSource"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src_hd"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src_wsproc"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src_dataClasses"/>
-        <property name="context-root" value="cronjob-test"/>
-        <property name="java-output-path" value="/cronjob-test/target/classes"/>
-    </wb-module>
-</project-modules>
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="cronjob-test">
+        <wb-resource deploy-path="/" source-path="/webContent" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src_wsproc"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src_dataClasses"/>
+        <property name="context-root" value="cronjob-test"/>
+        <property name="java-output-path" value="/cronjob-test/target/classes"/>
+    </wb-module>
+</project-modules>
diff --git a/cronjob-test/dataclasses/com/axonivy/utils/cronjob/test/Data.ivyClass b/cronjob-test/dataclasses/com/axonivy/utils/cronjob/test/Data.ivyClass
@@ -1,2 +1,2 @@
 Data #class
-com.axonivy.utils.cronjobutils.test #namespace
+com.axonivy.utils.cronjob.test #namespace
diff --git a/cronjob-test/pom.xml b/cronjob-test/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.utils.cronjob</groupId>
   <artifactId>cronjob-test</artifactId>
-  <version>11.2.0-SNAPSHOT</version>
+  <version>11.3.0-SNAPSHOT</version>
   <packaging>iar-integration-test</packaging>
   <dependencies>
     <dependency>
@@ -21,22 +21,21 @@
     </dependency>
   </dependencies>
   <pluginRepositories>
-    <!-- Snapshot releases are available via sonatype.org -->
     <pluginRepository>
-      <id>sonatype</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
       <snapshots>
         <updatePolicy>always</updatePolicy>
       </snapshots>
+      <id>sonatype</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
     </pluginRepository>
-  </pluginRepositories>  
+  </pluginRepositories>
   <build>
     <testSourceDirectory>src_test</testSourceDirectory>
     <plugins>
       <plugin>
         <groupId>com.axonivy.ivy.ci</groupId>
         <artifactId>project-build-plugin</artifactId>
-        <version>11.2.0-SNAPSHOT</version>
+        <version>11.3.0</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>

diff --git a/cronjob/.classpath b/cronjob/.classpath
@@ -5,12 +5,7 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**/*.ivyClass|**/*.p.json|**/*.rddescriptor|**/*.xhtml" kind="src" path="src_hd">
-		<attributes>
-			<attribute name="optional" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="src_wsproc">
+		<classpathentry kind="src" path="src_wsproc">
 		<attributes>
 			<attribute name="optional" value="true"/>
 		</attributes>

diff --git a/cronjob/.project b/cronjob/.project
@@ -25,6 +25,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>ch.ivyteam.ivy.dialog.form.build.ivyDialogFormBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder</name>
 			<arguments>

diff --git a/cronjob/.settings/ch.ivyteam.ivy.designer.prefs b/cronjob/.settings/ch.ivyteam.ivy.designer.prefs
@@ -1,5 +1,5 @@
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.utils.cronjobutils.automated.process.start.utils.Data
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.utils.cronjobutils.automated.process.start.utils
-ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
-ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000
-eclipse.preferences.version=1
+ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
+ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=113000
+eclipse.preferences.version=1
diff --git a/cronjob/.settings/org.eclipse.wst.common.component b/cronjob/.settings/org.eclipse.wst.common.component
@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="cronjob">
-        <wb-resource deploy-path="/" source-path="/webContent" tag="defaultRootSource"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src_hd"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src_wsproc"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src_dataClasses"/>
-        <property name="context-root" value="cronjob"/>
-        <property name="java-output-path" value="/cronjob/target/classes"/>
-    </wb-module>
-</project-modules>
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="cronjob">
+        <wb-resource deploy-path="/" source-path="/webContent" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src_wsproc"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src_dataClasses"/>
+        <property name="context-root" value="cronjob"/>
+        <property name="java-output-path" value="/cronjob/target/classes"/>
+    </wb-module>
+</project-modules>
diff --git a/cronjob/pom.xml b/cronjob/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.utils.cronjob</groupId>
   <artifactId>cronjob</artifactId>
-  <version>11.2.0-SNAPSHOT</version>
+  <version>11.3.0-SNAPSHOT</version>
   <packaging>iar</packaging>
   <organization>
     <name>Axon Ivy AG</name>
@@ -26,21 +26,20 @@
     </dependency>
   </dependencies>
   <pluginRepositories>
-    <!-- Snapshot releases are available via sonatype.org -->
     <pluginRepository>
-      <id>sonatype</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
       <snapshots>
         <updatePolicy>always</updatePolicy>
       </snapshots>
+      <id>sonatype</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
     </pluginRepository>
-  </pluginRepositories>  
+  </pluginRepositories>
   <build>
     <plugins>
       <plugin>
         <groupId>com.axonivy.ivy.ci</groupId>
         <artifactId>project-build-plugin</artifactId>
-        <version>11.2.0-SNAPSHOT</version>
+        <version>11.3.0</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <groupId>com.axonivy.utils.cronjob</groupId>
   <name>cronjob</name>
   <artifactId>cronjob-modules</artifactId>
-  <version>11.2.0-SNAPSHOT</version>
+  <version>11.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>