Skip to content

Commit 9dc38df

Browse files
committed
GH-5076: Fix dependencies
1 parent f295b61 commit 9dc38df

File tree

4 files changed

+38
-1
lines changed

4 files changed

+38
-1
lines changed

pom.xml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -807,6 +807,22 @@
807807
<artifactId>solr-core</artifactId>
808808
<version>${solr.version}</version>
809809
</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>
810826
</additionalDependencies>
811827
</configuration>
812828
</plugin>
@@ -1040,6 +1056,8 @@
10401056
<include>javax.servlet:jstl:*:*:provided</include>
10411057
<!-- Allow test server dependencies -->
10421058
<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>
10431061
</includes>
10441062
</bannedDependencies>
10451063
</rules>
@@ -1062,6 +1080,8 @@
10621080
<!-- mockserver-junit-jupiter-no-dependencies contains these classes -->
10631081
<ignoreClass>org.opentest4j.*</ignoreClass>
10641082
</ignoreClasses>
1083+
<!-- Allow to provide old javax dependencies for compiling with JDK 17+ -->
1084+
<ignoredScopes>provided</ignoredScopes>
10651085
<ignoreWhenIdentical>true</ignoreWhenIdentical>
10661086
</banDuplicateClasses>
10671087
</rules>
@@ -1073,7 +1093,7 @@
10731093
<dependency>
10741094
<groupId>org.codehaus.mojo</groupId>
10751095
<artifactId>extra-enforcer-rules</artifactId>
1076-
<version>1.6.1</version>
1096+
<version>1.11.0</version>
10771097
</dependency>
10781098
</dependencies>
10791099
</plugin>

spring-components/rdf4j-spring-demo/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@
3636
</exclusion>
3737
</exclusions>
3838
</dependency>
39+
<dependency>
40+
<groupId>javax.annotation</groupId>
41+
<artifactId>javax.annotation-api</artifactId>
42+
<version>1.3.2</version>
43+
<scope>provided</scope>
44+
</dependency>
3945
</dependencies>
4046
<dependencyManagement>
4147
<dependencies>

spring-components/rdf4j-spring/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,13 @@
8080
<artifactId>mockserver-junit-jupiter-no-dependencies</artifactId>
8181
<scope>test</scope>
8282
</dependency>
83+
<dependency>
84+
<groupId>javax.validation</groupId>
85+
<artifactId>validation-api</artifactId>
86+
<version>2.0.1.Final</version>
87+
<scope>provided</scope>
88+
<!-- For javadoc/compile; not bundled at runtime -->
89+
</dependency>
8390
</dependencies>
8491
<build>
8592
<plugins>

tools/config/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
<groupId>ch.qos.logback</groupId>
2020
<artifactId>logback-classic</artifactId>
2121
</dependency>
22+
<dependency>
23+
<groupId>ch.qos.logback</groupId>
24+
<artifactId>logback-core</artifactId>
25+
</dependency>
2226
<dependency>
2327
<groupId>org.junit.jupiter</groupId>
2428
<artifactId>junit-jupiter-engine</artifactId>

0 commit comments

Comments
 (0)