Skip to content

Commit 1e896cd

Browse files
committed
updated enforcer
1 parent 21bf21f commit 1e896cd

2 files changed

Lines changed: 14 additions & 29 deletions

File tree

jcp/pom.xml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -411,26 +411,6 @@
411411
</configuration>
412412
</plugin>
413413

414-
<plugin>
415-
<groupId>org.apache.maven.plugins</groupId>
416-
<artifactId>maven-enforcer-plugin</artifactId>
417-
<executions>
418-
<execution>
419-
<id>enforce-java</id>
420-
<goals>
421-
<goal>enforce</goal>
422-
</goals>
423-
<configuration>
424-
<rules>
425-
<requireMavenVersion>
426-
<version>[${min.maven.api}},)</version>
427-
</requireMavenVersion>
428-
</rules>
429-
</configuration>
430-
</execution>
431-
</executions>
432-
</plugin>
433-
434414
<plugin>
435415
<groupId>org.apache.maven.plugins</groupId>
436416
<artifactId>maven-compiler-plugin</artifactId>

pom.xml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
1818
<min.maven.api>3.0</min.maven.api>
1919
<junit.version>5.10.0</junit.version>
20-
<maven.compiler.release>8</maven.compiler.release>
2120
<maven.compiler.source>1.8</maven.compiler.source>
2221
<maven.compiler.target>1.8</maven.compiler.target>
2322
</properties>
@@ -38,7 +37,7 @@
3837
<name>Igor Maznitsa</name>
3938
<email>rrg4400@gmail.com</email>
4039
<url>https://www.igormaznitsa.com</url>
41-
<timezone>+3</timezone>
40+
<timezone>+2</timezone>
4241
<roles>
4342
<role>developer</role>
4443
</roles>
@@ -164,22 +163,28 @@
164163
<plugin>
165164
<groupId>org.apache.maven.plugins</groupId>
166165
<artifactId>maven-enforcer-plugin</artifactId>
167-
<version>3.1.0</version>
168166
<executions>
169167
<execution>
170-
<id>no-duplicate-declared-dependencies</id>
171-
<goals>
172-
<goal>enforce</goal>
173-
</goals>
168+
<id>enforce</id>
174169
<configuration>
175170
<rules>
176171
<banDuplicatePomDependencyVersions/>
177172
<enforceBytecodeVersion>
178-
<maxJdkVersion>1.8</maxJdkVersion>
173+
<maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
179174
</enforceBytecodeVersion>
180-
<!-- <dependencyConvergence/>-->
175+
<banCircularDependencies/>
176+
<reactorModuleConvergence/>
177+
<requireJavaVersion>
178+
<version>${maven.compiler.target}</version>
179+
</requireJavaVersion>
180+
<requireMavenVersion>
181+
<version>[${min.maven.api}},)</version>
182+
</requireMavenVersion>
181183
</rules>
182184
</configuration>
185+
<goals>
186+
<goal>enforce</goal>
187+
</goals>
183188
</execution>
184189
</executions>
185190
<dependencies>

0 commit comments

Comments
 (0)