From da4d79a2821dc2ca321ea57448c149b5663146a1 Mon Sep 17 00:00:00 2001
From: Elle Imhoff <Kronic.Deth@gmail.com>
Date: Mon, 17 Apr 2023 14:40:00 -0500
Subject: [PATCH 1/2] Add #3176 to changelogs

---
 CHANGELOG.md                      | 2 ++
 resources/META-INF/changelog.html | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f92e42d17..246b0e40d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -294,6 +294,8 @@
 * [#3172](https://github.com/KronicDeth/intellij-elixir/pull/3172) - [@KronicDeth](https://github.com/KronicDeth)
   * Ignore from preload list that doesn't have square brackets.
     When trying to resolve keyword keys to `from`, don't error on unknown keys if any previous key was preload as this may be a list of preloads that is missing the square brackets.
+* [#3176](https://github.com/KronicDeth/intellij-elixir/pull/3176) - [@sh41](https://github.com/sh41)
+  * Re-enable canary releases.
 
 ## v14.0.1
 
diff --git a/resources/META-INF/changelog.html b/resources/META-INF/changelog.html
index faa75c774..d4eae15ca 100644
--- a/resources/META-INF/changelog.html
+++ b/resources/META-INF/changelog.html
@@ -24,6 +24,7 @@ <h1>v15.0.0</h1>
           preload as this may be a list of preloads that is missing the square brackets.
         </p>
       </li>
+      <li>Re-enable canary releases.</li>
     </ul>
   </li>
 </ul>

From 243950af844ad046dfcc03e198d477d16f96cf22 Mon Sep 17 00:00:00 2001
From: Elle Imhoff <Kronic.Deth@gmail.com>
Date: Mon, 17 Apr 2023 10:03:26 -0500
Subject: [PATCH 2/2] Remove duplicate dependency on
 `com.intellij.modules.java` plugin

---
 CHANGELOG.md                      | 2 ++
 resources/META-INF/changelog.html | 1 +
 resources/META-INF/plugin.xml     | 2 --
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 246b0e40d..ca8d8e1a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -296,6 +296,8 @@
     When trying to resolve keyword keys to `from`, don't error on unknown keys if any previous key was preload as this may be a list of preloads that is missing the square brackets.
 * [#3176](https://github.com/KronicDeth/intellij-elixir/pull/3176) - [@sh41](https://github.com/sh41)
   * Re-enable canary releases.
+* [#3180](https://github.com/KronicDeth/intellij-elixir/pull/3180) - [@KronicDeth](https://github.com/KronicDeth)
+  * Remove duplicate dependency on `com.intellij.modules.java` plugin.
 
 ## v14.0.1
 
diff --git a/resources/META-INF/changelog.html b/resources/META-INF/changelog.html
index d4eae15ca..baa7d5987 100644
--- a/resources/META-INF/changelog.html
+++ b/resources/META-INF/changelog.html
@@ -25,6 +25,7 @@ <h1>v15.0.0</h1>
         </p>
       </li>
       <li>Re-enable canary releases.</li>
+      <li>Remove duplicate dependency on `com.intellij.modules.java` plugin.</li>
     </ul>
   </li>
 </ul>
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
index 37dc0cc12..141ed8a63 100644
--- a/resources/META-INF/plugin.xml
+++ b/resources/META-INF/plugin.xml
@@ -9,8 +9,6 @@
     <!-- please see http://confluence.jetbrains.com/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
          on how to target different products -->
     <depends>com.intellij.modules.lang</depends>
-    <!-- Needed for JPS builder -->
-    <depends optional="true">com.intellij.modules.java</depends>
     <depends>org.intellij.plugins.markdown</depends>
     <depends config-file="rich-platform-plugin.xml" optional="true">com.intellij.modules.java</depends>