From ad35f4a357258351673724e3fd86cb76f54d6430 Mon Sep 17 00:00:00 2001 From: "yasmin.aumeeruddy" Date: Mon, 14 Apr 2025 11:16:13 +0100 Subject: [PATCH 1/8] Add MicroProfile 7.1 feature --- ...openliberty.internal.mpVersion-7.1.feature | 9 +++++++ .../io.openliberty.microProfile-7.0.feature | 25 +++++++++++++++++++ ...io.openliberty.microProfile-7.0.properties | 19 ++++++++++++++ ...openliberty.microProfile-7.0_cs.properties | 19 ++++++++++++++ ...openliberty.microProfile-7.0_de.properties | 19 ++++++++++++++ ...openliberty.microProfile-7.0_es.properties | 19 ++++++++++++++ ...openliberty.microProfile-7.0_fr.properties | 19 ++++++++++++++ ...openliberty.microProfile-7.0_hu.properties | 19 ++++++++++++++ ...openliberty.microProfile-7.0_it.properties | 19 ++++++++++++++ ...openliberty.microProfile-7.0_ja.properties | 19 ++++++++++++++ ...openliberty.microProfile-7.0_ko.properties | 19 ++++++++++++++ ...openliberty.microProfile-7.0_pl.properties | 19 ++++++++++++++ ...nliberty.microProfile-7.0_pt_BR.properties | 19 ++++++++++++++ ...openliberty.microProfile-7.0_ro.properties | 19 ++++++++++++++ ...openliberty.microProfile-7.0_ru.properties | 19 ++++++++++++++ ...openliberty.microProfile-7.0_zh.properties | 19 ++++++++++++++ ...nliberty.microProfile-7.0_zh_TW.properties | 19 ++++++++++++++ 17 files changed, 319 insertions(+) create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.mpVersion-7.1.feature create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/io.openliberty.microProfile-7.0.feature create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0.properties create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_cs.properties create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_de.properties create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_es.properties create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_fr.properties create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_hu.properties create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_it.properties create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_ja.properties create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_ko.properties create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_pl.properties create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_pt_BR.properties create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_ro.properties create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_ru.properties create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_zh.properties create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_zh_TW.properties diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.mpVersion-7.1.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.mpVersion-7.1.feature new file mode 100644 index 000000000000..62a1ee08ea7a --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.mpVersion-7.1.feature @@ -0,0 +1,9 @@ +-include= ~${workspace}/cnf/resources/bnd/feature.props +symbolicName=io.openliberty.internal.mpVersion-7.1 +visibility=private +singleton=true +-features=io.openliberty.mpCompatible-7.1 +kind=noship +edition=full +WLP-Activation-Type: parallel +WLP-Platform: microProfile-7.1 \ No newline at end of file diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/io.openliberty.microProfile-7.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/io.openliberty.microProfile-7.0.feature new file mode 100644 index 000000000000..eac226d9771c --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/io.openliberty.microProfile-7.0.feature @@ -0,0 +1,25 @@ +-include= ~${workspace}/cnf/resources/bnd/feature.props +symbolicName=io.openliberty.microProfile-7.1 +visibility=public +singleton=true +IBM-App-ForceRestart: install, \ + uninstall +IBM-ShortName: microProfile-7.1 +Subsystem-Name: MicroProfile 7.1 +-features=\ + io.openliberty.cdi-4.0; ibm.tolerates:="4.1", \ + io.openliberty.jsonb-3.0, \ + io.openliberty.jsonp-2.1, \ + io.openliberty.restfulWS-3.1; ibm.tolerates:="4.0", \ + io.openliberty.restfulWSClient-3.1; ibm.tolerates:="4.0", \ + io.openliberty.mpCompatible-7.1, \ + io.openliberty.mpConfig-3.1, \ + io.openliberty.mpHealth-4.0, \ + io.openliberty.mpOpenAPI-4.0, \ + io.openliberty.mpFaultTolerance-4.1, \ + io.openliberty.mpJwt-2.1, \ + io.openliberty.mpRestClient-4.0, \ + io.openliberty.mpTelemetry-2.0 +kind=noship +edition=full +WLP-InstantOn-Enabled: true diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0.properties new file mode 100644 index 000000000000..f6580d2e3429 --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0.properties @@ -0,0 +1,19 @@ +############################################################################### +# Copyright (c) 2018 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=This feature combines the Liberty features that support MicroProfile 7.1 for Cloud Native Java. diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_cs.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_cs.properties new file mode 100644 index 000000000000..985a0c0b24f4 --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_cs.properties @@ -0,0 +1,19 @@ +############################################################################### +# Copyright (c) 2018 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=Tato funkce kombinuje funkce Liberty , kter\u00e9 podporuj\u00ed MicroProfile 7.1 pro Cloud Native Java. diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_de.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_de.properties new file mode 100644 index 000000000000..370e89d6290b --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_de.properties @@ -0,0 +1,19 @@ +############################################################################### +# Copyright (c) 2018 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=Dieses Feature kombiniert die Liberty -Features, die MicroProfile 7.1 f\u00fcr Cloud Native Java unterst\u00fctzen. diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_es.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_es.properties new file mode 100644 index 000000000000..460c6a6416dd --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_es.properties @@ -0,0 +1,19 @@ +############################################################################### +# Copyright (c) 2018 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=Esta caracter\u00edstica combina las caracter\u00edsticas de Liberty que dan soporte a MicroProfile 7.1 for Cloud Native Java. diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_fr.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_fr.properties new file mode 100644 index 000000000000..55d156bc3765 --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_fr.properties @@ -0,0 +1,19 @@ +############################################################################### +# Copyright (c) 2018 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=Cette fonction combine les fonctions Liberty qui prennent en charge MicroProfile 7.1 pour Cloud Native Java. diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_hu.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_hu.properties new file mode 100644 index 000000000000..f6580d2e3429 --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_hu.properties @@ -0,0 +1,19 @@ +############################################################################### +# Copyright (c) 2018 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=This feature combines the Liberty features that support MicroProfile 7.1 for Cloud Native Java. diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_it.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_it.properties new file mode 100644 index 000000000000..12574c7866dc --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_it.properties @@ -0,0 +1,19 @@ +############################################################################### +# Copyright (c) 2018 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=Questa funzione unisce le funzioni Liberty che supportano MicroProfile 7.1 per Cloud Native Java. diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_ja.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_ja.properties new file mode 100644 index 000000000000..26e94aa8dbca --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_ja.properties @@ -0,0 +1,19 @@ +############################################################################### +# Copyright (c) 2018 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=\u3053\u306e\u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u306f\u3001 MicroProfile 7.1 for Cloud Native Java \u3092\u30b5\u30dd\u30fc\u30c8\u3059\u308b Liberty \u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u3092\u7d50\u5408\u3057\u307e\u3059\u3002 diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_ko.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_ko.properties new file mode 100644 index 000000000000..abdd1e9d8671 --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_ko.properties @@ -0,0 +1,19 @@ +############################################################################### +# Copyright (c) 2018 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=\uc774 \uae30\ub2a5\uc740 Cloud Native Java\uc6a9 MicroProfile 7.1 \uc744 \uc9c0\uc6d0\ud558\ub294 Liberty \uae30\ub2a5\uc744 \uacb0\ud569\ud569\ub2c8\ub2e4. diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_pl.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_pl.properties new file mode 100644 index 000000000000..d3ad277d3937 --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_pl.properties @@ -0,0 +1,19 @@ +############################################################################### +# Copyright (c) 2018 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=Ten sk\u0142adnik \u0142\u0105czy sk\u0142adniki produktu Liberty , kt\u00f3re obs\u0142uguj\u0105 produkt MicroProfile 7.1 for Cloud Native Java. diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_pt_BR.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_pt_BR.properties new file mode 100644 index 000000000000..80def3758c82 --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_pt_BR.properties @@ -0,0 +1,19 @@ +############################################################################### +# Copyright (c) 2018 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=Esse recurso combina os recursos do Liberty que suportam o MicroProfile 7.1 for Cloud Native Java. diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_ro.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_ro.properties new file mode 100644 index 000000000000..6d62b2556066 --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_ro.properties @@ -0,0 +1,19 @@ +############################################################################### +# Copyright (c) 2018 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=Aceast\u0103 caracteristic\u0103 combin\u0103 caracteristicile Liberty care suport\u0103 MicroProfile 7.1 pentru Cloud Native Java. diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_ru.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_ru.properties new file mode 100644 index 000000000000..b829c43d3646 --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_ru.properties @@ -0,0 +1,19 @@ +############################################################################### +# Copyright (c) 2018 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=\u042d\u0442\u0430 \u0444\u0443\u043d\u043a\u0446\u0438\u044f \u043e\u0431\u044a\u0435\u0434\u0438\u043d\u044f\u0435\u0442 \u0444\u0443\u043d\u043a\u0446\u0438\u0438 Liberty , \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u044e\u0442 MicroProfile 7.1 for Cloud Native Java. diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_zh.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_zh.properties new file mode 100644 index 000000000000..dedf7346238c --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_zh.properties @@ -0,0 +1,19 @@ +############################################################################### +# Copyright (c) 2018 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=\u6b64\u529f\u80fd\u90e8\u4ef6\u7ec4\u5408\u4e86\u652f\u6301 MicroProfile 7.1 for Cloud Native Java \u7684 Liberty \u529f\u80fd\u90e8\u4ef6\u3002 diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_zh_TW.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_zh_TW.properties new file mode 100644 index 000000000000..5ac4d94686ce --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_zh_TW.properties @@ -0,0 +1,19 @@ +############################################################################### +# Copyright (c) 2018 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +# +#ISMESSAGEFILE FALSE +#NLS_ENCODING=UNICODE +#NLS_MESSAGEFORMAT_NONE +# + +description=\u9019\u9805\u7279\u6027\u7d50\u5408\u4e86\u652f\u63f4 MicroProfile 7.1 for Cloud Native Java \u7684 Liberty \u7279\u6027\u3002 From 5ab7ed6b1a761032182130f036104d4547541348 Mon Sep 17 00:00:00 2001 From: "yasmin.aumeeruddy" Date: Mon, 14 Apr 2025 11:26:20 +0100 Subject: [PATCH 2/8] Add MicroProfile 7.1 repeat actions --- .../rules/repeater/MicroProfileActions.java | 48 ++++++++++++++++++- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/dev/fattest.simplicity/src/componenttest/rules/repeater/MicroProfileActions.java b/dev/fattest.simplicity/src/componenttest/rules/repeater/MicroProfileActions.java index 3189c7728f7d..a6eb2d9981d4 100644 --- a/dev/fattest.simplicity/src/componenttest/rules/repeater/MicroProfileActions.java +++ b/dev/fattest.simplicity/src/componenttest/rules/repeater/MicroProfileActions.java @@ -315,6 +315,25 @@ public class MicroProfileActions { "mpReactiveMessaging-3.0", //standalone "mpReactiveStreams-3.0" };//standalone + private static final String[] MP71_EE10_FEATURES_ARRAY = { "microProfile-7.1", + "cdi-4.0", //ee10 + "restfulWS-3.1", //ee10 + "restfulWSClient-3.1", //ee10 + "jsonb-3.0", //ee10 + "jsonp-2.1", //ee10 + "mpConfig-3.1", + "mpFaultTolerance-4.1", + "mpHealth-4.0", + "mpJwt-2.1", + "mpOpenAPI-4.0", //TODO : update to 4.1 + "mpTelemetry-2.0", //TODO : update to 2.1 + "mpRestClient-4.0", + "mpMetrics-5.1", //standalone + "mpContextPropagation-1.3", //standalone + "mpGraphQL-2.0", //standalone + "mpReactiveMessaging-3.0", //standalone + "mpReactiveStreams-3.0" };//standalone + private static final String[] MP70_EE11_FEATURES_ARRAY = { "microProfile-7.0", "cdi-4.1", //ee11 "restfulWS-4.0", //ee11 @@ -334,6 +353,25 @@ public class MicroProfileActions { "mpReactiveMessaging-3.0", //standalone "mpReactiveStreams-3.0" };//standalone + private static final String[] MP71_EE11_FEATURES_ARRAY = { "microProfile-7.1", + "cdi-4.1", //ee11 + "restfulWS-4.0", //ee11 + "restfulWSClient-4.0", //ee11 + "jsonb-3.0", //ee11 + "jsonp-2.1", //ee11 + "mpConfig-3.1", + "mpFaultTolerance-4.1", + "mpHealth-4.0", + "mpJwt-2.1", + "mpOpenAPI-4.0", //TODO : update to 4.1 + "mpTelemetry-2.0", //TODO : update to 2.1 + "mpRestClient-4.0", + "mpMetrics-5.1", //standalone + "mpContextPropagation-1.3", //standalone + "mpGraphQL-2.0", //standalone + "mpReactiveMessaging-3.0", //standalone + "mpReactiveStreams-3.0" };//standalone + private static final Set MP10_FEATURE_SET = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(MP10_FEATURES_ARRAY))); private static final Set MP12_FEATURE_SET = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(MP12_FEATURES_ARRAY))); private static final Set MP13_FEATURE_SET = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(MP13_FEATURES_ARRAY))); @@ -351,6 +389,8 @@ public class MicroProfileActions { private static final Set MP61_FEATURE_SET = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(MP61_FEATURES_ARRAY))); private static final Set MP70_EE10_FEATURE_SET = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(MP70_EE10_FEATURES_ARRAY))); private static final Set MP70_EE11_FEATURE_SET = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(MP70_EE11_FEATURES_ARRAY))); + private static final Set MP71_EE10_FEATURE_SET = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(MP71_EE10_FEATURES_ARRAY))); + private static final Set MP71_EE11_FEATURE_SET = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(MP71_EE11_FEATURES_ARRAY))); //The FeatureSet IDs. Since these will be used as the RepeatAction IDs, they can also be used in annotations such as @SkipForRepeat public static final String MP10_ID = EE7FeatureReplacementAction.ID + "_MicroProfile_10"; @@ -370,6 +410,8 @@ public class MicroProfileActions { public static final String MP61_ID = JakartaEE10Action.ID + "_MicroProfile_61"; public static final String MP70_EE10_ID = JakartaEE10Action.ID + "_MicroProfile_70"; public static final String MP70_EE11_ID = JakartaEE11Action.ID + "_MicroProfile_70"; + public static final String MP71_EE10_ID = JakartaEE10Action.ID + "_MicroProfile_71"; + public static final String MP71_EE11_ID = JakartaEE11Action.ID + "_MicroProfile_71"; public static final String MP70_EE11_APP_MODE_ID = MP70_EE11_ID + "_App_Mode"; //The MicroProfile FeatureSets @@ -390,10 +432,12 @@ public class MicroProfileActions { public static final FeatureSet MP61 = new FeatureSet(MP61_ID, MP61_FEATURE_SET, EEVersion.EE10); public static final FeatureSet MP70_EE10 = new FeatureSet(MP70_EE10_ID, MP70_EE10_FEATURE_SET, EEVersion.EE10); public static final FeatureSet MP70_EE11 = new FeatureSet(MP70_EE11_ID, MP70_EE11_FEATURE_SET, EEVersion.EE11); + public static final FeatureSet MP71_EE10 = new FeatureSet(MP71_EE10_ID, MP71_EE10_FEATURE_SET, EEVersion.EE10); + public static final FeatureSet MP71_EE11 = new FeatureSet(MP71_EE11_ID, MP71_EE11_FEATURE_SET, EEVersion.EE11); public static final FeatureSet MP70_EE11_APP_MODE = new FeatureSet(MP70_EE11_APP_MODE_ID, MP70_EE11_FEATURE_SET, EEVersion.EE11); - //All MicroProfile FeatureSets - must be descending order - private static final FeatureSet[] ALL_SETS_ARRAY = { MP70_EE11, MP70_EE10, MP61, MP60, MP50, MP41, MP40, MP33, MP32, MP30, MP22, MP21, MP20, MP14, MP13, MP12, MP10 }; + //All MicroProfile FeatureSets - must be descending order + private static final FeatureSet[] ALL_SETS_ARRAY = { MP70_EE11, MP70_EE10, MP61, MP60, MP50, MP41, MP40, MP33, MP32, MP30, MP22, MP21, MP20, MP14, MP13, MP12, MP10 }; //TODO : Add MP71 public static final List ALL = Collections.unmodifiableList(Arrays.asList(ALL_SETS_ARRAY)); /** From 918c0a8019dee1f33be54d8cf1e3913303799c9a Mon Sep 17 00:00:00 2001 From: "yasmin.aumeeruddy" Date: Mon, 14 Apr 2025 14:18:31 +0100 Subject: [PATCH 3/8] Add MicroProfile 7.1 compatible feature --- .../private/io.openliberty.mpCompatible-7.1.feature | 8 ++++++++ ....0.feature => io.openliberty.microProfile-7.1.feature} | 0 ...perties => io.openliberty.microProfile-7.1.properties} | 0 ...ties => io.openliberty.microProfile-7.1_cs.properties} | 0 ...ties => io.openliberty.microProfile-7.1_de.properties} | 0 ...ties => io.openliberty.microProfile-7.1_es.properties} | 0 ...ties => io.openliberty.microProfile-7.1_fr.properties} | 0 ...ties => io.openliberty.microProfile-7.1_hu.properties} | 0 ...ties => io.openliberty.microProfile-7.1_it.properties} | 0 ...ties => io.openliberty.microProfile-7.1_ja.properties} | 0 ...ties => io.openliberty.microProfile-7.1_ko.properties} | 0 ...ties => io.openliberty.microProfile-7.1_pl.properties} | 0 ...s => io.openliberty.microProfile-7.1_pt_BR.properties} | 0 ...ties => io.openliberty.microProfile-7.1_ro.properties} | 0 ...ties => io.openliberty.microProfile-7.1_ru.properties} | 0 ...ties => io.openliberty.microProfile-7.1_zh.properties} | 0 ...s => io.openliberty.microProfile-7.1_zh_TW.properties} | 0 17 files changed, 8 insertions(+) create mode 100644 dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.mpCompatible-7.1.feature rename dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/{io.openliberty.microProfile-7.0.feature => io.openliberty.microProfile-7.1.feature} (100%) rename dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/{io.openliberty.microProfile-7.0.properties => io.openliberty.microProfile-7.1.properties} (100%) rename dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/{io.openliberty.microProfile-7.0_cs.properties => io.openliberty.microProfile-7.1_cs.properties} (100%) rename dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/{io.openliberty.microProfile-7.0_de.properties => io.openliberty.microProfile-7.1_de.properties} (100%) rename dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/{io.openliberty.microProfile-7.0_es.properties => io.openliberty.microProfile-7.1_es.properties} (100%) rename dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/{io.openliberty.microProfile-7.0_fr.properties => io.openliberty.microProfile-7.1_fr.properties} (100%) rename dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/{io.openliberty.microProfile-7.0_hu.properties => io.openliberty.microProfile-7.1_hu.properties} (100%) rename dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/{io.openliberty.microProfile-7.0_it.properties => io.openliberty.microProfile-7.1_it.properties} (100%) rename dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/{io.openliberty.microProfile-7.0_ja.properties => io.openliberty.microProfile-7.1_ja.properties} (100%) rename dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/{io.openliberty.microProfile-7.0_ko.properties => io.openliberty.microProfile-7.1_ko.properties} (100%) rename dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/{io.openliberty.microProfile-7.0_pl.properties => io.openliberty.microProfile-7.1_pl.properties} (100%) rename dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/{io.openliberty.microProfile-7.0_pt_BR.properties => io.openliberty.microProfile-7.1_pt_BR.properties} (100%) rename dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/{io.openliberty.microProfile-7.0_ro.properties => io.openliberty.microProfile-7.1_ro.properties} (100%) rename dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/{io.openliberty.microProfile-7.0_ru.properties => io.openliberty.microProfile-7.1_ru.properties} (100%) rename dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/{io.openliberty.microProfile-7.0_zh.properties => io.openliberty.microProfile-7.1_zh.properties} (100%) rename dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/{io.openliberty.microProfile-7.0_zh_TW.properties => io.openliberty.microProfile-7.1_zh_TW.properties} (100%) diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.mpCompatible-7.1.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.mpCompatible-7.1.feature new file mode 100644 index 000000000000..c97c2facdf83 --- /dev/null +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.mpCompatible-7.1.feature @@ -0,0 +1,8 @@ +-include= ~${workspace}/cnf/resources/bnd/feature.props +symbolicName=io.openliberty.mpCompatible-7.1 +visibility=private +singleton=true +-features=com.ibm.websphere.appserver.eeCompatible-10.0; ibm.tolerates:="11.0" +kind=ga +edition=core +WLP-Activation-Type: parallel diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/io.openliberty.microProfile-7.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/io.openliberty.microProfile-7.1.feature similarity index 100% rename from dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/io.openliberty.microProfile-7.0.feature rename to dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/io.openliberty.microProfile-7.1.feature diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1.properties similarity index 100% rename from dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0.properties rename to dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1.properties diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_cs.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_cs.properties similarity index 100% rename from dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_cs.properties rename to dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_cs.properties diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_de.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_de.properties similarity index 100% rename from dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_de.properties rename to dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_de.properties diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_es.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_es.properties similarity index 100% rename from dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_es.properties rename to dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_es.properties diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_fr.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_fr.properties similarity index 100% rename from dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_fr.properties rename to dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_fr.properties diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_hu.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_hu.properties similarity index 100% rename from dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_hu.properties rename to dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_hu.properties diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_it.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_it.properties similarity index 100% rename from dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_it.properties rename to dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_it.properties diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_ja.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_ja.properties similarity index 100% rename from dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_ja.properties rename to dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_ja.properties diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_ko.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_ko.properties similarity index 100% rename from dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_ko.properties rename to dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_ko.properties diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_pl.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_pl.properties similarity index 100% rename from dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_pl.properties rename to dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_pl.properties diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_pt_BR.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_pt_BR.properties similarity index 100% rename from dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_pt_BR.properties rename to dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_pt_BR.properties diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_ro.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_ro.properties similarity index 100% rename from dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_ro.properties rename to dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_ro.properties diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_ru.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_ru.properties similarity index 100% rename from dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_ru.properties rename to dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_ru.properties diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_zh.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_zh.properties similarity index 100% rename from dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_zh.properties rename to dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_zh.properties diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_zh_TW.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_zh_TW.properties similarity index 100% rename from dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.0_zh_TW.properties rename to dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_zh_TW.properties From 6e3f4093b32588b3bb6ddccf1ecae99ca67ddd0f Mon Sep 17 00:00:00 2001 From: "yasmin.aumeeruddy" Date: Tue, 15 Apr 2025 09:57:47 +0100 Subject: [PATCH 4/8] Update MicroProfile 7.1 feature files --- .../private/io.openliberty.mpCompatible-7.1.feature | 4 ++-- .../l10n/io.openliberty.microProfile-7.1.properties | 9 ++------- .../l10n/io.openliberty.microProfile-7.1_cs.properties | 9 ++------- .../l10n/io.openliberty.microProfile-7.1_de.properties | 9 ++------- .../l10n/io.openliberty.microProfile-7.1_es.properties | 9 ++------- .../l10n/io.openliberty.microProfile-7.1_fr.properties | 9 ++------- .../l10n/io.openliberty.microProfile-7.1_hu.properties | 9 ++------- .../l10n/io.openliberty.microProfile-7.1_it.properties | 9 ++------- .../l10n/io.openliberty.microProfile-7.1_ja.properties | 9 ++------- .../l10n/io.openliberty.microProfile-7.1_ko.properties | 9 ++------- .../l10n/io.openliberty.microProfile-7.1_pl.properties | 9 ++------- .../io.openliberty.microProfile-7.1_pt_BR.properties | 9 ++------- .../l10n/io.openliberty.microProfile-7.1_ro.properties | 9 ++------- .../l10n/io.openliberty.microProfile-7.1_ru.properties | 9 ++------- .../l10n/io.openliberty.microProfile-7.1_zh.properties | 9 ++------- .../io.openliberty.microProfile-7.1_zh_TW.properties | 9 ++------- .../rules/repeater/MicroProfileActions.java | 2 +- 17 files changed, 33 insertions(+), 108 deletions(-) diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.mpCompatible-7.1.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.mpCompatible-7.1.feature index c97c2facdf83..5a6757562f4e 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.mpCompatible-7.1.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.mpCompatible-7.1.feature @@ -3,6 +3,6 @@ symbolicName=io.openliberty.mpCompatible-7.1 visibility=private singleton=true -features=com.ibm.websphere.appserver.eeCompatible-10.0; ibm.tolerates:="11.0" -kind=ga -edition=core +kind=noship +edition=full WLP-Activation-Type: parallel diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1.properties index f6580d2e3429..92d0e30b44cf 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1.properties +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1.properties @@ -1,15 +1,10 @@ -############################################################################### -# Copyright (c) 2018 IBM Corporation and others. +# Copyright (c) 2025 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 # -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### +# SPDX-License-Identifier: EPL-2.0 # #ISMESSAGEFILE FALSE #NLS_ENCODING=UNICODE diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_cs.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_cs.properties index 985a0c0b24f4..94f8b60717e4 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_cs.properties +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_cs.properties @@ -1,15 +1,10 @@ -############################################################################### -# Copyright (c) 2018 IBM Corporation and others. +# Copyright (c) 2025 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 # -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### +# SPDX-License-Identifier: EPL-2.0 # #ISMESSAGEFILE FALSE #NLS_ENCODING=UNICODE diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_de.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_de.properties index 370e89d6290b..16ef647d7f64 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_de.properties +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_de.properties @@ -1,15 +1,10 @@ -############################################################################### -# Copyright (c) 2018 IBM Corporation and others. +# Copyright (c) 2025 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 # -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### +# SPDX-License-Identifier: EPL-2.0 # #ISMESSAGEFILE FALSE #NLS_ENCODING=UNICODE diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_es.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_es.properties index 460c6a6416dd..773a5c5ea873 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_es.properties +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_es.properties @@ -1,15 +1,10 @@ -############################################################################### -# Copyright (c) 2018 IBM Corporation and others. +# Copyright (c) 2025 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 # -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### +# SPDX-License-Identifier: EPL-2.0 # #ISMESSAGEFILE FALSE #NLS_ENCODING=UNICODE diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_fr.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_fr.properties index 55d156bc3765..40c08d4eff81 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_fr.properties +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_fr.properties @@ -1,15 +1,10 @@ -############################################################################### -# Copyright (c) 2018 IBM Corporation and others. +# Copyright (c) 2025 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 # -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### +# SPDX-License-Identifier: EPL-2.0 # #ISMESSAGEFILE FALSE #NLS_ENCODING=UNICODE diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_hu.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_hu.properties index f6580d2e3429..92d0e30b44cf 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_hu.properties +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_hu.properties @@ -1,15 +1,10 @@ -############################################################################### -# Copyright (c) 2018 IBM Corporation and others. +# Copyright (c) 2025 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 # -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### +# SPDX-License-Identifier: EPL-2.0 # #ISMESSAGEFILE FALSE #NLS_ENCODING=UNICODE diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_it.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_it.properties index 12574c7866dc..c81ad64a4e4b 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_it.properties +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_it.properties @@ -1,15 +1,10 @@ -############################################################################### -# Copyright (c) 2018 IBM Corporation and others. +# Copyright (c) 2025 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 # -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### +# SPDX-License-Identifier: EPL-2.0 # #ISMESSAGEFILE FALSE #NLS_ENCODING=UNICODE diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_ja.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_ja.properties index 26e94aa8dbca..b46763e28284 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_ja.properties +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_ja.properties @@ -1,15 +1,10 @@ -############################################################################### -# Copyright (c) 2018 IBM Corporation and others. +# Copyright (c) 2025 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 # -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### +# SPDX-License-Identifier: EPL-2.0 # #ISMESSAGEFILE FALSE #NLS_ENCODING=UNICODE diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_ko.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_ko.properties index abdd1e9d8671..8a5b6bab18b4 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_ko.properties +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_ko.properties @@ -1,15 +1,10 @@ -############################################################################### -# Copyright (c) 2018 IBM Corporation and others. +# Copyright (c) 2025 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 # -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### +# SPDX-License-Identifier: EPL-2.0 # #ISMESSAGEFILE FALSE #NLS_ENCODING=UNICODE diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_pl.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_pl.properties index d3ad277d3937..2a9cd9a8c907 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_pl.properties +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_pl.properties @@ -1,15 +1,10 @@ -############################################################################### -# Copyright (c) 2018 IBM Corporation and others. +# Copyright (c) 2025 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 # -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### +# SPDX-License-Identifier: EPL-2.0 # #ISMESSAGEFILE FALSE #NLS_ENCODING=UNICODE diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_pt_BR.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_pt_BR.properties index 80def3758c82..a621610860d1 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_pt_BR.properties +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_pt_BR.properties @@ -1,15 +1,10 @@ -############################################################################### -# Copyright (c) 2018 IBM Corporation and others. +# Copyright (c) 2025 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 # -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### +# SPDX-License-Identifier: EPL-2.0 # #ISMESSAGEFILE FALSE #NLS_ENCODING=UNICODE diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_ro.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_ro.properties index 6d62b2556066..6ccb1a3389f4 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_ro.properties +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_ro.properties @@ -1,15 +1,10 @@ -############################################################################### -# Copyright (c) 2018 IBM Corporation and others. +# Copyright (c) 2025 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 # -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### +# SPDX-License-Identifier: EPL-2.0 # #ISMESSAGEFILE FALSE #NLS_ENCODING=UNICODE diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_ru.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_ru.properties index b829c43d3646..3c0ffab7c6f6 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_ru.properties +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_ru.properties @@ -1,15 +1,10 @@ -############################################################################### -# Copyright (c) 2018 IBM Corporation and others. +# Copyright (c) 2025 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 # -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### +# SPDX-License-Identifier: EPL-2.0 # #ISMESSAGEFILE FALSE #NLS_ENCODING=UNICODE diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_zh.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_zh.properties index dedf7346238c..df73b339404d 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_zh.properties +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_zh.properties @@ -1,15 +1,10 @@ -############################################################################### -# Copyright (c) 2018 IBM Corporation and others. +# Copyright (c) 2025 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 # -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### +# SPDX-License-Identifier: EPL-2.0 # #ISMESSAGEFILE FALSE #NLS_ENCODING=UNICODE diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_zh_TW.properties b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_zh_TW.properties index 5ac4d94686ce..eaf02fe2ca22 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_zh_TW.properties +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/microProfile-7.1/resources/l10n/io.openliberty.microProfile-7.1_zh_TW.properties @@ -1,15 +1,10 @@ -############################################################################### -# Copyright (c) 2018 IBM Corporation and others. +# Copyright (c) 2025 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 # -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### +# SPDX-License-Identifier: EPL-2.0 # #ISMESSAGEFILE FALSE #NLS_ENCODING=UNICODE diff --git a/dev/fattest.simplicity/src/componenttest/rules/repeater/MicroProfileActions.java b/dev/fattest.simplicity/src/componenttest/rules/repeater/MicroProfileActions.java index a6eb2d9981d4..7db1e674abcc 100644 --- a/dev/fattest.simplicity/src/componenttest/rules/repeater/MicroProfileActions.java +++ b/dev/fattest.simplicity/src/componenttest/rules/repeater/MicroProfileActions.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020, 2024 IBM Corporation and others. + * Copyright (c) 2020, 2025 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at From 8eb09f7d5a083ea7d03e5ab6ceefcf019040b924 Mon Sep 17 00:00:00 2001 From: "yasmin.aumeeruddy" Date: Wed, 16 Apr 2025 00:08:40 +0100 Subject: [PATCH 5/8] Update MicroProfile 7.1 feature files --- .../io.openliberty.internal.versionless.mpConfig-3.1.feature | 2 +- ...erty.internal.versionless.mpContextPropagation-1.3.feature | 2 +- ...nliberty.internal.versionless.mpFaultTolerance-4.1.feature | 2 +- .../io.openliberty.internal.versionless.mpGraphQL-2.0.feature | 2 +- .../io.openliberty.internal.versionless.mpHealth-4.0.feature | 2 +- .../io.openliberty.internal.versionless.mpJwt-2.1.feature | 2 +- .../io.openliberty.internal.versionless.mpMetrics-5.1.feature | 2 +- .../io.openliberty.internal.versionless.mpOpenAPI-4.0.feature | 2 +- ...berty.internal.versionless.mpReactiveMessaging-3.0.feature | 2 +- ...liberty.internal.versionless.mpReactiveStreams-3.0.feature | 2 +- ....openliberty.internal.versionless.mpRestClient-4.0.feature | 2 +- ...o.openliberty.internal.versionless.mpTelemetry-2.0.feature | 2 +- .../private/io.openliberty.microprofile.cdi.api-4.0.feature | 2 +- .../private/io.openliberty.microprofile.cdi.api-4.1.feature | 2 +- .../private/io.openliberty.mpHealth.4.0.ee-10.0.feature | 2 +- .../private/io.openliberty.mpHealth.4.0.ee-11.0.feature | 2 +- .../private/io.openliberty.mpTelemetry2.0.ee-10.0.feature | 2 +- .../private/io.openliberty.mpTelemetry2.0.ee-11.0.feature | 2 +- ...iberty.org.eclipse.microprofile.config.3.1.ee-10.0.feature | 2 +- ...iberty.org.eclipse.microprofile.config.3.1.ee-11.0.feature | 2 +- ...ty.org.eclipse.microprofile.contextpropagation-1.3.feature | 2 +- ...o.openliberty.org.eclipse.microprofile.graphql-2.0.feature | 2 +- ...io.openliberty.org.eclipse.microprofile.health-4.0.feature | 2 +- .../io.openliberty.org.eclipse.microprofile.jwt-2.1.feature | 2 +- ...o.openliberty.org.eclipse.microprofile.metrics-5.1.feature | 2 +- ...o.openliberty.org.eclipse.microprofile.openapi-4.0.feature | 2 +- ...ty.org.eclipse.microprofile.reactive.messaging-3.0.feature | 2 +- ...clipse.microprofile.reactive.streams.operators-3.0.feature | 2 +- .../public/mpConfig-3.1/io.openliberty.mpConfig-3.1.feature | 4 ++-- .../io.openliberty.mpContextPropagation-1.3.feature | 4 ++-- .../io.openliberty.mpFaultTolerance-4.1.feature | 4 ++-- .../public/mpGraphQL-2.0/io.openliberty.mpGraphQL-2.0.feature | 2 +- .../public/mpHealth-4.0/io.openliberty.mpHealth-4.0.feature | 2 +- .../public/mpJwt-2.1/io.openliberty.mpJwt-2.1.feature | 4 ++-- .../public/mpMetrics-5.1/io.openliberty.mpMetrics-5.1.feature | 4 ++-- .../public/mpOpenAPI-4.0/io.openliberty.mpOpenAPI-4.0.feature | 4 ++-- .../io.openliberty.mpReactiveMessaging-3.0.feature | 4 ++-- .../io.openliberty.mpReactiveStreams-3.0.feature | 4 ++-- .../mpRestClient-4.0/io.openliberty.mpRestClient-4.0.feature | 4 ++-- .../mpTelemetry-2.0/io.openliberty.mpTelemetry-2.0.feature | 2 +- 40 files changed, 49 insertions(+), 49 deletions(-) diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpConfig-3.1.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpConfig-3.1.feature index db955d7cc13d..805b2722ba85 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpConfig-3.1.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpConfig-3.1.feature @@ -3,7 +3,7 @@ symbolicName=io.openliberty.internal.versionless.mpConfig-3.1 visibility=private singleton=true -features= \ - io.openliberty.internal.mpVersion-6.1; ibm.tolerates:="7.0", \ + io.openliberty.internal.mpVersion-6.1; ibm.tolerates:="7.0,7.1", \ io.openliberty.mpConfig-3.1 kind=ga edition=core diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpContextPropagation-1.3.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpContextPropagation-1.3.feature index a55a25ce04f0..22dd1dc48eee 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpContextPropagation-1.3.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpContextPropagation-1.3.feature @@ -3,7 +3,7 @@ symbolicName=io.openliberty.internal.versionless.mpContextPropagation-1.3 visibility=private singleton=true -features= \ - io.openliberty.internal.mpVersion-5.0; ibm.tolerates:="6.0,6.1,7.0", \ + io.openliberty.internal.mpVersion-5.0; ibm.tolerates:="6.0,6.1,7.0,7.1", \ io.openliberty.mpContextPropagation-1.3 kind=ga edition=core diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpFaultTolerance-4.1.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpFaultTolerance-4.1.feature index c61b72211aed..93b66b42f4e6 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpFaultTolerance-4.1.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpFaultTolerance-4.1.feature @@ -3,7 +3,7 @@ symbolicName=io.openliberty.internal.versionless.mpFaultTolerance-4.1 visibility=private singleton=true -features= \ - io.openliberty.internal.mpVersion-7.0, \ + io.openliberty.internal.mpVersion-7.0; ibm.tolerates:="7.1", \ io.openliberty.mpFaultTolerance-4.1 kind=ga edition=core diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpGraphQL-2.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpGraphQL-2.0.feature index da6f577c396c..01fc60db85f6 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpGraphQL-2.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpGraphQL-2.0.feature @@ -3,7 +3,7 @@ symbolicName=io.openliberty.internal.versionless.mpGraphQL-2.0 visibility=private singleton=true -features= \ - io.openliberty.internal.mpVersion-5.0; ibm.tolerates:="6.0,6.1,7.0", \ + io.openliberty.internal.mpVersion-5.0; ibm.tolerates:="6.0,6.1,7.0,7.1", \ io.openliberty.mpGraphQL-2.0 kind=ga edition=core diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpHealth-4.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpHealth-4.0.feature index 4dfa13e497ad..7515cddc401a 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpHealth-4.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpHealth-4.0.feature @@ -3,7 +3,7 @@ symbolicName=io.openliberty.internal.versionless.mpHealth-4.0 visibility=private singleton=true -features= \ - io.openliberty.internal.mpVersion-5.0; ibm.tolerates:="6.0,6.1,7.0", \ + io.openliberty.internal.mpVersion-5.0; ibm.tolerates:="6.0,6.1,7.0,7.1", \ io.openliberty.mpHealth-4.0 kind=ga edition=core diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpJwt-2.1.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpJwt-2.1.feature index 30304fa0484c..bdb157f8d269 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpJwt-2.1.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpJwt-2.1.feature @@ -3,7 +3,7 @@ symbolicName=io.openliberty.internal.versionless.mpJwt-2.1 visibility=private singleton=true -features= \ - io.openliberty.internal.mpVersion-6.0; ibm.tolerates:="6.1,7.0", \ + io.openliberty.internal.mpVersion-6.0; ibm.tolerates:="6.1,7.0,7.1", \ io.openliberty.mpJwt-2.1 kind=ga edition=core diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpMetrics-5.1.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpMetrics-5.1.feature index 1d822d3619e9..937dcf6f2d8c 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpMetrics-5.1.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpMetrics-5.1.feature @@ -3,7 +3,7 @@ symbolicName=io.openliberty.internal.versionless.mpMetrics-5.1 visibility=private singleton=true -features= \ - io.openliberty.internal.mpVersion-6.1; ibm.tolerates:="7.0", \ + io.openliberty.internal.mpVersion-6.1; ibm.tolerates:="7.0,7.1", \ io.openliberty.mpMetrics-5.1 kind=ga edition=core diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpOpenAPI-4.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpOpenAPI-4.0.feature index 8722244bab8f..33375435ed3a 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpOpenAPI-4.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpOpenAPI-4.0.feature @@ -3,7 +3,7 @@ symbolicName=io.openliberty.internal.versionless.mpOpenAPI-4.0 visibility=private singleton=true -features= \ - io.openliberty.internal.mpVersion-7.0, \ + io.openliberty.internal.mpVersion-7.0; ibm.tolerates:="7.1", \ io.openliberty.mpOpenAPI-4.0 kind=ga edition=core diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpReactiveMessaging-3.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpReactiveMessaging-3.0.feature index f188394be012..c1a1961bc276 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpReactiveMessaging-3.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpReactiveMessaging-3.0.feature @@ -3,7 +3,7 @@ symbolicName=io.openliberty.internal.versionless.mpReactiveMessaging-3.0 visibility=private singleton=true -features= \ - io.openliberty.internal.mpVersion-5.0; ibm.tolerates:="6.0,6.1,7.0", \ + io.openliberty.internal.mpVersion-5.0; ibm.tolerates:="6.0,6.1,7.0,7.1", \ io.openliberty.mpReactiveMessaging-3.0 kind=ga edition=core diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpReactiveStreams-3.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpReactiveStreams-3.0.feature index 22c28e81648b..6414a363f1de 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpReactiveStreams-3.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpReactiveStreams-3.0.feature @@ -3,7 +3,7 @@ symbolicName=io.openliberty.internal.versionless.mpReactiveStreams-3.0 visibility=private singleton=true -features= \ - io.openliberty.internal.mpVersion-5.0; ibm.tolerates:="6.0,6.1,7.0", \ + io.openliberty.internal.mpVersion-5.0; ibm.tolerates:="6.0,6.1,7.0,7.1", \ io.openliberty.mpReactiveStreams-3.0 kind=ga edition=core diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpRestClient-4.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpRestClient-4.0.feature index d16f0218f752..9527202dea6e 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpRestClient-4.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpRestClient-4.0.feature @@ -3,7 +3,7 @@ symbolicName=io.openliberty.internal.versionless.mpRestClient-4.0 visibility=private singleton=true -features= \ - io.openliberty.internal.mpVersion-7.0, \ + io.openliberty.internal.mpVersion-7.0; ibm.tolerates:="7.1", \ io.openliberty.mpRestClient-4.0 kind=ga edition=core diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpTelemetry-2.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpTelemetry-2.0.feature index e3e85e8296b8..61a34cff009e 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpTelemetry-2.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.internal.versionless.mpTelemetry-2.0.feature @@ -3,7 +3,7 @@ symbolicName=io.openliberty.internal.versionless.mpTelemetry-2.0 visibility=private singleton=true -features= \ - io.openliberty.internal.mpVersion-7.0, \ + io.openliberty.internal.mpVersion-7.0; ibm.tolerates:="7.1", \ io.openliberty.mpTelemetry-2.0 kind=ga edition=core diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.microprofile.cdi.api-4.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.microprofile.cdi.api-4.0.feature index 91a2e43e50da..5cd5531e634d 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.microprofile.cdi.api-4.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.microprofile.cdi.api-4.0.feature @@ -1,7 +1,7 @@ -include= ~${workspace}/cnf/resources/bnd/feature.props symbolicName=io.openliberty.microprofile.cdi.api-4.0 singleton=true --features=io.openliberty.mpCompatible-6.0; ibm.tolerates:="6.1,7.0",\ +-features=io.openliberty.mpCompatible-6.0; ibm.tolerates:="6.1,7.0,7.1",\ io.openliberty.jakarta.cdi-4.0 kind=ga edition=core diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.microprofile.cdi.api-4.1.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.microprofile.cdi.api-4.1.feature index 5ec01f9bd74c..4ed4844c6f46 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.microprofile.cdi.api-4.1.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.microprofile.cdi.api-4.1.feature @@ -1,7 +1,7 @@ -include= ~${workspace}/cnf/resources/bnd/feature.props symbolicName=io.openliberty.microprofile.cdi.api-4.1 singleton=true --features=io.openliberty.mpCompatible-7.0,\ +-features=io.openliberty.mpCompatible-7.0; ibm.tolerates:="7.1", \ io.openliberty.jakarta.cdi-4.1 kind=beta edition=core diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.mpHealth.4.0.ee-10.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.mpHealth.4.0.ee-10.0.feature index fafb68b4251c..3273a7773c45 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.mpHealth.4.0.ee-10.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.mpHealth.4.0.ee-10.0.feature @@ -6,7 +6,7 @@ singleton=true io.openliberty.mpHealth.4.0.ee.10.0.mp-6.0; ibm.tolerates:="6.1",\ io.openliberty.jsonp-2.1,\ io.openliberty.cdi-4.0,\ - io.openliberty.mpCompatible-6.0; ibm.tolerates:="6.1,7.0", \ + io.openliberty.mpCompatible-6.0; ibm.tolerates:="6.1,7.0,7.1", \ com.ibm.websphere.appserver.eeCompatible-10.0 -bundles=\ io.openliberty.microprofile.health.4.0.internal.jakarta; apiJar=false; location:="lib/" diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.mpHealth.4.0.ee-11.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.mpHealth.4.0.ee-11.0.feature index ab333fde536d..6e0ddb0def74 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.mpHealth.4.0.ee-11.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.mpHealth.4.0.ee-11.0.feature @@ -6,7 +6,7 @@ singleton=true io.openliberty.mpConfig-3.1,\ io.openliberty.jsonp-2.1,\ io.openliberty.cdi-4.1,\ - io.openliberty.mpCompatible-7.0,\ + io.openliberty.mpCompatible-7.0; ibm.tolerates:="7.1", \ com.ibm.websphere.appserver.eeCompatible-11.0 -bundles=\ io.openliberty.microprofile.health.4.0.internal.jakarta; apiJar=false; location:="lib/" diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.mpTelemetry2.0.ee-10.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.mpTelemetry2.0.ee-10.0.feature index 63e850a472ff..d77d01660e1d 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.mpTelemetry2.0.ee-10.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.mpTelemetry2.0.ee-10.0.feature @@ -5,7 +5,7 @@ singleton=true io.openliberty.restfulWS-3.1, \ io.openliberty.mpConfig-3.1, \ io.openliberty.cdi-4.0, \ - io.openliberty.mpCompatible-6.1; ibm.tolerates:="7.0", \ + io.openliberty.mpCompatible-6.1; ibm.tolerates:="7.0, 7.1", \ io.openliberty.org.eclipse.microprofile.rest.client-3.0; ibm.tolerates:="4.0", \ com.ibm.websphere.appserver.eeCompatible-10.0 -bundles=\ diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.mpTelemetry2.0.ee-11.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.mpTelemetry2.0.ee-11.0.feature index 5a04837385cc..f4368bc6e000 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.mpTelemetry2.0.ee-11.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.mpTelemetry2.0.ee-11.0.feature @@ -5,7 +5,7 @@ singleton=true io.openliberty.restfulWS-4.0, \ io.openliberty.mpConfig-3.1, \ io.openliberty.cdi-4.1, \ - io.openliberty.mpCompatible-7.0,\ + io.openliberty.mpCompatible-7.0; ibm.tolerates:="7.1", \ io.openliberty.org.eclipse.microprofile.rest.client-4.0,\ com.ibm.websphere.appserver.eeCompatible-11.0 -bundles=\ diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.config.3.1.ee-10.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.config.3.1.ee-10.0.feature index c036f1f62fd6..2ccbca7d195e 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.config.3.1.ee-10.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.config.3.1.ee-10.0.feature @@ -1,7 +1,7 @@ -include= ~${workspace}/cnf/resources/bnd/feature.props symbolicName=io.openliberty.org.eclipse.microprofile.config.3.1.ee-10.0 singleton=true --features=io.openliberty.mpCompatible-6.1; ibm.tolerates:="7.0", \ +-features=io.openliberty.mpCompatible-6.1; ibm.tolerates:="7.0, 7.1", \ io.openliberty.jakarta.cdi-4.0 kind=ga edition=core diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.config.3.1.ee-11.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.config.3.1.ee-11.0.feature index 6512a15b95a1..2eb17099a770 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.config.3.1.ee-11.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.config.3.1.ee-11.0.feature @@ -1,7 +1,7 @@ -include= ~${workspace}/cnf/resources/bnd/feature.props symbolicName=io.openliberty.org.eclipse.microprofile.config.3.1.ee-11.0 singleton=true --features=io.openliberty.mpCompatible-7.0, \ +-features=io.openliberty.mpCompatible-7.0; ibm.tolerates:="7.1",\ io.openliberty.jakarta.cdi-4.1 kind=beta edition=core diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.contextpropagation-1.3.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.contextpropagation-1.3.feature index c7a9d1019f7a..3c540c441af0 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.contextpropagation-1.3.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.contextpropagation-1.3.feature @@ -1,7 +1,7 @@ -include= ~${workspace}/cnf/resources/bnd/feature.props symbolicName=io.openliberty.org.eclipse.microprofile.contextpropagation-1.3 singleton=true --features=io.openliberty.mpCompatible-5.0; ibm.tolerates:="6.0,6.1,7.0" +-features=io.openliberty.mpCompatible-5.0; ibm.tolerates:="6.0,6.1,7.0,7.1" -bundles=\ io.openliberty.org.eclipse.microprofile.contextpropagation.1.3; location:="dev/api/stable/,lib/"; mavenCoordinates="org.eclipse.microprofile.context-propagation:microprofile-context-propagation-api:1.3" kind=ga diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.graphql-2.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.graphql-2.0.feature index 99c3ea2e9d4a..d3d854964ab8 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.graphql-2.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.graphql-2.0.feature @@ -1,7 +1,7 @@ -include= ~${workspace}/cnf/resources/bnd/feature.props symbolicName=io.openliberty.org.eclipse.microprofile.graphql-2.0 singleton=true --features=io.openliberty.mpCompatible-5.0; ibm.tolerates:="6.0,6.1,7.0" +-features=io.openliberty.mpCompatible-5.0; ibm.tolerates:="6.0,6.1,7.0,7.1" -bundles=io.openliberty.org.eclipse.microprofile.graphql.2.0; location:="dev/api/stable/,lib/"; mavenCoordinates="org.eclipse.microprofile.graphql:microprofile-graphql-api:2.0" kind=ga edition=core diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.health-4.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.health-4.0.feature index 384175fc44e2..0eab2f0ac1ca 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.health-4.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.health-4.0.feature @@ -1,7 +1,7 @@ -include= ~${workspace}/cnf/resources/bnd/feature.props symbolicName=io.openliberty.org.eclipse.microprofile.health-4.0 singleton=true -# io.openliberty.mpCompatible-5.0; ibm.tolerates:="6.0,6.1,7.0" comes from io.openliberty.microprofile.cdi.api features +# io.openliberty.mpCompatible-5.0; ibm.tolerates:="6.0,6.1,7.0,7.1" comes from io.openliberty.microprofile.cdi.api features -features=\ io.openliberty.microprofile.cdi.api-3.0; ibm.tolerates:="4.0,4.1" -bundles=io.openliberty.org.eclipse.microprofile.health.4.0; location:="dev/api/stable/,lib/"; mavenCoordinates="org.eclipse.microprofile.health:microprofile-health-api:4.0.1" diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.jwt-2.1.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.jwt-2.1.feature index cfa5bddf753e..8fa15e1ad6eb 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.jwt-2.1.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.jwt-2.1.feature @@ -2,7 +2,7 @@ symbolicName=io.openliberty.org.eclipse.microprofile.jwt-2.1 visibility=private singleton=true --features=io.openliberty.mpCompatible-6.0; ibm.tolerates:="6.1,7.0" +-features=io.openliberty.mpCompatible-6.0; ibm.tolerates:="6.1,7.0,7.1" -bundles=io.openliberty.org.eclipse.microprofile.jwt.2.1; location:="dev/api/stable/,lib/"; mavenCoordinates="org.eclipse.microprofile.jwt:microprofile-jwt-auth-api:2.1" kind=ga edition=core diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.metrics-5.1.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.metrics-5.1.feature index 25bc2d002ea3..d933207e183d 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.metrics-5.1.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.metrics-5.1.feature @@ -1,7 +1,7 @@ -include= ~${workspace}/cnf/resources/bnd/feature.props symbolicName=io.openliberty.org.eclipse.microprofile.metrics-5.1 singleton=true --features=io.openliberty.mpCompatible-6.1; ibm.tolerates:="7.0" +-features=io.openliberty.mpCompatible-6.1; ibm.tolerates:="7.0, 7.1" -bundles=io.openliberty.org.eclipse.microprofile.metrics.5.1; location:="dev/api/stable/,lib/"; mavenCoordinates="org.eclipse.microprofile.metrics:microprofile-metrics-api:5.1.0" kind=ga edition=core diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.openapi-4.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.openapi-4.0.feature index d9f6cc1a5c8f..d3e947637cde 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.openapi-4.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.openapi-4.0.feature @@ -2,7 +2,7 @@ symbolicName=io.openliberty.org.eclipse.microprofile.openapi-4.0 singleton=true -features=\ - io.openliberty.mpCompatible-7.0 + io.openliberty.mpCompatible-7.0; ibm.tolerates:="7.1" -bundles=io.openliberty.org.eclipse.microprofile.openapi.4.0; location:="dev/api/stable/,lib/"; mavenCoordinates="org.eclipse.microprofile.openapi:microprofile-openapi-api:4.0.2" kind=ga edition=core diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.reactive.messaging-3.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.reactive.messaging-3.0.feature index 2cb6865616c3..17a61d146106 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.reactive.messaging-3.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.reactive.messaging-3.0.feature @@ -4,7 +4,7 @@ WLP-DisableAllFeatures-OnConflict: true singleton=true -bundles=io.openliberty.io.smallrye.reactive.messaging-api4 -jars=io.openliberty.org.eclipse.microprofile.reactive.messaging.3.0; location:="dev/api/stable/"; mavenCoordinates="org.eclipse.microprofile.reactive.messaging:microprofile-reactive-messaging-api:3.0.1" --features=io.openliberty.mpCompatible-5.0; ibm.tolerates:="6.0,6.1,7.0", \ +-features=io.openliberty.mpCompatible-5.0; ibm.tolerates:="6.0,6.1,7.0,7.1", \ io.openliberty.org.eclipse.microprofile.reactive.streams.operators-3.0, \ io.openliberty.org.eclipse.microprofile.config-3.0; ibm.tolerates:="3.1", \ io.openliberty.jakarta.cdi-3.0; ibm.tolerates:="4.0,4.1" diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.reactive.streams.operators-3.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.reactive.streams.operators-3.0.feature index 3444c95df0ea..f6bce11d051b 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.reactive.streams.operators-3.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.org.eclipse.microprofile.reactive.streams.operators-3.0.feature @@ -2,7 +2,7 @@ symbolicName=io.openliberty.org.eclipse.microprofile.reactive.streams.operators-3.0 visibility=private singleton=true --features=io.openliberty.mpCompatible-5.0; ibm.tolerates:="6.0,6.1,7.0", \ +-features=io.openliberty.mpCompatible-5.0; ibm.tolerates:="6.0,6.1,7.0,7.1", \ com.ibm.websphere.appserver.classloading-1.0, \ com.ibm.websphere.appserver.org.reactivestreams.reactive-streams-1.0 -bundles=\ diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/mpConfig-3.1/io.openliberty.mpConfig-3.1.feature b/dev/com.ibm.websphere.appserver.features/visibility/public/mpConfig-3.1/io.openliberty.mpConfig-3.1.feature index 2e79af758079..5df719a9438c 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/mpConfig-3.1/io.openliberty.mpConfig-3.1.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/mpConfig-3.1/io.openliberty.mpConfig-3.1.feature @@ -15,7 +15,7 @@ Subsystem-Name: MicroProfile Config 3.1 io.openliberty.jakarta.annotation-2.1; ibm.tolerates:="3.0", \ io.openliberty.org.eclipse.microprofile.config-3.1, \ com.ibm.websphere.appserver.internal.slf4j-1.7, \ - io.openliberty.mpCompatible-6.1; ibm.tolerates:="7.0" + io.openliberty.mpCompatible-6.1; ibm.tolerates:="7.0, 7.1" -bundles=io.openliberty.io.smallrye.config3, \ io.openliberty.io.smallrye.common2, \ io.openliberty.microprofile.config.internal.common, \ @@ -27,4 +27,4 @@ kind=ga edition=core WLP-Activation-Type: parallel WLP-InstantOn-Enabled: true -WLP-Platform: microProfile-6.1,microProfile-7.0 +WLP-Platform: microProfile-6.1,microProfile-7.0,microProfile-7.1 diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/mpContextPropagation-1.3/io.openliberty.mpContextPropagation-1.3.feature b/dev/com.ibm.websphere.appserver.features/visibility/public/mpContextPropagation-1.3/io.openliberty.mpContextPropagation-1.3.feature index 70adc441188f..c1360712339a 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/mpContextPropagation-1.3/io.openliberty.mpContextPropagation-1.3.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/mpContextPropagation-1.3/io.openliberty.mpContextPropagation-1.3.feature @@ -11,9 +11,9 @@ IBM-API-Package: \ -features=\ io.openliberty.org.eclipse.microprofile.contextpropagation-1.3, \ io.openliberty.concurrent-2.0; ibm.tolerates:="3.0,3.1", \ - io.openliberty.mpCompatible-5.0; ibm.tolerates:="6.0,6.1,7.0" + io.openliberty.mpCompatible-5.0; ibm.tolerates:="6.0,6.1,7.0,7.1" -bundles=\ com.ibm.ws.microprofile.contextpropagation.1.0 kind=ga edition=core -WLP-Platform: microProfile-5.0,microProfile-6.0,microProfile-6.1,microProfile-7.0 +WLP-Platform: microProfile-5.0,microProfile-6.0,microProfile-6.1,microProfile-7.0,microProfile-7.1 diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/mpFaultTolerance-4.1/io.openliberty.mpFaultTolerance-4.1.feature b/dev/com.ibm.websphere.appserver.features/visibility/public/mpFaultTolerance-4.1/io.openliberty.mpFaultTolerance-4.1.feature index 7f1e29fd3c7f..6f7f9d85787f 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/mpFaultTolerance-4.1/io.openliberty.mpFaultTolerance-4.1.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/mpFaultTolerance-4.1/io.openliberty.mpFaultTolerance-4.1.feature @@ -9,7 +9,7 @@ IBM-API-Package: org.eclipse.microprofile.faulttolerance.exceptions; type="stab IBM-ShortName: mpFaultTolerance-4.1 Subsystem-Name: MicroProfile Fault Tolerance 4.1 -features=io.openliberty.mpConfig-3.1, \ - io.openliberty.mpCompatible-7.0, \ + io.openliberty.mpCompatible-7.0; ibm.tolerates:="7.1",\ io.openliberty.org.eclipse.microprofile.faulttolerance-4.1, \ io.openliberty.cdi-4.0; ibm.tolerates:="4.1" -bundles=com.ibm.ws.microprofile.faulttolerance; apiJar=false; location:="lib/", \ @@ -24,4 +24,4 @@ kind=ga edition=core WLP-Activation-Type: parallel WLP-InstantOn-Enabled: true -WLP-Platform: microProfile-7.0 +WLP-Platform: microProfile-7.0,microProfile-7.1 diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/mpGraphQL-2.0/io.openliberty.mpGraphQL-2.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/public/mpGraphQL-2.0/io.openliberty.mpGraphQL-2.0.feature index b4556182c6d9..41597ac9e6f6 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/mpGraphQL-2.0/io.openliberty.mpGraphQL-2.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/mpGraphQL-2.0/io.openliberty.mpGraphQL-2.0.feature @@ -13,7 +13,7 @@ Subsystem-Name: MicroProfile GraphQL 2.0 io.openliberty.cdi-3.0; ibm.tolerates:="4.0,4.1", \ io.openliberty.jakarta.annotation-2.0; ibm.tolerates:="2.1,3.0", \ io.openliberty.jsonb-2.0; ibm.tolerates:="3.0", \ - io.openliberty.mpCompatible-5.0; ibm.tolerates:="6.0,6.1,7.0", \ + io.openliberty.mpCompatible-5.0; ibm.tolerates:="6.0,6.1,7.0,7.1", \ io.openliberty.mpConfig-3.0; ibm.tolerates:="3.1", \ io.openliberty.concurrent-2.0; ibm.tolerates:="3.0,3.1", \ io.openliberty.mpContextPropagation-1.3, \ diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/mpHealth-4.0/io.openliberty.mpHealth-4.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/public/mpHealth-4.0/io.openliberty.mpHealth-4.0.feature index 25e6cfefa730..e3e47a8d3e7b 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/mpHealth-4.0/io.openliberty.mpHealth-4.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/mpHealth-4.0/io.openliberty.mpHealth-4.0.feature @@ -22,4 +22,4 @@ kind=ga edition=core WLP-Activation-Type: parallel WLP-InstantOn-Enabled: true -WLP-Platform: microProfile-5.0,microProfile-6.0,microProfile-6.1,microProfile-7.0 +WLP-Platform: microProfile-5.0,microProfile-6.0,microProfile-6.1,microProfile-7.0,microProfile-7.1 diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/mpJwt-2.1/io.openliberty.mpJwt-2.1.feature b/dev/com.ibm.websphere.appserver.features/visibility/public/mpJwt-2.1/io.openliberty.mpJwt-2.1.feature index d33eec86b2f5..08fa1475de68 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/mpJwt-2.1/io.openliberty.mpJwt-2.1.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/mpJwt-2.1/io.openliberty.mpJwt-2.1.feature @@ -34,7 +34,7 @@ Subsystem-Name: MicroProfile JSON Web Token 2.1 com.ibm.websphere.appserver.httpcommons-1.0, \ io.openliberty.mpConfig-3.0; ibm.tolerates:="3.1", \ io.openliberty.org.eclipse.microprofile.jwt-2.1, \ - io.openliberty.mpCompatible-6.0; ibm.tolerates:="6.1,7.0", \ + io.openliberty.mpCompatible-6.0; ibm.tolerates:="6.1,7.0,7.1", \ io.openliberty.cdi-4.0; ibm.tolerates:="4.1" -bundles=io.openliberty.security.mp.jwt.internal,\ io.openliberty.security.mp.jwt.cdi.internal,\ @@ -45,4 +45,4 @@ kind=ga edition=core WLP-Activation-Type: parallel WLP-InstantOn-Enabled: true -WLP-Platform: microProfile-6.0,microProfile-6.1,microProfile-7.0 +WLP-Platform: microProfile-6.0,microProfile-6.1,microProfile-7.0,microProfile-7.1 diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/mpMetrics-5.1/io.openliberty.mpMetrics-5.1.feature b/dev/com.ibm.websphere.appserver.features/visibility/public/mpMetrics-5.1/io.openliberty.mpMetrics-5.1.feature index c1f832dad803..e613232c2968 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/mpMetrics-5.1/io.openliberty.mpMetrics-5.1.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/mpMetrics-5.1/io.openliberty.mpMetrics-5.1.feature @@ -36,7 +36,7 @@ Subsystem-Name: MicroProfile Metrics 5.1 io.openliberty.mpConfig-3.1, \ io.openliberty.jakarta.annotation-2.1; ibm.tolerates:="3.0",\ io.openliberty.servlet.internal-6.0; ibm.tolerates:="6.1", \ - io.openliberty.mpCompatible-6.1; ibm.tolerates:="7.0", \ + io.openliberty.mpCompatible-6.1; ibm.tolerates:="7.0, 7.1", \ io.openliberty.cdi-4.0; ibm.tolerates:="4.1", \ io.openliberty.org.eclipse.microprofile.metrics-5.1, \ com.ibm.websphere.appserver.monitor-1.0 @@ -50,4 +50,4 @@ Subsystem-Name: MicroProfile Metrics 5.1 kind=ga edition=core WLP-InstantOn-Enabled: true -WLP-Platform: microProfile-6.1,microProfile-7.0 +WLP-Platform: microProfile-6.1,microProfile-7.0,microProfile-7.1 diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/mpOpenAPI-4.0/io.openliberty.mpOpenAPI-4.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/public/mpOpenAPI-4.0/io.openliberty.mpOpenAPI-4.0.feature index 3a3643506eab..d4f834c1a8a9 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/mpOpenAPI-4.0/io.openliberty.mpOpenAPI-4.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/mpOpenAPI-4.0/io.openliberty.mpOpenAPI-4.0.feature @@ -37,7 +37,7 @@ IBM-API-Package: \ -features=io.openliberty.mpConfig-3.1, \ io.openliberty.webBundle.internal-1.0,\ io.openliberty.restfulWS-3.1; ibm.tolerates:="4.0", \ - io.openliberty.mpCompatible-7.0, \ + io.openliberty.mpCompatible-7.0; ibm.tolerates:="7.1",\ io.openliberty.org.eclipse.microprofile.openapi-4.0,\ io.openliberty.jandex.internal-3.0 -bundles=\ @@ -55,4 +55,4 @@ kind=ga edition=core WLP-Activation-Type: parallel WLP-InstantOn-Enabled: true -WLP-Platform: microProfile-7.0 +WLP-Platform: microProfile-7.0,microProfile-7.1 diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/mpReactiveMessaging-3.0/io.openliberty.mpReactiveMessaging-3.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/public/mpReactiveMessaging-3.0/io.openliberty.mpReactiveMessaging-3.0.feature index 79c4387a1bbe..3c37293fd3e1 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/mpReactiveMessaging-3.0/io.openliberty.mpReactiveMessaging-3.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/mpReactiveMessaging-3.0/io.openliberty.mpReactiveMessaging-3.0.feature @@ -13,7 +13,7 @@ IBM-ShortName: mpReactiveMessaging-3.0 Subsystem-Name: MicroProfile Reactive Messaging 3.0 -features=io.openliberty.mpConfig-3.0; ibm.tolerates:="3.1", \ io.openliberty.mpReactiveStreams-3.0, \ - io.openliberty.mpCompatible-5.0; ibm.tolerates:="6.0,6.1,7.0", \ + io.openliberty.mpCompatible-5.0; ibm.tolerates:="6.0,6.1,7.0,7.1", \ io.openliberty.org.eclipse.microprofile.reactive.messaging-3.0, \ io.openliberty.cdi-3.0; ibm.tolerates:="4.0,4.1", \ io.openliberty.org.eclipse.microprofile.metrics-4.0; ibm.tolerates:="5.0,5.1" @@ -28,4 +28,4 @@ kind=ga edition=core WLP-Activation-Type: parallel WLP-InstantOn-Enabled: true -WLP-Platform: microProfile-5.0,microProfile-6.0,microProfile-6.1,microProfile-7.0 +WLP-Platform: microProfile-5.0,microProfile-6.0,microProfile-6.1,microProfile-7.0,microProfile-7.1 diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/mpReactiveStreams-3.0/io.openliberty.mpReactiveStreams-3.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/public/mpReactiveStreams-3.0/io.openliberty.mpReactiveStreams-3.0.feature index a4ade1ef5e65..0e11a7f1fc51 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/mpReactiveStreams-3.0/io.openliberty.mpReactiveStreams-3.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/mpReactiveStreams-3.0/io.openliberty.mpReactiveStreams-3.0.feature @@ -11,7 +11,7 @@ IBM-API-Package: \ org.eclipse.microprofile.reactive.streams.operators.spi; type="stable", \ org.eclipse.microprofile.reactive.streams.operators.core; type="stable", \ org.reactivestreams; type="stable"; --features=io.openliberty.mpCompatible-5.0; ibm.tolerates:="6.0,6.1,7.0", \ +-features=io.openliberty.mpCompatible-5.0; ibm.tolerates:="6.0,6.1,7.0,7.1", \ io.openliberty.jakarta.cdi-3.0; ibm.tolerates:="4.0,4.1", \ io.openliberty.org.eclipse.microprofile.reactive.streams.operators-3.0 -bundles=\ @@ -24,4 +24,4 @@ kind=ga edition=core WLP-Activation-Type: parallel WLP-InstantOn-Enabled: true -WLP-Platform: microProfile-5.0,microProfile-6.0,microProfile-6.1,microProfile-7.0 +WLP-Platform: microProfile-5.0,microProfile-6.0,microProfile-6.1,microProfile-7.0,,microProfile-7.1 diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/mpRestClient-4.0/io.openliberty.mpRestClient-4.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/public/mpRestClient-4.0/io.openliberty.mpRestClient-4.0.feature index 7a4480723144..b4a91f713151 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/mpRestClient-4.0/io.openliberty.mpRestClient-4.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/mpRestClient-4.0/io.openliberty.mpRestClient-4.0.feature @@ -18,7 +18,7 @@ IBM-ShortName: mpRestClient-4.0 Subsystem-Name: MicroProfile Rest Client 4.0 -features=\ - io.openliberty.mpCompatible-7.0, \ + io.openliberty.mpCompatible-7.0; ibm.tolerates:="7.1",\ io.openliberty.jsonp-2.1, \ io.openliberty.mpConfig-3.1, \ io.openliberty.mpRestClient.internal.cdi-4.0; ibm.tolerates:="4.1", \ @@ -31,4 +31,4 @@ kind=ga edition=core WLP-Activation-Type: parallel WLP-InstantOn-Enabled: true -WLP-Platform: microProfile-7.0 +WLP-Platform: microProfile-7.0,microProfile-7.1 diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/mpTelemetry-2.0/io.openliberty.mpTelemetry-2.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/public/mpTelemetry-2.0/io.openliberty.mpTelemetry-2.0.feature index 2c7ad3fe2dd5..8db39fa2dec2 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/mpTelemetry-2.0/io.openliberty.mpTelemetry-2.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/mpTelemetry-2.0/io.openliberty.mpTelemetry-2.0.feature @@ -56,4 +56,4 @@ kind=ga edition=core WLP-Activation-Type: parallel WLP-InstantOn-Enabled: true -WLP-Platform: microProfile-7.0 +WLP-Platform: microProfile-7.0,microProfile-7.1 From 37db6d683dfb79d8a98d190283c0e743eac093ad Mon Sep 17 00:00:00 2001 From: "yasmin.aumeeruddy" Date: Wed, 16 Apr 2025 12:01:36 +0100 Subject: [PATCH 6/8] Update Jakarta EE tests for MP7.1 --- .../mpGraphQL-2.0/io.openliberty.mpGraphQL-2.0.feature | 2 +- .../componenttest/rules/repeater/MicroProfileActions.java | 2 +- .../jakartaee10/internal/tests/EE10Features.java | 6 ++++++ .../jakartaee11/internal/tests/EE11Features.java | 6 ++++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/mpGraphQL-2.0/io.openliberty.mpGraphQL-2.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/public/mpGraphQL-2.0/io.openliberty.mpGraphQL-2.0.feature index 41597ac9e6f6..61f7fc906de7 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/mpGraphQL-2.0/io.openliberty.mpGraphQL-2.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/mpGraphQL-2.0/io.openliberty.mpGraphQL-2.0.feature @@ -27,4 +27,4 @@ Subsystem-Name: MicroProfile GraphQL 2.0 kind=ga edition=core WLP-Activation-Type: parallel -WLP-Platform: microProfile-5.0,microProfile-6.0,microProfile-6.1,microProfile-7.0 +WLP-Platform: microProfile-5.0,microProfile-6.0,microProfile-6.1,microProfile-7.0,microProfile-7.1 diff --git a/dev/fattest.simplicity/src/componenttest/rules/repeater/MicroProfileActions.java b/dev/fattest.simplicity/src/componenttest/rules/repeater/MicroProfileActions.java index 7db1e674abcc..38a7a55ee4bd 100644 --- a/dev/fattest.simplicity/src/componenttest/rules/repeater/MicroProfileActions.java +++ b/dev/fattest.simplicity/src/componenttest/rules/repeater/MicroProfileActions.java @@ -437,7 +437,7 @@ public class MicroProfileActions { public static final FeatureSet MP70_EE11_APP_MODE = new FeatureSet(MP70_EE11_APP_MODE_ID, MP70_EE11_FEATURE_SET, EEVersion.EE11); //All MicroProfile FeatureSets - must be descending order - private static final FeatureSet[] ALL_SETS_ARRAY = { MP70_EE11, MP70_EE10, MP61, MP60, MP50, MP41, MP40, MP33, MP32, MP30, MP22, MP21, MP20, MP14, MP13, MP12, MP10 }; //TODO : Add MP71 + private static final FeatureSet[] ALL_SETS_ARRAY = { MP71_EE11, MP71_EE10, MP70_EE11, MP70_EE10, MP61, MP60, MP50, MP41, MP40, MP33, MP32, MP30, MP22, MP21, MP20, MP14, MP13, MP12, MP10 }; public static final List ALL = Collections.unmodifiableList(Arrays.asList(ALL_SETS_ARRAY)); /** diff --git a/dev/io.openliberty.jakartaee10.internal_fat/fat/src/io/openliberty/jakartaee10/internal/tests/EE10Features.java b/dev/io.openliberty.jakartaee10.internal_fat/fat/src/io/openliberty/jakartaee10/internal/tests/EE10Features.java index 09bb4ca1207e..4c1ee9449a13 100644 --- a/dev/io.openliberty.jakartaee10.internal_fat/fat/src/io/openliberty/jakartaee10/internal/tests/EE10Features.java +++ b/dev/io.openliberty.jakartaee10.internal_fat/fat/src/io/openliberty/jakartaee10/internal/tests/EE10Features.java @@ -267,6 +267,12 @@ private static Set getExtendedCompatibleFeatures(Set compatibleF features.remove("microProfile-6.1"); features.remove("mpTelemetry-1.1"); + //remove MP 7.0 features which would conflict with MP 7.1 features + features.remove("microProfile-7.0"); + //In preparation for the release of MpTelemetry 2.1 and MpOpenAPI 4.1 + //features.remove("mpTelemetry-2.0"); + //features.remove("mpOpenAPI-4.0"); + // remove client features features.remove("jakartaeeClient-10.0"); features.remove("appSecurityClient-1.0"); diff --git a/dev/io.openliberty.jakartaee11.internal_fat/fat/src/io/openliberty/jakartaee11/internal/tests/EE11Features.java b/dev/io.openliberty.jakartaee11.internal_fat/fat/src/io/openliberty/jakartaee11/internal/tests/EE11Features.java index dc5b6e57989d..66c75216a636 100644 --- a/dev/io.openliberty.jakartaee11.internal_fat/fat/src/io/openliberty/jakartaee11/internal/tests/EE11Features.java +++ b/dev/io.openliberty.jakartaee11.internal_fat/fat/src/io/openliberty/jakartaee11/internal/tests/EE11Features.java @@ -277,6 +277,12 @@ private static Set getExtendedCompatibleFeatures(Set compatibleF features.remove("passwordUtilities-1.1"); features.remove("persistenceContainer-3.2"); + //remove MP 7.0 features which would conflict with MP 7.1 features + features.remove("microProfile-7.0"); + //In preparation for the release of MpTelemetry 2.1 and MpOpenAPI 4.1 + //features.remove("mpTelemetry-2.0"); + //features.remove("mpOpenAPI-4.0"); + // remove client features features.remove("jakartaeeClient-11.0"); features.remove("appSecurityClient-1.0"); From 6482106e263276591a5de57a6f19d90e1295752f Mon Sep 17 00:00:00 2001 From: "yasmin.aumeeruddy" Date: Wed, 16 Apr 2025 15:36:10 +0100 Subject: [PATCH 7/8] Update feature tests --- .../test/src/com/ibm/ws/feature/tests/VersionlessTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev/com.ibm.websphere.appserver.features/test/src/com/ibm/ws/feature/tests/VersionlessTest.java b/dev/com.ibm.websphere.appserver.features/test/src/com/ibm/ws/feature/tests/VersionlessTest.java index bf4d5251aeab..eb805235ff66 100644 --- a/dev/com.ibm.websphere.appserver.features/test/src/com/ibm/ws/feature/tests/VersionlessTest.java +++ b/dev/com.ibm.websphere.appserver.features/test/src/com/ibm/ws/feature/tests/VersionlessTest.java @@ -326,6 +326,7 @@ public void validatePlatformSettings() { featureToPlatformMapping.get("io.openliberty.xmlBinding-4.0").add("jakartaee-11.0"); featureToPlatformMapping.get("io.openliberty.xmlWS-4.0").add("jakartaee-11.0"); featureToPlatformMapping.get("io.openliberty.mpMetrics-5.1").add("microProfile-7.0"); + featureToPlatformMapping.get("io.openliberty.mpMetrics-5.1").add("microProfile-7.1"); // jdbc is special featureToPlatformMapping.get("com.ibm.websphere.appserver.jdbc-4.1").remove("javaee-8.0"); @@ -503,6 +504,7 @@ public void listSelectorDetails() { }); versionlessFeatures.get("mpMetrics").addFeaturePlatformAndKind("mpMetrics-5.1", "microProfile-7.0", "io.openliberty.mpMetrics-5.1", "ga"); + versionlessFeatures.get("mpMetrics").addFeaturePlatformAndKind("mpMetrics-5.1", "microProfile-7.1", "io.openliberty.mpMetrics-5.1", "ga"); VersionlessFeatureCreator creator = new VersionlessFeatureCreator(featureRepo); From 38c12b9bf54e2a5b4d36c23e86692469b6830f8d Mon Sep 17 00:00:00 2001 From: yasmin-aumeeruddy Date: Wed, 16 Apr 2025 16:08:50 +0100 Subject: [PATCH 8/8] Update dev/com.ibm.websphere.appserver.features/visibility/public/mpReactiveStreams-3.0/io.openliberty.mpReactiveStreams-3.0.feature Co-authored-by: Jared Anderson --- .../io.openliberty.mpReactiveStreams-3.0.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/mpReactiveStreams-3.0/io.openliberty.mpReactiveStreams-3.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/public/mpReactiveStreams-3.0/io.openliberty.mpReactiveStreams-3.0.feature index 0e11a7f1fc51..2abca5e4a653 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/mpReactiveStreams-3.0/io.openliberty.mpReactiveStreams-3.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/mpReactiveStreams-3.0/io.openliberty.mpReactiveStreams-3.0.feature @@ -24,4 +24,4 @@ kind=ga edition=core WLP-Activation-Type: parallel WLP-InstantOn-Enabled: true -WLP-Platform: microProfile-5.0,microProfile-6.0,microProfile-6.1,microProfile-7.0,,microProfile-7.1 +WLP-Platform: microProfile-5.0,microProfile-6.0,microProfile-6.1,microProfile-7.0,microProfile-7.1