Migrate to 12.0 🐫 (#29)

* Raise project to 12.0.0-SNAPSHOT * Update maven version to 12.0.0-SNAPSHOT * Update workflow actions to v5 * migrate to PF13 using Designer * fix DataClass field warnings * Update encoding * Update encoding configuration for pom files * Update encoding config --------- Co-authored-by: Khanh Nguyen <[email protected]>
axonivy-market · Dec 13, 2024 · f62ff4f · f62ff4f
1 parent 0195805
commit f62ff4f
Show file tree

Hide file tree

Showing 61 changed files with 359 additions and 374 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,4 +8,4 @@ on:
 
 jobs:
   build:
-    uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v4
+    uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v5
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -8,4 +8,4 @@ on:
 
 jobs:
   build:
-    uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v4
+    uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v5
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,4 +4,4 @@ on: workflow_dispatch
 
 jobs:
   build:
-    uses: axonivy-market/github-workflows/.github/workflows/release.yml@v4
+    uses: axonivy-market/github-workflows/.github/workflows/release.yml@v5
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/currency-converter-connector-demo/.classpath b/currency-converter-connector-demo/.classpath
@@ -5,12 +5,7 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**/*.ivyClass|**/*.mod|**/*.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/currency-converter-connector-demo/.project b/currency-converter-connector-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>
@@ -44,6 +49,5 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
-</projectDescription>
+</projectDescription>
diff --git a/currency-converter-connector-demo/.settings/.jsdtscope b/currency-converter-connector-demo/.settings/.jsdtscope
diff --git a/currency-converter-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs b/currency-converter-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs
@@ -1,4 +1,4 @@
-ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.currency.converter.connector.demo.Data
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.currency.converter.connector.demo
-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=120001
+eclipse.preferences.version=1
diff --git a/currency-converter-connector-demo/.settings/org.eclipse.core.resources.prefs b/currency-converter-connector-demo/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/currency-converter-connector-demo/.settings/org.eclipse.jdt.core.prefs b/currency-converter-connector-demo/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/currency-converter-connector-demo/.settings/org.eclipse.wst.common.component b/currency-converter-connector-demo/.settings/org.eclipse.wst.common.component
@@ -1,21 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-
     <wb-module deploy-name="currency-converter-connector-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="currency-converter-connector-demo"/>
-
         <property name="java-output-path" value="/currency-converter-connector-demo/classes"/>
-
     </wb-module>
-
-</project-modules>
+</project-modules>
diff --git a/currency-converter-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml b/currency-converter-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <fixed facet="wst.jsdt.web"/>
-  <installed facet="java" version="17"/>
+  <installed facet="java" version="21"/>
   <installed facet="jst.web" version="3.0"/>
-  <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="jst.jsf" version="2.1"/>
-</faceted-project>
+</faceted-project>
diff --git a/currency-converter-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container b/currency-converter-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container
diff --git a/currency-converter-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name b/currency-converter-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name
diff --git a/currency-converter-connector-demo/config/variables.yaml b/currency-converter-connector-demo/config/variables.yaml
@@ -0,0 +1,2 @@
+# yaml-language-server: $schema=https://json-schema.axonivy.com/app/12.0.0/variables.json
+Variables:
diff --git a/...ctor-demo/dataclasses/com/axonivy/connector/currency/converter/connector/demo/Data.d.json b/...ctor-demo/dataclasses/com/axonivy/connector/currency/converter/connector/demo/Data.d.json
@@ -0,0 +1,6 @@
+{
+  "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
+  "simpleName" : "Data",
+  "namespace" : "com.axonivy.connector.currency.converter.connector.demo",
+  "isBusinessCaseData" : false
+}
diff --git a/...or-demo/dataclasses/com/axonivy/connector/currency/converter/connector/demo/Data.ivyClass b/...or-demo/dataclasses/com/axonivy/connector/currency/converter/connector/demo/Data.ivyClass
diff --git a/currency-converter-connector-demo/pom.xml b/currency-converter-connector-demo/pom.xml
@@ -1,38 +1,41 @@
 <?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.axonivy.connector.currency</groupId>
-  <artifactId>currency-converter-connector-demo</artifactId>
-  <version>10.0.4-SNAPSHOT</version>
-  <packaging>iar</packaging>
-  <properties>
-    <project.build.plugin.version>10.0.16</project.build.plugin.version>
-  </properties>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>sonatype</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-      <snapshots>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
-  <dependencies>
-    <dependency>
-      <groupId>com.axonivy.connector.currency</groupId>
-      <artifactId>currency-converter-connector</artifactId>
-      <version>${project.version}</version>
-      <type>iar</type>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>com.axonivy.ivy.ci</groupId>
-        <artifactId>project-build-plugin</artifactId>
-        <version>${project.build.plugin.version}</version>
-        <extensions>true</extensions>
-      </plugin>
-    </plugins>
-  </build>
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.axonivy.connector.currency</groupId>
+	<artifactId>currency-converter-connector-demo</artifactId>
+	<version>12.0.0-SNAPSHOT</version>
+	<packaging>iar</packaging>
+	<properties>
+		<project.build.plugin.version>12.0.0</project.build.plugin.version>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>sonatype</id>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+			<snapshots>
+				<updatePolicy>always</updatePolicy>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
+	<dependencies>
+		<dependency>
+			<groupId>com.axonivy.connector.currency</groupId>
+			<artifactId>currency-converter-connector</artifactId>
+			<version>${project.version}</version>
+			<type>iar</type>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>com.axonivy.ivy.ci</groupId>
+				<artifactId>project-build-plugin</artifactId>
+				<version>${project.build.plugin.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/...verter-connector-demo/processes/currency_converter_connector/CurrencyConverterDemo.p.json b/...verter-connector-demo/processes/currency_converter_connector/CurrencyConverterDemo.p.json
@@ -1,5 +1,5 @@
 {
-  "format" : "10.0.0",
+  "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
   "id" : "17D7B9CE272367D5",
   "config" : {
     "data" : "com.axonivy.connector.currency.converter.connector.demo.Data"
@@ -9,25 +9,28 @@
       "type" : "RequestStart",
       "name" : "Demo Start",
       "config" : {
-        "callSignature" : "convertDemo",
-        "case" : {
-          "name" : "Währungsrechner"
+        "signature" : "convertDemo",
+        "request" : {
+          "name" : "Currency Converter",
+          "description" : "Example of a Currency Converter",
+          "customFields" : [
+            { "name" : "cssIcon", "value" : "si si-monetization-approve" }
+          ]
         },
-        "outLink" : "convertDemo.ivp",
-        "startDescription" : "Example of a Currency Converter",
-        "startCustomFields" : [
-          { "name" : "cssIcon", "value" : "si si-monetization-approve" }
-        ],
         "task" : {
           "name" : "Währungsrechner"
         },
-        "startName" : "Currency Converter"
+        "case" : {
+          "name" : "Währungsrechner"
+        }
       },
       "visual" : {
         "at" : { "x" : 96, "y" : 64 },
         "labelOffset" : { "x" : 22, "y" : 37 }
       },
-      "connect" : { "id" : "f4", "to" : "f3" }
+      "connect" : [
+        { "id" : "f4", "to" : "f3" }
+      ]
     }, {
       "id" : "f1",
       "type" : "TaskEnd",
@@ -39,13 +42,14 @@
       "type" : "DialogCall",
       "name" : "CurrencyConverterInput",
       "config" : {
-        "dialogId" : "com.axonivy.connector.currency.converter.connector.demo.CurrencyConverterInput",
-        "startMethod" : "start()"
+        "dialog" : "com.axonivy.connector.currency.converter.connector.demo.CurrencyConverterInput:start()"
       },
       "visual" : {
         "at" : { "x" : 256, "y" : 64 },
-        "size" : { "width" : 160, "height" : 60 }
+        "size" : { "width" : 160 }
       },
-      "connect" : { "id" : "f2", "to" : "f1" }
+      "connect" : [
+        { "id" : "f2", "to" : "f1" }
+      ]
     } ]
 }
diff --git a/...rency/converter/connector/demo/CurrencyConverterInput/CurrencyConverterInput.rddescriptor b/...rency/converter/connector/demo/CurrencyConverterInput/CurrencyConverterInput.rddescriptor
diff --git a/...tor/currency/converter/connector/demo/CurrencyConverterInput/CurrencyConverterInput.xhtml b/...tor/currency/converter/connector/demo/CurrencyConverterInput/CurrencyConverterInput.xhtml
@@ -20,16 +20,16 @@
 						ui-g-12 ui-md-9 ui-lg-4">
 
 					<p:outputLabel for="currencyConverterDataFromAmount" value="Input Amount" />
-					<p:inputNumber id="currencyConverterDataFromAmount" value="#{data.convert.FromAmount}" required="true" />
+					<p:inputNumber id="currencyConverterDataFromAmount" value="#{data.convert.fromAmount}" required="true" />
 
 					<p:outputLabel value="Input Currency" />
-					<ic:com.axonivy.connector.currency.converter.connector.demo.CurrencyDropdown currency="#{data.convert.FromCurrency}" />
+					<ic:com.axonivy.connector.currency.converter.connector.demo.CurrencyDropdown currency="#{data.convert.fromCurrency}" />
 
 					<p:outputLabel value="Output Currency" />
-					<ic:com.axonivy.connector.currency.converter.connector.demo.CurrencyDropdown currency="#{data.convert.ToCurrency}" />
+					<ic:com.axonivy.connector.currency.converter.connector.demo.CurrencyDropdown currency="#{data.convert.toCurrency}" />
 
 					<p:outputLabel for="currencyConverterDataAmountInEuro" value="Amount" />
-					<p:inputText id="currencyConverterDataAmountInEuro" value="#{data.convert.ToAmount}" disabled="true" />
+					<p:inputText id="currencyConverterDataAmountInEuro" value="#{data.convert.toAmount}" disabled="true" />
 
 				</p:panelGrid>
 				<br />

diff --git a/...urrency/converter/connector/demo/CurrencyConverterInput/CurrencyConverterInputData.d.json b/...urrency/converter/connector/demo/CurrencyConverterInput/CurrencyConverterInputData.d.json
@@ -0,0 +1,11 @@
+{
+  "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
+  "simpleName" : "CurrencyConverterInputData",
+  "namespace" : "com.axonivy.connector.currency.converter.connector.demo.CurrencyConverterInput",
+  "isBusinessCaseData" : false,
+  "fields" : [ {
+    "name" : "convert",
+    "type" : "com.axonivy.connector.currency.converter.connector.CurrencyConverterData",
+    "modifiers" : [ "PERSISTENT" ]
+  } ]
+}
diff --git a/...rency/converter/connector/demo/CurrencyConverterInput/CurrencyConverterInputData.ivyClass b/...rency/converter/connector/demo/CurrencyConverterInput/CurrencyConverterInputData.ivyClass
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,4 +8,4 @@ on: @@
     jobs:
       build:
-        uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v4
+        uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v5
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		eclipse.preferences.version=1
		encoding/<project>=UTF-8
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# yaml-language-server: $schema=https://json-schema.axonivy.com/app/12.0.0/variables.json
		Variables: