Skip to content

Commit

Permalink
moved combined test to seperate profile
Browse files Browse the repository at this point in the history
  • Loading branch information
@lausdahl
lausdahl committed Feb 8, 2024
1 parent 2d05bc8 commit da30b51
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 66 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
112 changes: 49 additions & 63 deletions combined/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
<project xmlns="http://maven.apache.org/POM/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">
<modelVersion>4.0.0</modelVersion>
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">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.into-cps</groupId>
<artifactId>vdmcheck</artifactId>
<version>${revision}${sha1}${changelist}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<parent>
<groupId>org.into-cps</groupId>
<artifactId>vdmcheck</artifactId>
<version>${revision}${sha1}${changelist}</version>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>org.into-cps.vdmcheck</groupId>
<artifactId>combined</artifactId>
<packaging>jar</packaging>
<groupId>org.into-cps.vdmcheck</groupId>
<artifactId>combined</artifactId>
<packaging>jar</packaging>

<name>Combined FMI2/FMI3 Testing</name>
<description>A combined FMI2/FMI3 test for MaestroChecks</description>
<name>Combined FMI2/FMI3 Testing</name>
<description>A combined FMI2/FMI3 test for MaestroChecks</description>

<properties>
<vdmj.version>4.5.0-P-SNAPSHOT</vdmj.version>
</properties>

<dependencies>
<dependency>
<groupId>org.into-cps.vdmcheck.fmi2</groupId>
<artifactId>vdmcheck2</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependencies>
<dependency>
<groupId>org.into-cps.vdmcheck.fmi2</groupId>
<artifactId>vdmcheck2</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.into-cps.vdmcheck.fmi2</groupId>
<artifactId>rule-model</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.into-cps.vdmcheck.fmi3</groupId>
<artifactId>vdmcheck3</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.into-cps.vdmcheck.fmi3</groupId>
<artifactId>vdmcheck3</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.into-cps.vdmcheck.fmi3</groupId>
<artifactId>rule-model</artifactId>
Expand All @@ -53,43 +53,29 @@
<artifactId>annotations</artifactId>
<version>${vdmj.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<build>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<configuration>
<skip>true</skip> <!-- Skipped because there is no jar, only tests -->
</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<skipIfEmpty>true</skipIfEmpty>
</configuration>
</plugin>
</plugins>
</build>
<plugins>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<configuration>
<skip>true</skip> <!-- Skipped because there is no jar, only tests -->
</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<skipIfEmpty>true</skipIfEmpty>
</configuration>
</plugin>
</plugins>
</build>
</project>
12 changes: 11 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<module>fmi3</module>
<module>xsd2vdm</module>
<module>fmuReader</module>
<module>combined</module>

</modules>

<dependencyManagement>
Expand Down Expand Up @@ -345,6 +345,16 @@
</distributionManagement>
</profile>

<profile>
<id>combinedtest</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>combined</module>
</modules>
</profile>

</profiles>

</project>

0 comments on commit da30b51

Please sign in to comment.