Skip to content

Commit

Permalink
MARP-1541 Migrate to 12.0 🐫 (#29)
Browse files Browse the repository at this point in the history
  • Loading branch information
ivy-rew authored Jan 6, 2025
1 parent 8dfa0f9 commit 3bcf6c6
Show file tree
Hide file tree
Showing 28 changed files with 116 additions and 115 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff 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
2 changes: 1 addition & 1 deletion .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion custom-mail-demo-product/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<groupId>com.axonivy.demo.custom.mail</groupId>
<artifactId>custom-mail-demo-product</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>12.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<build>
Expand Down
7 changes: 1 addition & 6 deletions custom-mail-demo/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 6 additions & 2 deletions custom-mail-demo/.project
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,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>
Expand All @@ -44,6 +49,5 @@
<nature>org.eclipse.m2e.core.maven2Nature</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>
12 changes: 0 additions & 12 deletions custom-mail-demo/.settings/.jsdtscope

This file was deleted.

5 changes: 2 additions & 3 deletions custom-mail-demo/.settings/ch.ivyteam.ivy.designer.prefs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.demo.custom.mail.Data
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.demo.custom.mail
ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000
ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001
eclipse.preferences.version=1
2 changes: 2 additions & 0 deletions custom-mail-demo/.settings/org.eclipse.core.resources.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
6 changes: 3 additions & 3 deletions custom-mail-demo/.settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -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
3 changes: 1 addition & 2 deletions custom-mail-demo/.settings/org.eclipse.wst.common.component
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
<wb-module deploy-name="custom-mail">
<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="custom-mail"/>
<property name="java-output-path" value="/custom-mail/target/classes"/>
</wb-module>
</project-modules>
</project-modules>
Original file line number Diff line number Diff line change
@@ -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>

This file was deleted.

This file was deleted.

1 change: 1 addition & 0 deletions custom-mail-demo/config/variables.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# yaml-language-server: $schema=https://json-schema.axonivy.com/app/12.0.0/variables.json
# == Variables ==
#
# You can define here your project Variables.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
"simpleName" : "Data",
"namespace" : "com.axonivy.demo.custom.mail",
"isBusinessCaseData" : false,
"fields" : [ {
"name" : "user",
"type" : "ch.ivyteam.ivy.security.IUser"
}, {
"name" : "task",
"type" : "ch.ivyteam.ivy.workflow.ITask"
}, {
"name" : "tasks",
"type" : "List<ch.ivyteam.ivy.workflow.ITask>"
} ]
}

This file was deleted.

5 changes: 3 additions & 2 deletions custom-mail-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.demo.custom.mail</groupId>
<artifactId>custom-mail-demo</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>12.0.0-SNAPSHOT</version>
<packaging>iar</packaging>
<properties>
<project.build.plugin.version>10.0.16</project.build.plugin.version>
<project.build.plugin.version>12.0.0</project.build.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<pluginRepositories>
<pluginRepository>
Expand Down
56 changes: 28 additions & 28 deletions custom-mail-demo/processes/mail.p.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format" : "10.0.0",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "180D6008051E52D8",
"config" : {
"data" : "com.axonivy.demo.custom.mail.Data"
Expand All @@ -9,25 +9,28 @@
"type" : "RequestStart",
"name" : "MailNotification_NewTask.ivp",
"config" : {
"callSignature" : "MailNotification_NewTask",
"signature" : "MailNotification_NewTask",
"input" : {
"params" : [
{ "name" : "notificationTaskId", "type" : "Number" },
{ "name" : "notificationSecurityMemberId", "type" : "String" }
{ "name" : "notificationTaskId", "type" : "Number", "desc" : "" },
{ "name" : "notificationSecurityMemberId", "type" : "String", "desc" : "" }
],
"map" : {
"out.task" : "ivy.wf.findTask(param.notificationTaskId as Long)",
"out.user" : "ivy.security.users().findById(param.notificationSecurityMemberId)"
}
},
"outLink" : "MailNotification_NewTask.ivp",
"showInStartList" : false
"request" : {
"isVisibleOnStartList" : false
}
},
"visual" : {
"at" : { "x" : 96, "y" : 64 },
"labelOffset" : { "x" : 18, "y" : 46 }
},
"connect" : { "id" : "f5", "to" : "f4" }
"connect" : [
{ "id" : "f5", "to" : "f4" }
]
}, {
"id" : "f1",
"type" : "TaskEnd",
Expand All @@ -39,36 +42,34 @@
"type" : "RequestStart",
"name" : "MailNotification_DailyTaskSummary.ivp",
"config" : {
"callSignature" : "MailNotification_DailyTaskSummary",
"signature" : "MailNotification_DailyTaskSummary",
"input" : {
"params" : [
{ "name" : "notificationSecurityMemberId", "type" : "String" }
{ "name" : "notificationSecurityMemberId", "type" : "String", "desc" : "" }
],
"map" : {
"out.tasks" : "ivy.wf.findWorkTasks(ivy.security.users().findById(param.notificationSecurityMemberId), 0, -1).getResultList()",
"out.tasks" : "ch.ivyteam.ivy.workflow.query.TaskQuery.create().where().canWorkOn(ivy.security.users().findById(param.notificationSecurityMemberId)).executor().results( 0, -1)",
"out.user" : "ivy.security.users().findById(param.notificationSecurityMemberId)"
}
},
"outLink" : "MailNotification_DailyTaskSummary.ivp",
"showInStartList" : false
"request" : {
"isVisibleOnStartList" : false
}
},
"visual" : {
"at" : { "x" : 96, "y" : 160 },
"labelOffset" : { "x" : 41, "y" : 46 }
},
"connect" : { "id" : "f9", "to" : "f8" }
"connect" : [
{ "id" : "f9", "to" : "f8" }
]
}, {
"id" : "f4",
"type" : "DialogCall",
"name" : "NewTask",
"config" : {
"dialogId" : "com.axonivy.demo.custom.mail.NewTask",
"startMethod" : "start(ch.ivyteam.ivy.security.IUser,ch.ivyteam.ivy.workflow.ITask)",
"dialog" : "com.axonivy.demo.custom.mail.NewTask:start(ch.ivyteam.ivy.security.IUser,ch.ivyteam.ivy.workflow.ITask)",
"call" : {
"params" : [
{ "name" : "user", "type" : "ch.ivyteam.ivy.security.IUser" },
{ "name" : "task", "type" : "ch.ivyteam.ivy.workflow.ITask" }
],
"map" : {
"param.user" : "in.user",
"param.task" : "in.task"
Expand All @@ -78,7 +79,9 @@
"visual" : {
"at" : { "x" : 328, "y" : 64 }
},
"connect" : { "id" : "f2", "to" : "f1" }
"connect" : [
{ "id" : "f2", "to" : "f1" }
]
}, {
"id" : "f6",
"type" : "TaskEnd",
Expand All @@ -90,13 +93,8 @@
"type" : "DialogCall",
"name" : "DailTaskSummary",
"config" : {
"dialogId" : "com.axonivy.demo.custom.mail.DailTaskSummary",
"startMethod" : "start(ch.ivyteam.ivy.security.IUser,List<ch.ivyteam.ivy.workflow.ITask>)",
"dialog" : "com.axonivy.demo.custom.mail.DailTaskSummary:start(ch.ivyteam.ivy.security.IUser,List<ch.ivyteam.ivy.workflow.ITask>)",
"call" : {
"params" : [
{ "name" : "user", "type" : "ch.ivyteam.ivy.security.IUser" },
{ "name" : "tasks", "type" : "List<ch.ivyteam.ivy.workflow.ITask>" }
],
"map" : {
"param.user" : "in.user",
"param.tasks" : "in.tasks"
Expand All @@ -105,8 +103,10 @@
},
"visual" : {
"at" : { "x" : 328, "y" : 160 },
"size" : { "width" : 128, "height" : 60 }
"size" : { "width" : 128 }
},
"connect" : { "id" : "f7", "to" : "f6" }
"connect" : [
{ "id" : "f7", "to" : "f6" }
]
} ]
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
"simpleName" : "DailTaskSummaryData",
"namespace" : "com.axonivy.demo.custom.mail.DailTaskSummary",
"isBusinessCaseData" : false,
"fields" : [ {
"name" : "user",
"type" : "ch.ivyteam.ivy.security.IUser"
}, {
"name" : "tasks",
"type" : "List<ch.ivyteam.ivy.workflow.ITask>"
} ]
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format" : "10.0.0",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "180D611C92D66220",
"kind" : "HTML_DIALOG",
"config" : {
Expand All @@ -10,11 +10,11 @@
"type" : "HtmlDialogStart",
"name" : "start(IUser,List<ITask>)",
"config" : {
"callSignature" : "start",
"signature" : "start",
"input" : {
"params" : [
{ "name" : "user", "type" : "ch.ivyteam.ivy.security.IUser" },
{ "name" : "tasks", "type" : "List<ch.ivyteam.ivy.workflow.ITask>" }
{ "name" : "user", "type" : "ch.ivyteam.ivy.security.IUser", "desc" : "" },
{ "name" : "tasks", "type" : "List<ch.ivyteam.ivy.workflow.ITask>", "desc" : "" }
],
"map" : {
"out.tasks" : "param.tasks",
Expand All @@ -27,7 +27,9 @@
"at" : { "x" : 96, "y" : 64 },
"labelOffset" : { "x" : 53, "y" : 35 }
},
"connect" : { "id" : "f2", "to" : "f1" }
"connect" : [
{ "id" : "f2", "to" : "f1" }
]
}, {
"id" : "f1",
"type" : "HtmlDialogEnd",
Expand All @@ -44,7 +46,9 @@
"visual" : {
"at" : { "x" : 96, "y" : 160 }
},
"connect" : { "id" : "f5", "to" : "f4" }
"connect" : [
{ "id" : "f5", "to" : "f4" }
]
}, {
"id" : "f4",
"type" : "HtmlDialogExit",
Expand Down

This file was deleted.

Loading

0 comments on commit 3bcf6c6

Please sign in to comment.