Skip to content

Commit 46be313

Browse files
committed
Split enforcer rules into validate and verify phases
1 parent e9c517f commit 46be313

2 files changed

Lines changed: 33 additions & 7 deletions

File tree

nbdemetra-app/pom.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,20 @@
134134
<etcConfFile>src/main/resources/nbdemetra.conf</etcConfFile>
135135
</configuration>
136136
</plugin>
137+
<plugin>
138+
<groupId>org.apache.maven.plugins</groupId>
139+
<artifactId>maven-enforcer-plugin</artifactId>
140+
<configuration combine.children="merge">
141+
<rules>
142+
<banDuplicateClasses>
143+
<ignoreClasses>
144+
<ignoreClass>org.apache.commons.logging.*</ignoreClass>
145+
<ignoreClass>org.apache.commons.codec.*</ignoreClass>
146+
</ignoreClasses>
147+
</banDuplicateClasses>
148+
</rules>
149+
</configuration>
150+
</plugin>
137151
</plugins>
138152
</build>
139153

pom.xml

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@
533533
</dependencies>
534534
<executions>
535535
<execution>
536-
<id>enforce</id>
536+
<id>enforce-on-validate</id>
537537
<goals>
538538
<goal>enforce</goal>
539539
</goals>
@@ -556,23 +556,35 @@
556556
</requireReleaseDeps>
557557
<requireUpperBoundDeps/>
558558
<!-- pomchecker-enforcer-rules -->
559-
<checkMavenCentral
560-
implementation="org.kordamp.maven.enforcer.checker.CheckMavenCentral">
559+
<checkMavenCentral>
561560
<release>false</release>
562561
<strict>false</strict>
563562
</checkMavenCentral>
563+
<!-- heylogs-enforcer-rules -->
564+
<checkChangelog/>
565+
<formatChangelog/>
566+
</rules>
567+
</configuration>
568+
</execution>
569+
<execution>
570+
<id>enforce-on-verify</id>
571+
<phase>verify</phase>
572+
<goals>
573+
<goal>enforce</goal>
574+
</goals>
575+
<configuration>
576+
<rules>
564577
<!-- extra-enforcer-rules -->
565578
<banCircularDependencies/>
566-
<!-- <banDuplicateClasses/>-->
579+
<banDuplicateClasses>
580+
<ignoredScopes>test</ignoredScopes>
581+
</banDuplicateClasses>
567582
<enforceBytecodeVersion>
568583
<maxJdkVersion>8</maxJdkVersion>
569584
<ignoredScopes>
570585
<ignoreScope>test</ignoreScope>
571586
</ignoredScopes>
572587
</enforceBytecodeVersion>
573-
<!-- heylogs-enforcer-rules -->
574-
<checkChangelog/>
575-
<formatChangelog/>
576588
</rules>
577589
</configuration>
578590
</execution>

0 commit comments

Comments
 (0)