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

MARP-626 Fix for Dev Fail on Market-Monitor #15

Closed
wants to merge 2 commits into from
+231 −146
Closed

MARP-626 Fix for Dev Fail on Market-Monitor #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
602cc25
MARP-626 Fix for Dev Fail on Market-Monitor
phhung-axonivy Aug 1, 2024
dfdb76d
convert projects to 11
phhung-axonivy Aug 1, 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 @@ -9,4 +9,4 @@ on:

jobs:
build:
uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v2
uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v4
11 changes: 0 additions & 11 deletions .github/workflows/dev-10.yml
View file
Open in desktop

This file was deleted.

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@feature/MARP-626-Fix-for-Dev-Fail-on-Market-Monitor
uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v4
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@v2
uses: axonivy-market/github-workflows/.github/workflows/release.yml@v4
16 changes: 14 additions & 2 deletions mattermost-connector-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,20 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.connector.mattermost</groupId>
<artifactId>mattermost-connector-demo</artifactId>
<version>10.0.20-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<packaging>iar</packaging>
<properties>
<project.build.plugin.version>11.3.0</project.build.plugin.version>
</properties>
<pluginRepositories>
<pluginRepository>
<id>sonatype</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<snapshots>
<updatePolicy>always</updatePolicy>
</snapshots>
</pluginRepository>
</pluginRepositories>
<dependencies>
<dependency>
<groupId>com.axonivy.connector.mattermost</groupId>
Expand Down Expand Up @@ -33,7 +45,7 @@
<plugin>
<groupId>com.axonivy.ivy.ci</groupId>
<artifactId>project-build-plugin</artifactId>
<version>10.0.14</version>
<version>${project.build.plugin.version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
Expand Down
37 changes: 24 additions & 13 deletions mattermost-connector-demo/processes/MattermostConnectorWebhookDemo.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/11.3.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" }
]
} ]
}
14 changes: 9 additions & 5 deletions ...d/com/axonivy/connector/mattermost/connector/demo/TeamAbsences/TeamAbsencesProcess.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/11.3.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
16 changes: 14 additions & 2 deletions mattermost-connector-notification/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,20 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.connector.mattermost</groupId>
<artifactId>mattermost-connector-notification</artifactId>
<version>10.0.20-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<packaging>iar</packaging>
<properties>
<project.build.plugin.version>11.3.0</project.build.plugin.version>
</properties>
<pluginRepositories>
<pluginRepository>
<id>sonatype</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<snapshots>
<updatePolicy>always</updatePolicy>
</snapshots>
</pluginRepository>
</pluginRepositories>
<dependencies>
<dependency>
<groupId>com.axonivy.connector.mattermost</groupId>
Expand All @@ -18,7 +30,7 @@
<plugin>
<groupId>com.axonivy.ivy.ci</groupId>
<artifactId>project-build-plugin</artifactId>
<version>10.0.14</version>
<version>${project.build.plugin.version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
Expand Down
5 changes: 3 additions & 2 deletions mattermost-connector-notification/processes/installer.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/11.3.0/process.json",
"id" : "18F94E04AF515A4D",
"config" : {
"data" : "com.axonivy.connector.mattermost.connector.notification.installerData"
Expand All @@ -9,7 +9,8 @@
"type" : "ProgramStart",
"name" : "Task listener",
"config" : {
"outerBean" : "com.axonivy.connector.mattermost.notification.MattermostNotificationStart"
"javaClass" : "com.axonivy.connector.mattermost.notification.MattermostNotificationStart",
"link" : "eventLink.ivp"
},
"visual" : {
"at" : { "x" : 96, "y" : 168 },
Expand Down
2 changes: 1 addition & 1 deletion mattermost-connector-product/pom.xml
View file
Open in desktop
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.mattermost</groupId>
<artifactId>mattermost-connector-product</artifactId>
<version>10.0.20-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
Expand Down
28 changes: 25 additions & 3 deletions mattermost-connector-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,30 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.connector.mattermost</groupId>
<artifactId>mattermost-connector-test</artifactId>
<version>10.0.20-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<packaging>iar</packaging>
<properties>
<project.build.plugin.version>11.3.0</project.build.plugin.version>
<tester.version>11.3.0</tester.version>
</properties>
<pluginRepositories>
<pluginRepository>
<id>sonatype</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<snapshots>
<updatePolicy>always</updatePolicy>
</snapshots>
</pluginRepository>
</pluginRepositories>
<repositories>
<repository>
<id>sonatype</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<snapshots>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>com.axonivy.connector.mattermost</groupId>
Expand All @@ -15,7 +37,7 @@
<dependency>
<groupId>com.axonivy.ivy.test</groupId>
<artifactId>unit-tester</artifactId>
<version>10.0.14</version>
<version>${tester.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -36,7 +58,7 @@
<plugin>
<groupId>com.axonivy.ivy.ci</groupId>
<artifactId>project-build-plugin</artifactId>
<version>10.0.14</version>
<version>${project.build.plugin.version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
Expand Down
7 changes: 1 addition & 6 deletions mattermost-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|**/*.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/.project
View file
Open in desktop
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/.settings/.jsdtscope
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions mattermost-connector/.settings/ch.ivyteam.ivy.designer.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.mattermost.connector.Data
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.mattermost.connector
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=114004
eclipse.preferences.version=1
6 changes: 3 additions & 3 deletions mattermost-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
Loading
Loading