Skip to content

Commit

Permalink
Upgrade Dependencies (#858)
Browse files Browse the repository at this point in the history
  • Loading branch information
@pierredebelen
pierredebelen authored Dec 27, 2024
1 parent de963ae commit 64acd5b
Show file tree
Hide file tree
Showing 28 changed files with 29 additions and 28 deletions.
1 change: 1 addition & 0 deletions .../src/test/resources/single-file-json-model/entities/model/domain/stores/TestDatabase.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"name" : "FirmTable",
"primaryKey" : [ "id" ]
} ],
"tabularFunctions" : [ ],
"views" : [ ]
} ],
"stereotypes" : [ ]
Expand Down
2 changes: 1 addition & 1 deletion ...-maven-plugin/src/main/java/org/finos/legend/sdlc/generation/file/FileGenerationMojo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import org.finos.legend.engine.protocol.pure.v1.model.context.AlloySDLC;
import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData;
import org.finos.legend.engine.protocol.pure.v1.model.context.SDLC;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.fileGeneration.FileGenerationSpecification;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.generationSpecification.GenerationSpecification;
import org.finos.legend.engine.shared.core.ObjectMapperFactory;
Expand Down
2 changes: 1 addition & 1 deletion ...le/src/main/java/org/finos/legend/sdlc/generation/artifact/ArtifactGenerationFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.finos.legend.engine.language.pure.dsl.generation.extension.ArtifactGenerationExtensionLoader;
import org.finos.legend.engine.protocol.pure.PureClientVersions;
import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.domain.Function;
import org.finos.legend.sdlc.generation.file.GenerationOutput;
import org.slf4j.Logger;
Expand Down
2 changes: 1 addition & 1 deletion ...ation-file/src/main/java/org/finos/legend/sdlc/generation/file/FileGenerationFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.finos.legend.engine.language.pure.compiler.toPureGraph.PureModel;
import org.finos.legend.engine.protocol.pure.v1.model.context.PackageableElementPointer;
import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.fileGeneration.FileGenerationSpecification;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.generationSpecification.GenerationSpecification;
import org.finos.legend.engine.shared.core.deployment.DeploymentMode;
Expand Down
2 changes: 1 addition & 1 deletion ...n-file/src/test/java/org/finos/legend/sdlc/generation/file/TestFileGenerationFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.finos.legend.engine.language.pure.compiler.toPureGraph.PureModel;
import org.finos.legend.engine.protocol.pure.v1.PureProtocolObjectMapperFactory;
import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.fileGeneration.FileGenerationSpecification;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.generationSpecification.GenerationSpecification;
import org.finos.legend.engine.shared.core.deployment.DeploymentMode;
Expand Down
2 changes: 1 addition & 1 deletion ...aven-plugin/src/main/java/org/finos/legend/sdlc/generation/model/ModelGenerationMojo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.eclipse.collections.impl.utility.ListIterate;
import org.finos.legend.engine.language.pure.compiler.toPureGraph.PureModel;
import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.generationSpecification.GenerationSpecification;
import org.finos.legend.sdlc.domain.model.entity.Entity;
import org.finos.legend.sdlc.language.pure.compiler.toPureGraph.PureModelBuilder;
Expand Down
2 changes: 1 addition & 1 deletion ...on-model/src/main/java/org/finos/legend/sdlc/generation/model/ModelGenerationFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import org.finos.legend.engine.protocol.pure.v1.model.SourceInformation;
import org.finos.legend.engine.protocol.pure.v1.model.context.EngineErrorType;
import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.generationSpecification.GenerationSpecification;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.generationSpecification.GenerationTreeNode;
import org.finos.legend.engine.shared.core.deployment.DeploymentMode;
Expand Down
2 changes: 1 addition & 1 deletion ...est/java/org/finos/legend/sdlc/generation/service/TestServiceExecutionClassGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.finos.legend.engine.language.pure.dsl.service.execution.ServiceRunnerInput;
import org.finos.legend.engine.plan.platform.java.JavaSourceHelper;
import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.service.PureExecution;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.service.Service;
import org.finos.legend.engine.protocol.pure.v1.model.type.PackageableType;
Expand Down
2 changes: 1 addition & 1 deletion ...src/test/java/org/finos/legend/sdlc/generation/service/TestServiceExecutionGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import org.finos.legend.engine.plan.generation.extension.PlanGeneratorExtension;
import org.finos.legend.engine.plan.platform.java.JavaSourceHelper;
import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.domain.Multiplicity;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.service.PureExecution;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.service.Service;
Expand Down
2 changes: 1 addition & 1 deletion .../main/java/org/finos/legend/sdlc/language/pure/compiler/toPureGraph/PureModelBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.finos.legend.engine.protocol.Protocol;
import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData;
import org.finos.legend.engine.protocol.pure.v1.model.context.SDLC;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
import org.finos.legend.engine.shared.core.deployment.DeploymentMode;
import org.finos.legend.sdlc.domain.model.entity.Entity;
import org.finos.legend.sdlc.protocol.pure.v1.EntityToPureConverter;
Expand Down
2 changes: 1 addition & 1 deletion ...ocol-pure/src/main/java/org/finos/legend/sdlc/protocol/pure/v1/EntityToPureConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package org.finos.legend.sdlc.protocol.pure.v1;

import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
import org.finos.legend.engine.shared.core.ObjectMapperFactory;
import org.finos.legend.sdlc.domain.model.entity.Entity;
import org.finos.legend.sdlc.protocol.EntityToProtocolConverter;
Expand Down
2 changes: 1 addition & 1 deletion ...tocol-pure/src/main/java/org/finos/legend/sdlc/protocol/pure/v1/PureEntitySerializer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.finos.legend.engine.language.pure.grammar.to.PureGrammarComposer;
import org.finos.legend.engine.language.pure.grammar.to.PureGrammarComposerContext;
import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.section.ImportAwareCodeSection;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.section.Section;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.section.SectionIndex;
Expand Down
2 changes: 1 addition & 1 deletion ...ure/src/main/java/org/finos/legend/sdlc/protocol/pure/v1/PureModelContextDataBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData;
import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextPointer;
import org.finos.legend.engine.protocol.pure.v1.model.context.SDLC;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
import org.finos.legend.sdlc.domain.model.entity.Entity;

import java.util.Optional;
Expand Down
2 changes: 1 addition & 1 deletion ...ocol-pure/src/main/java/org/finos/legend/sdlc/protocol/pure/v1/PureToEntityConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import org.eclipse.collections.api.set.ImmutableSet;
import org.finos.legend.engine.protocol.pure.v1.ProtocolToClassifierPathLoader;
import org.finos.legend.engine.protocol.pure.v1.PureProtocolObjectMapperFactory;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
import org.finos.legend.sdlc.protocol.ProtocolToEntityConverter;

import java.util.Map;
Expand Down
2 changes: 1 addition & 1 deletion ...rotocol-pure/src/test/java/org/finos/legend/sdlc/protocol/pure/v1/PureProtocolHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import org.finos.legend.engine.language.pure.grammar.to.PureGrammarComposer;
import org.finos.legend.engine.language.pure.grammar.to.PureGrammarComposerContext;
import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
import org.finos.legend.engine.shared.core.api.grammar.RenderStyle;
import org.junit.Assert;

Expand Down
2 changes: 1 addition & 1 deletion ...-pure/src/test/java/org/finos/legend/sdlc/protocol/pure/v1/TestEntityToPureConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package org.finos.legend.sdlc.protocol.pure.v1;

import java.util.stream.Collectors;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.domain.Class;
import org.finos.legend.sdlc.domain.model.TestTools;
import org.finos.legend.sdlc.domain.model.entity.Entity;
Expand Down
2 changes: 1 addition & 1 deletion ...-protocol/src/test/java/org/finos/legend/sdlc/protocol/TestProtocolToEntityConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import java.util.stream.Collectors;
import org.finos.legend.engine.protocol.pure.v1.PureProtocolObjectMapperFactory;
import org.finos.legend.engine.protocol.pure.v1.model.context.PackageableElementPointer;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.domain.Association;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.domain.Class;
import org.finos.legend.sdlc.domain.model.entity.Entity;
Expand Down
2 changes: 1 addition & 1 deletion ...generation/src/main/java/org/finos/legend/sdlc/test/junit/AbstractTestClassGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package org.finos.legend.sdlc.test.junit;

import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
import org.finos.legend.sdlc.generation.GeneratorTemplate;
import org.finos.legend.sdlc.generation.JavaCodeGenerator;
import org.finos.legend.sdlc.tools.entity.EntityPaths;
Expand Down
2 changes: 1 addition & 1 deletion ...lc-test-generation/src/main/java/org/finos/legend/sdlc/test/junit/JUnitTestGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package org.finos.legend.sdlc.test.junit;

import org.eclipse.collections.api.factory.Lists;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.mapping.Mapping;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.service.Service;
import org.finos.legend.engine.testable.extension.TestableRunnerExtensionLoader;
Expand Down
2 changes: 1 addition & 1 deletion ...test-generation/src/main/java/org/finos/legend/sdlc/test/junit/TestableTestGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package org.finos.legend.sdlc.test.junit;

import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
import org.finos.legend.sdlc.generation.GeneratorTemplate;

class TestableTestGenerator extends AbstractTestClassGenerator
Expand Down
2 changes: 1 addition & 1 deletion ...ration/src/test/java/org/finos/legend/sdlc/test/junit/AbstractTestClassGeneratorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package org.finos.legend.sdlc.test.junit;

import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
import org.finos.legend.sdlc.domain.model.entity.Entity;
import org.finos.legend.sdlc.generation.GeneratedJavaCode;
import org.finos.legend.sdlc.protocol.pure.v1.EntityToPureConverter;
Expand Down
2 changes: 1 addition & 1 deletion ...-generation/src/test/java/org/finos/legend/sdlc/test/junit/TestTestableTestGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package org.finos.legend.sdlc.test.junit;

import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;

public class TestTestableTestGenerator extends AbstractTestClassGeneratorTest<PackageableElement, TestableTestGenerator>
{
Expand Down
2 changes: 1 addition & 1 deletion ...test-utils/src/main/java/org/finos/legend/sdlc/test/junit/LegendSDLCTestSuiteBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import org.finos.legend.engine.plan.generation.extension.PlanGeneratorExtension;
import org.finos.legend.engine.plan.generation.transformers.PlanTransformer;
import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.mapping.Mapping;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.service.Service;
import org.finos.legend.engine.pure.code.core.LegendPureCoreExtension;
Expand Down
2 changes: 1 addition & 1 deletion ...est-utils/src/main/java/org/finos/legend/sdlc/test/junit/pure/v1/AbstractMappingTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package org.finos.legend.sdlc.test.junit.pure.v1;

import org.finos.legend.engine.plan.execution.PlanExecutor;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.mapping.Mapping;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.mapping.mappingTest.MappingTest_Legacy;
import org.finos.legend.engine.test.runner.mapping.MappingTestRunner;
Expand Down
2 changes: 1 addition & 1 deletion ...c-test-utils/src/main/java/org/finos/legend/sdlc/test/junit/pure/v1/AbstractPureTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import org.finos.legend.engine.language.pure.compiler.toPureGraph.PureModel;
import org.finos.legend.engine.plan.generation.transformers.PlanTransformer;
import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
import org.finos.legend.pure.generated.Root_meta_pure_extension_Extension;
import org.junit.BeforeClass;

Expand Down
2 changes: 1 addition & 1 deletion ...est-utils/src/main/java/org/finos/legend/sdlc/test/junit/pure/v1/AbstractServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package org.finos.legend.sdlc.test.junit.pure.v1;

import org.finos.legend.engine.plan.execution.PlanExecutor;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.service.Service;
import org.finos.legend.engine.test.runner.service.ServiceTestRunner;
import org.junit.Test;
Expand Down
2 changes: 1 addition & 1 deletion ...dlc-test-utils/src/main/java/org/finos/legend/sdlc/test/junit/pure/v1/PureTestHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import org.finos.legend.engine.plan.generation.extension.PlanGeneratorExtension;
import org.finos.legend.engine.plan.generation.transformers.PlanTransformer;
import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData;
import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
import org.finos.legend.engine.pure.code.core.LegendPureCoreExtension;
import org.finos.legend.pure.generated.Root_meta_pure_extension_Extension;
import org.finos.legend.sdlc.language.pure.compiler.toPureGraph.PureModelBuilder;
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@
<java.version.range>[11,12),[17,18),[21,22)</java.version.range>

<!-- Legend dependency versions -->
<legend.engine.version>4.67.5</legend.engine.version>
<legend.pure.version>5.26.0</legend.pure.version>
<legend.engine.version>4.67.10</legend.engine.version>
<legend.pure.version>5.28.0</legend.pure.version>
<legend.shared.version>0.25.7</legend.shared.version>

<!-- Dependency versions -->
Expand Down

0 comments on commit 64acd5b

Please sign in to comment.