Upgrade to Legend 5.3.0 (#2749)

finos · Apr 4, 2024 · ab2cee6 · ab2cee6
1 parent 4e21375
commit ab2cee6
Show file tree

Hide file tree

Showing 17 changed files with 78 additions and 6 deletions.
diff --git a/legend-engine-config/legend-engine-repl/legend-engine-repl-client/pom.xml b/legend-engine-config/legend-engine-repl/legend-engine-repl-client/pom.xml
@@ -26,8 +26,45 @@
     <artifactId>legend-engine-repl-client</artifactId>
     <name>Legend Engine - REPL - Client</name>
 
-    <dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <shadedArtifactAttached>true</shadedArtifactAttached>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>module-info.class</exclude>
+                                        <exclude>META-INF/**/module-info.class</exclude>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>org.finos.legend.engine.repl.client.Client</mainClass>
+                                </transformer>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
+    <dependencies>
         <dependency>
             <groupId>org.finos.legend.pure</groupId>
             <artifactId>legend-pure-m3-core</artifactId>

diff --git a/legend-engine-core/legend-engine-core-base/legend-engine-core-language-pure/pom.xml b/legend-engine-core/legend-engine-core-base/legend-engine-core-language-pure/pom.xml
@@ -37,8 +37,6 @@
         <module>legend-engine-language-pure-modelManager-sdlc-http-api</module>
         <module>legend-engine-protocol</module>
         <module>legend-engine-protocol-http-api</module>
-        <module>legend-engine-protocol-generation</module>
-        <module>legend-engine-protocol-generation-pure</module>
         <module>legend-engine-protocol-pure</module>
     </modules>
 </project>
diff --git a/...ed-extensions/src/main/java/org/finos/legend/engine/shared/core/extension/Extensions.java b/...ed-extensions/src/main/java/org/finos/legend/engine/shared/core/extension/Extensions.java
@@ -36,6 +36,9 @@ public static MutableList<LegendExtension> get()
                 .withAll(loadExtensions("org.finos.legend.engine.language.pure.grammar.to.extension.PureGrammarComposerExtension"))
                 .withAll(loadExtensions("org.finos.legend.engine.language.pure.compiler.toPureGraph.extension.CompilerExtension"))
 
+                .withAll(loadExtensions("org.finos.legend.engine.language.pure.grammar.from.IRelationalGrammarParserExtension"))
+                .withAll(loadExtensions("org.finos.legend.engine.language.pure.grammar.to.IRelationalGrammarComposerExtension"))
+
                 // ExternalFormat Extension
                 .withAll(loadExtensions("org.finos.legend.engine.external.shared.format.model.ExternalFormatExtension"))
                 .withAll(loadExtensions("org.finos.legend.engine.external.shared.runtime.ExternalFormatRuntimeExtension"))

diff --git a/...d-engine-protocol-generation-pure/pom.xml → ...d-engine-protocol-generation-pure/pom.xml b/...d-engine-protocol-generation-pure/pom.xml → ...d-engine-protocol-generation-pure/pom.xml
@@ -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/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.finos.legend.engine</groupId>
-        <artifactId>legend-engine-core-language-pure</artifactId>
+        <artifactId>legend-engine-xts-protocol-java-generation</artifactId>
         <version>4.42.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...ocolGenerationCodeRepositoryProvider.java → ...ocolGenerationCodeRepositoryProvider.java b/...ocolGenerationCodeRepositoryProvider.java → ...ocolGenerationCodeRepositoryProvider.java
diff --git a/...esystem.repository.CodeRepositoryProvider → ...esystem.repository.CodeRepositoryProvider b/...esystem.repository.CodeRepositoryProvider → ...esystem.repository.CodeRepositoryProvider
diff --git a/.../core_protocol_generation.definition.json → .../core_protocol_generation.definition.json b/.../core_protocol_generation.definition.json → .../core_protocol_generation.definition.json
diff --git a/.../core_protocol_generation/generation.pure → .../core_protocol_generation/generation.pure b/.../core_protocol_generation/generation.pure → .../core_protocol_generation/generation.pure
diff --git a/..._protocol_generation/generation_test.pure → ..._protocol_generation/generation_test.pure b/..._protocol_generation/generation_test.pure → ..._protocol_generation/generation_test.pure
diff --git a/...ore/Test_Pure_JavaProtocolGeneration.java → ...ore/Test_Pure_JavaProtocolGeneration.java b/...ore/Test_Pure_JavaProtocolGeneration.java → ...ore/Test_Pure_JavaProtocolGeneration.java
diff --git a/...legend-engine-protocol-generation/pom.xml → ...legend-engine-protocol-generation/pom.xml b/...legend-engine-protocol-generation/pom.xml → ...legend-engine-protocol-generation/pom.xml
@@ -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/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.finos.legend.engine</groupId>
-        <artifactId>legend-engine-core-language-pure</artifactId>
+        <artifactId>legend-engine-xts-protocol-java-generation</artifactId>
         <version>4.42.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...tocol/generation/GenerateMetaClasses.java → ...tocol/generation/GenerateMetaClasses.java b/...tocol/generation/GenerateMetaClasses.java → ...tocol/generation/GenerateMetaClasses.java
diff --git a/...enerateMetamodelToProtocolTranslator.java → ...enerateMetamodelToProtocolTranslator.java b/...enerateMetamodelToProtocolTranslator.java → ...enerateMetamodelToProtocolTranslator.java
diff --git a/...enerateProtocolToMetamodelTranslator.java → ...enerateProtocolToMetamodelTranslator.java b/...enerateProtocolToMetamodelTranslator.java → ...enerateProtocolToMetamodelTranslator.java
diff --git a/...otocol/generation/GenerationArgument.java → ...otocol/generation/GenerationArgument.java b/...otocol/generation/GenerationArgument.java → ...otocol/generation/GenerationArgument.java
diff --git a/legend-engine-xts-protocol-java-generation/pom.xml b/legend-engine-xts-protocol-java-generation/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2022 Goldman Sachs
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<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</artifactId>
+        <version>4.42.4-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>legend-engine-xts-protocol-java-generation</artifactId>
+    <packaging>pom</packaging>
+    <name>Legend Engine - XTS - Protocol - Java - Generation</name>
+
+    <modules>
+        <module>legend-engine-protocol-generation</module>
+        <module>legend-engine-protocol-generation-pure</module>
+    </modules>
+</project>
diff --git a/pom.xml b/pom.xml
@@ -92,6 +92,7 @@
 
         <!-- Misc -->
         <module>legend-engine-xts-authentication</module>
+        <module>legend-engine-xts-protocol-java-generation</module>
         <module>legend-engine-config</module>
 
         <!-- Analytics -->
@@ -104,7 +105,7 @@
 
     <properties>
         <!-- Legend -->
-        <legend.pure.version>5.2.2</legend.pure.version>
+        <legend.pure.version>5.3.0</legend.pure.version>
         <legend.shared.version>0.25.4</legend.shared.version>
 
         <!-- SONAR -->