Skip to content

Commit

Permalink
Clean dependencies for HTTP APIs and HTTP Servers
Browse files Browse the repository at this point in the history
  • Loading branch information
pierredebelen committed Mar 27, 2024
1 parent a44b0ef commit 20e949e
Show file tree
Hide file tree
Showing 512 changed files with 1,116 additions and 875 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
strategy:
fail-fast: false
matrix:
module: [ {parent: legend-engine-config, name: legend-engine-server}, {parent: legend-engine-pure/legend-engine-pure-ide, name: legend-engine-pure-ide-light} ]
module: [ {parent: legend-engine-config, name: legend-engine-server-http-server}, {parent: legend-engine-pure/legend-engine-pure-ide, name: legend-engine-pure-ide-light-http-server} ]
steps:
- name: Checkout code
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .run/Server External.run.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Server External" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" value="org.finos.legend.engine.server.Server" />
<module name="legend-engine-server-rest" />
<module name="legend-engine-server-http-server" />
<option name="PROGRAM_PARAMETERS" value="server $USER_HOME$/deployment/legend-local/engine_config.json" />
<extension name="coverage">
<pattern>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,39 +33,10 @@
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce</id>
<id>executionEnforcement</id>
<configuration>
<rules>
<requireJavaVersion>
<version>${maven.enforcer.requireJavaVersion}</version>
</requireJavaVersion>
<dependencyConvergence />
<bannedDependencies>
<searchTransitive>true</searchTransitive>
<excludes>
<exclude>commons-logging</exclude>
<exclude>javax.mail</exclude>
<exclude>log4j</exclude>
<exclude>ch.qos.logback</exclude>
<exclude>org.slf4j</exclude>
<exclude>org.finos.legend.pure</exclude>
<exclude>io.dropwizard</exclude>
</excludes>
<includes>
<!--only the specific included logging jars are allowed -->
<include>org.slf4j:jul-to-slf4j:${slf4j.version}</include>
<include>org.slf4j:slf4j-api:${slf4j.version}</include>
<include>org.slf4j:jcl-over-slf4j:${slf4j.version}</include>
<include>org.slf4j:slf4j-ext:${slf4j.version}</include>
<include>org.finos.legend.pure:legend-pure-m4</include>
</includes>

</bannedDependencies>
</rules>
<skip>false</skip>
</configuration>
<goals>
<goal>enforce</goal>
</goals>
</execution>
</executions>
</plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,45 +39,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce</id>
<configuration>
<rules>
<requireJavaVersion>
<version>${maven.enforcer.requireJavaVersion}</version>
</requireJavaVersion>
<dependencyConvergence />
<bannedDependencies>
<searchTransitive>true</searchTransitive>
<excludes>
<exclude>commons-logging</exclude>
<exclude>javax.mail</exclude>
<exclude>log4j</exclude>
<exclude>ch.qos.logback</exclude>
<exclude>org.slf4j</exclude>
<exclude>io.dropwizard</exclude>
</excludes>
<includes>
<!--only the specific included logging jars are allowed -->
<include>org.slf4j:jul-to-slf4j:${slf4j.version}</include>
<include>org.slf4j:slf4j-api:${slf4j.version}</include>
<include>org.slf4j:jcl-over-slf4j:${slf4j.version}</include>
<include>org.slf4j:slf4j-ext:${slf4j.version}</include>
</includes>

</bannedDependencies>
</rules>
</configuration>
<goals>
<goal>enforce</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
Expand Down Expand Up @@ -572,7 +533,7 @@
<!-- GraphQL -->
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-xt-graphQL-query</artifactId>
<artifactId>legend-engine-xt-graphQL-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
<version>4.42.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>legend-engine-server-rest</artifactId>
<name>Legend Engine - Server - REST</name>
<artifactId>legend-engine-server-http-server</artifactId>
<name>Legend Engine - Server - HTTP - Server</name>

<packaging>jar</packaging>

Expand Down Expand Up @@ -62,6 +62,18 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>httpEnforcement</id>
<configuration>
<skip>false</skip>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down Expand Up @@ -151,59 +163,59 @@
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-language-pure-grammar-api</artifactId>
<artifactId>legend-engine-language-pure-grammar-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-xt-relationalStore-api</artifactId>
<artifactId>legend-engine-xt-relationalStore-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-xt-relationalStore-executionPlan-connection-api</artifactId>
<artifactId>legend-engine-xt-relationalStore-connection-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-language-pure-compiler-api</artifactId>
<artifactId>legend-engine-language-pure-compiler-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-services-model-api</artifactId>
<artifactId>legend-engine-services-model-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-executionPlan-execution</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-executionPlan-execution-api</artifactId>
<artifactId>legend-engine-executionPlan-execution-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-core-query-pure-rest</artifactId>
<artifactId>legend-engine-core-query-pure-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-xt-graphQL-query</artifactId>
<artifactId>legend-engine-xt-graphQL-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-xt-graphQL-api</artifactId>
<artifactId>legend-engine-xt-graphQL-generation-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-xt-protobuf-api</artifactId>
<artifactId>legend-engine-xt-protobuf-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-xt-json-api</artifactId>
<artifactId>legend-engine-xt-json-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-xt-daml-api</artifactId>
<artifactId>legend-engine-xt-daml-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-xt-avro-api</artifactId>
<artifactId>legend-engine-xt-avro-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
Expand All @@ -216,7 +228,7 @@
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-xt-functionActivator-api</artifactId>
<artifactId>legend-engine-xt-functionActivator-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
Expand All @@ -228,7 +240,7 @@
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-xt-artifact-generation-api</artifactId>
<artifactId>legend-engine-xt-artifact-generation-http-api</artifactId>
</dependency>

<dependency>
Expand Down Expand Up @@ -338,7 +350,7 @@
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-xt-diagram-api</artifactId>
<artifactId>legend-engine-xt-diagram-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
Expand All @@ -352,7 +364,7 @@
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-xt-data-space-api</artifactId>
<artifactId>legend-engine-xt-data-space-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
Expand Down Expand Up @@ -420,7 +432,7 @@
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-xt-relationalStore-executionPlan-rest</artifactId>
<artifactId>legend-engine-xt-relationalStore-executionPlan-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
Expand All @@ -444,7 +456,7 @@
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-protocol-api</artifactId>
<artifactId>legend-engine-protocol-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
Expand All @@ -464,15 +476,15 @@
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-xt-analytics-class-api</artifactId>
<artifactId>legend-engine-xt-analytics-class-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-xt-analytics-function-api</artifactId>
<artifactId>legend-engine-xt-analytics-function-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-xt-analytics-binding-api</artifactId>
<artifactId>legend-engine-xt-analytics-binding-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
Expand Down Expand Up @@ -525,11 +537,11 @@
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-testable-api</artifactId>
<artifactId>legend-engine-testable-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-external-format-api</artifactId>
<artifactId>legend-engine-external-format-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
Expand Down Expand Up @@ -609,15 +621,15 @@
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-xt-analytics-mapping-api</artifactId>
<artifactId>legend-engine-xt-analytics-mapping-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-xt-analytics-lineage-api</artifactId>
<artifactId>legend-engine-xt-analytics-lineage-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-xt-analytics-store-entitlement-api</artifactId>
<artifactId>legend-engine-xt-analytics-store-entitlement-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
Expand Down Expand Up @@ -662,7 +674,7 @@

<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-xt-sql-query</artifactId>
<artifactId>legend-engine-xt-sql-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
Expand All @@ -682,7 +694,7 @@
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-test-data-generation</artifactId>
<artifactId>legend-engine-xt-relationalStore-testDataGeneration-http-api</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
Expand Down Expand Up @@ -1000,6 +1012,11 @@
<artifactId>legend-engine-test-runner-function</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-xt-relationalStore-executionPlan-connection</artifactId>
<scope>runtime</scope>
</dependency>
<!-- RUNTIME -->

<dependency>
Expand Down Expand Up @@ -1033,11 +1050,6 @@
<artifactId>legend-engine-pure-runtime-java-extension-compiled-functions-pureExtensions</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-xt-relationalStore-executionPlan-connection</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-external-shared-format-runtime</artifactId>
Expand All @@ -1047,11 +1059,6 @@
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-xt-relationalStore-executionPlan-connection</artifactId>
<scope>runtime</scope>
</dependency>

<!-- TEST -->
</dependencies>
Expand Down
Loading

0 comments on commit 20e949e

Please sign in to comment.