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

Merged
merged 8 commits into from
Dec 13, 2024
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@v4
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 currency-converter-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 currency-converter-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 currency-converter-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.currency.converter.connector.demo.Data
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.currency.converter.connector.demo
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
@@ -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="currency-converter-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="currency-converter-connector-demo"/>

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

2 changes: 2 additions & 0 deletions currency-converter-connector-demo/config/variables.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# yaml-language-server: $schema=https://json-schema.axonivy.com/app/12.0.0/variables.json
Variables:
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.currency.converter.connector.demo",
"isBusinessCaseData" : false
}

This file was deleted.

75 changes: 39 additions & 36 deletions currency-converter-connector-demo/pom.xml
Original file line number Diff line number Diff line change
@@ -1,38 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.connector.currency</groupId>
<artifactId>currency-converter-connector-demo</artifactId>
<version>10.0.4-SNAPSHOT</version>
<packaging>iar</packaging>
<properties>
<project.build.plugin.version>10.0.16</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.currency</groupId>
<artifactId>currency-converter-connector</artifactId>
<version>${project.version}</version>
<type>iar</type>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>com.axonivy.ivy.ci</groupId>
<artifactId>project-build-plugin</artifactId>
<version>${project.build.plugin.version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
</build>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.connector.currency</groupId>
<artifactId>currency-converter-connector-demo</artifactId>
<version>12.0.0-SNAPSHOT</version>
<packaging>iar</packaging>
<properties>
<project.build.plugin.version>12.0.0</project.build.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</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.currency</groupId>
<artifactId>currency-converter-connector</artifactId>
<version>${project.version}</version>
<type>iar</type>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>com.axonivy.ivy.ci</groupId>
<artifactId>project-build-plugin</artifactId>
<version>${project.build.plugin.version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
</build>
</project>
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" : "17D7B9CE272367D5",
"config" : {
"data" : "com.axonivy.connector.currency.converter.connector.demo.Data"
Expand All @@ -9,25 +9,28 @@
"type" : "RequestStart",
"name" : "Demo Start",
"config" : {
"callSignature" : "convertDemo",
"case" : {
"name" : "Währungsrechner"
"signature" : "convertDemo",
"request" : {
"name" : "Currency Converter",
"description" : "Example of a Currency Converter",
"customFields" : [
{ "name" : "cssIcon", "value" : "si si-monetization-approve" }
]
},
"outLink" : "convertDemo.ivp",
"startDescription" : "Example of a Currency Converter",
"startCustomFields" : [
{ "name" : "cssIcon", "value" : "si si-monetization-approve" }
],
"task" : {
"name" : "Währungsrechner"
},
"startName" : "Currency Converter"
"case" : {
"name" : "Währungsrechner"
}
},
"visual" : {
"at" : { "x" : 96, "y" : 64 },
"labelOffset" : { "x" : 22, "y" : 37 }
},
"connect" : { "id" : "f4", "to" : "f3" }
"connect" : [
{ "id" : "f4", "to" : "f3" }
]
}, {
"id" : "f1",
"type" : "TaskEnd",
Expand All @@ -39,13 +42,14 @@
"type" : "DialogCall",
"name" : "CurrencyConverterInput",
"config" : {
"dialogId" : "com.axonivy.connector.currency.converter.connector.demo.CurrencyConverterInput",
"startMethod" : "start()"
"dialog" : "com.axonivy.connector.currency.converter.connector.demo.CurrencyConverterInput:start()"
},
"visual" : {
"at" : { "x" : 256, "y" : 64 },
"size" : { "width" : 160, "height" : 60 }
"size" : { "width" : 160 }
},
"connect" : { "id" : "f2", "to" : "f1" }
"connect" : [
{ "id" : "f2", "to" : "f1" }
]
} ]
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@
ui-g-12 ui-md-9 ui-lg-4">

<p:outputLabel for="currencyConverterDataFromAmount" value="Input Amount" />
<p:inputNumber id="currencyConverterDataFromAmount" value="#{data.convert.FromAmount}" required="true" />
<p:inputNumber id="currencyConverterDataFromAmount" value="#{data.convert.fromAmount}" required="true" />

<p:outputLabel value="Input Currency" />
<ic:com.axonivy.connector.currency.converter.connector.demo.CurrencyDropdown currency="#{data.convert.FromCurrency}" />
<ic:com.axonivy.connector.currency.converter.connector.demo.CurrencyDropdown currency="#{data.convert.fromCurrency}" />

<p:outputLabel value="Output Currency" />
<ic:com.axonivy.connector.currency.converter.connector.demo.CurrencyDropdown currency="#{data.convert.ToCurrency}" />
<ic:com.axonivy.connector.currency.converter.connector.demo.CurrencyDropdown currency="#{data.convert.toCurrency}" />

<p:outputLabel for="currencyConverterDataAmountInEuro" value="Amount" />
<p:inputText id="currencyConverterDataAmountInEuro" value="#{data.convert.ToAmount}" disabled="true" />
<p:inputText id="currencyConverterDataAmountInEuro" value="#{data.convert.toAmount}" disabled="true" />

</p:panelGrid>
<br />
Expand Down
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" : "CurrencyConverterInputData",
"namespace" : "com.axonivy.connector.currency.converter.connector.demo.CurrencyConverterInput",
"isBusinessCaseData" : false,
"fields" : [ {
"name" : "convert",
"type" : "com.axonivy.connector.currency.converter.connector.CurrencyConverterData",
"modifiers" : [ "PERSISTENT" ]
} ]
}

This file was deleted.

Loading
Loading