Merge pull request #23 from INTO-CPS-Association/kel/add-fmi3-schemas

Kel/add fmi3 schemas
INTO-CPS-Association · May 4, 2022 · 06f9ac8 · 06f9ac8
2 parents 4696e8c + cf48454
commit 06f9ac8
Show file tree

Hide file tree

Showing 18 changed files with 215 additions and 756 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -167,7 +167,7 @@ jobs:
         run: mvn -B package --file pom.xml -Dmaven.test.skip=true
 
       - name: Maven Deploy
-        if: github.event_name == 'push' && (github.ref != 'refs/heads/development' || github.ref != 'refs/heads/master' )
+        if: github.event_name == 'push' && (github.ref != 'refs/heads/development' && github.ref != 'refs/heads/master' )
         run: mvn -P au -B deploy -Dsha1=-`git rev-parse --abbrev-ref HEAD | sed "s|/|-|g"` -Dmaven.test.skip=true -DskipITs -fae -Dgpg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} -Prelease
         env:
           MAVEN_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}

diff --git a/.gitignore b/.gitignore
@@ -109,3 +109,4 @@ Makefile
 jnifmuapi/src/main/native/include/*.h
 /.java-version
 *.ci-friendly-pom.xml
+*.cbp
diff --git a/...n/resources/org/intocps/fmi/schemas/2.0.0/FMI_for_ModelExchange_and_CoSimulation_v2.0.pdf b/...n/resources/org/intocps/fmi/schemas/2.0.0/FMI_for_ModelExchange_and_CoSimulation_v2.0.pdf
diff --git a/fmi2/src/main/resources/org/intocps/fmi/schemas/2.0.0/fmi2Annotation.xsd b/fmi2/src/main/resources/org/intocps/fmi/schemas/2.0.0/fmi2Annotation.xsd
diff --git a/fmi2/src/main/resources/org/intocps/fmi/schemas/2.0.0/fmi2AttributeGroups.xsd b/fmi2/src/main/resources/org/intocps/fmi/schemas/2.0.0/fmi2AttributeGroups.xsd
diff --git a/fmi2/src/main/resources/org/intocps/fmi/schemas/2.0.0/fmi2ModelDescription.xsd b/fmi2/src/main/resources/org/intocps/fmi/schemas/2.0.0/fmi2ModelDescription.xsd
diff --git a/fmi2/src/main/resources/org/intocps/fmi/schemas/2.0.0/fmi2ScalarVariable.xsd b/fmi2/src/main/resources/org/intocps/fmi/schemas/2.0.0/fmi2ScalarVariable.xsd
diff --git a/fmi2/src/main/resources/org/intocps/fmi/schemas/2.0.0/fmi2Type.xsd b/fmi2/src/main/resources/org/intocps/fmi/schemas/2.0.0/fmi2Type.xsd
diff --git a/fmi2/src/main/resources/org/intocps/fmi/schemas/2.0.0/fmi2Unit.xsd b/fmi2/src/main/resources/org/intocps/fmi/schemas/2.0.0/fmi2Unit.xsd