From 2a383310b601935bb091f35a38351934f439d810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20LELEU?= <leleuj@gmail.com>
Date: Tue, 31 Oct 2023 09:56:54 +0100
Subject: [PATCH] minor adjustments

---
 README.md                                              |  1 +
 play-pac4j_2.13/pom.xml                                |  2 +-
 play-pac4j_3/pom.xml                                   |  2 +-
 pom.xml                                                | 10 ++++++++--
 .../src/main/java/org/pac4j/play/PlayWebContext.java   |  8 ++++++--
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index a0d0cf4e..3d657917 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,7 @@ It's based on the **[pac4j security engine](https://github.com/pac4j/pac4j)**. I
 
 | JDK  | Play version | pac4j version | play-pac4j version | Modules (Java & Scala)                          | Usage of Lombok | Status           |
 |------|--------------|---------------|--------------------|-------------------------------------------------|-----------------|------------------|
+| 17   | 2.9          | 6.x           | 12.0.x-PLAY2.9     | play-pac4j_2.12 play-pac4j_2.13                 | Yes             | In development   |
 | 17   | 2.8          | 6.x           | 12.0.x-PLAY2.8     | play-pac4j_2.12 play-pac4j_2.13                 | Yes             | In development   |
 | 11   | 2.8          | 5.x           | 11.0.x-PLAY2.8     | play-pac4j_2.12 play-pac4j_2.13                 | No              | Production ready |
 | 11   | 2.8          | 4.x           | 10.x               | play-pac4j_2.12 play-pac4j_2.13                 | No              | Production ready |
diff --git a/play-pac4j_2.13/pom.xml b/play-pac4j_2.13/pom.xml
index c3f93508..bea93854 100644
--- a/play-pac4j_2.13/pom.xml
+++ b/play-pac4j_2.13/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.pac4j</groupId>
         <artifactId>play-pac4j-parent</artifactId>
-        <version>12.0.0-PLAY2.9</version>
+        <version>12.0.0-PLAY2.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>play-pac4j_2.13</artifactId>
diff --git a/play-pac4j_3/pom.xml b/play-pac4j_3/pom.xml
index 1ddb1cce..0abaacd6 100644
--- a/play-pac4j_3/pom.xml
+++ b/play-pac4j_3/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.pac4j</groupId>
         <artifactId>play-pac4j-parent</artifactId>
-        <version>12.0.0-PLAY2.9</version>
+        <version>12.0.0-PLAY2.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>play-pac4j_3</artifactId>
diff --git a/pom.xml b/pom.xml
index 81d92634..359e710a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <artifactId>play-pac4j-parent</artifactId>
     <packaging>pom</packaging>
     <name>pac4j parent for Play</name>
-    <version>12.0.0-PLAY2.9</version>
+    <version>12.0.0-PLAY2.9-SNAPSHOT</version>
     <url>https://github.com/pac4j/play-pac4j</url>
 
     <licenses>
@@ -62,7 +62,7 @@
     </repositories>
 
     <properties>
-        <pac4j.version>6.0.0-RC8</pac4j.version>
+        <pac4j.version>6.0.0-RC10-SNAPSHOT</pac4j.version>
         <play.version>2.9.0</play.version>
         <java.version>17</java.version>
         <guice.version>6.0.0</guice.version>
@@ -87,6 +87,12 @@
             <groupId>org.pac4j</groupId>
             <artifactId>pac4j-core</artifactId>
             <version>${pac4j.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-databind</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.google.inject</groupId>
diff --git a/shared/src/main/java/org/pac4j/play/PlayWebContext.java b/shared/src/main/java/org/pac4j/play/PlayWebContext.java
index 07d832a5..d6633033 100644
--- a/shared/src/main/java/org/pac4j/play/PlayWebContext.java
+++ b/shared/src/main/java/org/pac4j/play/PlayWebContext.java
@@ -1,7 +1,5 @@
 package org.pac4j.play;
 
-import java.util.*;
-
 import org.pac4j.core.context.Cookie;
 import org.pac4j.core.context.WebContext;
 import org.pac4j.core.context.session.SessionStore;
@@ -20,6 +18,7 @@
 
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
+import java.util.*;
 
 /**
  * <p>This class is the web context for Play (used both for Java and Scala).</p>
@@ -237,6 +236,11 @@ public String getRequestContent() {
         return requestContent;
     }
 
+    @Override
+    public Optional<String> getQueryString() {
+        return Optional.ofNullable(CommonHelper.substringAfter(javaRequest.uri(), "?"));
+    }
+
     public Http.Session getNativeSession() {
         return session;
     }