From a385b9a830b9f4523e861b821c783b5d93d80152 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Jun 2023 07:16:49 +0000 Subject: [PATCH 01/11] Bump commons-text from 1.9 to 1.10.0 Bumps commons-text from 1.9 to 1.10.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-text dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 35402200..c3c07c84 100644 --- a/pom.xml +++ b/pom.xml @@ -434,7 +434,7 @@ org.apache.commons commons-text - 1.9 + 1.10.0 From aeca3c3cda3126e9c2449de45e19c1bef51d83a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Jun 2023 07:17:19 +0000 Subject: [PATCH 02/11] Bump requests from 2.25.1 to 2.31.0 in /external_tester Bumps [requests](https://github.com/psf/requests) from 2.25.1 to 2.31.0. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](https://github.com/psf/requests/compare/v2.25.1...v2.31.0) --- updated-dependencies: - dependency-name: requests dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- external_tester/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external_tester/requirements.txt b/external_tester/requirements.txt index f8093589..5fc24189 100644 --- a/external_tester/requirements.txt +++ b/external_tester/requirements.txt @@ -9,6 +9,6 @@ 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 +requests==2.31.0 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' websocket-client==1.1.0 From 99ec66029601d01a1ca7e1fc8c6537b728ef4fd2 Mon Sep 17 00:00:00 2001 From: Kenneth Lausdahl Date: Mon, 3 Jul 2023 10:10:48 +0200 Subject: [PATCH 03/11] Update pom.xml change maven scala plugin version to 4.8.1 --- plugins/topologicalsorting/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/topologicalsorting/pom.xml b/plugins/topologicalsorting/pom.xml index 6d086373..846d849e 100644 --- a/plugins/topologicalsorting/pom.xml +++ b/plugins/topologicalsorting/pom.xml @@ -67,7 +67,7 @@ net.alchim31.maven scala-maven-plugin - 4.4.0 + 4.8.1 From ab3f7d9447d13e93b376a6371d6448d4b67b88b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Aug 2023 08:41:51 +0000 Subject: [PATCH 04/11] Bump certifi from 2021.5.30 to 2023.7.22 in /external_tester Bumps [certifi](https://github.com/certifi/python-certifi) from 2021.5.30 to 2023.7.22. - [Commits](https://github.com/certifi/python-certifi/compare/2021.05.30...2023.07.22) --- updated-dependencies: - dependency-name: certifi dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- external_tester/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external_tester/requirements.txt b/external_tester/requirements.txt index f8093589..5c602bed 100644 --- a/external_tester/requirements.txt +++ b/external_tester/requirements.txt @@ -6,7 +6,7 @@ # -i https://pypi.python.org/simple -certifi==2021.5.30 +certifi==2023.7.22 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 From 02c01c336805c80cb1e561b7b8807f705afee68e Mon Sep 17 00:00:00 2001 From: Kenneth Lausdahl Date: Thu, 11 Jan 2024 14:12:15 +0100 Subject: [PATCH 05/11] re-enabling snapshot deployment --- .github/workflows/maven.yml | 2 +- .github/workflows/release.yml | 4 ++-- pom.xml | 34 +++++++++++++++++++++++----------- 3 files changed, 26 insertions(+), 14 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 3192cc38..51803311 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -180,7 +180,7 @@ jobs: - 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 -P au -B deploy -Dsha1= -Psonatype -fae -Dgpg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} env: MAVEN_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} MAVEN_PASSWORD: ${{ secrets.ARTIFACTORY_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/pom.xml b/pom.xml index 8aced883..169e906c 100644 --- a/pom.xml +++ b/pom.xml @@ -602,17 +602,6 @@ true - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - @@ -639,6 +628,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 From a049fe753450315bc27557ee77f145240be3c96e Mon Sep 17 00:00:00 2001 From: Kenneth Lausdahl Date: Thu, 11 Jan 2024 16:01:48 +0100 Subject: [PATCH 06/11] removed au profile for deployment --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 51803311..7aff95e8 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -172,7 +172,7 @@ 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 }} @@ -180,7 +180,7 @@ jobs: - name: Maven Package SNAPSHOT if: github.event_name == 'push' && (github.ref == 'refs/heads/development' ) - run: mvn -P au -B deploy -Dsha1= -Psonatype -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 }} From c053e8838d390ce60eb8249af7e9e8c77a6c45a7 Mon Sep 17 00:00:00 2001 From: Kenneth Lausdahl Date: Thu, 11 Jan 2024 19:08:37 +0100 Subject: [PATCH 07/11] changed server login --- .github/workflows/maven.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 7aff95e8..fcd1053d 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' @@ -174,16 +174,16 @@ jobs: if: github.event_name == 'push' && (github.ref != 'refs/heads/development' && github.ref != 'refs/heads/master' ) 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 -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 }} From d0ac3a9f022ef032019a42f1473bf63dadfc2696 Mon Sep 17 00:00:00 2001 From: Kenneth Lausdahl Date: Thu, 8 Feb 2024 14:03:46 +0100 Subject: [PATCH 08/11] updated fmu validation --- .../org/intocps/maestro/framework/fmi2/Fmi2FmuValidator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -> { From dd0c7d04bc864ced0ebebbbfc472c4474582ead1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Feb 2024 14:47:48 +0000 Subject: [PATCH 09/11] Bump com.fasterxml.jackson.core:jackson-databind from 2.13.3 to 2.13.4.2 Bumps [com.fasterxml.jackson.core:jackson-databind](https://github.com/FasterXML/jackson) from 2.13.3 to 2.13.4.2. - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ac2549cc..a2c81e57 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ 2.13.5 11 1.7.10 - 2.13.3 + 2.13.4.2 2.3.1 -SNAPSHOT From acebabb330c2ae0abdd4d63a6f777c35a86ed7f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Feb 2024 14:49:06 +0000 Subject: [PATCH 10/11] Bump urllib3 from 1.26.5 to 1.26.18 in /external_tester Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.5 to 1.26.18. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](https://github.com/urllib3/urllib3/compare/1.26.5...1.26.18) --- updated-dependencies: - dependency-name: urllib3 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- external_tester/Pipfile.lock | 9 +++++---- external_tester/requirements.txt | 13 +++---------- 2 files changed, 8 insertions(+), 14 deletions(-) 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 c33c76f5..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==2023.7.22 +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.31.0 -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' +requests==2.25.1 +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 From b803726274ad3a53b614ad64a4c13c9f167de3e0 Mon Sep 17 00:00:00 2001 From: Kenneth Lausdahl Date: Thu, 8 Feb 2024 15:55:03 +0100 Subject: [PATCH 11/11] Update pom.xml 2.15.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a2c81e57..eda42402 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ 2.13.5 11 1.7.10 - 2.13.4.2 + 2.15.2 2.3.1 -SNAPSHOT