Skip to content

Commit

Permalink
Merge branch 'main' into release/UIMA-6449-Ruta-3.2.0-release
Browse files Browse the repository at this point in the history
* main:
  [No Jira] Temporarily update spotbugs to be compatible with Java 17 until we go to Parent POM 16
  [No Jira] Avoid triggering auto-staging as part of snapshot deployment
  • Loading branch information
reckart committed Jun 8, 2022
2 parents 440139d + 96c058e commit 87fcb96
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 3 deletions.
4 changes: 1 addition & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,5 @@
@Library('uima-build-jenkins-shared-library') _

defaultPipeline {
// The Eclipse libraries that our plugins depend unfortunately on required Java 11
jdk = 'jdk_11_latest'
extraMavenArguments = '-Pjacoco,pmd,run-rat-report'
extraMavenArguments = '-Pjacoco,spotbugs,pmd,run-rat-report -Ddisable-rc-auto-staging'
}
17 changes: 17 additions & 0 deletions ruta-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -290,4 +290,21 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>spotbugs</id>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>4.7.0.0</version>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
</profiles>
</project>

0 comments on commit 87fcb96

Please sign in to comment.