Skip to content

Commit

Permalink
Migrate to 12.0 🐫 (#83)
Browse files Browse the repository at this point in the history
* Raise project to 12.0.0-SNAPSHOT

* Update maven version to 12.0.0-SNAPSHOT

* Update workflow actions to v5

* remove java21 flags; it's the new default

* manualy adjust versions to fix latest

* migrate to PF13 using the Designer

* Update encoding config

* Update assistant using java compiler version 21

* Update version for tycho to 4.0.10

---------

Co-authored-by: Khanh Nguyen <[email protected]>
  • Loading branch information
ivy-rew and ndkhanh-axonivy authored Dec 13, 2024
1 parent 86cd5ca commit b6d191f
Show file tree
Hide file tree
Showing 77 changed files with 571 additions and 483 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,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
mvnArgs: -U
2 changes: 1 addition & 1 deletion .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ 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: -U

4 changes: 1 addition & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,5 @@ on: workflow_dispatch

jobs:
build:
uses: axonivy-market/github-workflows/.github/workflows/release.yml@v4
with:
javaVersion: 21
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
2 changes: 1 addition & 1 deletion openai-assistant-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.connector.openai</groupId>
<artifactId>openai-assistant-product</artifactId>
<version>10.0.17-SNAPSHOT</version>
<version>12.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
Expand Down
51 changes: 25 additions & 26 deletions openai-assistant/.classpath
Original file line number Diff line number Diff line change
@@ -1,29 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src" />
<classpathentry kind="src" output="target/test-classes" path="test">
<attributes>
<attribute name="test" value="true" />
<attribute name="optional" value="true" />
<attribute name="maven.pomderived" value="true" />
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/classes" path="generated">
<attributes>
<attribute name="optional" value="true" />
<attribute name="maven.pomderived" value="true" />
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true" />
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins" />
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true" />
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes" />
<classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="test">
<attributes>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
6 changes: 3 additions & 3 deletions openai-assistant/.settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.compliance=21
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
Expand All @@ -13,4 +13,4 @@ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=17
org.eclipse.jdt.core.compiler.source=21
4 changes: 2 additions & 2 deletions openai-assistant/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Axon Ivy OpenAI assistant
Bundle-SymbolicName: openai-assistant;singleton:=true
Bundle-Version: 10.0.17.qualifier
Bundle-Version: 12.0.0.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.commands,
org.eclipse.core.resources,
Expand All @@ -16,5 +16,5 @@ Require-Bundle: org.eclipse.core.runtime,
ch.ivyteam.ivy.jersey.client,
javax.ws.rs,
ch.ivyteam.ivy.rest.client.exec;resolution:=optional
Bundle-ClassPath: lib/commonmark-0.22.0.jar, .
Bundle-ClassPath: lib/commonmark.jar, .
Bundle-ActivationPolicy: lazy
11 changes: 6 additions & 5 deletions openai-assistant/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@

<groupId>com.axonivy.connector.openai</groupId>
<artifactId>openai-assistant</artifactId>
<version>10.0.17-SNAPSHOT</version>
<version>12.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.compiler.compliance>17</java.compiler.compliance>
<tycho.version>3.0.4</tycho.version>
<java.compiler.compliance>21</java.compiler.compliance>
<tycho.version>4.0.10</tycho.version>
</properties>

<repositories>
Expand All @@ -27,7 +27,7 @@
<dependency>
<groupId>org.commonmark</groupId>
<artifactId>commonmark</artifactId>
<version>0.22.0</version>
<version>0.24.0</version>
</dependency>
</dependencies>

Expand Down Expand Up @@ -73,7 +73,8 @@
</goals>
<configuration>
<outputDirectory>${project.basedir}/lib</outputDirectory>
<includeGroupIds>org.commonmark</includeGroupIds>
<includeGroupIds>org.commonmark</includeGroupIds>
<stripVersion>true</stripVersion>
</configuration>
</execution>
</executions>
Expand Down
7 changes: 1 addition & 6 deletions openai-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 openai-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 openai-connector-demo/.settings/.jsdtscope

This file was deleted.

5 changes: 2 additions & 3 deletions openai-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.openai.connector.demo.Data
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.openai.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
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
6 changes: 3 additions & 3 deletions openai-connector-demo/.settings/org.eclipse.jdt.core.prefs
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="openai-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="openai-connector-demo"/>
<property name="java-output-path" value="/openai-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 openai-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,13 @@
{
"$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
"simpleName" : "AIGeneratedMail",
"namespace" : "com.openai.connector.demo",
"isBusinessCaseData" : false,
"fields" : [ {
"name" : "subject",
"type" : "String"
}, {
"name" : "content",
"type" : "String"
} ]
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
"simpleName" : "CandidateInformation",
"namespace" : "com.openai.connector.demo",
"isBusinessCaseData" : false,
"fields" : [ {
"name" : "name",
"type" : "String"
}, {
"name" : "jobPosition",
"type" : "String"
}, {
"name" : "interviewerName",
"type" : "String"
}, {
"name" : "interviewerPosition",
"type" : "String"
}, {
"name" : "company",
"type" : "String"
}, {
"name" : "mostImportantSkill",
"type" : "String"
}, {
"name" : "interviewDate",
"type" : "java.time.LocalDate"
}, {
"name" : "email",
"type" : "String"
}, {
"name" : "decision",
"type" : "com.openai.connector.demo.enums.Decision"
} ]
}

This file was deleted.

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.openai.connector.demo",
"isBusinessCaseData" : false
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
"simpleName" : "Message",
"namespace" : "com.openai.connector.demo",
"isBusinessCaseData" : false,
"fields" : [ {
"name" : "sender",
"type" : "String"
}, {
"name" : "text",
"type" : "String"
} ]
}

This file was deleted.

Loading

0 comments on commit b6d191f

Please sign in to comment.