|
177 | 177 | <shell-executable>bash</shell-executable> |
178 | 178 |
|
179 | 179 | <!-- define the Java language version used by the compiler --> |
180 | | - <javac.version>8</javac.version> |
181 | | - <java.min.version>${javac.version}</java.min.version> |
182 | | - <maven.compiler.release>${javac.version}</maven.compiler.release> |
183 | | - <maven.min.version>3.3.9</maven.min.version> |
| 180 | + <maven.compiler.release>8</maven.compiler.release> |
| 181 | + <!-- override maven.compiler.target=8 defined in parent POM 35; can be removed on upgrade to 36+ --> |
| 182 | + <maven.compiler.target>${maven.compiler.release}</maven.compiler.target> |
184 | 183 |
|
185 | 184 | <!-- Contains all shaded thirdparty dependencies --> |
186 | 185 | <ratis.thirdparty.version>1.0.10</ratis.thirdparty.version> |
|
470 | 469 | <plugin> |
471 | 470 | <groupId>org.apache.maven.plugins</groupId> |
472 | 471 | <artifactId>maven-enforcer-plugin</artifactId> |
473 | | - <configuration> |
474 | | - <rules> |
475 | | - <requireMavenVersion> |
476 | | - <version>[${maven.min.version},)</version> |
477 | | - </requireMavenVersion> |
478 | | - <requireJavaVersion> |
479 | | - <version>[${java.min.version},)</version> |
480 | | - </requireJavaVersion> |
481 | | - </rules> |
482 | | - </configuration> |
483 | 472 | <dependencies> |
484 | 473 | <dependency> |
485 | 474 | <groupId>de.skuzzle.enforcer</groupId> |
|
654 | 643 | <groupId>com.github.spotbugs</groupId> |
655 | 644 | <artifactId>spotbugs-maven-plugin</artifactId> |
656 | 645 | </plugin> |
657 | | - <plugin> |
658 | | - <groupId>org.apache.maven.plugins</groupId> |
659 | | - <artifactId>maven-enforcer-plugin</artifactId> |
660 | | - <inherited>false</inherited> |
661 | | - <executions> |
662 | | - <execution> |
663 | | - <id>clean</id> |
664 | | - <goals> |
665 | | - <goal>enforce</goal> |
666 | | - </goals> |
667 | | - <phase>pre-clean</phase> |
668 | | - </execution> |
669 | | - <execution> |
670 | | - <id>default</id> |
671 | | - <goals> |
672 | | - <goal>enforce</goal> |
673 | | - </goals> |
674 | | - <phase>validate</phase> |
675 | | - <configuration> |
676 | | - <rules> |
677 | | - <!-- The earliest maven version we verify builds for via ASF Jenkins --> |
678 | | - <requireMavenVersion> |
679 | | - <version>[${maven.min.version},)</version> |
680 | | - <message>Maven is out of date. |
681 | | - Ratis requires at least version ${maven.min.version} of Maven to properly build from source. |
682 | | - You appear to be using an older version. You can use either "mvn -version" or |
683 | | - "mvn enforcer:display-info" to verify what version is active. |
684 | | - </message> |
685 | | - </requireMavenVersion> |
686 | | - <!-- The earliest JVM version we verify builds for via ASF Jenkins --> |
687 | | - <requireJavaVersion> |
688 | | - <version>[${java.min.version},)</version> |
689 | | - <message>Java is out of date. |
690 | | - Ratis requires at least version ${java.min.version} of the JDK to properly build from source. |
691 | | - You appear to be using an older version. You can use either "mvn -version" or |
692 | | - "mvn enforcer:display-info" to verify what version is active. |
693 | | - </message> |
694 | | - </requireJavaVersion> |
695 | | - </rules> |
696 | | - </configuration> |
697 | | - </execution> |
698 | | - </executions> |
699 | | - </plugin> |
700 | 646 | <plugin> |
701 | 647 | <groupId>org.apache.felix</groupId> |
702 | 648 | <artifactId>maven-bundle-plugin</artifactId> |
|
919 | 865 | <configuration> |
920 | 866 | <rules> |
921 | 867 | <enforceBytecodeVersion> |
922 | | - <maxJdkVersion>${java.min.version}</maxJdkVersion> |
| 868 | + <maxJdkVersion>${maven.compiler.release}</maxJdkVersion> |
923 | 869 | <message>Ratis has unsupported dependencies. |
924 | | - Ratis requires that all dependencies be compiled with version ${java.min.version} or earlier |
| 870 | + Ratis requires that all dependencies be compiled with version ${maven.compiler.release} or earlier |
925 | 871 | of the JDK to properly build from source. You appear to be using a newer dependency. You can use |
926 | 872 | either "mvn -version" or "mvn enforcer:display-info" to verify what version is active. |
927 | | - Non-release builds can temporarily build with a newer JDK version by setting the |
928 | | - 'javac.source' property (eg. mvn -Djavac.source=1.8 clean package). |
929 | 873 | </message> |
930 | 874 | </enforceBytecodeVersion> |
931 | 875 | </rules> |
|
0 commit comments