Skip to content

Commit

Permalink
Consolidate Pure Functions modules
Browse files Browse the repository at this point in the history
  • Loading branch information
pierredebelen committed Jan 5, 2025
1 parent 09d0816 commit 0d4f583
Show file tree
Hide file tree
Showing 183 changed files with 33 additions and 100 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-pure-runtime-javaCompiler</artifactId>
<artifactId>legend-engine-pure-code-functions-javaCompiler</artifactId>
<version>4.67.12-SNAPSHOT</version>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-pure-runtime-javaCompiler</artifactId>
<artifactId>legend-engine-pure-code-functions-javaCompiler</artifactId>
<version>4.67.12-SNAPSHOT</version>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-pure-runtime-javaCompiler</artifactId>
<artifactId>legend-engine-pure-code-functions-javaCompiler</artifactId>
<version>4.67.12-SNAPSHOT</version>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-pure-runtime-javaCompiler</artifactId>
<artifactId>legend-engine-pure-code-functions-javaCompiler</artifactId>
<version>4.67.12-SNAPSHOT</version>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-pure-runtime</artifactId>
<artifactId>legend-engine-core-pure</artifactId>
<version>4.67.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>legend-engine-pure-runtime-javaCompiler</artifactId>
<artifactId>legend-engine-pure-code-functions-javaCompiler</artifactId>
<packaging>pom</packaging>
<name>Legend Engine - Pure - Runtime - JavaCompiler</name>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-pure-runtime-legendCompiler</artifactId>
<artifactId>legend-engine-pure-code-functions-legendCompiler</artifactId>
<version>4.67.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-pure-runtime-legendCompiler</artifactId>
<artifactId>legend-engine-pure-code-functions-legendCompiler</artifactId>
<version>4.67.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-pure-runtime-legendCompiler</artifactId>
<artifactId>legend-engine-pure-code-functions-legendCompiler</artifactId>
<version>4.67.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-pure-runtime-legendCompiler</artifactId>
<artifactId>legend-engine-pure-code-functions-legendCompiler</artifactId>
<version>4.67.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-pure-runtime</artifactId>
<artifactId>legend-engine-core-pure</artifactId>
<version>4.67.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>legend-engine-pure-runtime-legendCompiler</artifactId>
<artifactId>legend-engine-pure-code-functions-legendCompiler</artifactId>
<packaging>pom</packaging>
<name>Legend Engine - Pure - Runtime - LegendCompiler</name>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-pure-runtime-planExecution</artifactId>
<artifactId>legend-engine-pure-code-functions-planExecution</artifactId>
<version>4.67.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-pure-runtime-planExecution</artifactId>
<artifactId>legend-engine-pure-code-functions-planExecution</artifactId>
<version>4.67.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-pure-runtime-planExecution</artifactId>
<artifactId>legend-engine-pure-code-functions-planExecution</artifactId>
<version>4.67.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-pure-runtime-planExecution</artifactId>
<artifactId>legend-engine-pure-code-functions-planExecution</artifactId>
<version>4.67.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-pure-runtime</artifactId>
<artifactId>legend-engine-core-pure</artifactId>
<version>4.67.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>legend-engine-pure-runtime-planExecution</artifactId>
<artifactId>legend-engine-pure-code-functions-planExecution</artifactId>
<packaging>pom</packaging>
<name>Legend Engine - Pure - Runtime - PlanExecution</name>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-pure-runtime-pureExtensions</artifactId>
<artifactId>legend-engine-pure-code-functions-pureExtensions</artifactId>
<version>4.67.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-pure-runtime-pureExtensions</artifactId>
<artifactId>legend-engine-pure-code-functions-pureExtensions</artifactId>
<version>4.67.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-pure-runtime-pureExtensions</artifactId>
<artifactId>legend-engine-pure-code-functions-pureExtensions</artifactId>
<version>4.67.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-pure-runtime-pureExtensions</artifactId>
<artifactId>legend-engine-pure-code-functions-pureExtensions</artifactId>
<version>4.67.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-pure-runtime</artifactId>
<artifactId>legend-engine-core-pure</artifactId>
<version>4.67.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>legend-engine-pure-runtime-pureExtensions</artifactId>
<artifactId>legend-engine-pure-code-functions-pureExtensions</artifactId>
<packaging>pom</packaging>
<name>Legend Engine - Pure - Runtime - PureExtensions</name>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@ public static void main(String[] args) throws Exception
{
System.setProperty("legend.test.h2.port", "1975");
System.setProperty("user.timezone", "GMT");
new PureIDELight().run(args.length == 0 ? new String[]{"server", "legend-engine-pure/legend-engine-pure-ide/legend-engine-pure-ide-light-http-server/src/main/resources/ideLightConfig.json"} : args);
new PureIDELight().run(args.length == 0 ? new String[]{"server", "legend-engine-core/legend-engine-core-pure/legend-engine-pure-ide/legend-engine-pure-ide-light-http-server/src/main/resources/ideLightConfig.json"} : args);
}

@Override
protected MutableList<RepositoryCodeStorage> buildRepositories(SourceLocationConfiguration sourceLocationConfiguration)
{
return Lists.mutable.<RepositoryCodeStorage>empty()
// --- MINIMUM -----
.with(this.buildCore("legend-engine-pure/legend-engine-pure-ide/legend-engine-pure-ide-light-metadata-pure", "ide_metadata"))
.with(this.build("legend-engine-pure/legend-engine-pure-ide/legend-engine-pure-ide-light-pure", "pure_ide", false))
.with(this.buildCore("legend-engine-core/legend-engine-core-pure/legend-engine-pure-ide/legend-engine-pure-ide-light-metadata-pure", "ide_metadata"))
.with(this.build("legend-engine-core/legend-engine-core-pure/legend-engine-pure-ide/legend-engine-pure-ide-light-pure", "pure_ide", false))
.with(this.buildCore("legend-engine-xts-relationalStore/legend-engine-xt-relationalStore-generation/legend-engine-xt-relationalStore-pure/legend-engine-xt-relationalStore-core-pure", "relational"))
.with(this.buildCore("legend-engine-xts-serviceStore/legend-engine-xt-serviceStore-pure", "servicestore"))
.with(this.buildCore("legend-engine-xts-service/legend-engine-language-pure-dsl-service-pure", "service"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.finos.legend.engine</groupId>
<artifactId>legend-engine-pure</artifactId>
<artifactId>legend-engine-core-pure</artifactId>
<version>4.67.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
5 changes: 5 additions & 0 deletions legend-engine-core/legend-engine-core-pure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,13 @@
<module>legend-engine-pure-code-functions-json</module>
<module>legend-engine-pure-code-functions-relation</module>
<module>legend-engine-pure-code-functions-unclassified</module>
<module>legend-engine-pure-code-functions-legendCompiler</module>
<module>legend-engine-pure-code-functions-pureExtensions</module>
<module>legend-engine-pure-code-functions-planExecution</module>
<module>legend-engine-pure-code-functions-javaCompiler</module>
<module>legend-engine-pure-code-core-extension</module>
<module>legend-engine-pure-code-precisePrimitives-pure</module>
<module>legend-engine-pure-platform-modular-generation</module>
<module>legend-engine-pure-ide</module>
</modules>
</project>
36 changes: 0 additions & 36 deletions legend-engine-pure/legend-engine-pure-runtime/pom.xml

This file was deleted.

33 changes: 0 additions & 33 deletions legend-engine-pure/pom.xml

This file was deleted.

3 changes: 0 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@
<!-- Core System -->
<module>legend-engine-core</module>

<!-- Pure Extension -->
<module>legend-engine-pure</module>

<!-- Stores -->
<module>legend-engine-xts-serviceStore</module>
<module>legend-engine-xts-relationalStore</module>
Expand Down

0 comments on commit 0d4f583

Please sign in to comment.