Merge branch 'pac4j:master' into master

rayacode · Nov 28, 2024 · 4162651 · 4162651
2 parents 2bac619 + 9f3a3aa
commit 4162651
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
@@ -39,7 +39,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build]
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:

diff --git a/play-pac4j_2.13/pom.xml b/play-pac4j_2.13/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.scala-lang</groupId>
             <artifactId>scala-library</artifactId>
-            <version>2.13.14</version>
+            <version>2.13.15</version>
         </dependency>
 
         <!-- tests -->

diff --git a/play-pac4j_3/pom.xml b/play-pac4j_3/pom.xml
@@ -13,35 +13,41 @@
     <name>pac4j implementation for Play framework (Scala 3)</name>
     <description>Security library for Play framework based on pac4j using Scala 3</description>
 
+    <properties>
+        <scala.major.version>3</scala.major.version>
+        <scala.version>3.6.1</scala.version>
+        <scala.maven.version>3.3.3</scala.maven.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.playframework</groupId>
-            <artifactId>play_${scala.version}</artifactId>
+            <artifactId>play_${scala.major.version}</artifactId>
             <version>${play.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.playframework</groupId>
-            <artifactId>play-cache_${scala.version}</artifactId>
+            <artifactId>play-cache_${scala.major.version}</artifactId>
             <version>${play.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.scala-lang</groupId>
             <artifactId>scala3-library_3</artifactId>
-            <version>3.4.2</version>
+            <version>${scala.version}</version>
         </dependency>
 
         <!-- tests -->
         <dependency>
             <groupId>org.playframework</groupId>
-            <artifactId>play-test_${scala.version}</artifactId>
+            <artifactId>play-test_${scala.major.version}</artifactId>
             <version>${play.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.scalatest</groupId>
-            <artifactId>scalatest_${scala.version}</artifactId>
+            <artifactId>scalatest_${scala.major.version}</artifactId>
             <version>${scalatest.version}</version>
             <scope>test</scope>
         </dependency>

diff --git a/pom.xml b/pom.xml
@@ -52,8 +52,8 @@
     </repositories>
 
     <properties>
-        <pac4j.version>6.0.3</pac4j.version>
-        <play.version>3.0.4</play.version>
+        <pac4j.version>6.1.0</pac4j.version>
+        <play.version>3.0.5</play.version>
         <java.version>17</java.version>
         <guice.version>6.0.0</guice.version>
         <shiro.version>1.13.0</shiro.version>
@@ -63,7 +63,7 @@
         <scala.maven.version>2.13.12</scala.maven.version>
         <junit.version>4.13.2</junit.version>
         <selenium.version>4.14.1</selenium.version>
-        <mockito.version>5.12.0</mockito.version>
+        <mockito.version>5.14.2</mockito.version>
         <pmdVersion>6.55.0</pmdVersion>
     </properties>
 
@@ -105,7 +105,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.32</version>
+            <version>1.18.36</version>
         </dependency>
 
         <!-- tests -->
@@ -173,7 +173,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.7.0</version>
+                <version>3.11.1</version>
                 <configuration>
                     <charset>UTF-8</charset>
                     <encoding>UTF-8</encoding>
@@ -191,7 +191,7 @@
             <plugin>
                 <groupId>net.alchim31.maven</groupId>
                 <artifactId>scala-maven-plugin</artifactId>
-                <version>4.9.1</version>
+                <version>4.9.2</version>
                 <executions>
                     <execution>
                         <goals>
@@ -214,7 +214,7 @@
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
-                <version>4.8.5.0</version>
+                <version>4.8.6.6</version>
                 <configuration>
                     <effort>Low</effort>
                     <threshold>Max</threshold>
@@ -275,7 +275,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.5.2</version>
                 <configuration>
                     <includes>
                         <include>**/*Tests.java</include>
@@ -301,7 +301,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.2.4</version>
+                        <version>3.2.7</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>

diff --git a/shared/src/test/java/org/pac4j/play/filters/SecurityFilterTests.scala b/shared/src/test/java/org/pac4j/play/filters/SecurityFilterTests.scala
@@ -46,7 +46,7 @@ class SecurityFilterTests extends ScalaFutures with Results {
   def testThatSecurityFilterBlocksUnauthorizedRequests(): Unit = {
     implicit val ec = scala.concurrent.ExecutionContext.global
     implicit val as = ActorSystem("text-actor-system")
-    implicit val mat = ActorMaterializer()
+    implicit val mat: ActorMaterializer = ActorMaterializer()
 
     val securityFilter = prepareSecurityFilter(
       """