Skip to content

Commit

Permalink
MARP-1481 convert to Ivy 12 (#59)
Browse files Browse the repository at this point in the history
  • Loading branch information
quanpham-axonivy authored Dec 2, 2024
1 parent 101ee3b commit 9cd3d03
Show file tree
Hide file tree
Showing 87 changed files with 393 additions and 397 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,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 pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<groupId>com.axonivy.utils.process.inspector</groupId>
<name>process-inspector</name>
<artifactId>process-inspector-modules</artifactId>
<version>11.2.7-SNAPSHOT</version>
<version>12.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
Expand Down
124 changes: 64 additions & 60 deletions process-inspector-demo/.project
Original file line number Diff line number Diff line change
@@ -1,60 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>process-inspector-demo</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>ch.ivyteam.ivy.designer.dataClasses.ui.ivyDataClassBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>ch.ivyteam.ivy.designer.process.ui.ivyWebServiceProcessClassBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>ch.ivyteam.ivy.project.IvyProjectNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<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>
<nature>org.eclipse.pde.PluginNature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>process-inspector-demo</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>ch.ivyteam.ivy.designer.dataClasses.ui.ivyDataClassBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>ch.ivyteam.ivy.designer.process.ui.ivyWebServiceProcessClassBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<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>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>ch.ivyteam.ivy.project.IvyProjectNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<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.pde.PluginNature</nature>
</natures>
</projectDescription>
12 changes: 0 additions & 12 deletions process-inspector-demo/.settings/.jsdtscope

This file was deleted.

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.utils.process.inspector.demo.Data
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.utils.process.inspector.demo
ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=112000
ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001
eclipse.preferences.version=1
6 changes: 3 additions & 3 deletions process-inspector-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
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="jst.web" version="3.0"/>
<installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="jst.jsf" version="2.1"/>
</faceted-project>
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<installed facet="java" version="21"/>
<installed facet="jst.web" version="3.0"/>
<installed facet="jst.jsf" version="2.1"/>
</faceted-project>

This file was deleted.

This file was deleted.

1 change: 1 addition & 0 deletions process-inspector-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,6 @@
{
"$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
"simpleName" : "Data",
"namespace" : "com.axonivy.utils.process.inspector.demo",
"isBusinessCaseData" : false
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
"simpleName" : "DemoData",
"namespace" : "com.axonivy.utils.process.inspector.demo",
"isBusinessCaseData" : false,
"fields" : [ {
"name" : "bean",
"type" : "com.axonivy.utils.process.inspector.demo.ProcessInspectorBean",
"modifiers" : [ "PERSISTENT" ]
} ]
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
"simpleName" : "FlowDemoSubProcessCallData",
"namespace" : "com.axonivy.utils.process.inspector.demo",
"isBusinessCaseData" : false
}

This file was deleted.

4 changes: 2 additions & 2 deletions process-inspector-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.utils.process.inspector</groupId>
<artifactId>process-inspector-demo</artifactId>
<version>11.2.7-SNAPSHOT</version>
<version>12.0.0-SNAPSHOT</version>
<packaging>iar</packaging>
<properties>
<project.build.plugin.version>11.3.0</project.build.plugin.version>
<project.build.plugin.version>12.0.0</project.build.plugin.version>
</properties>
<dependencies>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.2.2/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "18E180A64355D4D9",
"config" : {
"data" : "com.axonivy.utils.process.inspector.demo.Data",
Expand Down Expand Up @@ -63,7 +63,7 @@
},
"visual" : {
"at" : { "x" : 440, "y" : 64 },
"labelOffset" : { "x" : 16, "y" : -16 }
"labelOffset" : { "y" : -16 }
},
"connect" : [
{ "id" : "f13", "to" : "f12", "label" : {
Expand All @@ -81,7 +81,7 @@
"name" : "alter2",
"visual" : {
"at" : { "x" : 720, "y" : 64 },
"labelOffset" : { "x" : 16, "y" : -16 }
"labelOffset" : { "y" : -16 }
},
"connect" : [
{ "id" : "f9", "to" : "f8" }
Expand All @@ -92,7 +92,7 @@
"name" : "alter3",
"visual" : {
"at" : { "x" : 864, "y" : 64 },
"labelOffset" : { "x" : 16, "y" : -16 }
"labelOffset" : { "y" : -16 }
},
"connect" : [
{ "id" : "f10", "to" : "f37" }
Expand Down Expand Up @@ -139,9 +139,9 @@
"name" : "{internal}",
"offset" : { "x" : -7, "y" : -2 }
} },
{ "id" : "f21", "to" : "f20", "color" : "default path", "label" : {
{ "id" : "f21", "to" : "f20", "label" : {
"name" : "{external}"
} }
}, "color" : "default path" }
]
}, {
"id" : "f7",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.2.2/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "18EEB6E309329524",
"kind" : "CALLABLE_SUB",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.2.2/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "18E3BEFFB97FCA4E",
"config" : {
"data" : "com.axonivy.utils.process.inspector.demo.Data"
Expand Down Expand Up @@ -367,9 +367,9 @@
},
"connect" : [
{ "id" : "f64", "to" : "f58", "via" : [ { "x" : 352, "y" : 344 } ] },
{ "id" : "f79", "to" : "f0", "color" : "default path", "label" : {
{ "id" : "f79", "to" : "f0", "label" : {
"name" : "{internal}"
} }
}, "color" : "default path" }
]
}, {
"id" : "f0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.2.2/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "18E31D6BC0E4B857",
"config" : {
"data" : "com.axonivy.utils.process.inspector.demo.Data"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.2.2/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "18E180F943F963D5",
"config" : {
"data" : "com.axonivy.utils.process.inspector.demo.DemoData"
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
"simpleName" : "DummyData",
"namespace" : "com.axonivy.utils.process.inspector.demo.Dummy",
"isBusinessCaseData" : false
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.2.2/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "18E7EA48B28E4A37",
"kind" : "HTML_DIALOG",
"config" : {
Expand Down

This file was deleted.

Loading

0 comments on commit 9cd3d03

Please sign in to comment.