Skip to content

Commit

Permalink
Merge pull request #446 from hazendaz/spotbugs
Browse files Browse the repository at this point in the history 
Retool build depedencies to ensure proper loading
  • Loading branch information
@hazendaz
hazendaz committed Jul 5, 2022
2 parents 4450f51 + b952219 commit 0dddbd6
Show file tree
Hide file tree
Showing 6 changed files with 198 additions and 33 deletions.
62 changes: 32 additions & 30 deletions pom.xml
View file
Expand Up @@ -11,7 +11,7 @@

<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>4.7.0.1-SNAPSHOT</version>
<version>4.7.1.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>

<name>SpotBugs Maven Plugin</name>
Expand Down Expand Up @@ -138,7 +138,7 @@
<mavenCoreVersion>3.8.6</mavenCoreVersion>
<mavenSharedUtilsVersion>3.3.4</mavenSharedUtilsVersion>
<mavenTransferVersion>0.13.1</mavenTransferVersion>
<mavenCommonArtifactFilters>3.2.0</mavenCommonArtifactFilters>
<mavenCommonArtifactFilters>3.3.0</mavenCommonArtifactFilters>
<mavenReportingApiVersion>3.1.0</mavenReportingApiVersion>
<mavenReportingVersion>3.1.0</mavenReportingVersion>
<mavenVersion>3.8.6</mavenVersion>
Expand Down Expand Up @@ -176,7 +176,7 @@
<compilerPluginVersion>3.10.1</compilerPluginVersion>
<findsecbugsVersion>1.12.0</findsecbugsVersion>
<jxrPluginVersion>3.2.0</jxrPluginVersion>
<mavenSurefireVersion>3.0.0-M6</mavenSurefireVersion>
<mavenSurefireVersion>3.0.0-M7</mavenSurefireVersion>
<jakartaeeApiVersion>8.0.0</jakartaeeApiVersion>
<servletApiVersion>4.0.4</servletApiVersion>
<sb-contribVersion>7.4.7</sb-contribVersion>
Expand All @@ -197,6 +197,13 @@

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-bom</artifactId>
<version>${asm.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-bom</artifactId>
Expand Down Expand Up @@ -233,6 +240,28 @@
<version>${slf4jVersion}</version>
</dependency>

<!-- asm -->
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-analysis</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId>
</dependency>

<!-- gmaven -->
<dependency>
<groupId>org.apache.ant</groupId>
Expand Down Expand Up @@ -508,33 +537,6 @@
<artifactId>plexus-utils</artifactId>
<version>${plexusUtilsVersion}</version>
</dependency>

<!-- Better jdk support -->
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-analysis</artifactId>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId>
<version>${asm.version}</version>
</dependency>
</dependencies>

<build>
Expand Down
58 changes: 58 additions & 0 deletions src/it-tools/build-tools/pom.xml
View file
Expand Up @@ -26,10 +26,67 @@
<version>testing</version>

<build>
<pluginManagement>
<plugins>
<!-- Override plugins to latest -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>@antrun.plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>@assembly.plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>@clean.plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>@dependency.plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>@deploy.plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>@install.plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>@jar.plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>@release.plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>@resources.plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>@jxr.plugin@</version>
</plugin>
</plugins>
</pluginManagement>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>@compilerPluginVersion@</version>
<configuration>
<debug>false</debug>
<source>1.8</source>
Expand All @@ -48,6 +105,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>@mavenSurefireVersion@</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
Expand Down
53 changes: 53 additions & 0 deletions src/it-tools/prime/pom.xml
View file
Expand Up @@ -26,6 +26,59 @@
<version>testing</version>

<dependencies>
<!-- Override plugins to latest -->
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>@antrun.plugin@</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>@assembly.plugin@</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>@clean.plugin@</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>@dependency.plugin@</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>@deploy.plugin@</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>@install.plugin@</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>@jar.plugin@</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>@release.plugin@</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>@resources.plugin@</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>@jxr.plugin@</version>
</dependency>

<!-- Required plugins -->
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs</artifactId>
Expand Down
53 changes: 53 additions & 0 deletions src/it/common.xml
View file
Expand Up @@ -57,6 +57,59 @@
<testSourceDirectory>@project.basedir@/src/it-src/test/java</testSourceDirectory>
<pluginManagement>
<plugins>
<!-- Override plugins to latest -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>@antrun.plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>@assembly.plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>@clean.plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>@dependency.plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>@deploy.plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>@install.plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>@jar.plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>@release.plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>@resources.plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>@jxr.plugin@</version>
</plugin>

<!-- Required plugins -->
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion src/it/skipEmpty/pom.xml
View file
Expand Up @@ -16,7 +16,7 @@
-->
<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>
<modelVersion>4.0.0</modelVersion>

<!-- Parent is disabled on purpose
<parent>
Expand Down
3 changes: 1 addition & 2 deletions src/it/systemPropertyVariables/pom.xml
View file
Expand Up @@ -34,8 +34,7 @@
<artifactId>spotbugs-maven-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<findsecbugs.taint.taintedsystemvariables>true
</findsecbugs.taint.taintedsystemvariables>
<findsecbugs.taint.taintedsystemvariables>true</findsecbugs.taint.taintedsystemvariables>
</systemPropertyVariables>
<spotbugsXmlOutput>true</spotbugsXmlOutput>
<xmlOutput>true</xmlOutput>
Expand Down

0 comments on commit 0dddbd6

Please sign in to comment.