Merge pull request #27988 from jhanders34/fix-build-break

Add appSecurity-6.0 to list of features to enable security
OpenLiberty · Mar 25, 2024 · 4dccbf3 · 4dccbf3
2 parents 8c32643 + 6fb01f5
commit 4dccbf3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/...ntainer.security/src/com/ibm/ws/webcontainer/security/WebAppSecurityCollaboratorImpl.java b/...ntainer.security/src/com/ibm/ws/webcontainer/security/WebAppSecurityCollaboratorImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 IBM Corporation and others.
+ * Copyright (c) 2011, 2024 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
@@ -508,7 +508,8 @@ public boolean isCDINeeded() {
             return false;
         }
         Set<String> features = provisionerService.getInstalledFeatures();
-        return features.contains("appSecurity-3.0") || features.contains("appSecurity-4.0") || features.contains("appSecurity-5.0") || features.contains("mpJwt-2.1");
+        return features.contains("appSecurity-3.0") || features.contains("appSecurity-4.0") || features.contains("appSecurity-5.0") || features.contains("appSecurity-6.0")
+               || features.contains("mpJwt-2.1");
     }
 
     /**

diff --git a/...berty.grpc.1.0.internal/src/io/openliberty/grpc/internal/servlet/GrpcServerComponent.java b/...berty.grpc.1.0.internal/src/io/openliberty/grpc/internal/servlet/GrpcServerComponent.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 IBM Corporation and others.
+ * Copyright (c) 2020, 2024 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:
@@ -283,7 +283,8 @@ private void setSecurityEnabled() {
         Set<String> currentFeatureSet = _featureProvisioner.getService().getInstalledFeatures();
         if (currentFeatureSet.contains("appSecurity-2.0") || currentFeatureSet.contains("appSecurity-1.0")
                 || currentFeatureSet.contains("appSecurity-3.0") || currentFeatureSet.contains("appSecurity-4.0")
-                || currentFeatureSet.contains("appSecurity-5.0") || currentFeatureSet.contains("mpJwt-2.1")) {
+                || currentFeatureSet.contains("appSecurity-5.0") || currentFeatureSet.contains("appSecurity-6.0")
+                || currentFeatureSet.contains("mpJwt-2.1")) {
             useSecurity = true;
             return;
         }