From df42edffd7ef383774ecdc8ae52990c382ab9042 Mon Sep 17 00:00:00 2001 From: jim-krueger Date: Wed, 24 Jan 2024 16:26:02 -0600 Subject: [PATCH 1/2] Deprecate both @Context and @Suspended --- .../src/main/java/jakarta/ws/rs/container/Suspended.java | 4 +++- jaxrs-api/src/main/java/jakarta/ws/rs/core/Context.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/jaxrs-api/src/main/java/jakarta/ws/rs/container/Suspended.java b/jaxrs-api/src/main/java/jakarta/ws/rs/container/Suspended.java index fba0a462c..d1d7038b8 100644 --- a/jaxrs-api/src/main/java/jakarta/ws/rs/container/Suspended.java +++ b/jaxrs-api/src/main/java/jakarta/ws/rs/container/Suspended.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2024 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -76,7 +76,9 @@ * * @author Marek Potociar * @since 2.0 + * @deprecated This class will be removed in a future version. Better align with Jakarta CDI. */ +@Deprecated(forRemoval = true) @Target({ ElementType.PARAMETER }) @Retention(RetentionPolicy.RUNTIME) @Documented diff --git a/jaxrs-api/src/main/java/jakarta/ws/rs/core/Context.java b/jaxrs-api/src/main/java/jakarta/ws/rs/core/Context.java index 10fd7b658..48758aa55 100644 --- a/jaxrs-api/src/main/java/jakarta/ws/rs/core/Context.java +++ b/jaxrs-api/src/main/java/jakarta/ws/rs/core/Context.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2024 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -38,7 +38,9 @@ * @see SecurityContext * @see jakarta.ws.rs.ext.Providers * @since 1.0 + * @deprecated This class will be removed in a future version. Better align with Jakarta CDI. */ +@Deprecated(forRemoval = true) @Target({ ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD }) @Retention(RetentionPolicy.RUNTIME) @Documented From f6dbe89d152e60148e42afb46872e7adce377024 Mon Sep 17 00:00:00 2001 From: jim-krueger Date: Wed, 24 Jan 2024 16:58:28 -0600 Subject: [PATCH 2/2] fix typo in yml file --- .github/workflows/maven-package.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven-package.yml b/.github/workflows/maven-package.yml index 4000c40e2..b3bfa858f 100644 --- a/.github/workflows/maven-package.yml +++ b/.github/workflows/maven-package.yml @@ -3,9 +3,9 @@ name: Jakarta REST CI on: push: - branches: [ '3.2.0-SNAPSHOT' ] + branches: [ 'release-3.2' ] pull_request: - branches: [ '3.2.0-SNAPSHOT' ] + branches: [ 'release-3.2' ] jobs: build: