Skip to content

Commit

Permalink
Merge pull request #49 from axonivy-market/raise-to-12.0.0-SNAPSHOT
Browse files Browse the repository at this point in the history
Migrate to 12.0 🐫
  • Loading branch information
ivy-rew authored Nov 29, 2024
2 parents 0a8c5c9 + 1f01b4b commit e90ac26
Show file tree
Hide file tree
Showing 52 changed files with 232 additions and 234 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 pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<groupId>com.axonivy.connector.telsearch</groupId>
<name>tel-search-ch-connector</name>
<artifactId>tel-search-ch-connector-modules</artifactId>
<version>10.0.3-SNAPSHOT</version>
<version>12.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
Expand Down
7 changes: 1 addition & 6 deletions tel-search-ch-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|**/*.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>
Expand Down
8 changes: 6 additions & 2 deletions tel-search-ch-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 tel-search-ch-connector-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.connector.telsearch.tel.search.connector.demo.Data
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.telsearch.tel.search.connector.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=120001
eclipse.preferences.version=1
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,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="tel-search-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="tel-search-connector-demo"/>
<property name="java-output-path" value="/tel-search-connector-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="tel-search-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_wsproc"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src_dataClasses"/>
<property name="context-root" value="tel-search-connector-demo"/>
<property name="java-output-path" value="/tel-search-connector-demo/target/classes"/>
</wb-module>
</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="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 tel-search-ch-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.connector.telsearch.tel.search.connector.demo",
"isBusinessCaseData" : false
}

This file was deleted.

4 changes: 2 additions & 2 deletions tel-search-ch-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.telsearch</groupId>
<artifactId>tel-search-ch-connector-demo</artifactId>
<version>10.0.3-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>
</properties>
<dependencies>
<dependency>
Expand Down
20 changes: 12 additions & 8 deletions tel-search-ch-connector-demo/processes/PhoneDirectoryDemo.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" : "17D132BFCF818781",
"config" : {
"data" : "com.axonivy.connector.telsearch.tel.search.connector.demo.Data"
Expand All @@ -9,15 +9,18 @@
"type" : "RequestStart",
"name" : "phoneDirectoryRequest.ivp",
"config" : {
"callSignature" : "phoneDirectoryRequest",
"outLink" : "phoneDirectoryRequest.ivp",
"tags" : "demo"
"signature" : "phoneDirectoryRequest"
},
"tags" : [
"demo"
],
"visual" : {
"at" : { "x" : 56, "y" : 192 },
"labelOffset" : { "x" : 68, "y" : 37 }
},
"connect" : { "id" : "f9", "to" : "f8" }
"connect" : [
{ "id" : "f9", "to" : "f8" }
]
}, {
"id" : "f6",
"type" : "TaskEnd",
Expand All @@ -29,13 +32,14 @@
"type" : "DialogCall",
"name" : "AddressFinder",
"config" : {
"dialogId" : "com.axonivy.connector.telsearch.demo.AddressFinder",
"startMethod" : "start()"
"dialog" : "com.axonivy.connector.telsearch.demo.AddressFinder:start()"
},
"visual" : {
"at" : { "x" : 184, "y" : 192 }
},
"connect" : { "id" : "f7", "to" : "f6" }
"connect" : [
{ "id" : "f7", "to" : "f6" }
]
}, {
"id" : "f0",
"type" : "ProcessAnnotation",
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
"simpleName" : "AddressFinderData",
"namespace" : "com.axonivy.connector.telsearch.demo.AddressFinder",
"isBusinessCaseData" : false,
"fields" : [ {
"name" : "entries",
"type" : "java.util.List<String>",
"modifiers" : [ "PERSISTENT" ]
}, {
"name" : "what",
"type" : "String",
"modifiers" : [ "PERSISTENT" ]
}, {
"name" : "where",
"type" : "String",
"modifiers" : [ "PERSISTENT" ]
} ]
}

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" : "17D14C4DFA5FA288",
"kind" : "HTML_DIALOG",
"config" : {
Expand All @@ -10,7 +10,7 @@
"type" : "HtmlDialogStart",
"name" : "start()",
"config" : {
"callSignature" : "start",
"signature" : "start",
"input" : {
"map" : {
"out.entries" : "[]"
Expand All @@ -22,7 +22,9 @@
"at" : { "x" : 96, "y" : 64 },
"labelOffset" : { "x" : 12, "y" : 35 }
},
"connect" : { "id" : "f2", "to" : "f1" }
"connect" : [
{ "id" : "f2", "to" : "f1" }
]
}, {
"id" : "f1",
"type" : "HtmlDialogEnd",
Expand All @@ -40,7 +42,9 @@
"at" : { "x" : 96, "y" : 160 },
"labelOffset" : { "x" : 9, "y" : 35 }
},
"connect" : { "id" : "f5", "to" : "f4" }
"connect" : [
{ "id" : "f5", "to" : "f4" }
]
}, {
"id" : "f4",
"type" : "HtmlDialogExit",
Expand All @@ -58,7 +62,9 @@
"at" : { "x" : 96, "y" : 224 },
"labelOffset" : { "x" : 9, "y" : 35 }
},
"connect" : { "id" : "f10", "to" : "f9" }
"connect" : [
{ "id" : "f10", "to" : "f9" }
]
}, {
"id" : "f7",
"type" : "HtmlDialogEnd",
Expand All @@ -71,21 +77,17 @@
"name" : "PhoneDirectory",
"config" : {
"processCall" : "PhoneDirectory:search(String,String)",
"output" : {
"map" : {
"out" : "in",
"out.entries" : "result.matches"
}
},
"call" : {
"params" : [
{ "name" : "what", "type" : "String" },
{ "name" : "where", "type" : "String" }
],
"map" : {
"param.what" : "in.what",
"param.where" : "in.where"
}
},
"output" : {
"map" : {
"out" : "in",
"out.entries" : "result.matches"
}
}
},
"visual" : {
Expand All @@ -97,9 +99,13 @@
"visual" : {
"at" : { "x" : 256, "y" : 256 }
},
"connect" : { "id" : "f13", "to" : "f12" }
"connect" : [
{ "id" : "f13", "to" : "f12" }
]
} ],
"connect" : { "id" : "f8", "to" : "f7" }
"connect" : [
{ "id" : "f8", "to" : "f7" }
]
}, {
"id" : "f12",
"type" : "Script",
Expand All @@ -116,6 +122,8 @@
"visual" : {
"at" : { "x" : 352, "y" : 336 }
},
"connect" : { "id" : "f14", "to" : "f7" }
"connect" : [
{ "id" : "f14", "to" : "f7" }
]
} ]
}
2 changes: 1 addition & 1 deletion tel-search-ch-connector-product/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.connector.telsearch</groupId>
<artifactId>tel-search-ch-connector-product</artifactId>
<version>10.0.3-SNAPSHOT</version>
<version>12.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<build>
Expand Down
7 changes: 1 addition & 6 deletions tel-search-ch-connector-test/.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|**/*.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>
Expand Down
Loading

0 comments on commit e90ac26

Please sign in to comment.