From a3c5547298dcfbaef2997ad3dfa6bea7f0114a3c Mon Sep 17 00:00:00 2001
From: Nilansh Bansal <nilansh@appsmith.com>
Date: Tue, 17 Dec 2024 20:21:28 +0530
Subject: [PATCH] chore: added comment to avoid merge conflicts (#38211)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Description
> This PR adds comment to avoid merge conflicts while creating a EE
specific plugin.
Ref: https://github.com/appsmithorg/appsmith-ee/pull/5748
Fixes #`Issue Number`
_or_
Fixes `Issue URL`
> [!WARNING]
> _If no issue exists, please create an issue first, and check with the
maintainers if the issue is valid._

## Automation

/ok-to-test tags="@tag.Sanity"

### :mag: Cypress test results
<!-- This is an auto-generated comment: Cypress test results  -->
> [!TIP]
> 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
> Workflow run:
<https://github.com/appsmithorg/appsmith/actions/runs/12374140333>
> Commit: 19d726b36a880186e8def9145fdee0393b340e8a
> <a
href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=12374140333&attempt=1"
target="_blank">Cypress dashboard</a>.
> Tags: `@tag.Sanity`
> Spec:
> <hr>Tue, 17 Dec 2024 14:12:40 UTC
<!-- end of auto-generated comment: Cypress test results  -->


## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [ ] No


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **Documentation**
- Added comments in the `PluginType` enum and `pom.xml` to guide
developers on adding Enterprise Edition Plugin Types.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
---
 .../src/main/java/com/appsmith/external/models/PluginType.java  | 2 ++
 app/server/appsmith-plugins/pom.xml                             | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/PluginType.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/PluginType.java
index e210b018e8..bfcd43a285 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/PluginType.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/PluginType.java
@@ -8,4 +8,6 @@ public enum PluginType {
     REMOTE,
     AI,
     INTERNAL,
+
+    // Add EE Plugin Types below this line, to avoid conflicts.
 }
diff --git a/app/server/appsmith-plugins/pom.xml b/app/server/appsmith-plugins/pom.xml
index 15763d1af2..59cf769c21 100644
--- a/app/server/appsmith-plugins/pom.xml
+++ b/app/server/appsmith-plugins/pom.xml
@@ -40,6 +40,8 @@
         <module>appsmithAiPlugin</module>
         <module>awsLambdaPlugin</module>
         <module>databricksPlugin</module>
+
+        <!--        Add EE Plugins below this line, to avoid conflicts.-->
     </modules>
 
     <properties>