Commit 4276d28
committed
Merge remote-tracking branch 'origin/master'
# Conflicts:
# compileflow-core/src/main/java/com/alibaba/compileflow/engine/core/builder/converter/parser/provider/AbstractParserProvider.java
# compileflow-core/src/main/java/com/alibaba/compileflow/engine/core/builder/generator/analyzer/DominatorTreeCalculator.java
# compileflow-core/src/main/java/com/alibaba/compileflow/engine/core/builder/generator/analyzer/TopDownCorrectionGraphAnalyzer.java
# compileflow-core/src/main/java/com/alibaba/compileflow/engine/core/builder/generator/analyzer/UpwardCheckingGraphAnalyzer.java
# src/main/java/com/alibaba/compileflow/engine/ProcessEngine.java
# src/main/java/com/alibaba/compileflow/engine/ProcessEngineFactory.java
# src/main/java/com/alibaba/compileflow/engine/process/builder/compiler/impl/support/EcJavaCompiler.java
# src/main/java/com/alibaba/compileflow/engine/process/builder/compiler/impl/support/JdkJavaCompiler.java
# src/main/java/com/alibaba/compileflow/engine/process/impl/AbstractProcessEngine.java
# src/main/resources/META-INF/extensions/com.alibaba.compileflow.engine.runtime.graph.ProcessGraphAnalyzer
# src/test/java/com/alibaba/compileflow/engine/process/ProcessEngineTest.java
# src/test/java/com/alibaba/compileflow/engine/process/mock/MockJavaClazz.java
# src/test/resources/bpm/gateway/sampleBranchMerge.bpm
# src/test/resources/bpm/ktv/ktvExample.bpm0 file changed
0 commit comments