Skip to content

Commit

Permalink
Merge pull request #409 from hazendaz/master
Browse files Browse the repository at this point in the history
Sort pom and adjust GHA
  • Loading branch information
hazendaz authored Nov 4, 2023
2 parents 47e5751 + 993d405 commit 62aeb92
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Java CI

on: [push, pull_request]
on: [workflow_dispatch, push, pull_request]

jobs:
test:
Expand Down
44 changes: 22 additions & 22 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<groupId>org.mybatis</groupId>
<artifactId>mybatis-parent</artifactId>
<version>39</version>
<relativePath />
<relativePath/>
</parent>

<groupId>org.mybatis</groupId>
Expand All @@ -37,10 +37,10 @@
<inceptionYear>2013</inceptionYear>

<scm>
<url>https://github.com/mybatis/cdi</url>
<connection>scm:git:ssh://git@github.com/mybatis/cdi.git</connection>
<developerConnection>scm:git:ssh://git@github.com/mybatis/cdi.git</developerConnection>
<tag>HEAD</tag>
<url>https://github.com/mybatis/cdi</url>
</scm>
<issueManagement>
<system>GitHub</system>
Expand Down Expand Up @@ -195,26 +195,26 @@
</systemProperties>
</configuration>
<executions>
<execution>
<id>default-test</id>
<configuration>
<excludes>
<exclude>**/FooServiceJTATest.java</exclude>
</excludes>
</configuration>
</execution>
<execution>
<id>jta-test</id>
<configuration>
<excludes>
<exclude>**/FooServiceTest.java</exclude>
<exclude>**/MybatisExtensionTest.java</exclude>
</excludes>
</configuration>
<goals>
<goal>test</goal>
</goals>
</execution>
<execution>
<id>default-test</id>
<configuration>
<excludes>
<exclude>**/FooServiceJTATest.java</exclude>
</excludes>
</configuration>
</execution>
<execution>
<id>jta-test</id>
<goals>
<goal>test</goal>
</goals>
<configuration>
<excludes>
<exclude>**/FooServiceTest.java</exclude>
<exclude>**/MybatisExtensionTest.java</exclude>
</excludes>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
Expand Down

0 comments on commit 62aeb92

Please sign in to comment.