Skip to content

Commit d15fe5d

Browse files
deps: bump org.codehaus.mojo:extra-enforcer-rules from 1.11.0 to 1.12.0 in the regular group (#2193)
While I was there, I refactored the config to reduce the boilerplate.
1 parent 78d2676 commit d15fe5d

1 file changed

Lines changed: 5 additions & 49 deletions

File tree

build/build-parent/pom.xml

Lines changed: 5 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -208,12 +208,12 @@
208208
<dependency>
209209
<groupId>org.codehaus.mojo</groupId>
210210
<artifactId>extra-enforcer-rules</artifactId>
211-
<version>1.11.0</version>
211+
<version>1.12.0</version>
212212
</dependency>
213213
</dependencies>
214214
<executions>
215215
<execution>
216-
<id>enforce-no-logback-test-in-main</id>
216+
<id>enforcement</id>
217217
<goals>
218218
<goal>enforce</goal>
219219
</goals>
@@ -225,49 +225,16 @@
225225
<file>${project.basedir}/src/main/filtered-resources/logback-test.xml</file>
226226
</files>
227227
</requireFilesDontExist>
228-
</rules>
229-
</configuration>
230-
</execution>
231-
<execution>
232-
<id>no-managed-deps</id>
233-
<goals>
234-
<goal>enforce</goal>
235-
</goals>
236-
<configuration>
237-
<rules>
238-
<requireManagedDeps implementation="org.commonjava.maven.enforcer.rule.EnforceManagedDepsRule">
228+
<requireManagedDeps>
239229
<checkProfiles>true</checkProfiles>
240-
<failOnViolation>true</failOnViolation>
241230
</requireManagedDeps>
242-
</rules>
243-
</configuration>
244-
</execution>
245-
<execution>
246-
<id>ban-forbidden-dependencies</id>
247-
<goals>
248-
<goal>enforce</goal>
249-
</goals>
250-
<configuration>
251-
<rules>
252-
<bannedDependencies>
253-
<excludes combine.children="append">
254-
<!-- Ban forbidden logging deps (we only use SLF4J + Logback) -->
255-
<!-- In case of transitive dependency, exclude it and use 'org.slf4j:jcl-over-slf4j' instead -->
256-
<exclude>commons-logging:commons-log*</exclude>
257-
<!-- In case of transitive dependency, exclude it and use 'org.apache.logging.log4j:log4j-to-slf4j' instead -->
258-
<exclude>log4j:log4j</exclude>
259-
<!-- In case of transitive dependency, exclude it and use 'org.javassist:javassist' instead -->
260-
<exclude>javassist:javassist</exclude>
261-
<exclude>org.apache.cxf:cxf-bundle-jaxrs</exclude>
262-
<exclude>org.mockito:mockito-all</exclude><!-- Use mockito-core instead -->
263-
</excludes>
264-
</bannedDependencies>
231+
<banDuplicatePomDependencyVersions/>
265232
</rules>
266233
<fail>true</fail>
267234
</configuration>
268235
</execution>
269236
<execution>
270-
<id>ban-duplicated-classes</id>
237+
<id>enforcement-duplicate-classes</id>
271238
<goals>
272239
<goal>enforce</goal>
273240
</goals>
@@ -301,17 +268,6 @@
301268
<fail>${enforcer.failOnDuplicatedClasses}</fail>
302269
</configuration>
303270
</execution>
304-
<execution>
305-
<id>no-duplicate-declared-dependencies</id>
306-
<goals>
307-
<goal>enforce</goal>
308-
</goals>
309-
<configuration>
310-
<rules>
311-
<banDuplicatePomDependencyVersions/>
312-
</rules>
313-
</configuration>
314-
</execution>
315271
</executions>
316272
</plugin>
317273
<plugin>

0 commit comments

Comments
 (0)