Skip to content

Commit 14a4b3f

Browse files
committed
fix: skip Jakarta Servlet adapter on JDK < 17
Moved sentinel-web-servlet-jakarta into a jdk17-plus profile so CI on JDK 8 and 11 no longer fails. Set compiler source/target to 17 for the Jakarta module since Spring Boot 3.x requires JDK 17+.
1 parent 4d21d48 commit 14a4b3f

2 files changed

Lines changed: 14 additions & 1 deletion

File tree

sentinel-adapter/pom.xml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
<modules>
1818
<module>sentinel-web-servlet</module>
19-
<module>sentinel-web-servlet-jakarta</module>
2019
<module>sentinel-dubbo-adapter</module>
2120
<module>sentinel-apache-dubbo-adapter</module>
2221
<module>sentinel-apache-dubbo3-adapter</module>
@@ -83,4 +82,16 @@
8382
</dependency>
8483
</dependencies>
8584
</dependencyManagement>
85+
86+
<profiles>
87+
<profile>
88+
<id>jdk17-plus</id>
89+
<activation>
90+
<jdk>[17,)</jdk>
91+
</activation>
92+
<modules>
93+
<module>sentinel-web-servlet-jakarta</module>
94+
</modules>
95+
</profile>
96+
</profiles>
8697
</project>

sentinel-adapter/sentinel-web-servlet-jakarta/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
<properties>
1717
<jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
1818
<skip.spring.v6x.test>false</skip.spring.v6x.test>
19+
<maven.compiler.source>17</maven.compiler.source>
20+
<maven.compiler.target>17</maven.compiler.target>
1921
</properties>
2022

2123
<dependencies>

0 commit comments

Comments
 (0)