diff --git a/legend-engine-ide-lsp-default-extensions/pom.xml b/legend-engine-ide-lsp-default-extensions/pom.xml index 21b75f9f..5107a189 100644 --- a/legend-engine-ide-lsp-default-extensions/pom.xml +++ b/legend-engine-ide-lsp-default-extensions/pom.xml @@ -46,6 +46,33 @@ + + org.apache.maven.plugins + maven-enforcer-plugin + + + + + commons-logging + io.swagger + io.zipkin + io.zipkin.* + javax.mail + javax.ws.rs + junit + log4j + org.antlr:antlr4 + org.bouncycastle + org.slf4j + + + org.slf4j:jcl-over-slf4j:${slf4j.version} + org.slf4j:slf4j-api:${slf4j.version} + + + + + org.apache.maven.plugins maven-shade-plugin diff --git a/legend-engine-ide-lsp-extension-api/pom.xml b/legend-engine-ide-lsp-extension-api/pom.xml index 326c2729..3a3aa02a 100644 --- a/legend-engine-ide-lsp-extension-api/pom.xml +++ b/legend-engine-ide-lsp-extension-api/pom.xml @@ -39,4 +39,4 @@ test - \ No newline at end of file + diff --git a/legend-engine-ide-lsp-extension/pom.xml b/legend-engine-ide-lsp-extension/pom.xml deleted file mode 100644 index 7209a00d..00000000 --- a/legend-engine-ide-lsp-extension/pom.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - 4.0.0 - - org.finos.legend.engine.ide.lsp - legend-engine-ide-lsp - 0.0.3-SNAPSHOT - - - legend-engine-ide-lsp-extension - Legend Engine IDE LSP Extension - - - - - org.finos.legend.engine.ide.lsp - legend-engine-ide-lsp-extension-api - - - - - org.slf4j - slf4j-api - - - - - org.junit.jupiter - junit-jupiter - test - - - org.junit.jupiter - junit-jupiter-api - test - - - - diff --git a/legend-engine-ide-lsp-server-shaded/pom.xml b/legend-engine-ide-lsp-server-shaded/pom.xml index 812d67f4..4c07cbbf 100644 --- a/legend-engine-ide-lsp-server-shaded/pom.xml +++ b/legend-engine-ide-lsp-server-shaded/pom.xml @@ -26,8 +26,29 @@ legend-engine-ide-lsp-server-shaded Legend Engine IDE LSP Server Shaded + + 1.4.14 + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + + + ch.qos.logback:*:${logback.version}:jar:runtime + com.google.code.gson:gson:*:jar:runtime + org.eclipse.lsp4j:*:*:jar:runtime + org.finos.legend.engine.ide.lsp:*:${project.version}:jar:runtime + org.slf4j:slf4j-api:${slf4j.version}:jar:runtime + + + + + org.apache.maven.plugins maven-shade-plugin @@ -73,7 +94,7 @@ ch.qos.logback logback-classic - 1.4.14 + ${logback.version} runtime diff --git a/legend-engine-ide-lsp-server/pom.xml b/legend-engine-ide-lsp-server/pom.xml index 042dff2f..28d20c98 100644 --- a/legend-engine-ide-lsp-server/pom.xml +++ b/legend-engine-ide-lsp-server/pom.xml @@ -31,6 +31,27 @@ 0.21.1 + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + + + com.google.code.gson:gson:${gson.version}:jar:compile + org.eclipse.lsp4j:*:${lsp4j.version}:jar:compile + org.finos.legend.engine.ide.lsp:*:${project.version}:jar:compile + org.slf4j:slf4j-api:${slf4j.version}:jar:compile + + + + + + + + @@ -41,10 +62,6 @@ org.finos.legend.engine.ide.lsp legend-engine-ide-lsp-extension-api - - org.finos.legend.engine.ide.lsp - legend-engine-ide-lsp-extension - diff --git a/legend-engine-ide-lsp-extension/src/main/java/org/finos/legend/engine/ide/lsp/extension/LegendLSPExtensionLibrary.java b/legend-engine-ide-lsp-server/src/main/java/org/finos/legend/engine/ide/lsp/extension/LegendLSPExtensionLibrary.java similarity index 100% rename from legend-engine-ide-lsp-extension/src/main/java/org/finos/legend/engine/ide/lsp/extension/LegendLSPExtensionLibrary.java rename to legend-engine-ide-lsp-server/src/main/java/org/finos/legend/engine/ide/lsp/extension/LegendLSPExtensionLibrary.java diff --git a/legend-engine-ide-lsp-extension/src/main/java/org/finos/legend/engine/ide/lsp/extension/LegendLSPGrammarLibrary.java b/legend-engine-ide-lsp-server/src/main/java/org/finos/legend/engine/ide/lsp/extension/LegendLSPGrammarLibrary.java similarity index 100% rename from legend-engine-ide-lsp-extension/src/main/java/org/finos/legend/engine/ide/lsp/extension/LegendLSPGrammarLibrary.java rename to legend-engine-ide-lsp-server/src/main/java/org/finos/legend/engine/ide/lsp/extension/LegendLSPGrammarLibrary.java diff --git a/legend-engine-ide-lsp-extension/src/main/java/org/finos/legend/engine/ide/lsp/extension/LegendLSPInlineDSLLibrary.java b/legend-engine-ide-lsp-server/src/main/java/org/finos/legend/engine/ide/lsp/extension/LegendLSPInlineDSLLibrary.java similarity index 100% rename from legend-engine-ide-lsp-extension/src/main/java/org/finos/legend/engine/ide/lsp/extension/LegendLSPInlineDSLLibrary.java rename to legend-engine-ide-lsp-server/src/main/java/org/finos/legend/engine/ide/lsp/extension/LegendLSPInlineDSLLibrary.java diff --git a/legend-engine-ide-lsp-extension/src/test/java/org/finos/legend/engine/ide/lsp/extension/AbstractTestLegendLSPExtensionLibrary.java b/legend-engine-ide-lsp-server/src/test/java/org/finos/legend/engine/ide/lsp/extension/AbstractTestLegendLSPExtensionLibrary.java similarity index 100% rename from legend-engine-ide-lsp-extension/src/test/java/org/finos/legend/engine/ide/lsp/extension/AbstractTestLegendLSPExtensionLibrary.java rename to legend-engine-ide-lsp-server/src/test/java/org/finos/legend/engine/ide/lsp/extension/AbstractTestLegendLSPExtensionLibrary.java diff --git a/legend-engine-ide-lsp-extension/src/test/java/org/finos/legend/engine/ide/lsp/extension/TestLegendLSPGrammarLibrary.java b/legend-engine-ide-lsp-server/src/test/java/org/finos/legend/engine/ide/lsp/extension/TestLegendLSPGrammarLibrary.java similarity index 100% rename from legend-engine-ide-lsp-extension/src/test/java/org/finos/legend/engine/ide/lsp/extension/TestLegendLSPGrammarLibrary.java rename to legend-engine-ide-lsp-server/src/test/java/org/finos/legend/engine/ide/lsp/extension/TestLegendLSPGrammarLibrary.java diff --git a/legend-engine-ide-lsp-extension/src/test/java/org/finos/legend/engine/ide/lsp/extension/TestLegendLSPInlineDSLLibrary.java b/legend-engine-ide-lsp-server/src/test/java/org/finos/legend/engine/ide/lsp/extension/TestLegendLSPInlineDSLLibrary.java similarity index 100% rename from legend-engine-ide-lsp-extension/src/test/java/org/finos/legend/engine/ide/lsp/extension/TestLegendLSPInlineDSLLibrary.java rename to legend-engine-ide-lsp-server/src/test/java/org/finos/legend/engine/ide/lsp/extension/TestLegendLSPInlineDSLLibrary.java diff --git a/legend-engine-ide-lsp-test-reports/pom.xml b/legend-engine-ide-lsp-test-reports/pom.xml index a616311f..0b219e0e 100644 --- a/legend-engine-ide-lsp-test-reports/pom.xml +++ b/legend-engine-ide-lsp-test-reports/pom.xml @@ -33,10 +33,12 @@ org.apache.maven.plugins maven-enforcer-plugin - - - ${java.version.range} - + + + + org.finos.legend.engine.ide.lsp:*:${project.version}:jar:compile + + @@ -89,16 +91,6 @@ - - org.finos.legend.engine.ide.lsp - legend-engine-ide-lsp-extension - - - * - * - - - org.finos.legend.engine.ide.lsp legend-engine-ide-lsp-default-extensions @@ -120,4 +112,4 @@ - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index 80b387d3..814d26b5 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,6 @@ legend-engine-ide-lsp-text-tools legend-engine-ide-lsp-extension-api - legend-engine-ide-lsp-extension legend-engine-ide-lsp-server legend-engine-ide-lsp-default-extensions legend-engine-ide-lsp-test-reports @@ -223,24 +222,11 @@ - - commons-logging - io.swagger - io.zipkin - io.zipkin.* - javax.mail - javax.ws.rs - junit - log4j - org.antlr:antlr4 - org.bouncycastle - org.slf4j + + *:*:*:*:compile + *:*:*:*:runtime + *:*:*:*:provided - - org.slf4j:jcl-over-slf4j:${slf4j.version}:jar - org.slf4j:slf4j-api:${slf4j.version} - org.slf4j:slf4j-simple:${slf4j.version}:jar:test - @@ -315,11 +301,6 @@ legend-engine-ide-lsp-extension-api ${project.version} - - org.finos.legend.engine.ide.lsp - legend-engine-ide-lsp-extension - ${project.version} - org.finos.legend.engine.ide.lsp legend-engine-ide-lsp-default-extensions @@ -332,14 +313,7 @@ - - org.junit - junit-bom - ${junit.version} - pom - import - - + org.slf4j slf4j-api @@ -350,6 +324,17 @@ jcl-over-slf4j ${slf4j.version} + + + + + org.junit + junit-bom + ${junit.version} + pom + import + +