Skip to content

Commit 6c1caa1

Browse files
pujavsjgomer2001moabuduttarnabdevrimyatar
authored
feat(jans): jetty 11 integration (#1123)
* feat: jetty upgrade * feat: jetty upgrade * feat: jetty upgrade * feat(jans-jetty-upgrade): orm changes to replace javax with jakarta * feat(jans-jetty-upgrade): orm changes to replace javax with jakarta * feat(jans-jetty-upgrade): orm changes to replace javax with jakarta * feat: jetty upgrade changes * feat: jetty upgrade changes * feat: removed unused dependency * feat: jans auth jetty upgrade - wip * feat: jetty upgrade code for jans-auth * feat(jans): jetty upgrade to version 11 * feat(jans) sync with main * feat(jans) sync with main * feat(jans-scim): jetty upgrade to version 11.0.8 * feat(jans): updated beans.xml to use jakarta cdi * feat(jans-auth-server): updated code to use jakarta lib * feat(jans-auth-server): updated code to use jakarta lib * feat(jans-auth): jetty upgrade xml schema changes * feat(jans-auth): jetty xml change for upgrade to version 11 * feat: jetty upgrade dependency and xml changes * feat(jans-auth): jetty upgrade changes wrt to faces * feat(jans-auth): jetty upgrade changes * feat: jetty upgrade changes * feat(jans-config-api): jetty upgrade changes * feat(jans-config-api): jetty upgrade changes * feat(jans-config_api): json related changes * feat(jans-eleven): jetty upgrade changes * feat(jans-fido2): jetty upgrade changes * feat(jans-notify): jetty upgrade changes * feat(jans-notify): jetty upgrade changes * feat(jans-client-api): jetty upgrade changes * feat(jans-config-api): jetty upgrade changes * feat(jans-config-api): jetty upgrade changes * feat(jans): dependency changes to solve sonar issue * feat(jans-config-api): dependency changes to solve sonar issue * feat(jans-config-api): dependency changes to solve sonar issue * feat(jans): dependency changes to solve sonar issue * feat(jans-config-api): dependency changes to solve sonar issue * chore: rename pom versions to avoid rewriting existing artifacts * feat: bom and orm jetty upgrade changed * feat(jans-orm): orm jetty upgrade changed * feat(jans-core): orm jetty upgrade changed * feat(jans-core): jetty upgrade changed * feat(jans-core): jetty upgrade changed * feat(jans-fido2): jetty upgrade changed * feat(jans-scim): jetty upgrade changed * feat(jans-notify): jetty upgrade changed * feat(jans-auth-server): jetty upgrade changed * feat(jans-eleven): jetty upgrade changed * feat(jans-auth-server): jetty upgrade changed * feat(jans-auth-server): jetty upgrade changed * feat(jans-auth-server): jetty upgrade changed * feat(jans-auth-server): jetty upgrade changed * feat(jans-auth-server): jetty upgrade changed * feat(jans-config-api): jetty upgrade changes * feat(jans-client-api): jetty upgrade changes * feat(jans-client-api): jetty upgrade changes * fix: update base jetty version * fix: update jackson patch Addresses CVE-2020-36518 * ci: update autobuild * fix: correcting built errors * feat(jans-auth): jetty upgrade changes * feat: jans-linux-setup jetty-11 deployment * fix: jans-linux-setup download jetty-11 war files * feat(jans-config-api): swagger spec changes to fix get LDAP config by name issue * fix: jans-linux-setup avoid installing jython pip * Revert "fix: jans-linux-setup avoid installing jython pip" This reverts commit a75d8e6. * fix(jans-auth-server): adapted registration code to jakarta #951 * fix(jans-config-api): adapted code to jakarta #951 * feat: fixed merge with main code for jetty upgrade * feat(jans-config-api): fixed sonar quality gate and cache and client patch issue * feat(jans-config-api): fixed cache and client patch issue, sonarqube code smells * feat(jans-config-api): code syn with main * fix: modify poms to 1.0.0-SNAPSHOT Co-authored-by: Jose <bonustrack310@gmail.com> Co-authored-by: Mohammad Abudayyeh <47318409+moabu@users.noreply.github.com> Co-authored-by: Arnab Dutta <arnab.bdutta@gmail.com> Co-authored-by: Mustafa Baser <mbaser@mail.com> Co-authored-by: YuriyZ <yzabrovarniy@gmail.com>
1 parent 230f987 commit 6c1caa1

1,036 files changed

Lines changed: 4769 additions & 4671 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docker-jans-auth-server/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN apk update \
1515
# Jetty
1616
# =====
1717

18-
ARG JETTY_VERSION=10.0.6
18+
ARG JETTY_VERSION=11.0.8
1919
ARG JETTY_HOME=/opt/jetty
2020
ARG JETTY_BASE=/opt/jans/jetty
2121
ARG JETTY_USER_HOME_LIB=/home/jetty/lib

‎docker-jans-config-api/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN apk update \
1515
# Jetty
1616
# =====
1717

18-
ARG JETTY_VERSION=10.0.6
18+
ARG JETTY_VERSION=11.0.8
1919
ARG JETTY_HOME=/opt/jetty
2020
ARG JETTY_BASE=/opt/jans/jetty
2121
ARG JETTY_USER_HOME_LIB=/home/jetty/lib

‎docker-jans-fido2/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN apk update \
1515
# Jetty
1616
# =====
1717

18-
ARG JETTY_VERSION=10.0.6
18+
ARG JETTY_VERSION=11.0.8
1919
ARG JETTY_HOME=/opt/jetty
2020
ARG JETTY_BASE=/opt/jans/jetty
2121
ARG JETTY_USER_HOME_LIB=/home/jetty/lib

‎docker-jans-scim/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN apk update \
1515
# Jetty
1616
# =====
1717

18-
ARG JETTY_VERSION=10.0.6
18+
ARG JETTY_VERSION=11.0.8
1919
ARG JETTY_HOME=/opt/jetty
2020
ARG JETTY_BASE=/opt/jans/jetty
2121
ARG JETTY_USER_HOME_LIB=/home/jetty/lib

‎jans-auth-server/client/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@
210210
</dependency>
211211

212212
<dependency>
213-
<groupId>javax.servlet</groupId>
214-
<artifactId>javax.servlet-api</artifactId>
213+
<groupId>jakarta.servlet</groupId>
214+
<artifactId>jakarta.servlet-api</artifactId>
215215
<scope>test</scope>
216216
</dependency>
217217

‎jans-auth-server/client/src/main/java/io/jans/as/client/AuthorizationResponse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.json.JSONException;
2121
import org.json.JSONObject;
2222

23-
import javax.ws.rs.core.Response;
23+
import jakarta.ws.rs.core.Response;
2424
import java.io.UnsupportedEncodingException;
2525
import java.net.URLDecoder;
2626
import java.nio.charset.StandardCharsets;

‎jans-auth-server/client/src/main/java/io/jans/as/client/AuthorizeClient.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
import org.jboss.resteasy.client.jaxrs.ClientHttpEngine;
1616
import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
1717

18-
import javax.ws.rs.HttpMethod;
19-
import javax.ws.rs.client.ClientBuilder;
20-
import javax.ws.rs.client.Entity;
21-
import javax.ws.rs.client.Invocation.Builder;
22-
import javax.ws.rs.core.MediaType;
18+
import jakarta.ws.rs.HttpMethod;
19+
import jakarta.ws.rs.client.ClientBuilder;
20+
import jakarta.ws.rs.client.Entity;
21+
import jakarta.ws.rs.client.Invocation.Builder;
22+
import jakarta.ws.rs.core.MediaType;
2323
import java.util.ArrayList;
2424
import java.util.List;
2525

‎jans-auth-server/client/src/main/java/io/jans/as/client/BackchannelAuthenticationClient.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
import org.apache.log4j.Logger;
1414
import org.json.JSONObject;
1515

16-
import javax.ws.rs.HttpMethod;
17-
import javax.ws.rs.client.Entity;
18-
import javax.ws.rs.client.Invocation.Builder;
16+
import jakarta.ws.rs.HttpMethod;
17+
import jakarta.ws.rs.client.Entity;
18+
import jakarta.ws.rs.client.Invocation.Builder;
1919

2020
import static io.jans.as.model.ciba.BackchannelAuthenticationResponseParam.AUTH_REQ_ID;
2121
import static io.jans.as.model.ciba.BackchannelAuthenticationResponseParam.EXPIRES_IN;

‎jans-auth-server/client/src/main/java/io/jans/as/client/BackchannelAuthenticationRequest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import io.jans.as.model.util.QueryBuilder;
1212
import io.jans.as.model.util.Util;
1313

14-
import javax.ws.rs.core.MediaType;
14+
import jakarta.ws.rs.core.MediaType;
1515
import java.util.List;
1616

1717
/**

‎jans-auth-server/client/src/main/java/io/jans/as/client/BackchannelAuthenticationResponse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.json.JSONException;
1313
import org.json.JSONObject;
1414

15-
import javax.ws.rs.core.Response;
15+
import jakarta.ws.rs.core.Response;
1616

1717
import static io.jans.as.model.ciba.BackchannelAuthenticationResponseParam.AUTH_REQ_ID;
1818
import static io.jans.as.model.ciba.BackchannelAuthenticationResponseParam.EXPIRES_IN;

0 commit comments

Comments
 (0)