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.

Sign up for GitHub

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 🐫 #41

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Migrate to 12.0 🐫 #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7510cb7
Raise project to 12.0.0-SNAPSHOT
actions-user Dec 25, 2024
6d933c5
Update maven version to 12.0.0-SNAPSHOT
actions-user Dec 25, 2024
bfd82db
Update workflow actions to v5
actions-user Dec 25, 2024
a772ba3
update default encoding set, primeface version & deprecated test api
ntqdinh-axonivy Dec 26, 2024
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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: 2 additions & 0 deletions .settings/org.eclipse.core.resources.prefs
View file
Open in desktop
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 axonivy-intellix-connector/.classpath
View file
Open in desktop
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 axonivy-intellix-connector/.project
View file
Open in desktop
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 axonivy-intellix-connector/.settings/.jsdtscope
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions axonivy-intellix-connector/.settings/ch.ivyteam.ivy.designer.prefs
View file
Open in desktop
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.intellix.Data
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.intellix
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 axonivy-intellix-connector/.settings/org.eclipse.core.resources.prefs
View file
Open in desktop
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 axonivy-intellix-connector/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
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 axonivy-intellix-connector/.settings/org.eclipse.wst.common.component
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
<wb-module deploy-name="axonivy-intellix-connector">
<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="axonivy-intellix-connector"/>
<property name="java-output-path" value="/axonivy-intellix-connector/target/classes"/>
</wb-module>
</project-modules>
</project-modules>
6 changes: 2 additions & 4 deletions axonivy-intellix-connector/.settings/org.eclipse.wst.common.project.facet.core.xml
View file
Open in desktop
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>
1 change: 0 additions & 1 deletion axonivy-intellix-connector/.settings/org.eclipse.wst.jsdt.ui.superType.container
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion axonivy-intellix-connector/.settings/org.eclipse.wst.jsdt.ui.superType.name
View file
Open in desktop

This file was deleted.

9 changes: 5 additions & 4 deletions axonivy-intellix-connector/config/variables.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
# yaml-language-server: $schema=https://json-schema.axonivy.com/app/12.0.0/variables.json
# == Variables ==
Variables:
intellix-connector:
host:
username:
host: ''
username: ''
# [password]
password:
msName:
password: ''
msName: ''

# The Logon URL will be automatically determined.
# If this variable is set (not-empty), this URL
Expand Down
6 changes: 6 additions & 0 deletions axonivy-intellix-connector/dataclasses/com/axonivy/connector/intellix/Data.d.json
View file
Open in desktop
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.intellix",
"isBusinessCaseData" : false
}
2 changes: 0 additions & 2 deletions axonivy-intellix-connector/dataclasses/com/axonivy/connector/intellix/Data.ivyClass
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions axonivy-intellix-connector/dataclasses/com/axonivy/connector/intellix/intellixData.d.json
View file
Open in desktop
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" : "intellixData",
"namespace" : "com.axonivy.connector.intellix",
"isBusinessCaseData" : false,
"fields" : [ {
"name" : "file",
"type" : "java.io.File"
}, {
"name" : "indexData",
"type" : "com.docuware.dev._public.services.intellix.IndexData"
} ]
}
4 changes: 0 additions & 4 deletions axonivy-intellix-connector/dataclasses/com/axonivy/connector/intellix/intellixData.ivyClass
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions axonivy-intellix-connector/pom.xml
View file
Open in desktop
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.intellix</groupId>
<artifactId>axonivy-intellix-connector</artifactId>
<version>10.0.8-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
62 changes: 37 additions & 25 deletions axonivy-intellix-connector/processes/intellix.p.json
View file
Open in desktop
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" : "18166227E0841472",
"kind" : "CALLABLE_SUB",
"config" : {
Expand All @@ -10,7 +10,7 @@
"type" : "CallSubStart",
"name" : "identify(File)",
"config" : {
"callSignature" : "call",
"signature" : "call",
"input" : {
"params" : [
{ "name" : "file", "type" : "java.io.File", "desc" : "The file (PDF) to process" }
Expand All @@ -26,15 +26,19 @@
"map" : {
"result.indexData" : "in.indexData"
}
},
"tags" : "connector"
}
},
"tags" : [
"connector"
],
"visual" : {
"at" : { "x" : 96, "y" : 64 },
"labelOffset" : { "x" : 20, "y" : 37 },
"icon" : "res:/webContent/logos/intellix.png?small"
},
"connect" : { "id" : "f4", "to" : "f3" }
"connect" : [
{ "id" : "f4", "to" : "f3" }
]
}, {
"id" : "f1",
"type" : "CallSubEnd",
Expand All @@ -46,32 +50,40 @@
"type" : "RestClientCall",
"name" : "intellix",
"config" : {
"clientId" : "a3fb2ba0-71ab-49a6-82fe-bb0c202b38bd",
"method" : "POST",
"queryParams" : {
"extract" : "true"
},
"statusErrorCode" : "ivy:error:rest:client",
"bodyInputType" : "FORM",
"responseCode" : "ivy.log.info(\"recognized field count: \"+result.indexData.getField().size());",
"bodyForm" : {
"file" : "in.file",
"msName" : "ivy.var.get(\"intellix-connector.msName\")"
},
"path" : "documents",
"clientErrorCode" : "ivy:error:rest:client",
"responseMapping" : {
"out.indexData" : "result.indexData;"
"target" : {
"clientId" : "a3fb2ba0-71ab-49a6-82fe-bb0c202b38bd",
"path" : "documents",
"templateParams" : {
"host" : ""
},
"queryParams" : {
"extract" : "true"
}
},
"templateParams" : {
"host" : ""
"body" : {
"type" : "FORM",
"mediaType" : "multipart/form-data",
"form" : {
"file" : [ "in.file" ],
"msName" : [ "ivy.var.get(\"intellix-connector.msName\")" ]
}
},
"resultType" : "com.docuware.dev._public.services.intellix.FeedbackMessage",
"bodyMediaType" : "multipart/form-data"
"response" : {
"entity" : {
"type" : "com.docuware.dev._public.services.intellix.FeedbackMessage",
"map" : {
"out.indexData" : "result.indexData;"
},
"code" : "ivy.log.info(\"recognized field count: \"+result.indexData.getField().size());"
}
}
},
"visual" : {
"at" : { "x" : 224, "y" : 64 }
},
"connect" : { "id" : "f2", "to" : "f1" }
"connect" : [
{ "id" : "f2", "to" : "f1" }
]
} ]
}
3 changes: 2 additions & 1 deletion ...-intellix-connector/src/com/axonivy/connector/intellix/connector/IntellixAuthFeature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,8 @@ public static class DocuWareCookies {
public static final String DW_COOKIES_CACHE_ID = "cookies";
public static final String DW_COOKIES_CACHE_GROUP_ID = "com.docuware.cookies";
public static final int DW_COOKIES_EXPIRY_SECONDS = 86400;
private final Map<String, NewCookie> cookies;
@SuppressWarnings("unused")
private final Map<String, NewCookie> cookies;


private DocuWareCookies(Map<String, NewCookie> cookies) {
Expand Down
7 changes: 1 addition & 6 deletions axonivy-intellix-demo/.classpath
View file
Open in desktop
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 axonivy-intellix-demo/.project
View file
Open in desktop
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 axonivy-intellix-demo/.settings/.jsdtscope
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions axonivy-intellix-demo/.settings/ch.ivyteam.ivy.designer.prefs
View file
Open in desktop
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.intellix.demo.Data
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.intellix.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
2 changes: 2 additions & 0 deletions axonivy-intellix-demo/.settings/org.eclipse.core.resources.prefs
View file
Open in desktop
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 axonivy-intellix-demo/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
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 axonivy-intellix-demo/.settings/org.eclipse.wst.common.component
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
<wb-module deploy-name="axonivy-intellix-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="axonivy-intellix-demo"/>
<property name="java-output-path" value="/axonivy-intellix-demo/target/classes"/>
</wb-module>
</project-modules>
</project-modules>
6 changes: 2 additions & 4 deletions axonivy-intellix-demo/.settings/org.eclipse.wst.common.project.facet.core.xml
View file
Open in desktop
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>
1 change: 0 additions & 1 deletion axonivy-intellix-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container
View file
Open in desktop

This file was deleted.

Loading
Loading