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

More Jakarta progress #27732

Merged
merged 5 commits into from
Sep 5, 2022
Merged

More Jakarta progress #27732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f45d7c3
Jakarta - Switch to JAX-RS 3.1
gsmet Sep 5, 2022
30971c3
Jakarta - Upgrade authorization to 2.1.0 and authentication to 3.0.0
gsmet Sep 5, 2022
f6e059a
Upgrade to Servlet 6.0 and Websocket 2.1
gsmet Sep 5, 2022
ee395b1
Align Quarkus Security with CDI 4.0
gsmet Sep 5, 2022
7bc1bac
Jakarta - ClientEndpointConfig now includes SSLContext
gsmet Sep 5, 2022
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
5 changes: 5 additions & 0 deletions ...nt/runtime/src/main/java/io/quarkus/websockets/BearerTokenClientEndpointConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import java.util.List;
import java.util.Map;

import javax.net.ssl.SSLContext;
import javax.websocket.ClientEndpointConfig;
import javax.websocket.Decoder;
import javax.websocket.Encoder;
Expand Down Expand Up @@ -53,4 +54,8 @@ public List<Class<? extends Decoder>> getDecoders() {
public Map<String, Object> getUserProperties() {
return Collections.emptyMap();
}

public SSLContext getSSLContext() {
return null;
}
Comment on lines +58 to +60
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sberyozkin this one is interesting. ClientEndpointConfig introduces a new getSSLContext() method that should return a non-null SSLContext if you want to usee wss.
That being said, I have no idea how you are supposed to use this one? Should people only use the configurator?

}
20 changes: 8 additions & 12 deletions jakarta/rewrite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ recipeList:
# JAX-RS - See below for the specs
- org.openrewrite.maven.ChangePropertyValue:
key: resteasy.version
newValue: 6.0.3.Final
newValue: 6.1.0.Final
# JAXB - See below
# JSON - See below
# JSON Bind
Expand Down Expand Up @@ -134,15 +134,14 @@ recipeList:
# Security - See below
- org.openrewrite.maven.ChangePropertyValue:
key: quarkus-security.version
newValue: 2.0.0.Alpha1
newValue: 2.0.0.Alpha2
# Servlet
# TODO EE 10 6.0.0
- org.openrewrite.maven.ChangePropertyValue:
key: jakarta.servlet-api.version
newValue: 5.0.0
newValue: 6.0.0
- org.openrewrite.maven.ChangePropertyValue:
key: quarkus-http.version
newValue: 5.0.0.Alpha1
newValue: 5.0.0.Alpha2
# Transaction
- org.openrewrite.maven.ChangePropertyValue:
key: version.jta
Expand Down Expand Up @@ -171,10 +170,9 @@ recipeList:
key: hibernate-validator.version
newValue: 8.0.0.CR3
# Websockets
# TODO EE 10 2.1.0
- org.openrewrite.maven.ChangePropertyValue:
key: jakarta.websocket-api.version
newValue: 2.0.0
newValue: 2.1.0
# XML Bind
- org.openrewrite.maven.ChangePropertyValue:
key: jakarta.xml.bind-api.version
Expand Down Expand Up @@ -205,7 +203,7 @@ recipeList:
addIfMissing: true
- org.openrewrite.maven.ChangePropertyValue:
key: jakarta.ws.rs-api.version
newValue: 3.0.0
newValue: 3.1.0
addIfMissing: true
---
type: specs.openrewrite.org/v1beta/recipe
Expand Down Expand Up @@ -345,15 +343,13 @@ recipeList:
groupId: jakarta.authentication
artifactId: jakarta.authentication-api
version: "${jakarta.authentication-api}"
# TODO EE 10 2.1.0
- org.openrewrite.maven.ChangePropertyValue:
key: jakarta.authorization-api.version
newValue: 2.0.0
newValue: 2.1.0
addIfMissing: true
# TODO EE 10 3.0.0
- org.openrewrite.maven.ChangePropertyValue:
key: jakarta.authentication-api
newValue: 2.0.0
newValue: 3.0.0
addIfMissing: true
---
type: specs.openrewrite.org/v1beta/recipe
Expand Down
6 changes: 6 additions & 0 deletions jakarta/transform.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@ sed -i 's@<excludedArtifact>jakarta.xml.bind:jakarta.xml.bind-api</excludedArtif
sed -i 's@<excludedArtifact>jakarta.ws.rs:jakarta.ws.rs-api</excludedArtifact>@<excludedArtifact>org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_3.0_spec</excludedArtifact>\n <excludedArtifact>org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec</excludedArtifact>@g' extensions/resteasy-classic/resteasy-common/runtime/pom.xml
rm extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/{Target_org_jboss_resteasy_microprofile_config_FilterConfigSource.java,Target_org_jboss_resteasy_microprofile_config_ServletConfigSource.java,Target_org_jboss_resteasy_microprofile_config_ServletContextConfigSource.java,ServletMissing.java}
sed -i 's@<quarkus.rest-client-reactive.scope>javax.enterprise.context.Dependent</quarkus.rest-client-reactive.scope>@<quarkus.rest-client-reactive.scope>jakarta.enterprise.context.Dependent</quarkus.rest-client-reactive.scope>@g' tcks/microprofile-rest-client-reactive/pom.xml
sed -i '/public SSLContext getSSLContext() {/i \ \ \ \ @Override' extensions/websockets/client/runtime/src/main/java/io/quarkus/websockets/BearerTokenClientEndpointConfigurator.java

sed -i '[email protected]:[email protected]:narayana-lra-jakarta@g' extensions/narayana-lra/runtime/pom.xml
sed -i '[email protected]:[email protected]:lra-client-jakarta@g' extensions/narayana-lra/runtime/pom.xml
Expand Down Expand Up @@ -351,6 +352,11 @@ git fetch origin jakarta-10-cdi
JAKARTA_10_CDI_HASH=$(git rev-parse origin/jakarta-10-cdi)
git cherry-pick -x ${JAKARTA_10_CDI_HASH}

## JAX-RS/RESTEasy Reactive
git fetch origin jakarta-10-jaxrs
JAKARTA_10_JAXRS_HASH=$(git rev-parse origin/jakarta-10-jaxrs)
git cherry-pick -x ${JAKARTA_10_JAXRS_HASH}

# Build phase

if [ "${REWRITE_TESTS_CONTAINERS-false}" == "true" ]; then
Expand Down