Merge pull request #32811 from tjwatson/removeBetaOverrideLibrary

Remove beta guards for overrideLibrary references

Author: tjwatson

dev/com.ibm.ws.app.manager.module/src/com/ibm/ws/app/manager/module/internal/DeployedAppInfoBase.java

@@ -58,7 +58,6 @@
 import com.ibm.ws.ffdc.FFDCFilter;
 import com.ibm.ws.ffdc.annotation.FFDCIgnore;
 import com.ibm.ws.javaee.dd.permissions.PermissionsConfig;
-import com.ibm.ws.kernel.productinfo.ProductInfo;
 import com.ibm.wsspi.adaptable.module.AdaptableModuleFactory;
 import com.ibm.wsspi.adaptable.module.Container;
 import com.ibm.wsspi.adaptable.module.UnableToAdaptException;
@@ -271,7 +270,7 @@ public SharedLibDeploymentInfo(DeployedAppServices deployedAppServices, String p
                     Configuration cfg = classloaderConfigs[0];
                     Dictionary<String, Object> props = cfg.getProperties();
                     if (props != null) {
-                        String[] libraryPIDs = ProductInfo.getBetaEdition() ? (String[]) props.get("overrideLibraryRef") : null;
+                        String[] libraryPIDs = (String[]) props.get("overrideLibraryRef");
                         processLibraryPIDs(deployedAppServices, classesContainerInfo, libraryPIDs, LibraryType.OVERRIDE_LIB);
 
                         libraryPIDs = (String[]) props.get("privateLibraryRef");

dev/com.ibm.ws.cdi.visibility_fat/publish/servers/visTestServer/jvm.options

@@ -32,7 +32,7 @@ classloader.library.ref.desc=List of library references. Library class instances
 
 # Override libraryRefs
 classloader.override.library.ref=Override Library
-classloader.override.library.ref$Ref=Override Library references
+classloader.override.library.ref$Ref=Override library references
 classloader.override.library.ref.desc=List of library references. Library class instances are unique to this class loader, independent of class instances from other class loaders. The referenced library class path is searched before searching the class path of this class loader.
 
 classloader.common.library.ref=Shared Library

dev/com.ibm.ws.cdi.visibility_fat/publish/servers/visTestServerAddWarCPToEar/jvm.options

@@ -37,7 +37,6 @@
 
     <AD name="%classloader.override.library.ref" description="%classloader.override.library.ref.desc"
         id="overrideLibraryRef"
-        ibm:beta="true"
         required="false"
         type="String"
         cardinality="10000"

dev/com.ibm.ws.classloading/resources/OSGI-INF/l10n/classloader.properties

@@ -52,7 +52,6 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.osgi.framework.Bundle;
@@ -68,7 +67,6 @@
 import com.ibm.ws.classloading.internal.util.ClassRedefiner;
 import com.ibm.ws.classloading.internal.util.FeatureSuggestion;
 import com.ibm.ws.ffdc.annotation.FFDCIgnore;
-import com.ibm.ws.kernel.productinfo.ProductInfo;
 import com.ibm.ws.kernel.security.thread.ThreadIdentityManager;
 import com.ibm.wsspi.adaptable.module.Container;
 import com.ibm.wsspi.classloading.ApiType;
@@ -84,7 +82,6 @@
  */
 public class AppClassLoader extends ContainerClassLoader implements SpringLoader {
     static final TraceComponent tc = Tr.register(AppClassLoader.class);
-    private static final AtomicBoolean issuedOverrideBetaMessage = new AtomicBoolean(false);
 
     private static final Set<String> forbiddenClassNames = Collections.unmodifiableSet( loadForbidden() );
 
@@ -185,21 +182,7 @@ private TraceComponent getClassLoadingTraceComponent(String pkg) {
         for (Container container : config.getNativeLibraryContainers())
             addNativeLibraryContainer(container);
 
-        List<Library> foundOverrideLibraries = Providers.getOverrideLibraries(config);
-        if (foundOverrideLibraries != null && !foundOverrideLibraries.isEmpty()) {
-            // beta guard check
-            if (!ProductInfo.getBetaEdition()) {
-                foundOverrideLibraries  = Collections.emptyList();
-                if (issuedOverrideBetaMessage.compareAndSet(false, true)) {
-                    Tr.info(tc, "BETA: Override libraries can only be used with the Open Liberty BETA.");
-                }
-            } else {
-                if (issuedOverrideBetaMessage.compareAndSet(false, true)) {
-                    Tr.info(tc, "BETA: Override libraries are being used.");
-                }
-            }
-        }
-        this.overrideLibraries = new AtomicReference<>(foundOverrideLibraries);
+        this.overrideLibraries = new AtomicReference<>(Providers.getOverrideLibraries(config));
         this.privateLibraries = new AtomicReference<>(Providers.getPrivateLibraries(config));
 
         List<LibertyLoader> tmpBeforeApp = new ArrayList<>();

dev/com.ibm.ws.classloading/resources/OSGI-INF/metatype/classloader.xml

@@ -54,7 +54,6 @@
 import com.ibm.ws.jdbc.internal.JDBCDriverService;
 import com.ibm.ws.jdbc.internal.JDBCDrivers;
 import com.ibm.ws.jdbc.internal.PropertyService;
-import com.ibm.ws.kernel.productinfo.ProductInfo;
 import com.ibm.ws.resource.ResourceFactory;
 import com.ibm.ws.resource.ResourceFactoryBuilder;
 import com.ibm.ws.rsadapter.AdapterUtil;
@@ -488,7 +487,7 @@ private final String updateWithLibraries(BundleContext bundleContext,
 
                 // Do not check for privateLibraryRef for java:global data source definitions, applicationName is null when java:global is used
                 if (applicationName != null) {
-                    Object overrideLibraryRef = ProductInfo.getBetaEdition() ? classloaderProps.get("overrideLibraryRef") : null;
+                    Object overrideLibraryRef = classloaderProps.get("overrideLibraryRef");
                     if (overrideLibraryRef != null && overrideLibraryRef instanceof String[])
                         for (String pid : (String[]) overrideLibraryRef)
                             libraryFilter.append(FilterUtils.createPropertyFilter(Constants.SERVICE_PID, pid));