Merge branch 'master' into feature/MARP-747-ChatGPT-assistant-Not-pos…

…sible-to-mark-only-one-word-in-xhtlm-code
axonivy-market · Nov 19, 2024 · ea2b583 · ea2b583
2 parents efcf452 + c3c0b7b
commit ea2b583
Show file tree

Hide file tree

Showing 13 changed files with 45 additions and 23 deletions.
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -0,0 +1,18 @@
+name: Publish Release
+
+on:
+  push:
+    tags:
+      - "v*.*.*"
+
+permissions:
+  contents: write
+  pull-requests: read
+
+jobs:
+  build:
+    uses: axonivy-market/github-workflows/.github/workflows/publish-release.yml@v4
+    # The 'publish_release' input parameter is used to control whether the release should be published automatically.
+    # Uncomment and set to 'false' if you want to prevent the release from being published immediately.
+    # with:
+    #   publish_release: false
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
@@ -1,26 +1,16 @@
 name: Release Drafter
+
 on:
   push:
     branches:
       - master
   pull_request:
     types: [opened, reopened, synchronize]
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Release version'
-        required: true
-      prerelease:
-        description: 'Is this a prerelease?'
-        required: false
-        default: false
-        type: boolean
+
 permissions:
   contents: write
   pull-requests: write
+
 jobs:
   build:
     uses: axonivy-market/github-workflows/.github/workflows/release-drafter.yml@v4
-    with:
-      version: ${{ github.event.inputs.version }}
-      prerelease: ${{ github.event.inputs.prerelease }}
diff --git a/openai-assistant-product/pom.xml b/openai-assistant-product/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.connector.openai</groupId>
   <artifactId>openai-assistant-product</artifactId>
-  <version>10.0.16-SNAPSHOT</version>
+  <version>10.0.17-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -45,6 +45,8 @@
                 <copy file="README.md" tofile="${project.build.directory}/README.md" />
                 <loadfile property="variables.yaml" srcFile="${variables.yaml.file}" encoding="UTF-8" failonerror="false" />
                 <replace file="${project.build.directory}/README.md" token="@variables.yaml@" value="${variables.yaml}" />
+                <copy file="README_DE.md" tofile="${project.build.directory}/README_DE.md" />
+                <replace file="${project.build.directory}/README_DE.md" token="@variables.yaml@" value="${variables.yaml}" />
               </target>
             </configuration>
             <goals>

diff --git a/openai-assistant-product/zip.xml b/openai-assistant-product/zip.xml
@@ -19,7 +19,7 @@
       <directory>target</directory>
       <outputDirectory>/</outputDirectory>
       <includes>
-        <include>README.md</include>
+        <include>README*.md</include>
       </includes>
     </fileSet>
   </fileSets>

diff --git a/openai-assistant/META-INF/MANIFEST.MF b/openai-assistant/META-INF/MANIFEST.MF
@@ -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.16.qualifier
+Bundle-Version: 10.0.17.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.commands,
  org.eclipse.core.resources,

diff --git a/openai-assistant/pom.xml b/openai-assistant/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>com.axonivy.connector.openai</groupId>
   <artifactId>openai-assistant</artifactId>
-  <version>10.0.16-SNAPSHOT</version>
+  <version>10.0.17-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>

diff --git a/openai-assistant/target-platform/ivy.target b/openai-assistant/target-platform/ivy.target
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="ivy">
+	<locations>
+		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<repository location="https://p2.axonivy.com/p2/10.0/"/>
+			<unit id="ch.ivyteam.ivy.designer.product" version="10.0.17"/>
+		</location>
+	</locations>
+</target>
diff --git a/openai-connector-demo/pom.xml b/openai-connector-demo/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.connector.openai</groupId>
   <artifactId>openai-connector-demo</artifactId>
-  <version>10.0.16-SNAPSHOT</version>
+  <version>10.0.17-SNAPSHOT</version>
   <packaging>iar</packaging>
   <properties>
     <project.build.plugin.version>10.0.16</project.build.plugin.version>

diff --git a/openai-connector-product/pom.xml b/openai-connector-product/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.connector.openai</groupId>
   <artifactId>openai-connector-product</artifactId>
-  <version>10.0.16-SNAPSHOT</version>
+  <version>10.0.17-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -45,6 +45,8 @@
                 <copy file="README.md" tofile="${project.build.directory}/README.md" />
                 <loadfile property="variables.yaml" srcFile="${variables.yaml.file}" encoding="UTF-8" failonerror="false" />
                 <replace file="${project.build.directory}/README.md" token="@variables.yaml@" value="${variables.yaml}" />
+                <copy file="README_DE.md" tofile="${project.build.directory}/README_DE.md" />
+                <replace file="${project.build.directory}/README_DE.md" token="@variables.yaml@" value="${variables.yaml}" />
               </target>
             </configuration>
             <goals>

diff --git a/openai-connector-product/zip.xml b/openai-connector-product/zip.xml
@@ -19,7 +19,7 @@
       <directory>target</directory>
       <outputDirectory>/</outputDirectory>
       <includes>
-        <include>README.md</include>
+        <include>README*.md</include>
       </includes>
     </fileSet>
   </fileSets>

diff --git a/openai-connector-test/pom.xml b/openai-connector-test/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.connector.openai</groupId>
   <artifactId>openai-connector-test</artifactId>
-  <version>10.0.16-SNAPSHOT</version>
+  <version>10.0.17-SNAPSHOT</version>
   <packaging>iar</packaging>
   <properties>
     <project.build.plugin.version>10.0.16</project.build.plugin.version>

diff --git a/openai-connector/pom.xml b/openai-connector/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.connector.openai</groupId>
   <artifactId>openai-connector</artifactId>
-  <version>10.0.16-SNAPSHOT</version>
+  <version>10.0.17-SNAPSHOT</version>
   <packaging>iar</packaging>
   <properties>
     <project.build.plugin.version>10.0.16</project.build.plugin.version>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <groupId>com.axonivy.connector.openai</groupId><!-- your group id: e.g. com.axonivy.connector.<myconnector> or com.axonivy.utils.<myutil> -->
   <name>openai-connector</name><!-- fill your product name -->
   <artifactId>openai-connector-modules</artifactId><!-- fill your product name + a "-modules" postfix -->
-  <version>10.0.16-SNAPSHOT</version><!-- identicate your minimal compliant ivy version with the first 2 digits -->
+  <version>10.0.17-SNAPSHOT</version><!-- identicate your minimal compliant ivy version with the first 2 digits -->
   <packaging>pom</packaging>
 
   <modules>