Skip to content

Commit

Permalink
Merge pull request #23 from CybercentreCanada/sync/1.8.2/pr
Browse files Browse the repository at this point in the history
[chappie] wants to merge [sync/1.8.2/pr] into [develop]
  • Loading branch information
cccs-br committed Apr 24, 2024
2 parents 796d483 + 509ba9e commit fd41403
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name: Build and Publish

on:
push:
branches: [ "develop", "main" ]
branches: [ "develop", "main", "patch/*", "rc/*" ]
pull_request:
branches: [ "develop" ]

Expand Down
16 changes: 15 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@
<goals>
<goal>compile</goal>
<goal>testCompile</goal>
<goal>doc-jar</goal>
</goals>
</execution>
</executions>
Expand All @@ -115,6 +116,19 @@
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<phase>verify</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
Expand Down Expand Up @@ -146,7 +160,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.7</version>
<version>1.6.13</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
Expand Down

0 comments on commit fd41403

Please sign in to comment.