Merge remote-tracking branch 'origin/development' into kel/fmi3-all-t…

…ypes
INTO-CPS-Association · Feb 22, 2024 · 8cd0d08 · 8cd0d08
2 parents 21643ee + a1389f9
commit 8cd0d08
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 35 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -12,7 +12,7 @@ on:
 
 env:
   JAVA_VERSION: 11.0.3
-  SERVER_ID: overture.au.dk
+  SERVER_ID: ossrh
   PYTHON_VERSION: '3.9.7'
   MAVEN_VERSION: 3.8.1
   WINDOWS_VERSION: 'windows-2019'
@@ -172,18 +172,18 @@ jobs:
 
       - name: Maven Package feature SNAPSHOT
         if: github.event_name == 'push' && (github.ref != 'refs/heads/development' && github.ref != 'refs/heads/master' )
-        run: mvn -P au -B package -Dsha1=-`git rev-parse --abbrev-ref HEAD | sed "s|/|-|g;s|#||g;s|<||g;s|>||g;s|:||g;s|\"||g;s|/||g;s|\|||g;s|?||g;s|*||g;s|;||g"`   -fae -Dgpg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
+        run: mvn -Psonatype -B package -Dsha1=-`git rev-parse --abbrev-ref HEAD | sed "s|/|-|g;s|#||g;s|<||g;s|>||g;s|:||g;s|\"||g;s|/||g;s|\|||g;s|?||g;s|*||g;s|;||g"`   -fae -Dgpg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
         env:
-          MAVEN_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+          MAVEN_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
 
       - name: Maven Package SNAPSHOT
         if: github.event_name == 'push' && (github.ref == 'refs/heads/development' )
-        run: mvn -P au -B package -Dsha1=  -fae -Dgpg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
+        run: mvn -Psonatype -B deploy -Dsha1= -fae -Dgpg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
         env:
-          MAVEN_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+          MAVEN_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
 
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -230,11 +230,11 @@ jobs:
         run: mvn validate dependency:resolve-plugins -B --quiet
 
       - name: Maven Build Final
-        run: mvn -B package --file pom.xml -Dmaven.test.skip=true
+        run: mvn -B package -Psonatype -Prelease --file pom.xml -Dmaven.test.skip=true
 
       - name: Maven Deploy RELEASE
         # If autorelease is false then it must be released from here: https://oss.sonatype.org/#stagingRepositories
-        run: mvn -B deploy -Dchangelist= -Dsha1= -Dmaven.test.skip=true -DskipITs -fae -Prelease -DautoReleaseAfterClose=true
+        run: mvn -B deploy -Dchangelist= -Dsha1= -Dmaven.test.skip=true -DskipITs -fae -Prelease -Psonatype -DautoReleaseAfterClose=true
         env:
           MAVEN_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}

diff --git a/external_tester/Pipfile.lock b/external_tester/Pipfile.lock
diff --git a/external_tester/requirements.txt b/external_tester/requirements.txt
@@ -1,14 +1,7 @@
-#
-# These requirements were autogenerated by pipenv
-# To regenerate from the project's Pipfile, run:
-#
-#    pipenv lock --requirements
-#
-
 -i https://pypi.python.org/simple
 certifi==2021.5.30
 chardet==4.0.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
 idna==2.10; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 requests==2.25.1
-urllib3==1.26.5; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'
+urllib3==1.26.18; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
 websocket-client==1.1.0
diff --git a/frameworks/fmi2/src/main/java/org/intocps/maestro/framework/fmi2/Fmi2FmuValidator.java b/frameworks/fmi2/src/main/java/org/intocps/maestro/framework/fmi2/Fmi2FmuValidator.java
@@ -1,6 +1,7 @@
 package org.intocps.maestro.framework.fmi2;
 
 import maestro.MaestroCheck;
+import maestro.MaestroCheckFMI2;
 import maestro.OnFailError;
 import org.intocps.fmi.IFmu;
 import org.intocps.maestro.ast.LexToken;
@@ -32,7 +33,7 @@ public boolean validate(String id, URI path, IErrorReporter reporter) {
         try {
             logger.trace("Validating: {} at {}", id, path);
             IFmu fmu = FmuFactory.create(null, path);
-            MaestroCheck checker = new MaestroCheck();
+            MaestroCheckFMI2 checker = new MaestroCheckFMI2();
             List<OnFailError> onFailErrors = checker.check(fmu.getModelDescription());
 
             onFailErrors.forEach(onFailError -> {

diff --git a/pom.xml b/pom.xml
@@ -30,7 +30,7 @@
         <scala.version>2.13.11</scala.version>
         <kotlin.jvmTarget>11</kotlin.jvmTarget>
         <dokka.version>1.7.10</dokka.version>
-        <jackson.version>2.13.3</jackson.version>
+        <jackson.version>2.15.2</jackson.version>
         <revision>2.3.1</revision>
         <changelist>-SNAPSHOT</changelist>
         <sha1/>
@@ -433,7 +433,7 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-text</artifactId>
-                <version>1.9</version>
+                <version>1.10.0</version>
             </dependency>
 
             <dependency>
@@ -601,17 +601,6 @@
                     <value>true</value>
                 </property>
             </activation>
-            <distributionManagement>
-                <snapshotRepository>
-                    <id>ossrh</id>
-                    <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-                </snapshotRepository>
-                <repository>
-                    <id>ossrh</id>
-                    <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-                </repository>
-            </distributionManagement>
-
             <build>
                 <pluginManagement>
                     <plugins>
@@ -638,6 +627,29 @@
                         </plugin>
                     </plugins>
                 </pluginManagement>
+            </build>
+        </profile>
+        <profile>
+            <id>sonatype</id>
+            <activation>
+                <property>
+                    <name>performRelease</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <distributionManagement>
+                <snapshotRepository>
+                    <id>ossrh</id>
+                    <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+                </snapshotRepository>
+                <repository>
+                    <id>ossrh</id>
+                    <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+                </repository>
+            </distributionManagement>
+
+            <build>
+
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>