Skip to content

Commit 0711f0b

Browse files
authored
Merge pull request #997 from spotbugs/release/4.9.0
Release/4.9.0 with follow up moving reporting configuration to plugin management
2 parents c1dd4d9 + 60cfbe0 commit 0711f0b

File tree

1 file changed

+36
-29
lines changed

1 file changed

+36
-29
lines changed

pom.xml

Lines changed: 36 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<groupId>com.github.spotbugs</groupId>
3131
<artifactId>spotbugs-maven-plugin</artifactId>
32-
<version>4.9.0.0-SNAPSHOT</version>
32+
<version>4.9.0.1-SNAPSHOT</version>
3333
<packaging>maven-plugin</packaging>
3434

3535
<name>spotbugs-maven-plugin</name>
@@ -168,7 +168,7 @@
168168
<sourceDirectory>${project.basedir}/src/main/groovy</sourceDirectory>
169169

170170
<!-- Reproducible Builds: override timestamp value from parent -->
171-
<project.build.outputTimestamp>1731432691</project.build.outputTimestamp>
171+
<project.build.outputTimestamp>1739649724</project.build.outputTimestamp>
172172

173173
<!-- Override spotbugs to this version from base-parent -->
174174
<spotbugs.version>4.9.0</spotbugs.version>
@@ -645,6 +645,30 @@
645645
<artifactId>maven-plugin-plugin</artifactId>
646646
<version>${pluginPluginVersion}</version>
647647
</plugin>
648+
<plugin>
649+
<groupId>org.apache.maven.plugins</groupId>
650+
<artifactId>maven-plugin-reporting-plugin</artifactId>
651+
<version>${pluginPluginVersion}</version>
652+
<configuration>
653+
<requirements>
654+
<jdk>${project.build.java.target}</jdk>
655+
</requirements>
656+
</configuration>
657+
</plugin>
658+
659+
<plugin>
660+
<groupId>org.codehaus.mojo</groupId>
661+
<artifactId>l10n-maven-plugin</artifactId>
662+
<version>${l10nPluginVersion}</version>
663+
<configuration>
664+
<locales>
665+
<locale>es</locale>
666+
<locale>fr</locale>
667+
<locale>no_NO</locale>
668+
<locale>pt_BR</locale>
669+
</locales>
670+
</configuration>
671+
</plugin>
648672

649673
<plugin>
650674
<groupId>org.apache.maven.plugins</groupId>
@@ -662,6 +686,9 @@
662686
<groupId>com.github.spotbugs</groupId>
663687
<artifactId>spotbugs-maven-plugin</artifactId>
664688
<version>${project.version}</version>
689+
<configuration>
690+
<excludeFilterFile>${project.basedir}/src/main/tools/spotbugs-exclude-filters.xml</excludeFilterFile>
691+
</configuration>
665692
</plugin>
666693

667694
<plugin>
@@ -688,6 +715,13 @@
688715
<configuration>
689716
<!-- Repo https://github.com/gleclaire/codenarc-maven-plugin has been forked and will need major upgrades to use this. -->
690717
<skip>true</skip>
718+
719+
<codeNarcVersion>${codenarc.version}</codeNarcVersion>
720+
<groovyVersion>${groovyVersion}</groovyVersion>
721+
<maxPriority1Violations>0</maxPriority1Violations>
722+
<maxPriority2Violations>0</maxPriority2Violations>
723+
<maxPriority3Violations>5</maxPriority3Violations>
724+
<sourceDirectory>${project.basedir}/src/main/groovy</sourceDirectory>
691725
</configuration>
692726
<dependencies>
693727
<dependency>
@@ -798,45 +832,18 @@
798832
<plugin>
799833
<groupId>org.apache.maven.plugins</groupId>
800834
<artifactId>maven-plugin-report-plugin</artifactId>
801-
<version>${pluginPluginVersion}</version>
802-
<configuration>
803-
<requirements>
804-
<jdk>${project.build.java.target}</jdk>
805-
</requirements>
806-
</configuration>
807835
</plugin>
808836
<plugin>
809837
<groupId>org.codehaus.mojo</groupId>
810838
<artifactId>l10n-maven-plugin</artifactId>
811-
<version>${l10nPluginVersion}</version>
812-
<configuration>
813-
<locales>
814-
<locale>es</locale>
815-
<locale>fr</locale>
816-
<locale>no_NO</locale>
817-
<locale>pt_BR</locale>
818-
</locales>
819-
</configuration>
820839
</plugin>
821840
<plugin>
822841
<groupId>org.codehaus.mojo</groupId>
823842
<artifactId>codenarc-maven-plugin</artifactId>
824-
<configuration>
825-
<codeNarcVersion>${codenarc.version}</codeNarcVersion>
826-
<groovyVersion>${groovyVersion}</groovyVersion>
827-
<maxPriority1Violations>0</maxPriority1Violations>
828-
<maxPriority2Violations>0</maxPriority2Violations>
829-
<maxPriority3Violations>5</maxPriority3Violations>
830-
<sourceDirectory>${project.basedir}/src/main/groovy</sourceDirectory>
831-
</configuration>
832843
</plugin>
833844
<plugin>
834845
<groupId>com.github.spotbugs</groupId>
835846
<artifactId>spotbugs-maven-plugin</artifactId>
836-
<version>${project.version}</version>
837-
<configuration>
838-
<excludeFilterFile>${project.basedir}/src/main/tools/spotbugs-exclude-filters.xml</excludeFilterFile>
839-
</configuration>
840847
</plugin>
841848
</plugins>
842849
</reporting>

0 commit comments

Comments
 (0)