From 19c4a711c7431169a7b7d8cc2dbe3b2b06350ce5 Mon Sep 17 00:00:00 2001
From: "AAVN\\ptanh2" <anh.phamthai@axonactive.com>
Date: Thu, 4 Jan 2024 13:49:41 +0700
Subject: [PATCH 1/5] chore: Update product.json & group id, project version

---
 README.md                          |  8 +++--
 ups-connector-demo/pom.xml         |  4 +--
 ups-connector-product/product.json | 49 ++++++++++++++++++++++++++++++
 ups-connector-test/pom.xml         |  6 ++--
 ups-connector/pom.xml              |  6 ++--
 ups-oauth-feature/pom.xml          |  4 +--
 6 files changed, 65 insertions(+), 12 deletions(-)
 create mode 100644 ups-connector-product/product.json

diff --git a/README.md b/README.md
index 13c8e2e..da2fa7d 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,6 @@
-# ups-connector
-UPS connector
+# UPS connector
+[![CI Build](https://github.com/axonivy-market/ups-connector/actions/workflows/ci.yml/badge.svg)](https://github.com/axonivy-market/ups-connector/actions/workflows/ci.yml)
+
+This is a UPS module built in the Axon Ivy framework, enabling users to seamlessly integrate with UPS services. With this app, users can effortlessly manage their packages through UPS.
+
+Read our [documentation](ups-connector-product/README.md).
\ No newline at end of file
diff --git a/ups-connector-demo/pom.xml b/ups-connector-demo/pom.xml
index f34c51a..e0ccaea 100644
--- a/ups-connector-demo/pom.xml
+++ b/ups-connector-demo/pom.xml
@@ -2,13 +2,13 @@
 <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>ups.connector.demo</groupId>
+  <groupId>com.axonivy.connector.ups</groupId>
   <artifactId>ups-connector-demo</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>iar</packaging>
   <dependencies>
     <dependency>
-      <groupId>ups.connector</groupId>
+      <groupId>com.axonivy.connector.ups</groupId>
       <artifactId>ups-connector</artifactId>
       <version>${project.version}</version>
       <type>iar</type>
diff --git a/ups-connector-product/product.json b/ups-connector-product/product.json
new file mode 100644
index 0000000..9f1bcb5
--- /dev/null
+++ b/ups-connector-product/product.json
@@ -0,0 +1,49 @@
+{
+  "$schema": "https://json-schema.axonivy.com/market/10.0.0/product.json",
+  "installers": [
+    {
+      "id": "maven-import",
+      "data": {
+        "projects": [
+          {
+            "groupId": "com.axonivy.connector.ups",
+            "artifactId": "ups-connector-demo",
+            "version": "${version}",
+            "type": "iar"
+          }
+        ],
+        "repositories": [
+          {
+            "id": "maven.axonivy.com",
+            "url": "https://maven.axonivy.com",
+            "snapshots": {
+              "enabled": "true"
+            }
+          }
+        ]
+      }
+    },
+    {
+      "id": "maven-dependency",
+      "data": {
+        "dependencies": [
+          {
+            "groupId": "com.axonivy.connector.ups",
+            "artifactId": "ups-connector",
+            "version": "${version}",
+            "type": "iar"
+          }
+        ],
+        "repositories": [
+          {
+            "id": "maven.axonivy.com",
+            "url": "https://maven.axonivy.com",
+            "snapshots": {
+              "enabled": "true"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
diff --git a/ups-connector-test/pom.xml b/ups-connector-test/pom.xml
index d38b40e..46103dd 100644
--- a/ups-connector-test/pom.xml
+++ b/ups-connector-test/pom.xml
@@ -2,15 +2,15 @@
 <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>ups.connector.test</groupId>
+  <groupId>com.axonivy.connector.ups</groupId>
   <artifactId>ups-connector-test</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>iar</packaging>
   <dependencies>
     <dependency>
-      <groupId>ups.connector</groupId>
+      <groupId>com.axonivy.connector.ups</groupId>
       <artifactId>ups-connector</artifactId>
-      <version>1.0.0</version>
+      <version>1.0.0-SNAPSHOT</version>
       <type>iar</type>
     </dependency>
     <dependency>
diff --git a/ups-connector/pom.xml b/ups-connector/pom.xml
index c9b1775..4caac57 100644
--- a/ups-connector/pom.xml
+++ b/ups-connector/pom.xml
@@ -2,13 +2,13 @@
 <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>ups.connector</groupId>
+  <groupId>com.axonivy.connector.ups</groupId>
   <artifactId>ups-connector</artifactId>
-  <version>1.0.0</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>iar</packaging>
   <dependencies>
     <dependency>
-      <groupId>com.ups.oauth.feature</groupId>
+      <groupId>com.axonivy.connector.ups</groupId>
       <artifactId>ups-oauth-feature</artifactId>
       <version>1.0.0</version>
       <type>iar</type>
diff --git a/ups-oauth-feature/pom.xml b/ups-oauth-feature/pom.xml
index 3fa1775..e2f837a 100644
--- a/ups-oauth-feature/pom.xml
+++ b/ups-oauth-feature/pom.xml
@@ -2,9 +2,9 @@
 <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.ups.oauth.feature</groupId>
+  <groupId>com.axonivy.connector.ups</groupId>
   <artifactId>ups-oauth-feature</artifactId>
-  <version>1.0.0</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>iar</packaging>
   <scm>
     <developerConnection>scm:git:https://github.com/axonivy-market/${project.name}.git</developerConnection>

From 65165e6dd5eb7b17b536a5731f9c7740ba48e589 Mon Sep 17 00:00:00 2001
From: "AAVN\\ptanh2" <anh.phamthai@axonactive.com>
Date: Thu, 4 Jan 2024 14:25:31 +0700
Subject: [PATCH 2/5] fix: Correct version

---
 ups-connector/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ups-connector/pom.xml b/ups-connector/pom.xml
index 4caac57..3d5a345 100644
--- a/ups-connector/pom.xml
+++ b/ups-connector/pom.xml
@@ -10,7 +10,7 @@
     <dependency>
       <groupId>com.axonivy.connector.ups</groupId>
       <artifactId>ups-oauth-feature</artifactId>
-      <version>1.0.0</version>
+      <version>1.0.0-SNAPSHOT</version>
       <type>iar</type>
     </dependency>
   </dependencies>

From b6822fc4ac941183a803adb30344c700a4168ac3 Mon Sep 17 00:00:00 2001
From: "AAVN\\ptanh2" <anh.phamthai@axonactive.com>
Date: Thu, 4 Jan 2024 15:07:02 +0700
Subject: [PATCH 3/5] chore: Adjust product component

---
 ups-connector-product/pom.xml |  7 +++++++
 ups-connector-product/zip.xml | 26 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 ups-connector-product/pom.xml
 create mode 100644 ups-connector-product/zip.xml

diff --git a/ups-connector-product/pom.xml b/ups-connector-product/pom.xml
new file mode 100644
index 0000000..aa52e0b
--- /dev/null
+++ b/ups-connector-product/pom.xml
@@ -0,0 +1,7 @@
+<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">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.axonivy.connector.ups</groupId>
+  <artifactId>ups-connector-product</artifactId>
+  <version>10.0.14-SNAPSHOT</version>
+  <packaging>pom</packaging>
+</project>
diff --git a/ups-connector-product/zip.xml b/ups-connector-product/zip.xml
new file mode 100644
index 0000000..003f06c
--- /dev/null
+++ b/ups-connector-product/zip.xml
@@ -0,0 +1,26 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+  <id>zip</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+
+  <formats>
+    <format>zip</format>
+  </formats>
+
+  <fileSets>
+    <fileSet>
+      <directory>.</directory>
+      <includes>
+        <include>product.json</include>
+        <include>openapi.json</include>
+        <include>**/*.png</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>README.md</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>

From f5e0dd0303771b2c24bc586651c8340aade56e13 Mon Sep 17 00:00:00 2001
From: "AAVN\\ptanh2" <anh.phamthai@axonactive.com>
Date: Thu, 4 Jan 2024 16:05:35 +0700
Subject: [PATCH 4/5] fix: update version

---
 ups-connector-demo/pom.xml | 2 +-
 ups-connector-test/pom.xml | 4 ++--
 ups-connector/pom.xml      | 4 ++--
 ups-oauth-feature/pom.xml  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ups-connector-demo/pom.xml b/ups-connector-demo/pom.xml
index e0ccaea..abe23b9 100644
--- a/ups-connector-demo/pom.xml
+++ b/ups-connector-demo/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.connector.ups</groupId>
   <artifactId>ups-connector-demo</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>10.0.14-SNAPSHOT</version>
   <packaging>iar</packaging>
   <dependencies>
     <dependency>
diff --git a/ups-connector-test/pom.xml b/ups-connector-test/pom.xml
index 46103dd..912f80c 100644
--- a/ups-connector-test/pom.xml
+++ b/ups-connector-test/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.connector.ups</groupId>
   <artifactId>ups-connector-test</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>10.0.14-SNAPSHOT</version>
   <packaging>iar</packaging>
   <dependencies>
     <dependency>
       <groupId>com.axonivy.connector.ups</groupId>
       <artifactId>ups-connector</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
+      <version>10.0.14-SNAPSHOT</version>
       <type>iar</type>
     </dependency>
     <dependency>
diff --git a/ups-connector/pom.xml b/ups-connector/pom.xml
index 3d5a345..0849685 100644
--- a/ups-connector/pom.xml
+++ b/ups-connector/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.connector.ups</groupId>
   <artifactId>ups-connector</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>10.0.14-SNAPSHOT</version>
   <packaging>iar</packaging>
   <dependencies>
     <dependency>
       <groupId>com.axonivy.connector.ups</groupId>
       <artifactId>ups-oauth-feature</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
+      <version>10.0.14-SNAPSHOT</version>
       <type>iar</type>
     </dependency>
   </dependencies>
diff --git a/ups-oauth-feature/pom.xml b/ups-oauth-feature/pom.xml
index e2f837a..921a530 100644
--- a/ups-oauth-feature/pom.xml
+++ b/ups-oauth-feature/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.connector.ups</groupId>
   <artifactId>ups-oauth-feature</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>10.0.14-SNAPSHOT</version>
   <packaging>iar</packaging>
   <scm>
     <developerConnection>scm:git:https://github.com/axonivy-market/${project.name}.git</developerConnection>

From d4f61ce3123e39641e37d3cb01952692339c41e3 Mon Sep 17 00:00:00 2001
From: "AAVN\\ptanh2" <anh.phamthai@axonactive.com>
Date: Thu, 4 Jan 2024 16:11:36 +0700
Subject: [PATCH 5/5] fix: update version

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 517336b..44d99b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,9 +1,9 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.axonivy.market</groupId><!-- your group id: e.g. com.axonivy.connector.<myconnector> or com.axonivy.utils.<myutil> -->
-  <name>my-product</name><!-- fill your product name -->
-  <artifactId>my-product-modules</artifactId><!-- fill your product name + a "-modules" postfix -->
-  <version>10.0.0-SNAPSHOT</version><!-- identicate your minimal compliant ivy version with the first 2 digits -->
+  <groupId>com.axonivy.connector.ups</groupId><!-- your group id: e.g. com.axonivy.connector.<myconnector> or com.axonivy.utils.<myutil> -->
+  <name>ups-connector</name><!-- fill your product name -->
+  <artifactId>ups-connector-modules</artifactId><!-- fill your product name + a "-modules" postfix -->
+  <version>10.0.14-SNAPSHOT</version><!-- identicate your minimal compliant ivy version with the first 2 digits -->
   <packaging>pom</packaging>
 
   <modules>