chore(release): Bigraph Framework 2.0.1 -> 2.2.0

Author: PioBeat

README.md

@@ -1,6 +1,6 @@
 <img src="./etc/logo-bdsl-interpreter-dark.png" style="zoom:90%;" />
 
-> Latest Version: **2.0.1**
+> Latest Version: **2.2.0**
 
 - BDSL user guide: https://nbn-resolving.org/urn:nbn:de:bsz:14-qucosa2-752170
 
@@ -24,11 +24,12 @@ The framework and grammar can be extended and facilitate "bigraphical language e
 
 **Version Compatibility**
 
-| Component                        | Release |
-|----------------------------------| ------- |
-| **BDSL Interpreter**             | 2.0.1   |
-| \|- BDSL Core Elements (Grammar) | 2.0.1   |
-| \|- Bigraph Framework            | 2.0.1   |
+| BDSL Interpreter Release | BDSL Core Elements (Grammar) | Bigraph Framework |
+|--------------------------|------------------------------|-------------------|
+| **2.2.0** (current)      | 2.0.1                        | 2.2.0             |
+| 2.0.1                    | 2.0.1                        | 2.0.1             |
+
+
 
 ## Getting Started
 
@@ -86,25 +87,12 @@ $ mvn package -Pbuild-cli
 After executing the command above, the command-line interpreter tool for BDSL is then available under `./bdsl-interpreter-cli/target/` from the root directory of this project.
 See also the `README.md` of the respective submodules for more details on how to use the whole BDSL interpreter framework.
 
-### Dependency Management
-This project uses [Bigraph Framework](https://git-st.inf.tu-dresden.de/bigraphs/bigraph-framework) to perform all elementary underlying bigraph model operations.
-The grammar, parser and other DSL-related things come from [BDSL Core Elements](https://git-st.inf.tu-dresden.de/bigraphs/bigraph-dsl-ce).
-
-This BDSL interpreter project uses both dependencies to implement the fundamental interpretation logic and the command-line tool of the interpreter.
-
-
-#### Using a local BDSL-Grammar Dependency
+### Dependencies
 
-This approach is useful for development purposes, or in case one wants to use the latest version.
-To use a local variant of the BDSL dependency (`org.bigraphs.dsl:bdsl-grammar:VERSION`), the Maven profile `useLocalLib` must be used:
+This project uses [Bigraph Framework](https://github.com/bigraph-toolkit-suite/bigraphs.bigraph-framework) to perform all elementary underlying bigraph model operations.
+The grammar, parser and other DSL-related things come from [BDSL Grammar](https://github.com/bigraph-toolkit-suite/bigraphs.bdsl-core-elements).
 
-```bash
-$ mvn package -DskipTests -PuseLocalLib
-```
-
-This will install the dependency in the local Maven repository.
-The `*.jar` dependency must be placed inside the folder `./etc/libs`.
-The version can be specified in the project's root `pom.xml` via the property `bdsl.ce.version`.
+This BDSL interpreter project uses both dependencies to implement the fundamental interpretation logic and the command-line tool of the interpreter.
 
 ### Deployment
 
@@ -128,14 +116,6 @@ and the GPG credentials being available e.g. from `settings.xml`.
 
 More details can be found link:https://central.sonatype.org/publish/requirements/gpg/[here].
 
-### Additional Notes
-
-> **Note:** The current `*.jar` of the [Bigraph DSL](https://github.com/bigraph-toolkit-suite/bigraphs.bdsl-core-elements) project is also copied in the `./etc/lib/` folder for testing.
->
-> In case you want to use the latest <i>BDSL Core Elements</i> `*.jar`, you have to manually install it. See [BDSL Core Elements](https://github.com/bigraph-toolkit-suite/bigraphs.bdsl-core-elements) for more details.
-> 
-> The Maven build script can automatically install it in the local Maven repository (usually located under `~/.m2/`).
-
 
 ## License
 

bdsl-execution-common/pom.xml

@@ -5,12 +5,13 @@
     <parent>
         <groupId>org.bigraphs.dsl.interpreter</groupId>
         <artifactId>bdsl-interpreter-parent</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>bdsl-execution-common</artifactId>
-    <name>BDSL Interpreter - Execution Commons (Environment and Strategies)</name>
+    <name>BDSL Interpreter - Execution Commons</name>
     <packaging>jar</packaging>
+    <description>Execution Strategies for BDSL Statements.</description>
 
     <build>
         <plugins>

bdsl-execution-common/src/test/java/org/bigraphs/dsl/interpreter/execution/codeexecution/MyClass.java

@@ -47,27 +47,7 @@ To remove the files that the install script creates, delete the following files
 - /usr/local/bin/bdsl
 - /opt/bdsl/
 
-## Import Instructions
-
-For a Maven-based project, use this dependency inside the project's `pom.xml`:
-```xml
-<!-- ... -->
-<dependencies>
-    <dependency>
-        <groupId>de.tudresden.inf.st.bigraphs.dsl.interpreter</groupId>
-        <artifactId>bdsl-interpreter-cli</artifactId>
-        <version>${version}</version>
-        <!-- <classifier>sources</classifier> -->
-    </dependency>
-</dependencies>
-<!-- ... -->
-```
-
-Replace `${version}` with the current version.
-
-## Remarks
-
-### Configuration
+## Configuration
 
 Configuring BDSL programs can be accomplished by setting various parameters in an externalized configuration file.
 

bdsl-interpreter-cli/README.md

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.bigraphs.dsl.interpreter</groupId>
         <artifactId>bdsl-interpreter-parent</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>bdsl-interpreter-cli</artifactId>

bdsl-interpreter-cli/pom.xml

@@ -37,11 +37,6 @@ public static String[] addArgs(String[] args) {
         return arguments.toArray(new String[0]);
     }
 
-    @Value("${klo}")
-    String logLevel;
-    @Autowired
-    Environment env;
-
     public static void main(String[] args) {
         String[] args2 = addArgs(args);
 //        for (String arg : args2) {
@@ -57,16 +52,12 @@ public static void main(String[] args) {
     }
 
     @Autowired
-    @Qualifier("cliFactory")
+    @Qualifier("defaultCliFactory")
     CliFactory cliFactory;
 
-//    @Autowired
-//    ModelCheckingOptions modelCheckingOptions;
-
 
     @Override
     public void run(String... args) throws Exception {
-//        CliOptionProvider cliOptionProvider = cliFactory.createCliOptionProvider();
         CliOptionProcessor cliProcessor = cliFactory.createCliOptionProcessor();
         CommandLineParser commandLineParser = cliFactory.getCommandLineParser();
         CliExecutor cliExecutor = cliFactory.createCliExecutor();

bdsl-interpreter-cli/src/main/java/org/bigraphs/dsl/cli/Application.java

@@ -1,24 +1,13 @@
 package org.bigraphs.dsl.cli;
 
-import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ApplicationContext;
 
-import java.util.Optional;
-
-/**
- * @see <a href="https://blog.jdriven.com/2018/10/get-your-application-version-with-spring-boot/">Source: https://blog.jdriven.com/2018/10/get-your-application-version-with-spring-boot/</a>
- */
 public class VersionHolder {
 
     private final String version;
 
     public VersionHolder(ApplicationContext context) {
-        version = context.getBeansWithAnnotation(SpringBootApplication.class).entrySet().stream()
-                .findFirst()
-                .flatMap(es -> {
-                    final String implementationVersion = es.getValue().getClass().getPackage().getImplementationVersion();
-                    return Optional.ofNullable(implementationVersion);
-                }).orElse("unknown");
+        version = "2.2.0";
     }
 
     public String getVersion() {

bdsl-interpreter-cli/src/main/java/org/bigraphs/dsl/cli/VersionHolder.java

@@ -1,9 +1,10 @@
 package org.bigraphs.dsl.cli;
 
-import org.bigraphs.dsl.cli.Application;
-import org.bigraphs.framework.simulation.modelchecking.ModelCheckingOptions;
+import org.bigraphs.dsl.cli.configuration.v1.DefaultCliFactory;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.context.annotation.Bean;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
@@ -15,8 +16,10 @@
  */
 @ExtendWith(SpringExtension.class) // for junit5, no RunWith necessary
 @TestPropertySource(value = {"classpath:cli-test.properties"}, inheritProperties = true)
+@Disabled
 public class AppTest {
 
+
     @Test
     void name() {
         List<String> args = new ArrayList<>();

bdsl-interpreter-cli/src/test/java/org/bigraphs/dsl/cli/AppTest.java

@@ -3,7 +3,7 @@
 import com.google.common.io.Resources;
 import com.google.inject.Inject;
 import org.bigraphs.framework.core.ControlStatus;
-import org.bigraphs.framework.core.impl.signature.DefaultDynamicSignature;
+import org.bigraphs.framework.core.impl.signature.DynamicSignature;
 import org.bigraphs.dsl.bDSL.*;
 import org.bigraphs.dsl.interpreter.InterpreterServiceManager;
 import org.bigraphs.dsl.interpreter.ParserService;
@@ -120,22 +120,22 @@ public void assertLocalVarDeclCount(BDSLDocument brsModel, int expected) {
         assertEquals(expected, collect.size());
     }
 
-    public DefaultDynamicSignature getDefaultDynamicSignature(BDSLDocument brsModel) {
+    public DynamicSignature getDynamicSignature(BDSLDocument brsModel) {
         assertNotNull(brsModel.getSignature());
 //        assertEquals(1, brsModel.getSignature().size());
         Signature signature = brsModel.getSignature().get(0);
-        DefaultDynamicSignature signature1 = (DefaultDynamicSignature) signature.interpretStart(new SignatureEvalVisitorImpl());
+        DynamicSignature signature1 = (DynamicSignature) signature.interpretStart(new SignatureEvalVisitorImpl());
         return signature1;
     }
 
     public Signature getSignature(BDSLDocument brsModel, int ix) {
         assertNotNull(brsModel.getSignature());
         Signature signature = brsModel.getSignature().get(ix);
-//        DefaultDynamicSignature signature1 = (DefaultDynamicSignature) signature.interpretStart(new SignatureEvalVisitorImpl());
+//        DynamicSignature signature1 = (DynamicSignature) signature.interpretStart(new SignatureEvalVisitorImpl());
         return signature;
     }
 
-    protected void checkBasicSignature(DefaultDynamicSignature signature1) {
+    protected void checkBasicSignature(DynamicSignature signature1) {
         assertNotNull(signature1);
         assertEquals(3, signature1.getControls().size());
         assertEquals(ControlStatus.ACTIVE, signature1.getControlByName("a").getControlKind());

bdsl-interpreter-cli/src/test/java/org/bigraphs/dsl/cli/BaseUnitTestSupport.java

@@ -1,6 +1,7 @@
 package org.bigraphs.dsl.cli;
 
 import org.bigraphs.framework.simulation.modelchecking.ModelCheckingOptions;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +21,7 @@
 @ExtendWith(SpringExtension.class) // for junit5, no RunWith necessary
 @TestPropertySource("classpath:cli-test.properties")
 @EnableAutoConfiguration(exclude = DataSourceAutoConfiguration.class)
+@Disabled
 public class ConfigurationTest {
 
     @Autowired