Skip to content

Commit

Permalink
Merge pull request #93 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 74b765b + acb7fd0 commit c1da0c5
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 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
16 changes: 8 additions & 8 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 @@ -36,10 +36,10 @@
<inceptionYear>2010</inceptionYear>

<scm>
<url>https://github.com/mybatis/base-bundle-descriptor</url>
<connection>scm:git:ssh://[email protected]/mybatis/base-bundle-descriptor.git</connection>
<developerConnection>scm:git:ssh://[email protected]/mybatis/base-bundle-descriptor.git</developerConnection>
<tag>HEAD</tag>
<url>https://github.com/mybatis/base-bundle-descriptor</url>
</scm>
<issueManagement>
<system>GitHub Issue Management</system>
Expand All @@ -65,6 +65,12 @@
</properties>

<build>

<resources>
<resource>
<directory>${project.basedir}/src/main/resources-unfiltered</directory>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -79,12 +85,6 @@
</dependencies>
</plugin>
</plugins>

<resources>
<resource>
<directory>${project.basedir}/src/main/resources-unfiltered</directory>
</resource>
</resources>
</build>

</project>

0 comments on commit c1da0c5

Please sign in to comment.