Skip to content

Commit 9769a7a

Browse files
committed
Merge pull request #12 from jdcasey/master
remove duplicate rule declarations in different enforcer executions
2 parents a6c105c + 571898c commit 9769a7a

File tree

1 file changed

+2
-20
lines changed

1 file changed

+2
-20
lines changed

pom.xml

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,10 @@
222222
<requireManagedDeps implementation="org.commonjava.maven.enforcer.rule.EnforceManagedDepsRule">
223223
<!-- <message>Capture dependencies in top-level dependencyManagement section for easy reference.</message> -->
224224
<checkProfiles>false</checkProfiles>
225-
<failOnViolation>${managedDepEnforcement-fail}</failOnViolation>
225+
<failOnViolation>${enforceManagedDeps}</failOnViolation>
226226
</requireManagedDeps>
227227
<illegalTransitiveDependencyCheck implementation="de.is24.maven.enforcer.rules.IllegalTransitiveDependencyCheck">
228-
<reportOnly>${illegalTransitivesEnforcement-reportOnly}</reportOnly>
228+
<reportOnly>${skipIllegalTransitiveEnforcement}</reportOnly>
229229
<regexIgnoredClasses>
230230
<regexIgnoredClass>com\.sun\.net\.httpserver\..+</regexIgnoredClass>
231231
<regexIgnoredClass>javax\..+</regexIgnoredClass>
@@ -246,14 +246,6 @@
246246
<configuration>
247247
<fail>${enforceBestPractices}</fail>
248248
<rules>
249-
<requireManagedDeps implementation="org.commonjava.maven.enforcer.rule.EnforceManagedDepsRule">
250-
<!-- <message>Capture dependencies in top-level dependencyManagement section for easy reference.</message> -->
251-
<checkProfiles>false</checkProfiles>
252-
<failOnViolation>${managedDepEnforcement-fail}</failOnViolation>
253-
</requireManagedDeps>
254-
<!--
255-
<dependencyConvergence />
256-
-->
257249
<reactorModuleConvergence />
258250
<requireNoRepositories />
259251
<requirePluginVersions>
@@ -262,16 +254,6 @@
262254
<banSnapshots />
263255
<unCheckedPluginList>${unEnforcedPlugins}</unCheckedPluginList>
264256
</requirePluginVersions>
265-
<illegalTransitiveDependencyCheck implementation="de.is24.maven.enforcer.rules.IllegalTransitiveDependencyCheck">
266-
<reportOnly>${illegalTransitivesEnforcement-reportOnly}</reportOnly>
267-
<regexIgnoredClasses>
268-
<regexIgnoredClass>com\.sun\.net\.httpserver\..+</regexIgnoredClass>
269-
<regexIgnoredClass>javax\..+</regexIgnoredClass>
270-
<regexIgnoredClass>org\.w3c\.dom\..+</regexIgnoredClass>
271-
<regexIgnoredClass>org\.xml\.sax\..+</regexIgnoredClass>
272-
</regexIgnoredClasses>
273-
<useClassesFromLastBuild>true</useClassesFromLastBuild>
274-
</illegalTransitiveDependencyCheck>
275257
</rules>
276258
</configuration>
277259
</execution>

0 commit comments

Comments
 (0)