diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index dc91ac6..02b77c7 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -52,7 +52,7 @@ jobs: server-password: MAVEN_PASSWORD gpg-passphrase: MAVEN_GPG_PASSPHRASE - name: Deploy - run: mvn -B deploy -Psonatype + run: mvn -B deploy -Psonatype -P\!combinedtest env: MAVEN_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 99f892f..28d42ee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -193,7 +193,7 @@ jobs: - name: Maven Deploy RELEASE # If autorelease is false then it must be released from here: https://oss.sonatype.org/#stagingRepositories -DautoReleaseAfterClose=true - run: mvn -B deploy -Dchangelist= -Dsha1= -Dmaven.test.skip=true -DskipITs -fae -Psonatype -Prelease + run: mvn -B deploy -Dchangelist= -Dsha1= -Dmaven.test.skip=true -DskipITs -fae -Psonatype -Prelease -P\!combinedtest env: MAVEN_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }} diff --git a/combined/pom.xml b/combined/pom.xml index cb741c4..a56f003 100644 --- a/combined/pom.xml +++ b/combined/pom.xml @@ -1,43 +1,43 @@ - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - org.into-cps - vdmcheck - ${revision}${sha1}${changelist} - ../pom.xml - + + org.into-cps + vdmcheck + ${revision}${sha1}${changelist} + ../pom.xml + - org.into-cps.vdmcheck - combined - jar + org.into-cps.vdmcheck + combined + jar - Combined FMI2/FMI3 Testing - A combined FMI2/FMI3 test for MaestroChecks + Combined FMI2/FMI3 Testing + A combined FMI2/FMI3 test for MaestroChecks 4.5.0-P-SNAPSHOT - - - org.into-cps.vdmcheck.fmi2 - vdmcheck2 - ${project.version} - test - + + + org.into-cps.vdmcheck.fmi2 + vdmcheck2 + ${project.version} + test + org.into-cps.vdmcheck.fmi2 rule-model ${project.version} - - org.into-cps.vdmcheck.fmi3 - vdmcheck3 - ${project.version} - + + org.into-cps.vdmcheck.fmi3 + vdmcheck3 + ${project.version} + org.into-cps.vdmcheck.fmi3 rule-model @@ -53,43 +53,29 @@ annotations ${vdmj.version} - - junit - junit - 4.8.2 - test - - + + junit + junit + 4.8.2 + test + + - + - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-gpg-plugin - - true - - - - maven-install-plugin - - true - - - - maven-jar-plugin - - true - - - - + + + maven-install-plugin + + true + + + + maven-jar-plugin + + true + + + + diff --git a/pom.xml b/pom.xml index 9e72d38..8f8032f 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ fmi3 xsd2vdm fmuReader - combined + @@ -345,6 +345,16 @@ + + combinedtest + + true + + + combined + + +