Skip to content

Commit

Permalink
MARP-1481 Upgrade Ivy version to 12
Browse files Browse the repository at this point in the history
  • Loading branch information
quanpham-axonivy committed Nov 28, 2024
1 parent 7544053 commit fefd53c
Show file tree
Hide file tree
Showing 105 changed files with 1,466 additions and 1,020 deletions.
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.connector.ups</groupId>
<name>ups-connector</name>
<artifactId>ups-connector-modules</artifactId>
<version>10.0.17-SNAPSHOT</version>
<version>12.0.0</version>
<packaging>pom</packaging>

<modules>
Expand Down
7 changes: 1 addition & 6 deletions ups-connector-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 ups-connector-demo/.project
Original file line number Diff line number Diff line change
Expand Up @@ -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>
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 ups-connector-demo/.settings/.jsdtscope

This file was deleted.

5 changes: 2 additions & 3 deletions ups-connector-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.ups.connector.demo.Data
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.ups.connector.demo
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
6 changes: 3 additions & 3 deletions ups-connector-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
Expand Up @@ -2,10 +2,9 @@
<wb-module deploy-name="ups-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="ups-connector-demo"/>
<property name="java-output-path" value="/ups-connector-demo/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 ups-connector-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.ups.connector.demo",
"isBusinessCaseData" : false
}

This file was deleted.

4 changes: 2 additions & 2 deletions ups-connector-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.connector.ups</groupId>
<artifactId>ups-connector-demo</artifactId>
<version>10.0.17-SNAPSHOT</version>
<version>12.0.0</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>
</properties>
<pluginRepositories>
<pluginRepository>
Expand Down
24 changes: 15 additions & 9 deletions ups-connector-demo/processes/Address.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" : "18BEBB83F9E96872",
"config" : {
"data" : "com.axonivy.ups.connector.demo.Data"
Expand All @@ -9,15 +9,20 @@
"type" : "RequestStart",
"name" : "addressValidation.ivp",
"config" : {
"callSignature" : "addressValidation",
"outLink" : "addressValidation.ivp",
"startName" : "Validate Address",
"tags" : "demo"
"signature" : "addressValidation",
"request" : {
"name" : "Validate Address"
}
},
"tags" : [
"demo"
],
"visual" : {
"at" : { "x" : 96, "y" : 64 }
},
"connect" : { "id" : "f4", "to" : "f3" }
"connect" : [
{ "id" : "f4", "to" : "f3" }
]
}, {
"id" : "f1",
"type" : "TaskEnd",
Expand All @@ -29,12 +34,13 @@
"type" : "DialogCall",
"name" : "Address form",
"config" : {
"dialogId" : "com.axonivy.ups.connector.demo.Address",
"startMethod" : "start()"
"dialog" : "com.axonivy.ups.connector.demo.Address:start()"
},
"visual" : {
"at" : { "x" : 424, "y" : 64 }
},
"connect" : { "id" : "f2", "to" : "f1" }
"connect" : [
{ "id" : "f2", "to" : "f1" }
]
} ]
}
29 changes: 15 additions & 14 deletions ups-connector-demo/processes/ManageShipments.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" : "18B6B1E5C8AA1A82",
"config" : {
"data" : "com.axonivy.ups.connector.demo.Data"
Expand All @@ -9,32 +9,33 @@
"type" : "RequestStart",
"name" : "getTrackingInfo.ivp",
"config" : {
"callSignature" : "getTrackingInfo",
"outLink" : "getTrackingInfo.ivp",
"startName" : "Get Tracking",
"tags" : "demo"
"signature" : "getTrackingInfo",
"request" : {
"name" : "Get Tracking"
}
},
"tags" : [
"demo"
],
"visual" : {
"at" : { "x" : 88, "y" : 200 }
},
"connect" : { "id" : "f7", "to" : "f8" }
"connect" : [
{ "id" : "f7", "to" : "f8" }
]
}, {
"id" : "f8",
"type" : "DialogCall",
"name" : "TrackDetail",
"config" : {
"dialogId" : "com.axonivy.ups.connector.demo.TrackDetail",
"startMethod" : "start(com.ups.wwwcie.client.TrackApiResponse)",
"call" : {
"params" : [
{ "name" : "trackApiResponse", "type" : "com.ups.wwwcie.client.TrackApiResponse" }
]
}
"dialog" : "com.axonivy.ups.connector.demo.TrackDetail:start(com.ups.wwwcie.client.TrackApiResponse)"
},
"visual" : {
"at" : { "x" : 400, "y" : 200 }
},
"connect" : { "id" : "f12", "to" : "f9" }
"connect" : [
{ "id" : "f12", "to" : "f9" }
]
}, {
"id" : "f9",
"type" : "TaskEnd",
Expand Down
46 changes: 29 additions & 17 deletions ups-connector-demo/processes/PickupDemo.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" : "18BEFEC3A70B2B09",
"config" : {
"data" : "com.axonivy.ups.connector.demo.Data"
Expand All @@ -9,16 +9,21 @@
"type" : "RequestStart",
"name" : "pickupCreation.ivp",
"config" : {
"callSignature" : "pickupCreation",
"outLink" : "pickupCreation.ivp",
"startName" : "Pickup Creation",
"tags" : "demo"
"signature" : "pickupCreation",
"request" : {
"name" : "Pickup Creation"
}
},
"tags" : [
"demo"
],
"visual" : {
"at" : { "x" : 96, "y" : 64 },
"labelOffset" : { "x" : 17, "y" : 33 }
},
"connect" : { "id" : "f4", "to" : "f3" }
"connect" : [
{ "id" : "f4", "to" : "f3" }
]
}, {
"id" : "f1",
"type" : "TaskEnd",
Expand All @@ -30,40 +35,47 @@
"type" : "DialogCall",
"name" : "PickupCreation",
"config" : {
"dialogId" : "com.axonivy.ups.connector.demo.PickupCreation",
"startMethod" : "start()"
"dialog" : "com.axonivy.ups.connector.demo.PickupCreation:start()"
},
"visual" : {
"at" : { "x" : 272, "y" : 64 }
},
"connect" : { "id" : "f2", "to" : "f1" }
"connect" : [
{ "id" : "f2", "to" : "f1" }
]
}, {
"id" : "f5",
"type" : "RequestStart",
"name" : "pickupCancel.ivp",
"config" : {
"callSignature" : "pickupCancel",
"outLink" : "pickupCancel.ivp",
"startName" : "Pickup Cancel",
"tags" : "demo"
"signature" : "pickupCancel",
"request" : {
"name" : "Pickup Cancel"
}
},
"tags" : [
"demo"
],
"visual" : {
"at" : { "x" : 88, "y" : 248 },
"labelOffset" : { "x" : 17, "y" : 33 }
},
"connect" : { "id" : "f9", "to" : "f6" }
"connect" : [
{ "id" : "f9", "to" : "f6" }
]
}, {
"id" : "f6",
"type" : "DialogCall",
"name" : "PickupCancel",
"config" : {
"dialogId" : "com.axonivy.ups.connector.demo.PickupCancel",
"startMethod" : "start()"
"dialog" : "com.axonivy.ups.connector.demo.PickupCancel:start()"
},
"visual" : {
"at" : { "x" : 272, "y" : 248 }
},
"connect" : { "id" : "f8", "to" : "f7" }
"connect" : [
{ "id" : "f8", "to" : "f7" }
]
}, {
"id" : "f7",
"type" : "TaskEnd",
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
"simpleName" : "AddressData",
"namespace" : "com.axonivy.ups.connector.demo.Address",
"isBusinessCaseData" : false,
"fields" : [ {
"name" : "requestOption",
"type" : "Integer",
"modifiers" : [ "PERSISTENT" ]
}, {
"name" : "version",
"type" : "String",
"modifiers" : [ "PERSISTENT" ]
}, {
"name" : "regionalRequestIndicator",
"type" : "String",
"modifiers" : [ "PERSISTENT" ]
}, {
"name" : "maximumCandidateListSize",
"type" : "Integer",
"modifiers" : [ "PERSISTENT" ]
}, {
"name" : "xavRequest",
"type" : "com.ups.wwwcie.api.client.XAVRequest",
"modifiers" : [ "PERSISTENT" ]
}, {
"name" : "xavResponseWrapper",
"type" : "com.ups.wwwcie.api.client.XAVResponseWrapper",
"modifiers" : [ "PERSISTENT" ]
}, {
"name" : "errorMessage",
"type" : "String",
"modifiers" : [ "PERSISTENT" ]
} ]
}

This file was deleted.

Loading

0 comments on commit fefd53c

Please sign in to comment.