Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jdk21 compile check #1086

Closed
wants to merge 2 commits into from
Closed

Jdk21 compile check #1086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
946aab8
bugfix(ITs): standalone deployment of Jakarta EE test app actually wo…
lprimak Sep 23, 2023
f1889f8
enh: Compiles on JDK 21. Fixes #1077
lprimak Sep 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions integration-tests/jakarta-ee/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
<maven.compiler.source>${maven.compiler.release}</maven.compiler.source>
<maven.compiler.target>${maven.compiler.release}</maven.compiler.target>
<arquillian.version>1.7.1.Final</arquillian.version>
<arquillian.drone.version>2.5.6</arquillian.drone.version>
<arquillian.graphene.version>2.5.4</arquillian.graphene.version>
<failsafe.argLine>
--add-opens java.base/java.lang=ALL-UNNAMED
--add-opens java.base/java.net=ALL-UNNAMED
Expand Down Expand Up @@ -137,12 +139,6 @@
<version>2.1.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>${mockito-inline.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
Expand All @@ -153,7 +149,6 @@
<groupId>com.flowlogix</groupId>
<artifactId>flowlogix-jee</artifactId>
<version>5.5.2</version>
<scope>test</scope>
</dependency>

<!-- Arquillian test dependencies -->
Expand Down Expand Up @@ -186,7 +181,7 @@
<dependency>
<groupId>org.jboss.arquillian.graphene</groupId>
<artifactId>graphene-webdriver</artifactId>
<version>2.5.4</version>
<version>${arquillian.graphene.version}</version>
<scope>test</scope>
<type>pom</type>
</dependency>
Expand All @@ -204,7 +199,7 @@
<dependency>
<groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-drone-bom</artifactId>
<version>2.5.6</version>
<version>${arquillian.drone.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -220,6 +215,18 @@

<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
<annotationProcessorPath>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</annotationProcessorPath>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
</plugin>
Expand Down
1 change: 1 addition & 0 deletions integration-tests/jakarta-ee/src/main/webapp/WEB-INF/faces-config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@
</factory>
<application>
<resource-handler>org.omnifaces.resourcehandler.VersionedResourceHandler</resource-handler>
<resource-handler>org.omnifaces.resourcehandler.UnmappedResourceHandler</resource-handler>
</application>
</faces-config>
4 changes: 4 additions & 0 deletions integration-tests/jakarta-ee/src/main/webapp/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@
<param-name>org.omnifaces.FACES_VIEWS_SCAN_PATHS</param-name>
<param-value>/*.xhtml</param-value>
</context-param>
<context-param>
<param-name>com.flowlogix.add-unmapped-resources</param-name>
<param-value>true</param-value>
</context-param>
<context-param>
<param-name>org.apache.shiro.ee.disabled</param-name>
<param-value>false</param-value>
Expand Down
1 change: 1 addition & 0 deletions ...tion-tests/jakarta-ee/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mock-maker-inline
23 changes: 21 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@
<!-- Test 3rd-party dependencies: -->
<easymock.version>5.2.0</easymock.version>
<mockito.version>5.5.0</mockito.version>
<mockito-inline.version>5.2.0</mockito-inline.version>
<bytebuddy.version>1.14.8</bytebuddy.version>
<gmaven.version>3.0.0</gmaven.version>
<groovy.version>4.0.13</groovy.version>
<groovy.version>4.0.15</groovy.version>
<junit.version>5.10.0</junit.version>
<junit.server.jetty.version>3.0.0</junit.server.jetty.version>
<hibernate.version>5.6.15.Final</hibernate.version>
Expand Down Expand Up @@ -343,6 +343,7 @@
<exclude>**/target/**</exclude>
<exclude>**/nb-configuration.xml</exclude>
<exclude>**/faces-config.NavData</exclude>
<exclude>**/org.mockito.plugins.MockMaker</exclude>
</excludes>
</configuration>
</plugin>
Expand Down Expand Up @@ -606,6 +607,13 @@
<arg>-Xlint:deprecation</arg>
<arg>-Xlint:unchecked</arg>
</compilerArgs>
<annotationProcessorPaths>
<annotationProcessorPath>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>${aspectj.version}</version>
</annotationProcessorPath>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -1075,6 +1083,16 @@
<version>2.1.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>${bytebuddy.version}</version>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<version>${bytebuddy.version}</version>
</dependency>
<dependency>
<!-- used for the 'hashpass' command line tool: -->
<groupId>commons-cli</groupId>
Expand Down Expand Up @@ -1542,6 +1560,7 @@
<exclude>**/target/**</exclude>
<exclude>**/nb-configuration.xml</exclude>
<exclude>**/faces-config.NavData</exclude>
<exclude>**/org.mockito.plugins.MockMaker</exclude>
</excludes>
</configuration>
</plugin>
Expand Down
19 changes: 12 additions & 7 deletions support/cdi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,6 @@
<scope>test</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>${mockito-inline.version}</version>
<scope>test</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
Expand All @@ -86,6 +79,18 @@

<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
<annotationProcessorPath>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</annotationProcessorPath>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Expand Down
19 changes: 12 additions & 7 deletions support/jakarta-ee/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,6 @@
<scope>test</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>${mockito-inline.version}</version>
<scope>test</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
Expand All @@ -105,6 +98,18 @@

<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
<annotationProcessorPath>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</annotationProcessorPath>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Expand Down
9 changes: 4 additions & 5 deletions support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/FormResubmitSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import java.net.CookieManager;
import java.net.HttpCookie;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URLDecoder;
import java.net.http.HttpClient;
import java.net.http.HttpHeaders;
Expand Down Expand Up @@ -240,7 +239,7 @@ static String getReferer(HttpServletRequest request) {
* @param fallbackPath
* @param resubmit if true, attempt to resubmit the form that was unsubmitted prior to logout
*/
@SneakyThrows({IOException.class, URISyntaxException.class, InterruptedException.class})
@SneakyThrows({IOException.class, InterruptedException.class})
static void redirectToSaved(HttpServletRequest request, HttpServletResponse response,
FallbackPredicate useFallbackPath, String fallbackPath, boolean resubmit) {
String savedRequest = Servlets.getRequestCookie(request, WebUtils.SAVED_REQUEST_KEY);
Expand Down Expand Up @@ -268,7 +267,7 @@ static void redirectToSaved(HttpServletRequest request, HttpServletResponse resp


private static void doRedirectToSaved(HttpServletRequest request, HttpServletResponse response,
@NonNull String savedRequest, boolean resubmit) throws IOException, URISyntaxException, InterruptedException {
@NonNull String savedRequest, boolean resubmit) throws IOException, InterruptedException {
deleteCookie(response, request.getServletContext(), WebUtils.SAVED_REQUEST_KEY);
String savedFormDataKey = Servlets.getRequestCookie(request, SHIRO_FORM_DATA_KEY);
boolean doRedirectAtEnd = true;
Expand Down Expand Up @@ -358,7 +357,7 @@ static boolean isLoginUrl(HttpServletRequest request) {
static String resubmitSavedForm(@NonNull String savedFormData, @NonNull String savedRequest,
HttpServletRequest originalRequest, HttpServletResponse originalResponse,
ServletContext servletContext, boolean rememberedAjaxResubmit)
throws InterruptedException, URISyntaxException, IOException {
throws InterruptedException, IOException {
if (log.isDebugEnabled()) {
log.debug("saved form data: {}", savedFormData);
log.debug("Set Cookie Headers: {}", originalResponse.getHeaders(SET_COOKIE));
Expand Down Expand Up @@ -477,7 +476,7 @@ private static String resubmitResponseCleanup(HttpServletRequest originalRequest
}

private static HttpClient buildHttpClient(URI savedRequest, ServletContext servletContext,
HttpServletRequest originalRequest) throws URISyntaxException {
HttpServletRequest originalRequest) {
CookieManager cookieManager = new CookieManager();
var session = SecurityUtils.getSubject().getSession();
var sessionCookieName = getSessionCookieName(servletContext, SecurityUtils.getSecurityManager());
Expand Down