|
807 | 807 | <artifactId>solr-core</artifactId> |
808 | 808 | <version>${solr.version}</version> |
809 | 809 | </additionalDependency> |
| 810 | + <!-- add these in case we run with JDK 17+ --> |
| 811 | + <additionalDependency> |
| 812 | + <groupId>javax.validation</groupId> |
| 813 | + <artifactId>validation-api</artifactId> |
| 814 | + <version>2.0.1.Final</version> |
| 815 | + </additionalDependency> |
| 816 | + <additionalDependency> |
| 817 | + <groupId>javax.annotation</groupId> |
| 818 | + <artifactId>javax.annotation-api</artifactId> |
| 819 | + <version>1.3.2</version> |
| 820 | + </additionalDependency> |
| 821 | + <additionalDependency> |
| 822 | + <groupId>ch.qos.logback</groupId> |
| 823 | + <artifactId>logback-core</artifactId> |
| 824 | + <version>${logback.version}</version> |
| 825 | + </additionalDependency> |
810 | 826 | </additionalDependencies> |
811 | 827 | </configuration> |
812 | 828 | </plugin> |
|
1040 | 1056 | <include>javax.servlet:jstl:*:*:provided</include> |
1041 | 1057 | <!-- Allow test server dependencies --> |
1042 | 1058 | <include>javax.servlet:javax.servlet-api:*:*:test</include> |
| 1059 | + <!-- Allow to provide old javax dependencies for compiling with JDK 17+ --> |
| 1060 | + <include>javax.*:*:*:*:provided</include> |
1043 | 1061 | </includes> |
1044 | 1062 | </bannedDependencies> |
1045 | 1063 | </rules> |
|
1062 | 1080 | <!-- mockserver-junit-jupiter-no-dependencies contains these classes --> |
1063 | 1081 | <ignoreClass>org.opentest4j.*</ignoreClass> |
1064 | 1082 | </ignoreClasses> |
| 1083 | + <!-- Allow to provide old javax dependencies for compiling with JDK 17+ --> |
| 1084 | + <ignoredScopes>provided</ignoredScopes> |
1065 | 1085 | <ignoreWhenIdentical>true</ignoreWhenIdentical> |
1066 | 1086 | </banDuplicateClasses> |
1067 | 1087 | </rules> |
|
1073 | 1093 | <dependency> |
1074 | 1094 | <groupId>org.codehaus.mojo</groupId> |
1075 | 1095 | <artifactId>extra-enforcer-rules</artifactId> |
1076 | | - <version>1.6.1</version> |
| 1096 | + <version>1.11.0</version> |
1077 | 1097 | </dependency> |
1078 | 1098 | </dependencies> |
1079 | 1099 | </plugin> |
|
0 commit comments