Skip to content

Commit

Permalink
MARP-1481 Convert to Ivy 12 (#23)
Browse files Browse the repository at this point in the history
* MARP-1481 Convert to Ivy 12

* MARP-1481 Update CI build

* MARP-1481 Update release.yml

* MARP-1481 update 12.0.0-SNAPSHOT for versions

* MARP-1481 Update dev.yml

* Remove deprecated api
  • Loading branch information
tvtphuc-axonivy authored Nov 28, 2024
1 parent 14db99f commit 460da0d
Show file tree
Hide file tree
Showing 81 changed files with 374 additions and 304 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ on:
push:
pull_request:
schedule:
- cron: '21 21 * * *'
- cron: '21 21 * * *'
workflow_dispatch:

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
7 changes: 1 addition & 6 deletions mattermost-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 mattermost-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 mattermost-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.mattermost.connector.demo.Data
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.mattermost.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
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="mattermost-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="mattermost-connector-demo"/>
<property name="java-output-path" value="/mattermost-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 mattermost-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,10 @@
{
"$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
"simpleName" : "Data",
"namespace" : "com.axonivy.connector.mattermost.connector.demo",
"isBusinessCaseData" : false,
"fields" : [ {
"name" : "result",
"type" : "List<com.your.mattermost.url.client.ChannelMember>"
} ]
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
"simpleName" : "MattermostConnectorWebhookDemoData",
"namespace" : "com.axonivy.connector.mattermost.connector.demo",
"isBusinessCaseData" : false,
"fields" : [ {
"name" : "message",
"type" : "String",
"modifiers" : [ "PERSISTENT" ]
}, {
"name" : "channelId",
"type" : "String",
"modifiers" : [ "PERSISTENT" ]
} ]
}

This file was deleted.

4 changes: 2 additions & 2 deletions mattermost-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.mattermost</groupId>
<artifactId>mattermost-connector-demo</artifactId>
<version>10.0.22-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>
<pluginRepositories>
<pluginRepository>
Expand Down
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" : "18F952928A1574A7",
"config" : {
"data" : "com.axonivy.connector.mattermost.connector.demo.MattermostConnectorWebhookDemoData"
Expand All @@ -10,6 +10,7 @@
"name" : "Check Team Absences",
"config" : {
"signalCode" : "CheckTeamAbsences",
"attachToBusinessCase" : false,
"output" : {
"map" : {
"out.channelId" : "signal.getSignalData() as String"
Expand All @@ -18,15 +19,18 @@
"import com.axonivy.connector.mattermost.enums.CustomField;",
"ivy.case.customFields().stringField(CustomField.CHANNEL_ID.getFieldName()).set(out.channelId);"
]
},
"attachToBusinessCase" : "false",
"tags" : "demo"
}
},
"tags" : [
"demo"
],
"visual" : {
"at" : { "x" : 104, "y" : 112 },
"labelOffset" : { "x" : 17, "y" : -23 }
},
"connect" : { "id" : "f3", "to" : "f2" }
"connect" : [
{ "id" : "f3", "to" : "f2" }
]
}, {
"id" : "f1",
"type" : "TaskEnd",
Expand All @@ -41,22 +45,23 @@
"task" : {
"name" : "Check Team Absences",
"responsible" : {
"role" : "Leader"
"activator" : "Leader"
}
}
},
"visual" : {
"at" : { "x" : 232, "y" : 112 },
"labelOffset" : { "x" : 14, "y" : 34 }
},
"connect" : { "id" : "f6", "to" : "f5" }
"connect" : [
{ "id" : "f6", "to" : "f5" }
]
}, {
"id" : "f5",
"type" : "DialogCall",
"name" : "TeamAbsences",
"config" : {
"dialogId" : "com.axonivy.connector.mattermost.connector.demo.TeamAbsences",
"startMethod" : "start()",
"dialog" : "com.axonivy.connector.mattermost.connector.demo.TeamAbsences:start()",
"output" : {
"map" : {
"out" : "in",
Expand All @@ -67,7 +72,9 @@
"visual" : {
"at" : { "x" : 360, "y" : 112 }
},
"connect" : { "id" : "f17", "to" : "f16" }
"connect" : [
{ "id" : "f17", "to" : "f16" }
]
}, {
"id" : "f7",
"type" : "Script",
Expand All @@ -85,7 +92,9 @@
"visual" : {
"at" : { "x" : 648, "y" : 112 }
},
"connect" : { "id" : "f4", "to" : "f1" }
"connect" : [
{ "id" : "f4", "to" : "f1" }
]
}, {
"id" : "f16",
"type" : "TaskSwitchEvent",
Expand All @@ -94,14 +103,16 @@
"task" : {
"name" : "Send message to channel",
"responsible" : {
"role" : "SYSTEM"
"activator" : "SYSTEM"
}
}
},
"visual" : {
"at" : { "x" : 504, "y" : 112 },
"labelOffset" : { "x" : 14, "y" : 34 }
},
"connect" : { "id" : "f8", "to" : "f7" }
"connect" : [
{ "id" : "f8", "to" : "f7" }
]
} ]
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import com.fasterxml.jackson.databind.ObjectMapper;

import ch.ivyteam.ivy.environment.Ivy;
import ch.ivyteam.ivy.process.model.value.SignalCode;

@Path("/mattermost/slashCommand")
@PermitAll
Expand All @@ -22,7 +21,8 @@ public String startProcess(@BeanParam SlashCommandGetRequestParameter parameter)
SlashCommandResponse response = new SlashCommandResponse();
response.setResponseType("in_channel");
response.setText(String.format("Process CheckTeamAbsences has been started by %s", parameter.getUserName()));
Ivy.wf().signals().send(new SignalCode("CheckTeamAbsences"), parameter.getChannelId());
Ivy.wf().signals().create().data(parameter.getChannelId()).makeCurrentTaskPersistent()
.send("CheckTeamAbsences");
ObjectMapper mapper = new ObjectMapper();
try {
return mapper.writeValueAsString(response);
Expand Down

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" : "TeamAbsencesData",
"namespace" : "com.axonivy.connector.mattermost.connector.demo.TeamAbsences",
"isBusinessCaseData" : false,
"fields" : [ {
"name" : "message",
"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" : "18F953D50A711458",
"kind" : "HTML_DIALOG",
"config" : {
Expand All @@ -10,10 +10,10 @@
"type" : "HtmlDialogStart",
"name" : "start()",
"config" : {
"callSignature" : "start",
"signature" : "start",
"result" : {
"params" : [
{ "name" : "message", "type" : "String" }
{ "name" : "message", "type" : "String", "desc" : "" }
],
"map" : {
"result.message" : "in.message"
Expand All @@ -24,7 +24,9 @@
"visual" : {
"at" : { "x" : 96, "y" : 64 }
},
"connect" : { "id" : "f2", "to" : "f1" }
"connect" : [
{ "id" : "f2", "to" : "f1" }
]
}, {
"id" : "f1",
"type" : "HtmlDialogEnd",
Expand All @@ -41,7 +43,9 @@
"visual" : {
"at" : { "x" : 96, "y" : 160 }
},
"connect" : { "id" : "f5", "to" : "f4" }
"connect" : [
{ "id" : "f5", "to" : "f4" }
]
}, {
"id" : "f4",
"type" : "HtmlDialogExit",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ and refence it below in the head part.
<link rel="shortcut icon" href="#{resource['ivy-branding:favicon']}" />
<h:outputScript name="js/layout.js" library="#{ivyFreyaTheme.library}" />
<h:outputStylesheet name="#{ivyFreyaTheme.layout}" library="#{ivyFreyaTheme.library}" />
<h:outputStylesheet name="primeflex-2.min.css" library="primeflex" />
<h:outputStylesheet name="primeflex-3.min.css" library="primeflex" />
<h:outputStylesheet name="custom.css" library="ivy-branding" />
<!-- Optional Style or Script files:
<h:outputStylesheet name="layouts/styles/style.css" />
Expand Down
7 changes: 1 addition & 6 deletions mattermost-connector-notification/.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
Loading

0 comments on commit 460da0d

Please sign in to comment.