This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 3_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/3_0_X by this push:
new 60fbfb8ab4 Upgrading CodeQL actions, Swagger Core and
maven-compiler-plugins
60fbfb8ab4 is described below
commit 60fbfb8ab47ebeee763a5837f9b3aa42d15e4228
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Tue Dec 19 08:33:00 2023 +0100
Upgrading CodeQL actions, Swagger Core and maven-compiler-plugins
---
.github/workflows/codeql-analysis.yml | 4 ++--
.../syncope/client/console/pages/SAML2SPBeforeLogout.java | 14 +++++++++-----
pom.xml | 4 ++--
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/codeql-analysis.yml
b/.github/workflows/codeql-analysis.yml
index 3bb5eb3711..eb6c30a060 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -60,7 +60,7 @@ jobs:
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
- uses: github/codeql-action/init@v2
+ uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a
config file.
@@ -85,4 +85,4 @@ jobs:
mvn -T 1C -PskipTests,all
- name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v2
+ uses: github/codeql-action/analyze@v3
diff --git
a/ext/saml2sp4ui/client-console/src/main/java/org/apache/syncope/client/console/pages/SAML2SPBeforeLogout.java
b/ext/saml2sp4ui/client-console/src/main/java/org/apache/syncope/client/console/pages/SAML2SPBeforeLogout.java
index 2a7f5c0973..ecd1310c01 100644
---
a/ext/saml2sp4ui/client-console/src/main/java/org/apache/syncope/client/console/pages/SAML2SPBeforeLogout.java
+++
b/ext/saml2sp4ui/client-console/src/main/java/org/apache/syncope/client/console/pages/SAML2SPBeforeLogout.java
@@ -20,6 +20,7 @@ package org.apache.syncope.client.console.pages;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
+import java.util.Optional;
import org.apache.syncope.client.ui.commons.SAML2SP4UIConstants;
import org.apache.wicket.Session;
import org.apache.wicket.markup.html.WebPage;
@@ -35,12 +36,15 @@ public class SAML2SPBeforeLogout extends WebPage {
public SAML2SPBeforeLogout(final PageParameters parameters) {
super(parameters);
- String idpEntityId = URLEncoder.encode(
-
Session.get().getAttribute(SAML2SP4UIConstants.SAML2SP4UI_IDP_ENTITY_ID).toString(),
- StandardCharsets.UTF_8);
+ String queryString = Optional.ofNullable(
+
Session.get().getAttribute(SAML2SP4UIConstants.SAML2SP4UI_IDP_ENTITY_ID)).
+ map(idp -> "?" + SAML2SP4UIConstants.SAML2SP4UI_IDP_ENTITY_ID
+ + "=" + URLEncoder.encode(idp.toString(),
StandardCharsets.UTF_8)).
+ orElse("");
+
RequestCycle.get().scheduleRequestHandlerAfterCurrent(new
RedirectRequestHandler(
-
UrlUtils.rewriteToContextRelative(SAML2SP4UIConstants.URL_CONTEXT + "/logout"
- + "?" + SAML2SP4UIConstants.SAML2SP4UI_IDP_ENTITY_ID +
"=" + idpEntityId,
+ UrlUtils.rewriteToContextRelative(
+ SAML2SP4UIConstants.URL_CONTEXT + "/logout" +
queryString,
RequestCycle.get())));
}
}
diff --git a/pom.xml b/pom.xml
index b86cbd0333..00e45e4cee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -447,7 +447,7 @@ under the License.
<h2.version>2.2.224</h2.version>
- <swagger-core.version>2.2.19</swagger-core.version>
+ <swagger-core.version>2.2.20</swagger-core.version>
<swagger-ui.version>5.10.3</swagger-ui.version>
<jquery-slimscroll.version>1.3.8</jquery-slimscroll.version>
@@ -1471,7 +1471,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.11.0</version>
+ <version>3.12.0</version>
<configuration>
<release>${targetJdk}</release>
<useIncrementalCompilation>false</useIncrementalCompilation>
