diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index db474031..6f97a60e 100644 --- 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 index 965b8776..c3d72c75 100644 --- 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 index 95fc6f0d..4564385c 100644 --- a/external_tester/Pipfile.lock +++ b/external_tester/Pipfile.lock @@ -49,11 +49,12 @@ }, "urllib3": { "hashes": [ - "sha256:753a0374df26658f99d826cfe40394a686d05985786d946fbe4165b5148f5a7c", - "sha256:a7acd0977125325f516bda9735fa7142b909a8d01e8b2e4c8108d0984e6e0098" + "sha256:34b97092d7e0a3a8cf7cd10e386f401b3737364026c45e622aa02903dffe0f07", + "sha256:f8ecc1bba5667413457c529ab955bf8c67b45db799d159066261719e328580a0" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", - "version": "==1.26.5" + "index": "pypi", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", + "version": "==1.26.18" }, "websocket-client": { "hashes": [ diff --git a/external_tester/requirements.txt b/external_tester/requirements.txt index f8093589..0fd49de5 100644 --- 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 index 54386c56..0b074799 100644 --- 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 onFailErrors = checker.check(fmu.getModelDescription()); onFailErrors.forEach(onFailError -> { diff --git a/pom.xml b/pom.xml index 55af5aed..d1f735b8 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ 2.13.11 11 1.7.10 - 2.13.3 + 2.15.2 2.3.1 -SNAPSHOT @@ -433,7 +433,7 @@ org.apache.commons commons-text - 1.9 + 1.10.0 @@ -601,17 +601,6 @@ true - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - @@ -638,6 +627,29 @@ + + + + sonatype + + + performRelease + true + + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + org.apache.maven.plugins