Feature/MARP-917 Amazon comprehend connector (#43)

* change additionalVmOptions to additionalVmArg * convert version to 11.4.0
axonivy-market · Oct 25, 2024 · 65c3766 · 65c3766
1 parent 26eef00
commit 65c3766
Show file tree

Hide file tree

Showing 27 changed files with 70 additions and 109 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,3 +11,6 @@ jobs:
     uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v4
     secrets:
       mvnArgs: -Daws.access.key=${{ secrets.AWS_ACCESS_KEY }} -Daws.secret.key=${{ secrets.AWS_SECRET_KEY }}
+    with:
+      javaVersion: 21
+      mvnVersion: 3.9.8
diff --git a/amazon-comprehend-connector-demo/.project b/amazon-comprehend-connector-demo/.project
@@ -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>
diff --git a/amazon-comprehend-connector-demo/.settings/.jsdtscope b/amazon-comprehend-connector-demo/.settings/.jsdtscope
diff --git a/amazon-comprehend-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs b/amazon-comprehend-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs
@@ -1,5 +1,5 @@
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.amazon.comprehend.connector.demo.Data
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.amazon.comprehend.connector.demo
 ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
-ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=113000
+ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=114003
 eclipse.preferences.version=1
diff --git a/amazon-comprehend-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml b/amazon-comprehend-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -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="jst.web" version="3.0"/>
-  <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="jst.jsf" version="2.1"/>
-</faceted-project>
+</faceted-project>
diff --git a/amazon-comprehend-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container b/amazon-comprehend-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container
diff --git a/amazon-comprehend-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name b/amazon-comprehend-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name
diff --git a/amazon-comprehend-connector-demo/config/variables.yaml b/amazon-comprehend-connector-demo/config/variables.yaml
@@ -1,8 +1,10 @@
+# yaml-language-server: $schema=https://json-schema.axonivy.com/app/11.4.1/variables.json
 Variables:
-  Amazon.Comprehend:
-    # Secret key to access amazon comprehend     
-    SecretKey: ""
-    # Access key to access amazon comprehend
-    AccessKey: ""
-    # Session token to access amazon comprehend
-    SessionToken: ""
+  Amazon:
+    Comprehend:
+      # Secret key to access amazon comprehend     
+      SecretKey: ""
+      # Access key to access amazon comprehend
+      AccessKey: ""
+      # Session token to access amazon comprehend
+      SessionToken: ""
diff --git a/amazon-comprehend-connector-demo/pom.xml b/amazon-comprehend-connector-demo/pom.xml
@@ -1,22 +1,14 @@
 <?xml version="1.0"?>
-<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">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.connector.amazon.comprehend</groupId>
   <artifactId>amazon-comprehend-connector-demo</artifactId>
-  <version>11.3.2-SNAPSHOT</version>
+  <version>11.4.0-SNAPSHOT</version>
   <packaging>iar</packaging>
   <properties>
-    <project.build.plugin.version>11.3.0</project.build.plugin.version>
+    <project.build.plugin.version>11.4.0-SNAPSHOT</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.amazon.comprehend</groupId>
@@ -25,6 +17,15 @@
       <type>iar</type>
     </dependency>
   </dependencies>
+  <pluginRepositories>
+    <pluginRepository>
+      <snapshots>
+        <updatePolicy>always</updatePolicy>
+      </snapshots>
+      <id>sonatype</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+    </pluginRepository>
+  </pluginRepositories>
   <build>
     <plugins>
       <plugin>

diff --git a/amazon-comprehend-connector-product/pom.xml b/amazon-comprehend-connector-product/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.connector.amazon.comprehend</groupId>
   <artifactId>amazon-comprehend-connector-product</artifactId>
-  <version>11.3.2-SNAPSHOT</version>
+  <version>11.4.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <build>

diff --git a/amazon-comprehend-connector-test/.project b/amazon-comprehend-connector-test/.project
@@ -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>
diff --git a/amazon-comprehend-connector-test/.settings/.jsdtscope b/amazon-comprehend-connector-test/.settings/.jsdtscope
diff --git a/amazon-comprehend-connector-test/.settings/ch.ivyteam.ivy.designer.prefs b/amazon-comprehend-connector-test/.settings/ch.ivyteam.ivy.designer.prefs
@@ -1,5 +1,5 @@
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.amazon.comprehend.test.Data
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.amazon.comprehend.test
 ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
-ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=113000
+ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=114003
 eclipse.preferences.version=1
diff --git a/amazon-comprehend-connector-test/.settings/org.eclipse.wst.common.project.facet.core.xml b/amazon-comprehend-connector-test/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -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="jst.web" version="3.0"/>
-  <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="jst.jsf" version="2.1"/>
-</faceted-project>
+</faceted-project>
diff --git a/amazon-comprehend-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.container b/amazon-comprehend-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.container
diff --git a/amazon-comprehend-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.name b/amazon-comprehend-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.name
diff --git a/amazon-comprehend-connector-test/config/variables.yaml b/amazon-comprehend-connector-test/config/variables.yaml
@@ -1,8 +1,9 @@
+# yaml-language-server: $schema=https://json-schema.axonivy.com/app/11.4.1/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
diff --git a/amazon-comprehend-connector-test/pom.xml b/amazon-comprehend-connector-test/pom.xml
@@ -3,11 +3,11 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.connector.amazon.comprehend</groupId>
   <artifactId>amazon-comprehend-connector-test</artifactId>
-  <version>11.3.2-SNAPSHOT</version>
+  <version>11.4.0-SNAPSHOT</version>
   <packaging>iar-integration-test</packaging>
   <properties>
-    <project.build.plugin.version>11.3.0</project.build.plugin.version>
-    <tester.version>11.3.0</tester.version>
+    <project.build.plugin.version>11.4.0-SNAPSHOT</project.build.plugin.version>
+    <tester.version>11.4.0-SNAPSHOT</tester.version>
   </properties>
   <pluginRepositories>
     <pluginRepository>
@@ -67,8 +67,10 @@
         <version>${project.build.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
-          <additionalVmOptions>-Divy.Applications.amazoncomprehendconnectortest.Variables.Amazon.Comprehend.AccessKey=${aws.access.key}
-        		-Divy.Applications.amazoncomprehendconnectortest.Variables.Amazon.Comprehend.SecretKey=${aws.secret.key}</additionalVmOptions>
+          <additionalVmArgs>
+            <additionalVmArg>-Divy.Applications.amazoncomprehendconnectortest.Variables.Amazon.Comprehend.AccessKey=${aws.access.key}</additionalVmArg>
+            <additionalVmArg>-Divy.Applications.amazoncomprehendconnectortest.Variables.Amazon.Comprehend.SecretKey=${aws.secret.key}</additionalVmArg>
+          </additionalVmArgs>
         </configuration>
       </plugin>
     </plugins>

diff --git a/amazon-comprehend-connector/.project b/amazon-comprehend-connector/.project
@@ -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>
diff --git a/amazon-comprehend-connector/.settings/.jsdtscope b/amazon-comprehend-connector/.settings/.jsdtscope
diff --git a/amazon-comprehend-connector/.settings/ch.ivyteam.ivy.designer.prefs b/amazon-comprehend-connector/.settings/ch.ivyteam.ivy.designer.prefs
@@ -1,5 +1,5 @@
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.amazon.comprehend.Data
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.amazon.comprehend
 ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
-ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=113000
+ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=114003
 eclipse.preferences.version=1
diff --git a/amazon-comprehend-connector/.settings/org.eclipse.wst.common.project.facet.core.xml b/amazon-comprehend-connector/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -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="jst.web" version="3.0"/>
-  <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="jst.jsf" version="2.1"/>
-</faceted-project>
+</faceted-project>
diff --git a/amazon-comprehend-connector/.settings/org.eclipse.wst.jsdt.ui.superType.container b/amazon-comprehend-connector/.settings/org.eclipse.wst.jsdt.ui.superType.container
diff --git a/amazon-comprehend-connector/.settings/org.eclipse.wst.jsdt.ui.superType.name b/amazon-comprehend-connector/.settings/org.eclipse.wst.jsdt.ui.superType.name
diff --git a/amazon-comprehend-connector/config/variables.yaml b/amazon-comprehend-connector/config/variables.yaml
@@ -1,11 +1,13 @@
+# yaml-language-server: $schema=https://json-schema.axonivy.com/app/11.4.1/variables.json
 Variables:
-  Amazon.Comprehend:
-    # Secret key to access amazon comprehend
-    # [password]
-    SecretKey: ""
-    # Access key to access amazon comprehend
-    # [password]
-    AccessKey: ""
-    # Session token to access amazon comprehend
-    # [password]
-    SessionToken: ""
+  Amazon:
+    Comprehend:
+      # Secret key to access amazon comprehend
+      # [password]
+      SecretKey: ""
+      # Access key to access amazon comprehend
+      # [password]
+      AccessKey: ""
+      # Session token to access amazon comprehend
+      # [password]
+      SessionToken: ""
diff --git a/amazon-comprehend-connector/pom.xml b/amazon-comprehend-connector/pom.xml
@@ -1,22 +1,14 @@
 <?xml version="1.0"?>
-<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">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.connector.amazon.comprehend</groupId>
   <artifactId>amazon-comprehend-connector</artifactId>
-  <version>11.3.2-SNAPSHOT</version>
+  <version>11.4.0-SNAPSHOT</version>
   <packaging>iar</packaging>
   <properties>
-    <project.build.plugin.version>11.3.0</project.build.plugin.version>
+    <project.build.plugin.version>11.4.0-SNAPSHOT</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.aws</groupId>
@@ -30,6 +22,15 @@
       <url>https://maven.axonivy.com</url>
     </repository>
   </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <snapshots>
+        <updatePolicy>always</updatePolicy>
+      </snapshots>
+      <id>sonatype</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+    </pluginRepository>
+  </pluginRepositories>
   <build>
     <plugins>
       <plugin>

diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.connector.amazon.comprehend</groupId>
   <artifactId>amazon-comprehend-connector-modules</artifactId>
-  <version>11.3.2-SNAPSHOT</version>
+  <version>11.4.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>