Merge branch '140-native-binaries' into 276-rename-omp-to-esmf

Author: atextor

.github/workflows/pull_request_check.yml

@@ -10,15 +10,15 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [windows-latest, ubuntu-latest]
+        os: [windows-latest, ubuntu-20.04]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
 
       - name: Setup JDK
         uses: graalvm/setup-graalvm@v1
         with:
-          version: '22.3.0'
+          version: '22.3.1'
           java-version: '17'
           components: 'native-image,js'
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -45,7 +45,7 @@ jobs:
           disk-root: "C:"
 
       - name: Set Swap Space (Linux)
-        if: matrix.os == 'ubuntu-latest'
+        if: matrix.os == 'ubuntu-20.04'
         uses: pierotofy/set-swap-space@master
         with:
           swap-size-gb: 12
@@ -62,7 +62,7 @@ jobs:
 
       - name: Upload executable jar
         # We only need one OS job to upload the jars
-        if: matrix.os == 'ubuntu-latest'
+        if: matrix.os == 'ubuntu-20.04'
         uses: actions/upload-artifact@v2
         with:
           name: samm-cli-jar
@@ -77,9 +77,11 @@ jobs:
           # upload-artifact will upload the one(s) that are actually present
           path: |
             tools/samm-cli/target/samm.exe
+            tools/samm-cli/target/*.dll
+            tools/samm-cli/target/lib/
 
       - name: Upload binary (Linux/Mac)
-        if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
+        if: matrix.os == 'ubuntu-20.04' || matrix.os == 'macos-latest'
         uses: actions/upload-artifact@v2
         with:
           name: samm-cli-binary-${{ matrix.os }}

README.md

@@ -56,7 +56,7 @@ Are you having trouble with ESMF SDK? We want to help!
 
 The top level elements of the SDK structure are all carried out as Maven multimodule projects.
 Building the SDK requires a Java 17-compatible [GraalVM JDK](https://www.graalvm.org/) with the 'js'
-component installed. If you with to build the samm-cli (see below), you will also have to have the
+component installed. If you want to build the samm-cli (see below), you will also have to have the
 'native-image' GraalVM component installed.
 
 To build the SDK core components, run the following command:

core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/validation/services/AspectModelValidator.java

@@ -107,9 +107,6 @@ public List<Violation> validateModel( final Try<VersionedModel> versionedModel )
          // To catch false positives, also try to load the model
          final Try<List<ModelElement>> modelElements = AspectModelLoader.getElements( model );
          if ( modelElements.isFailure() && !(modelElements.getCause() instanceof InvalidRootElementCountException) ) {
-            final ByteArrayOutputStream out = new ByteArrayOutputStream();
-            model.getModel().write( out, "ttl" );
-            LOG.debug( out.toString( StandardCharsets.UTF_8 ) );
             return List.of( new ProcessingViolation(
                   "Validation succeeded, but an error was found while processing the model. "
                         + "This indicates an error in the model validation; please consider reporting this issue including the model "