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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
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,6 +8,6 @@ on:

jobs:
build:
uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v4
uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v5
with:
javaVersion: 21
2 changes: 1 addition & 1 deletion .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ on:

jobs:
build:
uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v4
uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v5
with:
mvnArgs: '-Dp2.repo=nightly'
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ 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
with:
javaVersion: 21
3 changes: 1 addition & 2 deletions dmn-decision-table-demo/.project
Original file line number Diff line number Diff line change
Expand Up @@ -49,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 dmn-decision-table-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.ivy.supplements.rule.beans.demos.Data
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.ivy.supplements.rule.beans.demos
ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=113000
eclipse.preferences.version=1
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
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<fixed facet="wst.jsdt.web"/>
<installed facet="jst.web" version="3.0"/>
<installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="jst.jsf" version="2.1"/>
<installed facet="java" version="17"/>
</faceted-project>
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<installed facet="jst.web" version="3.0"/>
<installed facet="jst.jsf" version="2.1"/>
<installed facet="java" version="21"/>
</faceted-project>

This file was deleted.

This file was deleted.

3 changes: 2 additions & 1 deletion dmn-decision-table-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.ivy.supplements.rule.beans.demos",
"isBusinessCaseData" : false,
"fields" : [ {
"name" : "person",
"type" : "com.axonivy.ivy.supplements.rule.beans.demos.Person"
}, {
"name" : "yearlyIncomeDollars",
"type" : "Number"
}, {
"name" : "isGoldMember",
"type" : "Boolean"
}, {
"name" : "taxrate",
"type" : "Number"
} ]
}

This file was deleted.

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" : "Person",
"namespace" : "com.axonivy.ivy.supplements.rule.beans.demos",
"isBusinessCaseData" : false,
"fields" : [ {
"name" : "firstname",
"type" : "String"
}, {
"name" : "lastname",
"type" : "String"
}, {
"name" : "age",
"type" : "Number"
}, {
"name" : "gender",
"type" : "String"
} ]
}

This file was deleted.

4 changes: 2 additions & 2 deletions dmn-decision-table-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.dmn.decisiontable</groupId>
<artifactId>dmn-decision-table-demo</artifactId>
<version>11.3.3-SNAPSHOT</version>
<version>12.0.0-SNAPSHOT</version>
<packaging>iar</packaging>
<properties>
<project.build.plugin.version>11.3.0</project.build.plugin.version>
<project.build.plugin.version>12.0.0</project.build.plugin.version>
</properties>
<build>
<plugins>
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" : "GatherPersonDataData",
"namespace" : "com.axonivy.ivy.supplements.rule.beans.demos.GatherPersonData",
"isBusinessCaseData" : false,
"fields" : [ {
"name" : "data",
"type" : "com.axonivy.ivy.supplements.rule.beans.demos.Data",
"modifiers" : [ "PERSISTENT" ]
} ]
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "15C82B07277A094A",
"kind" : "HTML_DIALOG",
"config" : {
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" : "TaxesDialogData",
"namespace" : "com.axonivy.ivy.supplements.rule.beans.demos.TaxesDialog",
"isBusinessCaseData" : false,
"fields" : [ {
"name" : "data",
"type" : "com.axonivy.ivy.supplements.rule.beans.demos.Data",
"modifiers" : [ "PERSISTENT" ]
} ]
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "15C82BA28CB7DA31",
"kind" : "HTML_DIALOG",
"config" : {
Expand Down
2 changes: 1 addition & 1 deletion dmn-decision-table-product/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.dmn.decisiontable</groupId>
<artifactId>dmn-decision-table-product</artifactId>
<version>11.3.3-SNAPSHOT</version>
<version>12.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<build>
Expand Down
8 changes: 4 additions & 4 deletions dmn-decision-table/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<groupId>com.axonivy.dmn.decisiontable</groupId>
<artifactId>dmn-decision-table</artifactId>
<version>11.3.3-SNAPSHOT</version>
<version>12.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<properties>
Expand All @@ -26,7 +26,7 @@
<dependency>
<groupId>org.camunda.bpm.dmn</groupId>
<artifactId>camunda-engine-dmn-bom</artifactId>
<version>7.6.0</version>
<version>7.23.0-alpha2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -41,13 +41,13 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.8.0</version>
<version>3.27.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<groupId>com.axonivy.dmn.decisiontable</groupId>
<artifactId>dmn-decision-table-modules</artifactId>
<version>11.3.3-SNAPSHOT</version>
<version>12.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
Expand Down
Loading