Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to 12.0 🐫 #40

Merged
merged 4 commits into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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@v2
uses: axonivy-market/github-workflows/.github/workflows/release.yml@v5
2 changes: 2 additions & 0 deletions .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
7 changes: 1 addition & 6 deletions genderize-io-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 genderize-io-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.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>
12 changes: 0 additions & 12 deletions genderize-io-connector-demo/.settings/.jsdtscope

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.genderize.io.connector.demo.Data
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.genderize.io.connector.demo
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
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
@@ -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,21 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">

<wb-module deploy-name="genderize-io-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="genderize-io-connector-demo"/>

<property name="java-output-path" value="/genderize-io-connector-demo/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="genderize-io-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="genderize-io-connector-demo"/>
<property name="java-output-path" value="/genderize-io-connector-demo/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.

3 changes: 2 additions & 1 deletion genderize-io-connector-demo/config/variables.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# yaml-language-server: $schema=https://json-schema.axonivy.com/app/12.0.0/variables.json
# == Variables ==
#
# You can define here your project Variables.
# If you want to define/override a Variable for a specific Environment,
# please add a 'variables.yaml' in the sub directory '_<environment>'.
#
Variables:
#myVariable: value
#myVariable: value
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" : "Data",
"namespace" : "com.axonivy.connector.genderize.io.connector.demo",
"isBusinessCaseData" : false,
"fields" : [ {
"name" : "firstname",
"type" : "String"
}, {
"name" : "lastname",
"type" : "String"
}, {
"name" : "saluation",
"type" : "String"
}, {
"name" : "birthday",
"type" : "Date"
} ]
}

This file was deleted.

5 changes: 3 additions & 2 deletions genderize-io-connector-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.connector.genderize</groupId>
<artifactId>genderize-io-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>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<pluginRepositories>
<!-- Snapshot releases are available via sonatype.org -->
Expand Down
53 changes: 19 additions & 34 deletions genderize-io-connector-demo/processes/genderizeDemo.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" : "17646F3A476DCB66",
"config" : {
"data" : "com.axonivy.connector.genderize.io.connector.demo.Data"
Expand All @@ -9,16 +9,21 @@
"type" : "RequestStart",
"name" : "salutationDemo.ivp",
"config" : {
"callSignature" : "salutationDemo",
"outLink" : "salutationDemo.ivp",
"startName" : "Genderize.io Connector Demo",
"tags" : "demo"
"signature" : "salutationDemo",
"request" : {
"name" : "Genderize.io Connector Demo"
}
},
"tags" : [
"demo"
],
"visual" : {
"at" : { "x" : 96, "y" : 64 },
"labelOffset" : { "x" : 16, "y" : 43 }
},
"connect" : { "id" : "f4", "to" : "f3" }
"connect" : [
{ "id" : "f4", "to" : "f3" }
]
}, {
"id" : "f1",
"type" : "TaskEnd",
Expand All @@ -33,20 +38,8 @@
"personal data"
],
"config" : {
"dialogId" : "com.axonivy.connector.genderize.io.connector.demo.enterForm",
"startMethod" : "start(com.axonivy.connector.genderize.io.connector.demo.Data)",
"output" : {
"map" : {
"out" : [
"in",
"result.data"
]
}
},
"dialog" : "com.axonivy.connector.genderize.io.connector.demo.enterForm:start(com.axonivy.connector.genderize.io.connector.demo.Data)",
"call" : {
"params" : [
{ "name" : "data", "type" : "com.axonivy.connector.genderize.io.connector.demo.Data" }
],
"map" : {
"param.data" : "in"
}
Expand All @@ -55,7 +48,9 @@
"visual" : {
"at" : { "x" : 224, "y" : 64 }
},
"connect" : { "id" : "f6", "to" : "f5" }
"connect" : [
{ "id" : "f6", "to" : "f5" }
]
}, {
"id" : "f5",
"type" : "DialogCall",
Expand All @@ -64,20 +59,8 @@
"salutation"
],
"config" : {
"dialogId" : "com.axonivy.connector.genderize.io.connector.demo.showSalutationForm",
"startMethod" : "start(com.axonivy.connector.genderize.io.connector.demo.Data)",
"output" : {
"map" : {
"out" : [
"in",
"result.data"
]
}
},
"dialog" : "com.axonivy.connector.genderize.io.connector.demo.showSalutationForm:start(com.axonivy.connector.genderize.io.connector.demo.Data)",
"call" : {
"params" : [
{ "name" : "data", "type" : "com.axonivy.connector.genderize.io.connector.demo.Data" }
],
"map" : {
"param.data" : "in"
}
Expand All @@ -86,6 +69,8 @@
"visual" : {
"at" : { "x" : 384, "y" : 64 }
},
"connect" : { "id" : "f2", "to" : "f1" }
"connect" : [
{ "id" : "f2", "to" : "f1" }
]
} ]
}

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" : "enterFormData",
"namespace" : "com.axonivy.connector.genderize.io.connector.demo.enterForm",
"isBusinessCaseData" : false,
"fields" : [ {
"name" : "data",
"type" : "com.axonivy.connector.genderize.io.connector.demo.Data",
"modifiers" : [ "PERSISTENT" ]
} ]
}

This file was deleted.

Loading
Loading