Reorganize dependency management

kevin-m-knight-gs · Jan 4, 2024 · 686d646 · 686d646
1 parent d2e4085
commit 686d646
Show file tree

Hide file tree

Showing 13 changed files with 590 additions and 589 deletions.
diff --git a/legend-engine-ide-lsp-default-extensions/pom.xml b/legend-engine-ide-lsp-default-extensions/pom.xml
diff --git a/legend-engine-ide-lsp-extension-api/pom.xml b/legend-engine-ide-lsp-extension-api/pom.xml
@@ -39,4 +39,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/legend-engine-ide-lsp-extension/pom.xml b/legend-engine-ide-lsp-extension/pom.xml
diff --git a/legend-engine-ide-lsp-server-shaded/pom.xml b/legend-engine-ide-lsp-server-shaded/pom.xml
@@ -26,8 +26,29 @@
     <artifactId>legend-engine-ide-lsp-server-shaded</artifactId>
     <name>Legend Engine IDE LSP Server Shaded</name>
 
+    <properties>
+        <logback.version>1.4.14</logback.version>
+    </properties>
+
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <configuration>
+                    <rules>
+                        <bannedDependencies>
+                            <includes>
+                                <include>ch.qos.logback:*:${logback.version}:jar:runtime</include>
+                                <include>com.google.code.gson:gson:*:jar:runtime</include>
+                                <include>org.eclipse.lsp4j:*:*:jar:runtime</include>
+                                <include>org.finos.legend.engine.ide.lsp:*:${project.version}:jar:runtime</include>
+                                <include>org.slf4j:slf4j-api:${slf4j.version}:jar:runtime</include>
+                            </includes>
+                        </bannedDependencies>
+                    </rules>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
@@ -70,16 +91,11 @@
             <artifactId>legend-engine-ide-lsp-server</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>org.finos.legend.engine.ide.lsp</groupId>
-            <artifactId>legend-engine-ide-lsp-default-extensions</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/legend-engine-ide-lsp-server/pom.xml b/legend-engine-ide-lsp-server/pom.xml
@@ -26,6 +26,32 @@
     <artifactId>legend-engine-ide-lsp-server</artifactId>
     <name>Legend Engine IDE LSP Server</name>
 
+    <properties>
+        <gson.version>2.10.1</gson.version>
+        <lsp4j.version>0.21.1</lsp4j.version>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <configuration>
+                    <rules>
+                        <bannedDependencies>
+                            <includes>
+                                <include>com.google.code.gson:gson:${gson.version}:jar:compile</include>
+                                <include>org.eclipse.lsp4j:*:${lsp4j.version}:jar:compile</include>
+                                <include>org.finos.legend.engine.ide.lsp:*:${project.version}:jar:compile</include>
+                                <include>org.slf4j:slf4j-api:${slf4j.version}:jar:compile</include>
+                            </includes>
+                        </bannedDependencies>
+                    </rules>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <dependencies>
         <!-- LEGEND ENGINE LSP -->
         <dependency>
@@ -36,24 +62,29 @@
             <groupId>org.finos.legend.engine.ide.lsp</groupId>
             <artifactId>legend-engine-ide-lsp-extension-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.finos.legend.engine.ide.lsp</groupId>
-            <artifactId>legend-engine-ide-lsp-extension</artifactId>
-        </dependency>
         <!-- LEGEND ENGINE LSP -->
 
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
+            <version>${gson.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.eclipse.lsp4j</groupId>
             <artifactId>org.eclipse.lsp4j</artifactId>
+            <version>${lsp4j.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.lsp4j</groupId>
             <artifactId>org.eclipse.lsp4j.jsonrpc</artifactId>
+            <version>${lsp4j.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.code.gson</groupId>
+                    <artifactId>gson</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -62,11 +93,6 @@
         </dependency>
 
         <!-- TEST -->
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
@@ -79,4 +105,4 @@
         </dependency>
         <!-- TEST -->
     </dependencies>
-</project>
+</project>
diff --git a/.../extension/LegendLSPExtensionLibrary.java → .../extension/LegendLSPExtensionLibrary.java b/.../extension/LegendLSPExtensionLibrary.java → .../extension/LegendLSPExtensionLibrary.java
diff --git a/...sp/extension/LegendLSPGrammarLibrary.java → ...sp/extension/LegendLSPGrammarLibrary.java b/...sp/extension/LegendLSPGrammarLibrary.java → ...sp/extension/LegendLSPGrammarLibrary.java
diff --git a/.../extension/LegendLSPInlineDSLLibrary.java → .../extension/LegendLSPInlineDSLLibrary.java b/.../extension/LegendLSPInlineDSLLibrary.java → .../extension/LegendLSPInlineDSLLibrary.java
diff --git a/...bstractTestLegendLSPExtensionLibrary.java → ...bstractTestLegendLSPExtensionLibrary.java b/...bstractTestLegendLSPExtensionLibrary.java → ...bstractTestLegendLSPExtensionLibrary.java
diff --git a/...xtension/TestLegendLSPGrammarLibrary.java → ...xtension/TestLegendLSPGrammarLibrary.java b/...xtension/TestLegendLSPGrammarLibrary.java → ...xtension/TestLegendLSPGrammarLibrary.java
diff --git a/...ension/TestLegendLSPInlineDSLLibrary.java → ...ension/TestLegendLSPInlineDSLLibrary.java b/...ension/TestLegendLSPInlineDSLLibrary.java → ...ension/TestLegendLSPInlineDSLLibrary.java
diff --git a/legend-engine-ide-lsp-test-reports/pom.xml b/legend-engine-ide-lsp-test-reports/pom.xml
@@ -33,10 +33,12 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
                 <configuration>
-                    <rules combine.self="override">
-                        <requireJavaVersion>
-                            <version>${java.version.range}</version>
-                        </requireJavaVersion>
+                    <rules>
+                        <bannedDependencies>
+                            <includes>
+                                <include>org.finos.legend.engine.ide.lsp:*:${project.version}:jar:compile</include>
+                            </includes>
+                        </bannedDependencies>
                     </rules>
                 </configuration>
             </plugin>
@@ -89,16 +91,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.finos.legend.engine.ide.lsp</groupId>
-            <artifactId>legend-engine-ide-lsp-extension</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.finos.legend.engine.ide.lsp</groupId>
             <artifactId>legend-engine-ide-lsp-default-extensions</artifactId>
@@ -120,4 +112,4 @@
             </exclusions>
         </dependency>
     </dependencies>
-</project>
+</project>