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

Closed
wants to merge 3 commits into from
Closed

Migrate to 12.0 🐫 #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4df29c7
Raise project to 12.0.0-SNAPSHOT
actions-user Dec 24, 2024
4932165
Update maven version to 12.0.0-SNAPSHOT
actions-user Dec 24, 2024
043b718
Update workflow actions to v5
actions-user Dec 24, 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: 1 addition & 1 deletion excel-importer-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.util.excel</groupId>
<artifactId>excel-importer-product</artifactId>
<version>10.0.15-SNAPSHOT</version>
<version>12.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
Expand Down
7 changes: 1 addition & 6 deletions excel-importer-test/.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 excel-importer-test/.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 Down Expand Up @@ -54,7 +59,6 @@
<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>
<nature>org.eclipse.pde.PluginNature</nature>
</natures>
</projectDescription>
</projectDescription>
12 changes: 0 additions & 12 deletions excel-importer-test/.settings/.jsdtscope
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions excel-importer-test/.settings/ch.ivyteam.ivy.designer.prefs
View file
Open in desktop
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.util.excel.test.Data
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.util.excel.test
ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000
eclipse.preferences.version=1
ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001
eclipse.preferences.version=1
6 changes: 3 additions & 3 deletions excel-importer-test/.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
22 changes: 1 addition & 21 deletions excel-importer-test/.settings/org.eclipse.wst.common.component
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">


<wb-module deploy-name="excel-importer-test">


<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"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src_test"/>


<property name="java-output-path" value="/excel-importer-test/target/classes"/>

<property name="context-root" value="excel-importer-test"/>


</wb-module>


</project-modules>
</project-modules>
6 changes: 2 additions & 4 deletions excel-importer-test/.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 excel-importer-test/.settings/org.eclipse.wst.jsdt.ui.superType.container
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion excel-importer-test/.settings/org.eclipse.wst.jsdt.ui.superType.name
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions excel-importer-test/config/variables.yaml
View file
Open in desktop
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
2 changes: 0 additions & 2 deletions excel-importer-test/dataclasses/com/axonivy/util/excel/test/Data.ivyClass
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions excel-importer-test/dataclasses/com/axonivy/util/excel/test/TestMe.ivyClass
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions excel-importer-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.util.excel</groupId>
<artifactId>excel-importer-test</artifactId>
<version>10.0.15-SNAPSHOT</version>
<version>12.0.0-SNAPSHOT</version>
<packaging>iar</packaging>
<properties>
<project.build.plugin.version>10.0.16</project.build.plugin.version>
<tester.version>10.0.16</tester.version>
<project.build.plugin.version>12.0.0</project.build.plugin.version>
<tester.version>12.0.1</tester.version>
</properties>
<pluginRepositories>
<pluginRepository>
Expand Down
7 changes: 1 addition & 6 deletions excel-importer/.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 excel-importer/.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 Down Expand Up @@ -54,7 +59,6 @@
<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>
<nature>org.eclipse.pde.PluginNature</nature>
</natures>
</projectDescription>
</projectDescription>
12 changes: 0 additions & 12 deletions excel-importer/.settings/.jsdtscope
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions excel-importer/.settings/ch.ivyteam.ivy.designer.prefs
View file
Open in desktop
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.util.excel.importer.Data
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.util.excel.importer
ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000
eclipse.preferences.version=1
ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001
eclipse.preferences.version=1
6 changes: 3 additions & 3 deletions excel-importer/.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 excel-importer/.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="excel-importer">
<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="excel-importer"/>
<property name="java-output-path" value="/excel-importer/target/classes"/>
</wb-module>
</project-modules>
</project-modules>
6 changes: 2 additions & 4 deletions excel-importer/.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 excel-importer/.settings/org.eclipse.wst.jsdt.ui.superType.container
View file
Open in desktop

This file was deleted.

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

This file was deleted.

1 change: 1 addition & 0 deletions excel-importer/config/variables.yaml
View file
Open in desktop
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
6 changes: 6 additions & 0 deletions excel-importer/dataclasses/com/axonivy/util/excel/importer/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.util.excel.importer",
"isBusinessCaseData" : false
}
2 changes: 0 additions & 2 deletions excel-importer/dataclasses/com/axonivy/util/excel/importer/Data.ivyClass
View file
Open in desktop

This file was deleted.

25 changes: 25 additions & 0 deletions excel-importer/dataclasses/com/axonivy/util/excel/importer/MyEntity.d.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
"simpleName" : "MyEntity",
"namespace" : "com.axonivy.util.excel.importer",
"isBusinessCaseData" : false,
"entity" : { },
"fields" : [ {
"name" : "id",
"type" : "Integer",
"comment" : "Identifier",
"modifiers" : [ "PERSISTENT", "ID", "GENERATED" ],
"entity" : {
"cascadeTypes" : [ "PERSIST", "MERGE" ],
"orphanRemoval" : false
}
}, {
"name" : "name",
"type" : "String",
"modifiers" : [ "PERSISTENT" ],
"entity" : {
"cascadeTypes" : [ "PERSIST", "MERGE" ],
"orphanRemoval" : false
}
} ]
}
10 changes: 0 additions & 10 deletions excel-importer/dataclasses/com/axonivy/util/excel/importer/MyEntity.ivyClass
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion excel-importer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.util.excel</groupId>
<artifactId>excel-importer</artifactId>
<version>10.0.15-SNAPSHOT</version>
<version>12.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<properties>
Expand Down
7 changes: 0 additions & 7 deletions ...-importer/src_hd/com/axonivy/util/excel/importer/EntityManager/EntityManager.rddescriptor
View file
Open in desktop

This file was deleted.

15 changes: 15 additions & 0 deletions excel-importer/src_hd/com/axonivy/util/excel/importer/EntityManager/EntityManagerData.d.json
View file
Open in desktop
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" : "EntityManagerData",
"namespace" : "com.axonivy.util.excel.importer.EntityManager",
"isBusinessCaseData" : false,
"fields" : [ {
"name" : "entries",
"type" : "java.util.List<com.axonivy.util.excel.importer.MyEntity>",
"modifiers" : [ "PERSISTENT" ]
}, {
"name" : "edit",
"type" : "com.axonivy.util.excel.importer.MyEntity",
"modifiers" : [ "PERSISTENT" ]
} ]
}
6 changes: 0 additions & 6 deletions ...-importer/src_hd/com/axonivy/util/excel/importer/EntityManager/EntityManagerData.ivyClass
View file
Open in desktop

This file was deleted.

Loading
Loading