From 1e1b835b327de6794c007d912b3af5450df06ffa Mon Sep 17 00:00:00 2001 From: Jared Anderson Date: Fri, 22 Mar 2024 17:45:23 -0500 Subject: [PATCH] Update to have version range end with the next minor version - Instead of using a micro version of .100 or .200 for the end range for bundle dependencies which will eventually lead to errors once the micro version in liberty changes to 100 or more in the next year, just use the minor version that is +1 of the lower range. --- .../lbr/lib/platform/defaultLogging-1.0.mf | 4 +- .../lbr/lib/platform/extension-1.0.mf | 2 +- .../lbr/lib/platform/kernelCore-1.0.mf | 4 +- .../lbr/lib/platform/kernelCoreMissing-1.0.mf | 4 +- .../lbr/lib/platform/missingJar-1.0.mf | 2 +- .../bnd.overrides | 30 ++++---- .../bnd.overrides | 26 +++---- ...m.websphere.appserver.componenttest-2.0.mf | 2 +- ...m.websphere.appserver.componenttest-1.0.mf | 2 +- .../timerInterfacesTestFeature-1.0.mf | 2 +- .../timerInterfacesTestFeature-2.0.mf | 2 +- .../publish/files/features/testFeature-1.0.mf | 4 +- .../publish/files/features/testFeature-1.0.mf | 2 +- .../features/singletonTestFeature-1.0.mf | 2 +- .../files/features/simulatedController-1.0.mf | 2 +- .../files/features/concurrenttest-1.0.mf | 2 +- .../publish/files/features/workManager-1.0.mf | 2 +- .../simulatedZOSContextProviders-1.0.mf | 4 +- .../bnd.bnd | 16 ++-- .../bnd.bnd | 8 +- .../delayedVariable-1.0.mf | 2 +- .../childAliasTest-1.0.mf | 2 +- .../childAliasTestB-1.0.mf | 2 +- .../childAliasTestC-1.0.mf | 2 +- ...configExtensionsSchemaGeneratorTest-1.0.mf | 2 +- .../configExtensionsTest-1.0.mf | 2 +- .../configExtensionsTestB-1.0.mf | 2 +- .../delayedVariable-1.0.mf | 2 +- .../mergedConfigTest-1.0.mf | 2 +- .../publish/files/features/contexttest-1.0.mf | 8 +- .../lib/features/noDescription-1.0.mf | 2 +- .../usr/extension/lib/features/valid-1.0.mf | 2 +- .../features/simpleCustomEncryption-1.0.mf | 2 +- ...com.ibm.websphere.appserver.ejbTest-1.0.mf | 2 +- ...bsphere.appserver.testAdapterForEJB-1.0.mf | 2 +- ...websphere.appserver.http2clienttest-1.0.mf | 2 +- ...ibm.websphere.appserver.httpservice-2.2.mf | 2 +- .../features/injectionBVTinternals-1.0.mf | 2 +- .../bnd.bnd | 40 +++++----- dev/com.ibm.ws.install.map/bnd.bnd | 40 +++++----- .../files/features/libertyinternals-1.0.mf | 4 +- dev/com.ibm.ws.jaxb.tools.schemagen/bnd.bnd | 8 +- dev/com.ibm.ws.jaxb.tools.xjc/bnd.bnd | 10 +-- dev/com.ibm.ws.jaxb.tools/jaxb_schemagen.bnd | 8 +- dev/com.ibm.ws.jaxb.tools/jaxb_xjc.bnd | 6 +- .../bnd.bnd | 20 ++--- dev/com.ibm.ws.jaxws.tools.wsgen/bnd.bnd | 16 ++-- dev/com.ibm.ws.jaxws.tools.wsimport/bnd.bnd | 14 ++-- .../bnd.bnd | 12 +-- .../files/features/jcabvtbundle-1.0.mf | 2 +- .../files/features/jdbcHeritage-1.0.mf | 2 +- .../internalFeatures/dataStoreHelper-1.0.mf | 2 +- .../features/testFeatureUsingJsonb-1.0.mf | 4 +- .../features/testFeatureUsingJsonp-1.1.mf | 2 +- .../files/features/customJsonpProvider-1.0.mf | 2 +- .../publish/files/features/globaltld-1.0.mf | 2 +- .../publish/platform/kernel-1.0.mf | 76 +++++++++---------- .../files/provisioningInterimFixTest-1.0.mf | 2 +- .../files/provisioningInterimFixesTest-1.0.mf | 8 +- .../lbr/lib/platform/defaultLogging-1.0.mf | 2 +- .../lbr/lib/platform/extension-1.0.mf | 2 +- .../lbr/lib/platform/missingJar-1.0.mf | 2 +- .../bnd.bnd | 14 ++-- .../extension/lib/features/usertest.mf | 2 +- .../isolation.KernelSPI.Test.Feature-1.0.mf | 2 +- .../isolation.Product.Test.Feature-1.0.mf | 6 +- ...ation.Product.Test.Feature.Negative-1.0.mf | 2 +- .../override.systemFeature.providesSwing.mf | 2 +- .../override.systemFeature.requiresSwing.mf | 2 +- .../override.userFeature.providesSwing.mf | 2 +- .../test.activation.parallel.system-1.0.mf | 2 +- .../test.activation.parallel.user-1.0.mf | 2 +- .../test.activation.sequential.system-1.0.mf | 2 +- .../test.activation.sequential.user-1.0.mf | 2 +- .../features/test.feature.api.internal-1.0.mf | 2 +- .../features/test.origin.system-1.0.mf | 2 +- .../publish/features/test.origin.user-1.0.mf | 2 +- .../lib/features/badPathTool-1.0.mf | 2 +- .../lib/features/emptyIconHeader-1.0.mf | 2 +- .../lib/features/goldenPathTool-1.0.mf | 2 +- .../lib/features/iconDirectivesTool-1.0.mf | 2 +- .../lib/features/missingIconsTool-1.0.mf | 2 +- .../lib/features/noHeaderTool-1.0.mf | 2 +- .../isolation.Runtime.Test.Feature-1.0.mf | 6 +- ...ation.Runtime.Test.Feature.Negative-1.0.mf | 2 +- .../files/test.InterimFixManagerTest-1.0.mf | 2 +- .../files/test.InterimFixesManagerTest-1.0.mf | 8 +- .../files/test.TestFixManagerTest-1.0.mf | 2 +- .../files/test.featurefixmanager-1.0.mf | 2 +- .../files/test.featureprovisioner-1.0.mf | 2 +- .../publish/files/usertest.mf | 2 +- .../publish/files/usertestprivate-1.0.mf | 2 +- .../features/monitoringPrintingFeature-1.0.mf | 2 +- .../bnd.bnd | 4 +- .../publish/platform/binaryLogging-1.0.mf | 6 +- .../publish/platform/defaultLogging-1.0.mf | 8 +- .../publish/features/logServiceTest-1.0.mf | 2 +- .../features/sampleSourceHandler-1.0.mf | 2 +- .../features/sampleTraceSourceHandler-1.0.mf | 4 +- .../features/unconfigurableIbmFeature-1.0.mf | 2 +- .../features/unconfigurableUserFeature-1.0.mf | 2 +- .../com.ibm.ws.opentracing.mock-1.1.mf | 2 +- .../com.ibm.ws.opentracing.mock-1.2.mf | 2 +- .../com.ibm.ws.opentracing.mock-1.3.mf | 2 +- .../com.ibm.ws.opentracing.mock-0.30.mf | 2 +- .../com.ibm.ws.opentracing.mock-1.1.mf | 2 +- .../com.ibm.ws.opentracing.mock-1.2.mf | 2 +- .../com.ibm.ws.opentracing.mock-1.3.mf | 2 +- .../com.ibm.ws.opentracing.mock-0.30.mf | 2 +- .../bnd.bnd | 12 +-- .../com.ibm.ws.persistence.consumer-1.0.mf | 4 +- ...ibm.ws.persistence.consumer.jakarta-1.0.mf | 4 +- .../bnd.bnd | 16 ++-- .../publish/files/features/nestedFlat-1.0.mf | 2 +- .../publish/features/quiescelistener-1.0.mf | 2 +- .../bnd.bnd | 38 +++++----- dev/com.ibm.ws.security.audit.reader/bnd.bnd | 12 +-- .../lib/features/jaccTestProvider-1.0.mf | 4 +- .../lib/features/jaccTestProvider-2.0.mf | 4 +- .../lib/features/jaccTestProvider-2.1.mf | 4 +- .../features/jaspicUserTestFeature-1.0.mf | 2 +- .../features/jaspicUserTestFeature-2.0.mf | 2 +- .../features/jaspicUserTestFeature-3.0.mf | 2 +- .../test-features/oauth20JwtMediator-1.0.mf | 2 +- .../oauth20TokenIntrospectProvider-1.0.mf | 2 +- .../test-features/oauth20TokenMapping-1.0.mf | 2 +- .../test-features/oauth20TokenMapping-2.0.mf | 2 +- .../test-features/oidcIdtokenMediator-1.0.mf | 2 +- .../publish/test-features/oidcTai-1.0.mf | 2 +- .../publish/test-features/oidcTai-2.0.mf | 2 +- .../publish/test-features/sampleTai-1.0.mf | 2 +- .../publish/test-features/sampleTai-2.0.mf | 2 +- .../publish/features/samlUserResolver-1.0.mf | 2 +- .../bnd.bnd | 18 ++--- ....websphere.appserver.wimfileadapter-1.0.mf | 2 +- .../internalfeatures/testfileadapter-1.0.mf | 2 +- .../customRepositorySampleDelay-1.0.mf | 2 +- .../features/customRepositorySample-1.0.mf | 2 +- .../bnd.bnd | 12 +-- ...m.ibm.websphere.appserver.timedexit-1.0.mf | 2 +- .../files/features/eventListener-1.0.mf | 2 +- .../files/features/remoteTester-1.0.mf | 2 +- .../publish/files/features/utdecorator-1.0.mf | 6 +- .../publish/files/features/xaflow-1.0.mf | 2 +- .../publish/features/txtest-1.0.mf | 6 +- .../publish/features/txtest-2.0.mf | 6 +- .../publish/features/test.iiop-1.0.mf | 2 +- .../publish/features/test.iiop.client-1.0.mf | 4 +- .../publish/features/IBMShortNameManifest.mf | 2 +- .../publish/features/SubsystemNameManifest.mf | 2 +- .../features/SubsystemSymbolicNameManifest.mf | 2 +- .../publish/features/basicAutoFeatureTool.mf | 2 +- .../features/basicProtectedAutoFeatureTool.mf | 2 +- .../features/basicPublicAutoFeatureTool.mf | 2 +- .../features/emptyIconHeaderManifest.mf | 2 +- .../publish/features/gifIconHeaderManifest.mf | 2 +- .../invalidRelativeIconURIHeaderManifest.mf | 2 +- .../features/jpegIconHeaderManifest.mf | 2 +- .../features/mixedSizedIconHeaderManifest.mf | 2 +- ...mixedSizedWithUnsizedIconHeaderManifest.mf | 2 +- .../features/multiUIEndpointManifestHeader.mf | 4 +- .../multiUnsizedIconHeaderManifest.mf | 2 +- .../publish/features/noIconHeaderManifest.mf | 2 +- .../features/noSizedIconHeaderManifest.mf | 2 +- .../features/originalUpdateAutoFeatureTool.mf | 2 +- ...EndpointAndNonEndpointWABManifestHeader.mf | 4 +- .../singleUIEndpointManifestHeader.mf | 2 +- .../features/updatedUpdateAutoFeatureTool.mf | 2 +- .../publish/features/urlInMultipleWabs.mf | 4 +- .../publish/features/urlInSingleWab.mf | 2 +- .../publish/features/usr.mf | 2 +- .../publish/productfeatures/prodextn1.mf | 2 +- .../prodextn1originalUpdateAutoFeatureTool.mf | 2 +- .../prodextn1updatedUpdateAutoFeatureTool.mf | 2 +- .../publish/productfeatures/prodextn2.mf | 2 +- .../publish/productfeatures/prodextn3.mf | 2 +- .../productfeatures/protectedprodextn.mf | 2 +- .../publish/productfeatures/publicprodextn.mf | 2 +- .../bnd.bnd | 18 ++--- .../publish/files/features/wsseccbh-1.0.mf | 2 +- .../publish/files/features/wsseccbh-2.0.mf | 2 +- .../publish/files/features/wsseccbh-1.0.mf | 2 +- .../publish/files/features/wsseccbh-2.0.mf | 2 +- .../publish/files/features/wsseccbh-1.0.mf | 2 +- .../publish/files/features/wsseccbh-2.0.mf | 2 +- .../publish/files/features/wsseccbh-1.0.mf | 2 +- .../publish/files/features/wsseccbh-2.0.mf | 2 +- .../publish/files/features/wsseccbh-1.0.mf | 2 +- .../publish/files/features/wsseccbh-2.0.mf | 2 +- .../publish/files/features/wsseccbh-1.0.mf | 2 +- .../publish/files/features/wsseccbh-2.0.mf | 2 +- .../publish/files/features/wsseccbh-1.0.mf | 2 +- .../publish/files/features/wsseccbh-2.0.mf | 2 +- .../publish/files/features/wsseccbh-1.0.mf | 2 +- .../publish/files/features/wsseccbh-2.0.mf | 2 +- .../publish/files/features/wsseccbh-1.0.mf | 2 +- .../publish/files/features/wsseccbh-2.0.mf | 2 +- .../features/test.checkpoint.config-1.0.mf | 2 +- .../features/jaspicUserTestFeature-1.0.mf | 2 +- .../features/jaspicUserTestFeature-2.0.mf | 2 +- .../features/jaspicUserTestFeature-3.0.mf | 2 +- .../io.openliberty.enterpriseBeansTest-2.0.mf | 2 +- .../io.openliberty.opentracing.mock-2.0.mf | 2 +- .../io.openliberty.opentracing.mock-3.0.mf | 2 +- .../io.openliberty.opentracing.mock-2.0.mf | 2 +- .../io.openliberty.opentracing.mock-3.0.mf | 2 +- .../bnd.bnd | 10 +-- .../bnd.bnd | 10 +-- .../bnd.bnd | 20 ++--- .../bnd.bnd | 18 ++--- .../ibm/ws/wlp/feature/tasks/FeatureBnd.java | 14 ++-- .../inputs/manifests/adminSecurity-1.0.mf | 8 +- .../jarcontent/wlp/lib/features/permtest.mf | 2 +- 213 files changed, 499 insertions(+), 503 deletions(-) diff --git a/dev/com.ibm.ws.appclient.boot/test/test data/lbr/lib/platform/defaultLogging-1.0.mf b/dev/com.ibm.ws.appclient.boot/test/test data/lbr/lib/platform/defaultLogging-1.0.mf index f6f835186b7..1e0d2660b98 100644 --- a/dev/com.ibm.ws.appclient.boot/test/test data/lbr/lib/platform/defaultLogging-1.0.mf +++ b/dev/com.ibm.ws.appclient.boot/test/test data/lbr/lib/platform/defaultLogging-1.0.mf @@ -5,8 +5,8 @@ Subsystem-Version: 1.0.0 WebSphere-LogProvider: com.ibm.ws.logging.internal.impl.LogProviderImpl -Subsystem-Content: a.b; version="[1,1.0.100)"; type="boot.jar", - a.b; version="[1,1.0.100)" +Subsystem-Content: a.b; version="[1,1.1)"; type="boot.jar", + a.b; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 \ No newline at end of file diff --git a/dev/com.ibm.ws.appclient.boot/test/test data/lbr/lib/platform/extension-1.0.mf b/dev/com.ibm.ws.appclient.boot/test/test data/lbr/lib/platform/extension-1.0.mf index de2a12fb769..9a506d2fa01 100644 --- a/dev/com.ibm.ws.appclient.boot/test/test data/lbr/lib/platform/extension-1.0.mf +++ b/dev/com.ibm.ws.appclient.boot/test/test data/lbr/lib/platform/extension-1.0.mf @@ -2,7 +2,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: com.ibm.websphere.appserver.logging-1.0; visibility:=private Subsystem-Version: 1.0.0 -Subsystem-Content: a.b; version="[1,1.0.100)"; type="boot.jar", +Subsystem-Content: a.b; version="[1,1.1)"; type="boot.jar", Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 \ No newline at end of file diff --git a/dev/com.ibm.ws.appclient.boot/test/test data/lbr/lib/platform/kernelCore-1.0.mf b/dev/com.ibm.ws.appclient.boot/test/test data/lbr/lib/platform/kernelCore-1.0.mf index e5fe928b845..c7c13ad022b 100644 --- a/dev/com.ibm.ws.appclient.boot/test/test data/lbr/lib/platform/kernelCore-1.0.mf +++ b/dev/com.ibm.ws.appclient.boot/test/test data/lbr/lib/platform/kernelCore-1.0.mf @@ -6,8 +6,8 @@ Subsystem-Version: 1.0.0 WebSphere-LogProvider: dummy.LogProvider Subsystem-Content: com.ibm.websphere.appserver.kernel-1.0; type="osgi.subsystem.feature", - x.y; version="[1.0.0,1.0.100)"; type="boot.jar", - x.y; version="[1.0.0,1.0.100)"; start-phase:=BOOTSTRAP, + x.y; version="[1.0.0,1.1)"; type="boot.jar", + x.y; version="[1.0.0,1.1)"; start-phase:=BOOTSTRAP, Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.appclient.boot/test/test data/lbr/lib/platform/kernelCoreMissing-1.0.mf b/dev/com.ibm.ws.appclient.boot/test/test data/lbr/lib/platform/kernelCoreMissing-1.0.mf index bc67f16575f..4d27063e2ee 100644 --- a/dev/com.ibm.ws.appclient.boot/test/test data/lbr/lib/platform/kernelCoreMissing-1.0.mf +++ b/dev/com.ibm.ws.appclient.boot/test/test data/lbr/lib/platform/kernelCoreMissing-1.0.mf @@ -3,8 +3,8 @@ Subsystem-SymbolicName: com.ibm.websphere.appserver.kernelCore-1.0; visibility:= Subsystem-Version: 1.0.0 Subsystem-Content: com.ibm.websphere.appserver.kernel-1.0; type="osgi.subsystem.feature", - x.y; version="[1.0.0,1.0.100)"; type="boot.jar", - p.q; version="[1.0.0,1.0.100)", + x.y; version="[1.0.0,1.1)"; type="boot.jar", + p.q; version="[1.0.0,1.1)", Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.appclient.boot/test/test data/lbr/lib/platform/missingJar-1.0.mf b/dev/com.ibm.ws.appclient.boot/test/test data/lbr/lib/platform/missingJar-1.0.mf index 5ddf4899c71..24c30cf8299 100644 --- a/dev/com.ibm.ws.appclient.boot/test/test data/lbr/lib/platform/missingJar-1.0.mf +++ b/dev/com.ibm.ws.appclient.boot/test/test data/lbr/lib/platform/missingJar-1.0.mf @@ -4,7 +4,7 @@ Subsystem-SymbolicName: com.ibm.websphere.appserver.logging-1.0; visibility:=pri Subsystem-Version: 1.0.0 Subsystem-Content: com.ibm.websphere.appserver.kernel-1.0; type="osgi.subsystem.feature", - p.q; version="[1.0.0,1.0.100)"; type="boot.jar" + p.q; version="[1.0.0,1.1)"; type="boot.jar" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 \ No newline at end of file diff --git a/dev/com.ibm.ws.com.sun.mail.javax.mail.1.6/bnd.overrides b/dev/com.ibm.ws.com.sun.mail.javax.mail.1.6/bnd.overrides index aa69ebef70c..cedb1748905 100644 --- a/dev/com.ibm.ws.com.sun.mail.javax.mail.1.6/bnd.overrides +++ b/dev/com.ibm.ws.com.sun.mail.javax.mail.1.6/bnd.overrides @@ -12,21 +12,21 @@ Include-Resource: \ @${repo;com.sun.mail:javax.mail;1.6.2}!/META-INF/javamail.default.address.map, \ @${repo;com.sun.mail:javax.mail;1.6.2}!/META-INF/javamail.default.providers -Import-Package: javax.mail;version="[1.6.0,1.6.200)", \ -javax.mail.event;version="[1.6.0,1.6.200)", \ -javax.mail.internet;version="[1.6.0,1.6.200)", \ -javax.mail.search;version="[1.6.0,1.6.200)", \ -javax.mail.util;version="[1.6.0,1.6.200)", \ -com.sun.mail;version="[1.6.0,1.6.200)", \ -com.sun.mail.auth;version="[1.6.0,1.6.200)", \ -com.sun.mail.imap;version="[1.6.0,1.6.200)", \ -com.sun.mail.imap.protocol;version="[1.6.0,1.6.200)", \ -com.sun.mail.iap;version="[1.6.0,1.6.200)", \ -com.sun.mail.pop3;version="[1.6.0,1.6.200)", \ -com.sun.mail.smtp;version="[1.6.0,1.6.200)", \ -com.sun.mail.util;version="[1.6.0,1.6.200)", \ -com.sun.mail.util.logging;version="[1.6.0,1.6.200)", \ -com.sun.mail.handlers;version="[1.6.0,1.6.200)" +Import-Package: javax.mail;version="[1.6.0,1.7)", \ +javax.mail.event;version="[1.6.0,1.7)", \ +javax.mail.internet;version="[1.6.0,1.7)", \ +javax.mail.search;version="[1.6.0,1.7)", \ +javax.mail.util;version="[1.6.0,1.7)", \ +com.sun.mail;version="[1.6.0,1.7)", \ +com.sun.mail.auth;version="[1.6.0,1.7)", \ +com.sun.mail.imap;version="[1.6.0,1.7)", \ +com.sun.mail.imap.protocol;version="[1.6.0,1.7)", \ +com.sun.mail.iap;version="[1.6.0,1.7)", \ +com.sun.mail.pop3;version="[1.6.0,1.7)", \ +com.sun.mail.smtp;version="[1.6.0,1.7)", \ +com.sun.mail.util;version="[1.6.0,1.7)", \ +com.sun.mail.util.logging;version="[1.6.0,1.7)", \ +com.sun.mail.handlers;version="[1.6.0,1.7)" Export-Package: \ diff --git a/dev/com.ibm.ws.com.sun.mail.javax.mail/bnd.overrides b/dev/com.ibm.ws.com.sun.mail.javax.mail/bnd.overrides index e1f0aab00c8..6a5f987269f 100644 --- a/dev/com.ibm.ws.com.sun.mail.javax.mail/bnd.overrides +++ b/dev/com.ibm.ws.com.sun.mail.javax.mail/bnd.overrides @@ -13,21 +13,21 @@ Include-Resource: \ @${repo;com.sun.mail:javax.mail;1.5.6}!/META-INF/javamail.default.providers Import-Package: \ - javax.mail;version="[1.5.0,1.5.200)", \ - javax.mail.event;version="[1.5.0,1.5.200)", \ - javax.mail.internet;version="[1.5.0,1.5.200)", \ - javax.mail.search;version="[1.5.0,1.5.200)", \ - javax.mail.util;version="[1.5.0,1.5.200)", \ + javax.mail;version="[1.5.0,1.6)", \ + javax.mail.event;version="[1.5.0,1.6)", \ + javax.mail.internet;version="[1.5.0,1.6)", \ + javax.mail.search;version="[1.5.0,1.6)", \ + javax.mail.util;version="[1.5.0,1.6)", \ com.sun.mail;version="1.5.16", \ com.sun.mail.auth;version="1.5.16", \ - com.sun.mail.imap;version="[1.5.0,1.5.200)", \ - com.sun.mail.imap.protocol;version="[1.5.0,1.5.200)", \ - com.sun.mail.iap;version="[1.5.0,1.5.200)", \ - com.sun.mail.pop3;version="[1.5.0,1.5.200)", \ - com.sun.mail.smtp;version="[1.5.0,1.5.200)", \ - com.sun.mail.util;version="[1.5.0,1.5.200)", \ - com.sun.mail.util.logging;version="[1.5.0,1.5.200)", \ - com.sun.mail.handlers;version="[1.5.0,1.5.200)" + com.sun.mail.imap;version="[1.5.0,1.6)", \ + com.sun.mail.imap.protocol;version="[1.5.0,1.6)", \ + com.sun.mail.iap;version="[1.5.0,1.6)", \ + com.sun.mail.pop3;version="[1.5.0,1.6)", \ + com.sun.mail.smtp;version="[1.5.0,1.6)", \ + com.sun.mail.util;version="[1.5.0,1.6)", \ + com.sun.mail.util.logging;version="[1.5.0,1.6)", \ + com.sun.mail.handlers;version="[1.5.0,1.6)" Export-Package: \ javax.mail, \ diff --git a/dev/com.ibm.ws.componenttest.2.0/publish/features/com.ibm.websphere.appserver.componenttest-2.0.mf b/dev/com.ibm.ws.componenttest.2.0/publish/features/com.ibm.websphere.appserver.componenttest-2.0.mf index 65ce94c396f..e8122bd22b8 100644 --- a/dev/com.ibm.ws.componenttest.2.0/publish/features/com.ibm.websphere.appserver.componenttest-2.0.mf +++ b/dev/com.ibm.ws.componenttest.2.0/publish/features/com.ibm.websphere.appserver.componenttest-2.0.mf @@ -3,7 +3,7 @@ IBM-Test-Feature: true IBM-ShortName: componenttest-2.0 Subsystem-SymbolicName: com.ibm.websphere.appserver.componenttest-2.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.componenttest.2.0; version="[1,1.0.100)" +Subsystem-Content: com.ibm.ws.componenttest.2.0; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 IBM-API-Package: componenttest.app, diff --git a/dev/com.ibm.ws.componenttest/publish/features/com.ibm.websphere.appserver.componenttest-1.0.mf b/dev/com.ibm.ws.componenttest/publish/features/com.ibm.websphere.appserver.componenttest-1.0.mf index d4f426e8056..c352d8ec311 100644 --- a/dev/com.ibm.ws.componenttest/publish/features/com.ibm.websphere.appserver.componenttest-1.0.mf +++ b/dev/com.ibm.ws.componenttest/publish/features/com.ibm.websphere.appserver.componenttest-1.0.mf @@ -3,7 +3,7 @@ IBM-Test-Feature: true IBM-ShortName: componenttest-1.0 Subsystem-SymbolicName: com.ibm.websphere.appserver.componenttest-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.componenttest; version="[1,1.0.100)" +Subsystem-Content: com.ibm.ws.componenttest; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 IBM-API-Package: componenttest.app, diff --git a/dev/com.ibm.ws.concurrent.persistent_fat/publish/files/features/timerInterfacesTestFeature-1.0.mf b/dev/com.ibm.ws.concurrent.persistent_fat/publish/files/features/timerInterfacesTestFeature-1.0.mf index 7aa6cd32ffc..c8afbf356c6 100755 --- a/dev/com.ibm.ws.concurrent.persistent_fat/publish/files/features/timerInterfacesTestFeature-1.0.mf +++ b/dev/com.ibm.ws.concurrent.persistent_fat/publish/files/features/timerInterfacesTestFeature-1.0.mf @@ -4,7 +4,7 @@ Subsystem-SymbolicName: test.concurrent.persistent.timerInterfacesTestFeature-1. Subsystem-Version: 1.0 Subsystem-Content: com.ibm.websphere.appserver.persistentExecutor-1.0; type="osgi.subsystem.feature", com.ibm.websphere.appserver.transaction-1.2; type="osgi.subsystem.feature", - test.feature.sim.ejb.timer; version="[1,1.0.100)" + test.feature.sim.ejb.timer; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 IBM-API-Package: com.ibm.ws.concurrent.persistent.ejb, diff --git a/dev/com.ibm.ws.concurrent.persistent_fat/publish/files/features/timerInterfacesTestFeature-2.0.mf b/dev/com.ibm.ws.concurrent.persistent_fat/publish/files/features/timerInterfacesTestFeature-2.0.mf index 3f20dc23037..782b7e59326 100755 --- a/dev/com.ibm.ws.concurrent.persistent_fat/publish/files/features/timerInterfacesTestFeature-2.0.mf +++ b/dev/com.ibm.ws.concurrent.persistent_fat/publish/files/features/timerInterfacesTestFeature-2.0.mf @@ -5,7 +5,7 @@ Subsystem-Version: 1.0 Subsystem-Content: com.ibm.websphere.appserver.persistentExecutor-1.0; type="osgi.subsystem.feature", com.ibm.websphere.appserver.jdbc-4.2; ibm.tolerates:="4.3, 4.1"; type="osgi.subsystem.feature", com.ibm.websphere.appserver.transaction-2.0; type="osgi.subsystem.feature", - test.feature.sim.ejb.timer.jakarta; version="[1,1.0.100)" + test.feature.sim.ejb.timer.jakarta; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 IBM-API-Package: com.ibm.ws.concurrent.persistent.ejb, diff --git a/dev/com.ibm.ws.concurrent.persistent_fat_delayexec/publish/files/features/testFeature-1.0.mf b/dev/com.ibm.ws.concurrent.persistent_fat_delayexec/publish/files/features/testFeature-1.0.mf index cb94560964c..c20378cd285 100755 --- a/dev/com.ibm.ws.concurrent.persistent_fat_delayexec/publish/files/features/testFeature-1.0.mf +++ b/dev/com.ibm.ws.concurrent.persistent_fat_delayexec/publish/files/features/testFeature-1.0.mf @@ -2,7 +2,7 @@ Subsystem-ManifestVersion: 1 IBM-ShortName: testFeature-1.0 Subsystem-SymbolicName: test.concurrent.persistent.testFeature-1.0; visibility:=public Subsystem-Version: 1.0 -Subsystem-Content: test.concurrent.persistent.delayexec; version="[1,1.0.100)", - com.ibm.ws.runtime.update; version="[1,1.0.100)"; type="jar" +Subsystem-Content: test.concurrent.persistent.delayexec; version="[1,1.1)", + com.ibm.ws.runtime.update; version="[1,1.1)"; type="jar" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 \ No newline at end of file diff --git a/dev/com.ibm.ws.concurrent.persistent_fat_feature/publish/files/features/testFeature-1.0.mf b/dev/com.ibm.ws.concurrent.persistent_fat_feature/publish/files/features/testFeature-1.0.mf index fb838b1aa7c..05a825cc5f3 100755 --- a/dev/com.ibm.ws.concurrent.persistent_fat_feature/publish/files/features/testFeature-1.0.mf +++ b/dev/com.ibm.ws.concurrent.persistent_fat_feature/publish/files/features/testFeature-1.0.mf @@ -2,7 +2,7 @@ Subsystem-ManifestVersion: 1 IBM-ShortName: testFeature-1.0 Subsystem-SymbolicName: test.concurrent.persistent.testFeature-1.0; visibility:=public Subsystem-Version: 1.0 -Subsystem-Content: test.concurrent.persistent.feature; version="[1,1.0.100)", +Subsystem-Content: test.concurrent.persistent.feature; version="[1,1.1)", com.ibm.websphere.appserver.jdbc-4.3; ibm.tolerates:="4.2, 4.1"; type="osgi.subsystem.feature", com.ibm.websphere.appserver.transaction-2.0; type="osgi.subsystem.feature", test.concurrent.persistent.persistentExecutorTestFeature-1.0; type="osgi.subsystem.feature" diff --git a/dev/com.ibm.ws.concurrent.persistent_fat_oneexec/publish/files/features/singletonTestFeature-1.0.mf b/dev/com.ibm.ws.concurrent.persistent_fat_oneexec/publish/files/features/singletonTestFeature-1.0.mf index f581001481c..154895786ef 100755 --- a/dev/com.ibm.ws.concurrent.persistent_fat_oneexec/publish/files/features/singletonTestFeature-1.0.mf +++ b/dev/com.ibm.ws.concurrent.persistent_fat_oneexec/publish/files/features/singletonTestFeature-1.0.mf @@ -4,7 +4,7 @@ Subsystem-SymbolicName: test.concurrent.persistent.singletonTestFeature-1.0; vis Subsystem-Version: 1.0 Subsystem-Content: com.ibm.websphere.appserver.persistentExecutor-1.0; type="osgi.subsystem.feature", com.ibm.websphere.appserver.transaction-1.2; type="osgi.subsystem.feature", - test.feature.ejb.singleton; version="[1,1.0.100)" + test.feature.ejb.singleton; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 IBM-API-Package: com.ibm.ws.concurrent.persistent.ejb, diff --git a/dev/com.ibm.ws.concurrent.persistent_fat_simctrl/publish/files/features/simulatedController-1.0.mf b/dev/com.ibm.ws.concurrent.persistent_fat_simctrl/publish/files/features/simulatedController-1.0.mf index 90d4c3ee50f..4da990bf6a7 100755 --- a/dev/com.ibm.ws.concurrent.persistent_fat_simctrl/publish/files/features/simulatedController-1.0.mf +++ b/dev/com.ibm.ws.concurrent.persistent_fat_simctrl/publish/files/features/simulatedController-1.0.mf @@ -3,7 +3,7 @@ IBM-ShortName: simulatedController-1.0 IBM-Test-Feature: true Subsystem-SymbolicName: test.concurrent.persistent.simulatedController-1.0; visibility:=public Subsystem-Version: 1.0 -Subsystem-Content: test.concurrent.persistent.fat.simctrl; version="[1,1.0.100)", +Subsystem-Content: test.concurrent.persistent.fat.simctrl; version="[1,1.1)", com.ibm.websphere.appserver.persistentExecutor-1.0; type="osgi.subsystem.feature", com.ibm.websphere.appserver.transaction-1.2; type="osgi.subsystem.feature" Subsystem-Type: osgi.subsystem.feature diff --git a/dev/com.ibm.ws.concurrent_fat/publish/files/features/concurrenttest-1.0.mf b/dev/com.ibm.ws.concurrent_fat/publish/files/features/concurrenttest-1.0.mf index 0343a92604b..78cc948d9ae 100644 --- a/dev/com.ibm.ws.concurrent_fat/publish/files/features/concurrenttest-1.0.mf +++ b/dev/com.ibm.ws.concurrent_fat/publish/files/features/concurrenttest-1.0.mf @@ -4,7 +4,7 @@ Subsystem-SymbolicName: test.concurrenttest-1.0;visibility:=public Subsystem-Version: 1.0.0 Subsystem-Content: com.ibm.websphere.appserver.osgiConsole-1.0; type="osgi.subsystem.feature", com.ibm.websphere.appserver.transaction-1.1; ibm.tolerates:="1.2, 2.0"; type="osgi.subsystem.feature", - test.resource.testresource; version="[1,1.0.100)" + test.resource.testresource; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Test-Feature: true IBM-API-Package: com.ibm.websphere.ras; type="internal", diff --git a/dev/com.ibm.ws.concurrent_fat_work/publish/files/features/workManager-1.0.mf b/dev/com.ibm.ws.concurrent_fat_work/publish/files/features/workManager-1.0.mf index 483f587a2ae..ba9aa6895d2 100755 --- a/dev/com.ibm.ws.concurrent_fat_work/publish/files/features/workManager-1.0.mf +++ b/dev/com.ibm.ws.concurrent_fat_work/publish/files/features/workManager-1.0.mf @@ -3,7 +3,7 @@ IBM-ShortName: workManager-1.0 Subsystem-SymbolicName: test.concurrent.work.workManager-1.0; visibility:=public Subsystem-Version: 1.0 Subsystem-Content: - test.concurrent.work; version="[1,1.0.100)", + test.concurrent.work; version="[1,1.1)", test.concurrent.work.concurrencyExtension-1.0; type="osgi.subsystem.feature" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.concurrent_fat_zcontext/publish/files/features/simulatedZOSContextProviders-1.0.mf b/dev/com.ibm.ws.concurrent_fat_zcontext/publish/files/features/simulatedZOSContextProviders-1.0.mf index 8ce1863b5a7..38550fe07a7 100644 --- a/dev/com.ibm.ws.concurrent_fat_zcontext/publish/files/features/simulatedZOSContextProviders-1.0.mf +++ b/dev/com.ibm.ws.concurrent_fat_zcontext/publish/files/features/simulatedZOSContextProviders-1.0.mf @@ -2,8 +2,8 @@ Subsystem-ManifestVersion: 1 IBM-ShortName: simulatedZOSContextProviders-1.0 Subsystem-SymbolicName: simulatedZOSContextProviders-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: test.concurrent.sim.zos.syncToOSThread; version="[1,1.0.100)", - test.concurrent.sim.zos.wlm; version="[1,1.0.100)" +Subsystem-Content: test.concurrent.sim.zos.syncToOSThread; version="[1,1.1)", + test.concurrent.sim.zos.wlm; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-API-Package: test.concurrent.cache; type="internal", test.concurrent.sim.context.zos.wlm; type="internal" diff --git a/dev/com.ibm.ws.config.schemagen.schemagen/bnd.bnd b/dev/com.ibm.ws.config.schemagen.schemagen/bnd.bnd index e9f00096418..02b2b90bc46 100644 --- a/dev/com.ibm.ws.config.schemagen.schemagen/bnd.bnd +++ b/dev/com.ibm.ws.config.schemagen.schemagen/bnd.bnd @@ -1,5 +1,5 @@ #******************************************************************************* -# Copyright (c) 2017 IBM Corporation and others. +# Copyright (c) 2017, 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 @@ -16,14 +16,14 @@ bVersion=1.0 Bundle-Name: WebSphere Schema Generator Bundle-SymbolicName: com.ibm.ws.config.schemagen.schemagen -Require-Bundle: com.ibm.ws.config; version="[1,1.0.100)", \ +Require-Bundle: com.ibm.ws.config; version="[1,1.1)", \ org.eclipse.osgi; version="[3.10, 4)", \ - com.ibm.ws.logging; version="[1, 1.0.100)", \ - com.ibm.ws.org.eclipse.equinox.metatype; version="[1.0.0, 1.0.100)", \ - com.ibm.ws.kernel.feature; version="[1,1.0.100)", \ - com.ibm.ws.org.apache.aries.util; version="[1,1.0.100)", \ - com.ibm.ws.kernel.service; version="[1.3,1.3.100)", \ - com.ibm.ws.config.schemagen; version="[1,1.0.100)" + com.ibm.ws.logging; version="[1, 1.1)", \ + com.ibm.ws.org.eclipse.equinox.metatype; version="[1.0.0, 1.1)", \ + com.ibm.ws.kernel.feature; version="[1,1.1)", \ + com.ibm.ws.org.apache.aries.util; version="[1,1.1)", \ + com.ibm.ws.kernel.service; version="[1.3,1.4)", \ + com.ibm.ws.config.schemagen; version="[1,1.1)" Command-Class: com.ibm.ws.config.schemagen.internal.Generator -outputmask: ws-schemagen.jar diff --git a/dev/com.ibm.ws.config.server.schemagen.serverschemagen/bnd.bnd b/dev/com.ibm.ws.config.server.schemagen.serverschemagen/bnd.bnd index eaf670469ad..545bff4aad5 100644 --- a/dev/com.ibm.ws.config.server.schemagen.serverschemagen/bnd.bnd +++ b/dev/com.ibm.ws.config.server.schemagen.serverschemagen/bnd.bnd @@ -1,5 +1,5 @@ #******************************************************************************* -# Copyright (c) 2017 IBM Corporation and others. +# Copyright (c) 2017, 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 @@ -16,9 +16,9 @@ bVersion=1.0 Bundle-Name: ServerSchema Generator Bundle-SymbolicName: com.ibm.ws.config.server.schemagen.serverschemagen -Require-Bundle: com.ibm.ws.config.server.schemagen; version="[1,1.0.100)", \ - com.ibm.ws.kernel.service; version="[1.3,1.3.100)", \ - com.ibm.ws.logging; version="[1, 1.0.100)", \ +Require-Bundle: com.ibm.ws.config.server.schemagen; version="[1,1.1)", \ + com.ibm.ws.kernel.service; version="[1.3,1.4)", \ + com.ibm.ws.logging; version="[1, 1.1)", \ javax.management,javax.management.remote Command-Class: com.ibm.ws.config.server.schemagen.ServerSchemaGenCommand diff --git a/dev/com.ibm.ws.config.variables_fat/publish/files/internalFeatureForFat/delayedVariable-1.0.mf b/dev/com.ibm.ws.config.variables_fat/publish/files/internalFeatureForFat/delayedVariable-1.0.mf index 8c6dcd7ade9..25cfa5c94f6 100644 --- a/dev/com.ibm.ws.config.variables_fat/publish/files/internalFeatureForFat/delayedVariable-1.0.mf +++ b/dev/com.ibm.ws.config.variables_fat/publish/files/internalFeatureForFat/delayedVariable-1.0.mf @@ -2,5 +2,5 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: delayedVariable-1.0;visibility:=public Subsystem-Version: 1.0.0 Subsystem-Type: osgi.subsystem.feature -Subsystem-Content: test.config.variables; version="[1,1.0.100)" +Subsystem-Content: test.config.variables; version="[1,1.1)" IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/childAliasTest-1.0.mf b/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/childAliasTest-1.0.mf index a1a5efb9249..3b170b521c6 100644 --- a/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/childAliasTest-1.0.mf +++ b/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/childAliasTest-1.0.mf @@ -2,5 +2,5 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: childAliasTest-1.0;visibility:=public Subsystem-Version: 1.0.0 Subsystem-Type: osgi.subsystem.feature -Subsystem-Content: test.config.childalias; version="[1,1.0.100)" +Subsystem-Content: test.config.childalias; version="[1,1.1)" IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/childAliasTestB-1.0.mf b/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/childAliasTestB-1.0.mf index 8668eb7b1b4..42f5d37e159 100644 --- a/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/childAliasTestB-1.0.mf +++ b/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/childAliasTestB-1.0.mf @@ -2,5 +2,5 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: childAliasTestB-1.0;visibility:=public Subsystem-Version: 1.0.0 Subsystem-Type: osgi.subsystem.feature -Subsystem-Content: test.config.childalias.b; version="[1,1.0.100)" +Subsystem-Content: test.config.childalias.b; version="[1,1.1)" IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/childAliasTestC-1.0.mf b/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/childAliasTestC-1.0.mf index 52408615ef9..3c0d5e35c88 100644 --- a/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/childAliasTestC-1.0.mf +++ b/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/childAliasTestC-1.0.mf @@ -2,5 +2,5 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: childAliasTestC-1.0;visibility:=public Subsystem-Version: 1.0.0 Subsystem-Type: osgi.subsystem.feature -Subsystem-Content: test.config.childalias.c; version="[1,1.0.100)" +Subsystem-Content: test.config.childalias.c; version="[1,1.1)" IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/configExtensionsSchemaGeneratorTest-1.0.mf b/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/configExtensionsSchemaGeneratorTest-1.0.mf index db1b52a69f7..abb277d1521 100644 --- a/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/configExtensionsSchemaGeneratorTest-1.0.mf +++ b/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/configExtensionsSchemaGeneratorTest-1.0.mf @@ -2,7 +2,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: configExtensionsSchemaGeneratorTest-1.0;visibility:=public Subsystem-Version: 1.0.0 Subsystem-Type: osgi.subsystem.feature -Subsystem-Content: test.config.extensions.schema.generator; version="[1,1.0.100)", +Subsystem-Content: test.config.extensions.schema.generator; version="[1,1.1)", com.ibm.websphere.appserver.servlet-3.1; type="osgi.subsystem.feature" IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/configExtensionsTest-1.0.mf b/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/configExtensionsTest-1.0.mf index f9f29e8239b..ec87ef19ea2 100644 --- a/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/configExtensionsTest-1.0.mf +++ b/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/configExtensionsTest-1.0.mf @@ -2,7 +2,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: configExtensionsTest-1.0;visibility:=public Subsystem-Version: 1.0.0 Subsystem-Type: osgi.subsystem.feature -Subsystem-Content: test.config.extensions; version="[1,1.0.100)", +Subsystem-Content: test.config.extensions; version="[1,1.1)", com.ibm.wsspi.appserver.webBundle-1.0; type="osgi.subsystem.feature", com.ibm.websphere.appserver.servlet-3.1; type="osgi.subsystem.feature" IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/configExtensionsTestB-1.0.mf b/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/configExtensionsTestB-1.0.mf index 90f03fa6bc9..82193b51514 100644 --- a/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/configExtensionsTestB-1.0.mf +++ b/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/configExtensionsTestB-1.0.mf @@ -2,7 +2,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: configExtensionsTestB-1.0;visibility:=public Subsystem-Version: 1.0.0 Subsystem-Type: osgi.subsystem.feature -Subsystem-Content: test.config.extensions.b; version="[1,1.0.100)", +Subsystem-Content: test.config.extensions.b; version="[1,1.1)", com.ibm.wsspi.appserver.webBundle-1.0; type="osgi.subsystem.feature", com.ibm.websphere.appserver.servlet-3.1; type="osgi.subsystem.feature" IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/delayedVariable-1.0.mf b/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/delayedVariable-1.0.mf index 8c6dcd7ade9..25cfa5c94f6 100644 --- a/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/delayedVariable-1.0.mf +++ b/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/delayedVariable-1.0.mf @@ -2,5 +2,5 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: delayedVariable-1.0;visibility:=public Subsystem-Version: 1.0.0 Subsystem-Type: osgi.subsystem.feature -Subsystem-Content: test.config.variables; version="[1,1.0.100)" +Subsystem-Content: test.config.variables; version="[1,1.1)" IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/mergedConfigTest-1.0.mf b/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/mergedConfigTest-1.0.mf index 20e4f39e8d1..083a296dfee 100644 --- a/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/mergedConfigTest-1.0.mf +++ b/dev/com.ibm.ws.config_fat/publish/files/internalFeatureForFat/mergedConfigTest-1.0.mf @@ -2,5 +2,5 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: mergedConfigTest-1.0;visibility:=public Subsystem-Version: 1.0.0 Subsystem-Type: osgi.subsystem.feature -Subsystem-Content: test.merged.config; version="[1,1.0.100)" +Subsystem-Content: test.merged.config; version="[1,1.1)" IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.context_fat_customproviders/publish/files/features/contexttest-1.0.mf b/dev/com.ibm.ws.context_fat_customproviders/publish/files/features/contexttest-1.0.mf index 78285971338..9d1f77fb545 100644 --- a/dev/com.ibm.ws.context_fat_customproviders/publish/files/features/contexttest-1.0.mf +++ b/dev/com.ibm.ws.context_fat_customproviders/publish/files/features/contexttest-1.0.mf @@ -2,10 +2,10 @@ Subsystem-ManifestVersion: 1 IBM-ShortName: contexttest-1.0 Subsystem-SymbolicName: ShortName:contexttest-1.0;visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: buffer; version="[1,1.0.100)", - map; version="[1,1.0.100)", - numeration; version="[1,1.0.100)", - threadfactory; version="[1,1.0.100)" +Subsystem-Content: buffer; version="[1,1.1)", + map; version="[1,1.1)", + numeration; version="[1,1.1)", + threadfactory; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-API-Package: org.osgi.framework; type="internal", com.ibm.websphere.ras; type="internal", diff --git a/dev/com.ibm.ws.crypto.passwordutil/test/test_data/custom_encryption/usr/extension/lib/features/noDescription-1.0.mf b/dev/com.ibm.ws.crypto.passwordutil/test/test_data/custom_encryption/usr/extension/lib/features/noDescription-1.0.mf index 7c9ef375949..67da08fa2b5 100644 --- a/dev/com.ibm.ws.crypto.passwordutil/test/test_data/custom_encryption/usr/extension/lib/features/noDescription-1.0.mf +++ b/dev/com.ibm.ws.crypto.passwordutil/test/test_data/custom_encryption/usr/extension/lib/features/noDescription-1.0.mf @@ -6,6 +6,6 @@ Subsystem-Version: 1.0.0 Subsystem-ManifestVersion: 1.0 Subsystem-SymbolicName: noDescription-1.0;visibility:=public Subsystem-Content: - com.ibm.ws.crypto.util.custom; version="[1,1.0.100)"; start-phase:="SERVICE_EARLY", + com.ibm.ws.crypto.util.custom; version="[1,1.1)"; start-phase:="SERVICE_EARLY", noDescription.jar; location:="bin/tools/extensions/ws-customPasswordEncryption/noDescription.jar"; type=file diff --git a/dev/com.ibm.ws.crypto.passwordutil/test/test_data/custom_encryption/usr/extension/lib/features/valid-1.0.mf b/dev/com.ibm.ws.crypto.passwordutil/test/test_data/custom_encryption/usr/extension/lib/features/valid-1.0.mf index 2d44b489bbc..22e066bd011 100644 --- a/dev/com.ibm.ws.crypto.passwordutil/test/test_data/custom_encryption/usr/extension/lib/features/valid-1.0.mf +++ b/dev/com.ibm.ws.crypto.passwordutil/test/test_data/custom_encryption/usr/extension/lib/features/valid-1.0.mf @@ -6,7 +6,7 @@ Subsystem-Version: 1.0.0 Subsystem-ManifestVersion: 1.0 Subsystem-SymbolicName: valid-1.0;visibility:=public Subsystem-Content: - com.ibm.ws.crypto.util.custom; version="[1,1.0.100)"; start-phase:="SERVICE_EARLY", + com.ibm.ws.crypto.util.custom; version="[1,1.1)"; start-phase:="SERVICE_EARLY", valid.jar; location:="bin/tools/extensions/ws-customPasswordEncryption/valid.jar"; type=file Subsystem-Description: %description diff --git a/dev/com.ibm.ws.crypto.passwordutil/test/test_data/simple_custom_encryption/usr/extension/lib/features/simpleCustomEncryption-1.0.mf b/dev/com.ibm.ws.crypto.passwordutil/test/test_data/simple_custom_encryption/usr/extension/lib/features/simpleCustomEncryption-1.0.mf index e416581f166..d0e4b31bbd2 100644 --- a/dev/com.ibm.ws.crypto.passwordutil/test/test_data/simple_custom_encryption/usr/extension/lib/features/simpleCustomEncryption-1.0.mf +++ b/dev/com.ibm.ws.crypto.passwordutil/test/test_data/simple_custom_encryption/usr/extension/lib/features/simpleCustomEncryption-1.0.mf @@ -6,7 +6,7 @@ Subsystem-Version: 1.0.0 Subsystem-ManifestVersion: 1.0 Subsystem-SymbolicName: simpleCustomEncryption-1.0;visibility:=public Subsystem-Content: - com.ibm.ws.crypto.util.custom; version="[1,1.0.100)"; start-phase:="SERVICE_EARLY", + com.ibm.ws.crypto.util.custom; version="[1,1.1)"; start-phase:="SERVICE_EARLY", simpleCustomEncryption.jar; location:="bin/tools/extensions/ws-customPasswordEncryption/simpleCustomEncryption.jar"; type=file Subsystem-Description: %description diff --git a/dev/com.ibm.ws.ejbcontainer.fat_tools/publish/features/com.ibm.websphere.appserver.ejbTest-1.0.mf b/dev/com.ibm.ws.ejbcontainer.fat_tools/publish/features/com.ibm.websphere.appserver.ejbTest-1.0.mf index 870eccfea9d..a49e1a2cd5a 100644 --- a/dev/com.ibm.ws.ejbcontainer.fat_tools/publish/features/com.ibm.websphere.appserver.ejbTest-1.0.mf +++ b/dev/com.ibm.ws.ejbcontainer.fat_tools/publish/features/com.ibm.websphere.appserver.ejbTest-1.0.mf @@ -3,7 +3,7 @@ IBM-ShortName: ejbTest-1.0 IBM-Test-Feature: true Subsystem-SymbolicName: com.ibm.websphere.appserver.ejbTest-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.ejbcontainer.fat_tools; version="[1,1.0.100)"; type="osgi.subsystem.feature" +Subsystem-Content: com.ibm.ws.ejbcontainer.fat_tools; version="[1,1.1)"; type="osgi.subsystem.feature" IBM-Feature-Version: 2 IBM-API-Package: com.ibm.websphere.ejbcontainer.test.tools, com.ibm.websphere.ejbcontainer.test.osgi.pmi diff --git a/dev/com.ibm.ws.ejbcontainer.fat_tools_rar/publish/features/com.ibm.websphere.appserver.testAdapterForEJB-1.0.mf b/dev/com.ibm.ws.ejbcontainer.fat_tools_rar/publish/features/com.ibm.websphere.appserver.testAdapterForEJB-1.0.mf index 2abbba8824b..df81a0dc1e1 100644 --- a/dev/com.ibm.ws.ejbcontainer.fat_tools_rar/publish/features/com.ibm.websphere.appserver.testAdapterForEJB-1.0.mf +++ b/dev/com.ibm.ws.ejbcontainer.fat_tools_rar/publish/features/com.ibm.websphere.appserver.testAdapterForEJB-1.0.mf @@ -3,7 +3,7 @@ IBM-ShortName: testAdapterForEJB-1.0 IBM-Test-Feature: true Subsystem-SymbolicName: com.ibm.websphere.appserver.testAdapterForEJB-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.ejbcontainer.fat_tools_rar; version="[1,1.0.100)"; type="osgi.subsystem.feature" +Subsystem-Content: com.ibm.ws.ejbcontainer.fat_tools_rar; version="[1,1.1)"; type="osgi.subsystem.feature" IBM-Feature-Version: 2 IBM-API-Package: com.ibm.ws.ejbcontainer.fat.rar.activationSpec, com.ibm.ws.ejbcontainer.fat.rar.core, diff --git a/dev/com.ibm.ws.http2.client/publish/features/com.ibm.websphere.appserver.http2clienttest-1.0.mf b/dev/com.ibm.ws.http2.client/publish/features/com.ibm.websphere.appserver.http2clienttest-1.0.mf index 074c1c99d9c..eedf3492e9f 100644 --- a/dev/com.ibm.ws.http2.client/publish/features/com.ibm.websphere.appserver.http2clienttest-1.0.mf +++ b/dev/com.ibm.ws.http2.client/publish/features/com.ibm.websphere.appserver.http2clienttest-1.0.mf @@ -3,7 +3,7 @@ IBM-Test-Feature: true IBM-ShortName: http2clienttest-1.0 Subsystem-SymbolicName: com.ibm.websphere.appserver.http2clienttest-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.http2.client; version="[1,1.0.100)" +Subsystem-Content: com.ibm.ws.http2.client; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 IBM-API-Package: com.ibm.ws.http2.test; type="api", diff --git a/dev/com.ibm.ws.httpservice/publish/features/com.ibm.websphere.appserver.httpservice-2.2.mf b/dev/com.ibm.ws.httpservice/publish/features/com.ibm.websphere.appserver.httpservice-2.2.mf index 0fda7463d86..f8d956eeb09 100644 --- a/dev/com.ibm.ws.httpservice/publish/features/com.ibm.websphere.appserver.httpservice-2.2.mf +++ b/dev/com.ibm.ws.httpservice/publish/features/com.ibm.websphere.appserver.httpservice-2.2.mf @@ -4,7 +4,7 @@ IBM-ShortName: httpservice-2.2 Subsystem-SymbolicName: com.ibm.websphere.appserver.httpservice-2.2;visibility:=public Subsystem-Version: 1.0.0 Subsystem-Content: io.openliberty.servlet.api-3.0; ibm.tolerates:="3.1"; type="osgi.subsystem.feature", - com.ibm.ws.httpservice; version="[1,1.0.100)", + com.ibm.ws.httpservice; version="[1,1.1)", com.ibm.websphere.appserver.httptransport-1.0; type="osgi.subsystem.feature" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.injection_fat/publish/files/features/injectionBVTinternals-1.0.mf b/dev/com.ibm.ws.injection_fat/publish/files/features/injectionBVTinternals-1.0.mf index 0a8acc55388..6919a57aeda 100644 --- a/dev/com.ibm.ws.injection_fat/publish/files/features/injectionBVTinternals-1.0.mf +++ b/dev/com.ibm.ws.injection_fat/publish/files/features/injectionBVTinternals-1.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: injectionBVTinternals-1.0;visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: test.com.ibm.ws.injection; version="[1,1.0.100)" +Subsystem-Content: test.com.ibm.ws.injection; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-API-Package: com.ibm.ws.injection.lookup; type="internal", org.osgi.framework; type="spec" diff --git a/dev/com.ibm.ws.install.featureUtility.featureutil/bnd.bnd b/dev/com.ibm.ws.install.featureUtility.featureutil/bnd.bnd index 22b7e0f85b5..653f617adca 100644 --- a/dev/com.ibm.ws.install.featureUtility.featureutil/bnd.bnd +++ b/dev/com.ibm.ws.install.featureUtility.featureutil/bnd.bnd @@ -1,5 +1,5 @@ #******************************************************************************* -# Copyright (c) 2019 IBM Corporation and others. +# Copyright (c) 2019, 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 @@ -17,26 +17,26 @@ Bundle-Name: Feature Utility Bundle-SymbolicName: com.ibm.ws.install.featureUtility.featureutil Require-Bundle:\ - com.ibm.ws.install.featureUtility; version="[1,1.0.100)",\ - com.ibm.ws.install; version="[1,1.0.100)",\ - com.ibm.ws.kernel.service; version="[1.3,1.3.100)",\ - com.ibm.ws.logging; version="[1,1.0.100)", \ - com.ibm.ws.repository.liberty; version="[1,1.0.100)",\ - com.ibm.ws.repository.resolver; version="[1,1.0.100)",\ - com.ibm.ws.repository; version="[1,1.0.100)",\ - com.ibm.ws.repository.parsers;version="[1,1.0.100)",\ - com.ibm.ws.product.utility; version="[1,1.0.100)", \ + com.ibm.ws.install.featureUtility; version="[1,1.1)",\ + com.ibm.ws.install; version="[1,1.1)",\ + com.ibm.ws.kernel.service; version="[1.3,1.4)",\ + com.ibm.ws.logging; version="[1,1.1)", \ + com.ibm.ws.repository.liberty; version="[1,1.1)",\ + com.ibm.ws.repository.resolver; version="[1,1.1)",\ + com.ibm.ws.repository; version="[1,1.1)",\ + com.ibm.ws.repository.parsers;version="[1,1.1)",\ + com.ibm.ws.product.utility; version="[1,1.1)", \ org.eclipse.osgi; version="[3.10,4)",\ - com.ibm.ws.org.eclipse.equinox.metatype; version="[1,1.0.100)",\ - com.ibm.ws.org.apache.aries.util; version="[1,1.0.100)", \ - com.ibm.ws.org.apache.yoko.corba.spec.1.5; version="[1,1.0.100)", \ - com.ibm.websphere.javaee.jaxb.2.2; location="dev/api/spec/"; version="[1, 1.0.100)",\ - com.ibm.websphere.javaee.jsonp.1.0; location="dev/api/spec/"; version="[1, 1.0.100)",\ - com.ibm.ws.org.glassfish.json.1.0; version="[1,1.0.100)",\ - com.ibm.ws.crypto.passwordutil; version="[1,1.0.100)",\ - com.ibm.ws.kernel.feature; version="[1,1.0.100)",\ - com.ibm.ws.config; version="[1,1.0.100)",\ - com.ibm.ws.kernel.boot; version="[1,1.0.100)" + com.ibm.ws.org.eclipse.equinox.metatype; version="[1,1.1)",\ + com.ibm.ws.org.apache.aries.util; version="[1,1.1)", \ + com.ibm.ws.org.apache.yoko.corba.spec.1.5; version="[1,1.1)", \ + com.ibm.websphere.javaee.jaxb.2.2; location="dev/api/spec/"; version="[1, 1.1)",\ + com.ibm.websphere.javaee.jsonp.1.0; location="dev/api/spec/"; version="[1, 1.1)",\ + com.ibm.ws.org.glassfish.json.1.0; version="[1,1.1)",\ + com.ibm.ws.crypto.passwordutil; version="[1,1.1)",\ + com.ibm.ws.kernel.feature; version="[1,1.1)",\ + com.ibm.ws.config; version="[1,1.1)",\ + com.ibm.ws.kernel.boot; version="[1,1.1)" Command-Class: com.ibm.ws.install.featureUtility.FeatureUtilityExecutor diff --git a/dev/com.ibm.ws.install.map/bnd.bnd b/dev/com.ibm.ws.install.map/bnd.bnd index 038fac3edf5..32c937c656c 100755 --- a/dev/com.ibm.ws.install.map/bnd.bnd +++ b/dev/com.ibm.ws.install.map/bnd.bnd @@ -1,5 +1,5 @@ #******************************************************************************* -# Copyright (c) 2018 IBM Corporation and others. +# Copyright (c) 2018, 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 @@ -17,26 +17,26 @@ Bundle-Name: WebSphere Runtime Install Map Bundle-SymbolicName: com.ibm.ws.install.map Bundle-Description: WebSphere Liberty Install Map, version ${bVersion} -Require-Bundle: com.ibm.ws.install; version="[1,1.0.100)", \ - com.ibm.ws.crypto.passwordutil; version="[1,1.0.100)", \ - com.ibm.ws.kernel.feature; version="[1,1.0.100)", \ - com.ibm.ws.org.apache.aries.util; version="[1,1.0.100)", \ - com.ibm.ws.org.apache.yoko.corba.spec.1.5; version="[1,1.0.100)", \ - com.ibm.ws.config; version="[1,1.0.100)", \ - com.ibm.ws.kernel.service; version="[1.3,1.3.100)", \ - com.ibm.ws.kernel.boot; version="[1,1.0.100)", \ - com.ibm.ws.logging; version="[1,1.0.100)", \ - com.ibm.ws.logging.core; version="[1,1.0.100)", \ - com.ibm.ws.product.utility; version="[1,1.0.100)", \ +Require-Bundle: com.ibm.ws.install; version="[1,1.1)", \ + com.ibm.ws.crypto.passwordutil; version="[1,1.1)", \ + com.ibm.ws.kernel.feature; version="[1,1.1)", \ + com.ibm.ws.org.apache.aries.util; version="[1,1.1)", \ + com.ibm.ws.org.apache.yoko.corba.spec.1.5; version="[1,1.1)", \ + com.ibm.ws.config; version="[1,1.1)", \ + com.ibm.ws.kernel.service; version="[1.3,1.4)", \ + com.ibm.ws.kernel.boot; version="[1,1.1)", \ + com.ibm.ws.logging; version="[1,1.1)", \ + com.ibm.ws.logging.core; version="[1,1.1)", \ + com.ibm.ws.product.utility; version="[1,1.1)", \ org.eclipse.osgi; version="[3.10,4)", \ - com.ibm.ws.org.eclipse.equinox.metatype; version="[1,1.0.100)", \ - com.ibm.ws.repository.liberty; version="[1,1.0.100)", \ - com.ibm.ws.repository.resolver; version="[1,1.0.100)", \ - com.ibm.ws.repository.parsers;version="[1,1.0.100)",\ - com.ibm.ws.repository; version="[1,1.0.100)", \ - com.ibm.websphere.javaee.jaxb.2.2; location="dev/api/spec/"; version="[1, 1.0.100)", \ - com.ibm.websphere.javaee.jsonp.1.0; location="dev/api/spec/"; version="[1, 1.0.100)", \ - com.ibm.ws.org.glassfish.json.1.0; version="[1,1.0.100)" + com.ibm.ws.org.eclipse.equinox.metatype; version="[1,1.1)", \ + com.ibm.ws.repository.liberty; version="[1,1.1)", \ + com.ibm.ws.repository.resolver; version="[1,1.1)", \ + com.ibm.ws.repository.parsers;version="[1,1.1)",\ + com.ibm.ws.repository; version="[1,1.1)", \ + com.ibm.websphere.javaee.jaxb.2.2; location="dev/api/spec/"; version="[1, 1.1)", \ + com.ibm.websphere.javaee.jsonp.1.0; location="dev/api/spec/"; version="[1, 1.1)", \ + com.ibm.ws.org.glassfish.json.1.0; version="[1,1.1)" Private-Package: \ com.ibm.ws.install.map, \ diff --git a/dev/com.ibm.ws.javaee.ddmodel_fat/publish/files/features/libertyinternals-1.0.mf b/dev/com.ibm.ws.javaee.ddmodel_fat/publish/files/features/libertyinternals-1.0.mf index 97af33e011b..5dbde8caab4 100644 --- a/dev/com.ibm.ws.javaee.ddmodel_fat/publish/files/features/libertyinternals-1.0.mf +++ b/dev/com.ibm.ws.javaee.ddmodel_fat/publish/files/features/libertyinternals-1.0.mf @@ -1,8 +1,8 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: libertyinternals-1.0;visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: ddmodel; version="[1,1.0.100)", - com.ibm.ws.javaee.ddmodel.wsbnd; version="[1.0.0,1.0.200)" +Subsystem-Content: ddmodel; version="[1,1.1)", + com.ibm.ws.javaee.ddmodel.wsbnd; version="[1.0.0,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-API-Package: com.ibm.wsspi.artifact; type="internal", diff --git a/dev/com.ibm.ws.jaxb.tools.schemagen/bnd.bnd b/dev/com.ibm.ws.jaxb.tools.schemagen/bnd.bnd index 130bfe4a106..13e078e1cab 100644 --- a/dev/com.ibm.ws.jaxb.tools.schemagen/bnd.bnd +++ b/dev/com.ibm.ws.jaxb.tools.schemagen/bnd.bnd @@ -19,10 +19,10 @@ Bundle-SymbolicName: com.ibm.ws.jaxb.tools.schemagen Require-Compiler: true -Require-Bundle: com.ibm.ws.jaxb.tools; version="[1,1.0.100)", \ - com.ibm.websphere.javaee.activation.1.1; version="[1,1.0.100)"; location="dev/api/spec/", \ - com.ibm.websphere.javaee.jaxb.2.2; version="[1,1.0.100)"; location="dev/api/spec/", \ - com.ibm.ws.logging; version="[1,1.0.100)" +Require-Bundle: com.ibm.ws.jaxb.tools; version="[1,1.1)", \ + com.ibm.websphere.javaee.activation.1.1; version="[1,1.1)"; location="dev/api/spec/", \ + com.ibm.websphere.javaee.jaxb.2.2; version="[1,1.1)"; location="dev/api/spec/", \ + com.ibm.ws.logging; version="[1,1.1)" Command-Class: com.ibm.ws.jaxb.tools.SchemaGen diff --git a/dev/com.ibm.ws.jaxb.tools.xjc/bnd.bnd b/dev/com.ibm.ws.jaxb.tools.xjc/bnd.bnd index 6f57533159c..e46d6816323 100644 --- a/dev/com.ibm.ws.jaxb.tools.xjc/bnd.bnd +++ b/dev/com.ibm.ws.jaxb.tools.xjc/bnd.bnd @@ -1,5 +1,5 @@ #******************************************************************************* -# Copyright (c) 2017, 2023 IBM Corporation and others. +# Copyright (c) 2017, 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 @@ -19,10 +19,10 @@ Bundle-SymbolicName: com.ibm.ws.jaxb.tools.xjc Require-Compiler: true -Require-Bundle: com.ibm.ws.jaxb.tools; version="[1,1.0.100)", \ - com.ibm.websphere.javaee.activation.1.1; version="[1,1.0.100)"; location="dev/api/spec/", \ - com.ibm.websphere.javaee.jaxb.2.2; version="[1,1.0.100)"; location="dev/api/spec/", \ - com.ibm.ws.logging; version="[1,1.0.100)" +Require-Bundle: com.ibm.ws.jaxb.tools; version="[1,1.1)", \ + com.ibm.websphere.javaee.activation.1.1; version="[1,1.1)"; location="dev/api/spec/", \ + com.ibm.websphere.javaee.jaxb.2.2; version="[1,1.1)"; location="dev/api/spec/", \ + com.ibm.ws.logging; version="[1,1.1)" Command-Class: com.ibm.ws.jaxb.tools.XJC diff --git a/dev/com.ibm.ws.jaxb.tools/jaxb_schemagen.bnd b/dev/com.ibm.ws.jaxb.tools/jaxb_schemagen.bnd index 89b2a65b9be..460a6475040 100644 --- a/dev/com.ibm.ws.jaxb.tools/jaxb_schemagen.bnd +++ b/dev/com.ibm.ws.jaxb.tools/jaxb_schemagen.bnd @@ -1,5 +1,5 @@ #******************************************************************************* -# Copyright (c) 2017 IBM Corporation and others. +# Copyright (c) 2017, 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 @@ -18,8 +18,8 @@ Bundle-Name: IBM JAXB SchemaGen Tool Require-Compiler: true -Require-Bundle: com.ibm.ws.jaxb.tools; version="[1,1.0.100)", \ - com.ibm.websphere.javaee.jaxb.2.2; version="[1,1.0.100)"; location="dev/api/spec/", \ - com.ibm.ws.logging; version="[1,1.0.100)" +Require-Bundle: com.ibm.ws.jaxb.tools; version="[1,1.1)", \ + com.ibm.websphere.javaee.jaxb.2.2; version="[1,1.1)"; location="dev/api/spec/", \ + com.ibm.ws.logging; version="[1,1.1)" Command-Class: com.ibm.ws.jaxb.tools.SchemaGen \ No newline at end of file diff --git a/dev/com.ibm.ws.jaxb.tools/jaxb_xjc.bnd b/dev/com.ibm.ws.jaxb.tools/jaxb_xjc.bnd index 29ecca8a3e1..c8c693d712e 100644 --- a/dev/com.ibm.ws.jaxb.tools/jaxb_xjc.bnd +++ b/dev/com.ibm.ws.jaxb.tools/jaxb_xjc.bnd @@ -18,8 +18,8 @@ Bundle-Name: IBM JAXB XJC Tool Require-Compiler: true -Require-Bundle: com.ibm.ws.jaxb.tools; version="[1,1.0.100)", \ - com.ibm.websphere.javaee.jaxb.2.2; version="[1,1.0.100)"; location="dev/api/spec/", \ - com.ibm.ws.logging; version="[1,1.0.100)" +Require-Bundle: com.ibm.ws.jaxb.tools; version="[1,1.1)", \ + com.ibm.websphere.javaee.jaxb.2.2; version="[1,1.1)"; location="dev/api/spec/", \ + com.ibm.ws.logging; version="[1,1.1)" Command-Class: com.ibm.ws.jaxb.tools.XJC \ No newline at end of file diff --git a/dev/com.ibm.ws.jaxrs.2.0.tools.wadl2java/bnd.bnd b/dev/com.ibm.ws.jaxrs.2.0.tools.wadl2java/bnd.bnd index 8a9f55777d4..de9c420a250 100644 --- a/dev/com.ibm.ws.jaxrs.2.0.tools.wadl2java/bnd.bnd +++ b/dev/com.ibm.ws.jaxrs.2.0.tools.wadl2java/bnd.bnd @@ -19,16 +19,16 @@ Bundle-SymbolicName: com.ibm.ws.jaxrs.2.0.tools.wadl2java Require-Compiler: true -Require-Bundle: com.ibm.ws.jaxrs.2.0.tools; version="[1,1.0.100)", \ - com.ibm.websphere.javaee.jaxrs.2.0; version="[1,1.0.100)"; location="dev/api/spec/", \ - com.ibm.ws.jaxrs.2.0.common; version ="[1,1.0.100)", \ - io.openliberty.jaxrs.2.0.wadl2java.jaxb.runtime; version="[1,1.0.100)", \ - com.ibm.websphere.javaee.activation.1.1; version="[1,1.0.100)"; location="dev/api/spec/", \ - com.ibm.websphere.javaee.jaxb.2.2; version="[1,1.0.100)"; location="dev/api/spec/", \ - com.ibm.ws.logging; version="[1,1.0.100)", \ - com.ibm.ws.org.apache.ws.xmlschema.core.2.0.3; version="[1,1.0.100)", \ - com.ibm.websphere.javaee.annotation.1.2; version="[1.0.1,1.0.200)"; location="dev/api/spec/", \ - com.ibm.ws.xlxp.1.5.3; version="[1,1.0.100)" +Require-Bundle: com.ibm.ws.jaxrs.2.0.tools; version="[1,1.1)", \ + com.ibm.websphere.javaee.jaxrs.2.0; version="[1,1.1)"; location="dev/api/spec/", \ + com.ibm.ws.jaxrs.2.0.common; version ="[1,1.1)", \ + io.openliberty.jaxrs.2.0.wadl2java.jaxb.runtime; version="[1,1.1)", \ + com.ibm.websphere.javaee.activation.1.1; version="[1,1.1)"; location="dev/api/spec/", \ + com.ibm.websphere.javaee.jaxb.2.2; version="[1,1.1)"; location="dev/api/spec/", \ + com.ibm.ws.logging; version="[1,1.1)", \ + com.ibm.ws.org.apache.ws.xmlschema.core.2.0.3; version="[1,1.1)", \ + com.ibm.websphere.javaee.annotation.1.2; version="[1.0.1,1.1)"; location="dev/api/spec/", \ + com.ibm.ws.xlxp.1.5.3; version="[1,1.1)" Parent-Last-Package: javax.xml.bind,\ javax.xml.bind.annotation,\ diff --git a/dev/com.ibm.ws.jaxws.tools.wsgen/bnd.bnd b/dev/com.ibm.ws.jaxws.tools.wsgen/bnd.bnd index 1053413b683..00213ec9563 100644 --- a/dev/com.ibm.ws.jaxws.tools.wsgen/bnd.bnd +++ b/dev/com.ibm.ws.jaxws.tools.wsgen/bnd.bnd @@ -18,14 +18,14 @@ Bundle-SymbolicName: com.ibm.ws.jaxws.tools.wsgen Require-Compiler: true -Require-Bundle: com.ibm.websphere.javaee.jws.1.0; version="[1,1.0.100)"; location="dev/api/spec/", \ - com.ibm.ws.com.sun.xml.messaging.saaj; version="[1,1.0.100)", \ - com.ibm.ws.jaxws.tools.2.2.10; version="[1,1.0.100)", \ - com.ibm.ws.jaxb.tools; version="[1,1.0.100)", \ - com.ibm.websphere.javaee.activation.1.1; version="[1,1.0.100)"; location="dev/api/spec/", \ - com.ibm.websphere.javaee.jaxws.2.2; version="[1,1.0.100)"; location="dev/api/spec/", \ - com.ibm.websphere.javaee.jaxb.2.2; version="[1,1.0.100)"; location="dev/api/spec/", \ - com.ibm.ws.logging; version="[1,1.0.100)" +Require-Bundle: com.ibm.websphere.javaee.jws.1.0; version="[1,1.1)"; location="dev/api/spec/", \ + com.ibm.ws.com.sun.xml.messaging.saaj; version="[1,1.1)", \ + com.ibm.ws.jaxws.tools.2.2.10; version="[1,1.1)", \ + com.ibm.ws.jaxb.tools; version="[1,1.1)", \ + com.ibm.websphere.javaee.activation.1.1; version="[1,1.1)"; location="dev/api/spec/", \ + com.ibm.websphere.javaee.jaxws.2.2; version="[1,1.1)"; location="dev/api/spec/", \ + com.ibm.websphere.javaee.jaxb.2.2; version="[1,1.1)"; location="dev/api/spec/", \ + com.ibm.ws.logging; version="[1,1.1)" Parent-Last-Package: javax.xml.bind,\ javax.xml.bind.annotation,\ diff --git a/dev/com.ibm.ws.jaxws.tools.wsimport/bnd.bnd b/dev/com.ibm.ws.jaxws.tools.wsimport/bnd.bnd index 7031e0c611d..262d1044c87 100644 --- a/dev/com.ibm.ws.jaxws.tools.wsimport/bnd.bnd +++ b/dev/com.ibm.ws.jaxws.tools.wsimport/bnd.bnd @@ -21,13 +21,13 @@ Require-Compiler: true Add-Opens: java.base/java.net Require-Bundle: \ - com.ibm.ws.jaxws.tools.2.2.10; version="[1,1.0.100)", \ - com.ibm.ws.jaxb.tools; version="[1,1.0.100)", \ - com.ibm.websphere.javaee.activation.1.1; version="[1,1.0.100)"; location="dev/api/spec/", \ - com.ibm.websphere.javaee.jaxws.2.2; version="[1,1.0.100)"; location="dev/api/spec/", \ - com.ibm.websphere.javaee.jaxb.2.2; version="[1,1.0.100)"; location="dev/api/spec/", \ - com.ibm.ws.logging; version="[1,1.0.100)", \ - com.ibm.websphere.javaee.jws.1.0; version="[1,1.0.100)"; location="dev/api/spec/" + com.ibm.ws.jaxws.tools.2.2.10; version="[1,1.1)", \ + com.ibm.ws.jaxb.tools; version="[1,1.1)", \ + com.ibm.websphere.javaee.activation.1.1; version="[1,1.1)"; location="dev/api/spec/", \ + com.ibm.websphere.javaee.jaxws.2.2; version="[1,1.1)"; location="dev/api/spec/", \ + com.ibm.websphere.javaee.jaxb.2.2; version="[1,1.1)"; location="dev/api/spec/", \ + com.ibm.ws.logging; version="[1,1.1)", \ + com.ibm.websphere.javaee.jws.1.0; version="[1,1.1)"; location="dev/api/spec/" Parent-Last-Package: javax.xml.bind,\ javax.xml.bind.annotation,\ diff --git a/dev/com.ibm.ws.jbatch.utility.jbatchutil/bnd.bnd b/dev/com.ibm.ws.jbatch.utility.jbatchutil/bnd.bnd index 47b96709070..c13bd0d28ea 100644 --- a/dev/com.ibm.ws.jbatch.utility.jbatchutil/bnd.bnd +++ b/dev/com.ibm.ws.jbatch.utility.jbatchutil/bnd.bnd @@ -1,5 +1,5 @@ #******************************************************************************* -# Copyright (c) 2019 IBM Corporation and others. +# Copyright (c) 2019, 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 @@ -15,11 +15,11 @@ bVersion=1.0 Bundle-Name: WebSphere BatchManager Utility Bundle-SymbolicName: com.ibm.ws.jbatch.utility.jbatchutil -Require-Bundle: com.ibm.ws.jbatch.utility; version="[1,1.0.100)", \ - com.ibm.websphere.javaee.batch.1.0; location="dev/api/spec/"; version="[1,1.0.100)", \ - com.ibm.ws.logging; version="[1,1.0.100)", \ - com.ibm.ws.org.glassfish.json.1.0; version="[1,1.0.100)", \ - com.ibm.websphere.javaee.jsonp.1.0; location="dev/api/spec/"; version="[1,1.0.100)" +Require-Bundle: com.ibm.ws.jbatch.utility; version="[1,1.1)", \ + com.ibm.websphere.javaee.batch.1.0; location="dev/api/spec/"; version="[1,1.1)", \ + com.ibm.ws.logging; version="[1,1.1)", \ + com.ibm.ws.org.glassfish.json.1.0; version="[1,1.1)", \ + com.ibm.websphere.javaee.jsonp.1.0; location="dev/api/spec/"; version="[1,1.1)" Command-Class: com.ibm.ws.jbatch.utility.JBatchUtility diff --git a/dev/com.ibm.ws.jca_fat_bvt/publish/files/features/jcabvtbundle-1.0.mf b/dev/com.ibm.ws.jca_fat_bvt/publish/files/features/jcabvtbundle-1.0.mf index 22289574236..eb7212ba07a 100644 --- a/dev/com.ibm.ws.jca_fat_bvt/publish/files/features/jcabvtbundle-1.0.mf +++ b/dev/com.ibm.ws.jca_fat_bvt/publish/files/features/jcabvtbundle-1.0.mf @@ -2,7 +2,7 @@ Subsystem-ManifestVersion: 1 IBM-ShortName: jcabvtbundle-1.0 Subsystem-SymbolicName: jcabvtbundle-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: test.jca.fat.bvt.bundle; version="[1,1.0.100)", +Subsystem-Content: test.jca.fat.bvt.bundle; version="[1,1.1)", contextProviderSPI-1.0; type="osgi.subsystem.feature" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.jdbc_fat_heritageinterop/publish/files/features/jdbcHeritage-1.0.mf b/dev/com.ibm.ws.jdbc_fat_heritageinterop/publish/files/features/jdbcHeritage-1.0.mf index 1944fd1d98d..38c09834d9b 100644 --- a/dev/com.ibm.ws.jdbc_fat_heritageinterop/publish/files/features/jdbcHeritage-1.0.mf +++ b/dev/com.ibm.ws.jdbc_fat_heritageinterop/publish/files/features/jdbcHeritage-1.0.mf @@ -2,6 +2,6 @@ Subsystem-ManifestVersion: 1 IBM-ShortName: jdbcHeritage-1.0 Subsystem-SymbolicName: ShortName:jdbcHeritage-1.0;visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: jdbcHeritage; version="[1,1.0.100)" +Subsystem-Content: jdbcHeritage; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 \ No newline at end of file diff --git a/dev/com.ibm.ws.jdbc_fat_heritageinterop/publish/files/internalFeatures/dataStoreHelper-1.0.mf b/dev/com.ibm.ws.jdbc_fat_heritageinterop/publish/files/internalFeatures/dataStoreHelper-1.0.mf index 0434c988f6f..48fec83c45b 100644 --- a/dev/com.ibm.ws.jdbc_fat_heritageinterop/publish/files/internalFeatures/dataStoreHelper-1.0.mf +++ b/dev/com.ibm.ws.jdbc_fat_heritageinterop/publish/files/internalFeatures/dataStoreHelper-1.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: dataStoreHelper-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: jdbcHeritageApi; version="[1,1.0.100)" +Subsystem-Content: jdbcHeritageApi; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-API-Package: com.ibm.websphere.appprofile.accessintent; type="ibm-api", com.ibm.websphere.ce.cm; type="ibm-api", diff --git a/dev/com.ibm.ws.jsonb_fat/publish/files/features/testFeatureUsingJsonb-1.0.mf b/dev/com.ibm.ws.jsonb_fat/publish/files/features/testFeatureUsingJsonb-1.0.mf index 916236cf431..c22edcb0559 100644 --- a/dev/com.ibm.ws.jsonb_fat/publish/files/features/testFeatureUsingJsonb-1.0.mf +++ b/dev/com.ibm.ws.jsonb_fat/publish/files/features/testFeatureUsingJsonb-1.0.mf @@ -2,8 +2,8 @@ Subsystem-ManifestVersion: 1 IBM-ShortName: testFeatureUsingJsonb-1.0 Subsystem-SymbolicName: com.ibm.ws.jsonb.fat.testFeatureUsingJsonb-1.0; visibility:=public Subsystem-Version: 1.0 -Subsystem-Content: test.jsonb.bundle; version="[1,1.0.100)", - test.jsonp.bundle; version="[1,1.0.100)", +Subsystem-Content: test.jsonb.bundle; version="[1,1.1)", + test.jsonp.bundle; version="[1,1.1)", com.ibm.websphere.appserver.jsonb-1.0;type="osgi.subsystem.feature" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 \ No newline at end of file diff --git a/dev/com.ibm.ws.jsonb_fat/publish/files/features/testFeatureUsingJsonp-1.1.mf b/dev/com.ibm.ws.jsonb_fat/publish/files/features/testFeatureUsingJsonp-1.1.mf index 40c61d8e8b8..1cc965695c3 100644 --- a/dev/com.ibm.ws.jsonb_fat/publish/files/features/testFeatureUsingJsonp-1.1.mf +++ b/dev/com.ibm.ws.jsonb_fat/publish/files/features/testFeatureUsingJsonp-1.1.mf @@ -2,7 +2,7 @@ Subsystem-ManifestVersion: 1 IBM-ShortName: testFeatureUsingJsonp-1.1 Subsystem-SymbolicName: com.ibm.ws.jsonb.fat.testFeatureUsingJsonp-1.1; visibility:=public Subsystem-Version: 1.0 -Subsystem-Content: test.jsonp.bundle; version="[1,1.0.100)", +Subsystem-Content: test.jsonp.bundle; version="[1,1.1)", com.ibm.websphere.appserver.jsonp-1.1;type="osgi.subsystem.feature" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 \ No newline at end of file diff --git a/dev/com.ibm.ws.jsonp_fat/publish/files/features/customJsonpProvider-1.0.mf b/dev/com.ibm.ws.jsonp_fat/publish/files/features/customJsonpProvider-1.0.mf index 34c4cb146bc..762cab2e908 100644 --- a/dev/com.ibm.ws.jsonp_fat/publish/files/features/customJsonpProvider-1.0.mf +++ b/dev/com.ibm.ws.jsonp_fat/publish/files/features/customJsonpProvider-1.0.mf @@ -3,7 +3,7 @@ IBM-ShortName: customJsonpProvider-1.0 Subsystem-SymbolicName: com.ibm.ws.jsonp.feature.provider.1.0; visibility:=public Subsystem-Version: 1.0.0 Subsystem-Content: com.ibm.websphere.appserver.classloading-1.0; type="osgi.subsystem.feature", - com.ibm.ws.jsonp.feature.provider.1.0; version="[1,1.0.100)" + com.ibm.ws.jsonp.feature.provider.1.0; version="[1,1.1)" IBM-API-Package: com.ibm.ws.jsonp.feature.provider; type="api" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.jsp.2.3_fat/publish/files/features/globaltld-1.0.mf b/dev/com.ibm.ws.jsp.2.3_fat/publish/files/features/globaltld-1.0.mf index 84a25194f9d..4ad35fc7e3a 100644 --- a/dev/com.ibm.ws.jsp.2.3_fat/publish/files/features/globaltld-1.0.mf +++ b/dev/com.ibm.ws.jsp.2.3_fat/publish/files/features/globaltld-1.0.mf @@ -2,6 +2,6 @@ Subsystem-ManifestVersion: 1.0 Subsystem-SymbolicName: io.openliberty.jsp.globaltld-1.0; visibility:=public Subsystem-Version: 1.0.0.qualifier Subsystem-Type: osgi.subsystem.feature -Subsystem-Content: io.openliberty.test.tld; version="[1,1.0.100)" +Subsystem-Content: io.openliberty.test.tld; version="[1,1.1)" IBM-Feature-Version: 2 IBM-ShortName: globaltld-1.0 diff --git a/dev/com.ibm.ws.kernel.boot/publish/platform/kernel-1.0.mf b/dev/com.ibm.ws.kernel.boot/publish/platform/kernel-1.0.mf index 125a18cba26..dbc21ebf1a5 100644 --- a/dev/com.ibm.ws.kernel.boot/publish/platform/kernel-1.0.mf +++ b/dev/com.ibm.ws.kernel.boot/publish/platform/kernel-1.0.mf @@ -34,54 +34,54 @@ Subsystem-Content: README.TXT; location:="README.TXT"; type="file", ws-server.jar; location:="bin/tools/ws-server.jar"; type="file", bin.tools.ws-serialfilteragent.jar; location:="bin/tools/ws-serialfilteragent.jar"; type="file", prunsrv.exe; location:="bin/tools/win/prunsrv.exe"; type="file"; os="win", - com.ibm.websphere.appserver.api.kernel.service; version="[1.1,1.1.100)"; location:="dev/api/ibm/"; type="jar", - com.ibm.websphere.appserver.spi.kernel.filemonitor; version="[1,1.0.100)"; location:="dev/spi/ibm/"; type="jar", - com.ibm.websphere.appserver.spi.kernel.embeddable; version="[1.1,1.1.100)"; location:="dev/spi/ibm/"; type="jar", - com.ibm.websphere.appserver.spi.kernel.service; version="[1.8,1.8.100)"; location:="dev/spi/ibm/"; type="jar", - com.ibm.websphere.appserver.spi.kernel.metatype; version="[1,1.0.100)"; location:="dev/spi/ibm/"; type="jar", + com.ibm.websphere.appserver.api.kernel.service; version="[1.1,1.2)"; location:="dev/api/ibm/"; type="jar", + com.ibm.websphere.appserver.spi.kernel.filemonitor; version="[1,1.1)"; location:="dev/spi/ibm/"; type="jar", + com.ibm.websphere.appserver.spi.kernel.embeddable; version="[1.1,1.2)"; location:="dev/spi/ibm/"; type="jar", + com.ibm.websphere.appserver.spi.kernel.service; version="[1.8,1.9)"; location:="dev/spi/ibm/"; type="jar", + com.ibm.websphere.appserver.spi.kernel.metatype; version="[1,1.1)"; location:="dev/spi/ibm/"; type="jar", com.ibm.websphere.appserver.api.kernel.service_1.1-javadoc.zip; location:="dev/api/ibm/javadoc/com.ibm.websphere.appserver.api.kernel.service_1.1-javadoc.zip"; type="file", com.ibm.websphere.appserver.spi.kernel.filemonitor_1.0-javadoc.zip; location:="dev/spi/ibm/javadoc/com.ibm.websphere.appserver.spi.kernel.filemonitor_1.0-javadoc.zip"; type="file", com.ibm.websphere.appserver.spi.kernel.embeddable_1.1-javadoc.zip; location:="dev/spi/ibm/javadoc/com.ibm.websphere.appserver.spi.kernel.embeddable_1.1-javadoc.zip"; type="file", com.ibm.websphere.appserver.spi.kernel.metatype_1.0-javadoc.zip; location:="dev/spi/ibm/javadoc/com.ibm.websphere.appserver.spi.kernel.metatype_1.0-javadoc.zip"; type="file", com.ibm.websphere.appserver.spi.kernel.service_1.8-javadoc.zip; location:="dev/spi/ibm/javadoc/com.ibm.websphere.appserver.spi.kernel.service_1.8-javadoc.zip"; type="file", - com.ibm.websphere.appserver.spi.threading; version="[1,1.1.100)"; location:="dev/spi/ibm/"; type="jar", + com.ibm.websphere.appserver.spi.threading; version="[1,1.2)"; location:="dev/spi/ibm/"; type="jar", com.ibm.websphere.appserver.spi.threading_1.1-javadoc.zip; location:="dev/spi/ibm/javadoc/com.ibm.websphere.appserver.spi.threading_1.1-javadoc.zip"; type="file", - com.ibm.wsspi.org.osgi.core; version="[1.2,1.2.100)"; location:="dev/spi/spec/"; type="jar", - com.ibm.wsspi.org.osgi.namespace.service; version="[1,1.0.100)"; location:="dev/spi/spec/"; type="jar", - com.ibm.wsspi.org.osgi.service.cm; version="[1.1,1.1.100)"; location:="dev/spi/spec/"; type="jar", - com.ibm.wsspi.org.osgi.service.component; version="[1.1,1.1.100)"; location:="dev/spi/spec/"; type="jar", - com.ibm.wsspi.org.osgi.service.component.annotations; version="[1,1.0.100)"; location:="dev/spi/spec/"; type="jar", - com.ibm.wsspi.org.osgi.service.coordinator; version="[1,1.0.100)"; location:="dev/spi/spec/"; type="jar", - com.ibm.wsspi.org.osgi.service.event; version="[1,1.0.100)"; location:="dev/spi/spec/"; type="jar", - com.ibm.wsspi.org.osgi.service.log; version="[1.2,1.2.100)"; location:="dev/spi/spec/"; type="jar", - com.ibm.wsspi.org.osgi.service.metatype; version="[1.1,1.1.100)"; location:="dev/spi/spec/"; type="jar", - com.ibm.wsspi.org.osgi.service.metatype.annotations; version="[1,1.0.100)"; location:="dev/spi/spec/"; type="jar", - com.ibm.wsspi.thirdparty.equinox; version="[1.1,1.3.100)"; location:="dev/spi/third-party/"; type="jar", - com.ibm.websphere.appserver.api.config; version="[1,1.2.100)"; type="jar"; location:="dev/api/ibm/", + com.ibm.wsspi.org.osgi.core; version="[1.2,1.3)"; location:="dev/spi/spec/"; type="jar", + com.ibm.wsspi.org.osgi.namespace.service; version="[1,1.1)"; location:="dev/spi/spec/"; type="jar", + com.ibm.wsspi.org.osgi.service.cm; version="[1.1,1.2)"; location:="dev/spi/spec/"; type="jar", + com.ibm.wsspi.org.osgi.service.component; version="[1.1,1.2)"; location:="dev/spi/spec/"; type="jar", + com.ibm.wsspi.org.osgi.service.component.annotations; version="[1,1.1)"; location:="dev/spi/spec/"; type="jar", + com.ibm.wsspi.org.osgi.service.coordinator; version="[1,1.1)"; location:="dev/spi/spec/"; type="jar", + com.ibm.wsspi.org.osgi.service.event; version="[1,1.1)"; location:="dev/spi/spec/"; type="jar", + com.ibm.wsspi.org.osgi.service.log; version="[1.2,1.3)"; location:="dev/spi/spec/"; type="jar", + com.ibm.wsspi.org.osgi.service.metatype; version="[1.1,1.2)"; location:="dev/spi/spec/"; type="jar", + com.ibm.wsspi.org.osgi.service.metatype.annotations; version="[1,1.1)"; location:="dev/spi/spec/"; type="jar", + com.ibm.wsspi.thirdparty.equinox; version="[1.1,1.4)"; location:="dev/spi/third-party/"; type="jar", + com.ibm.websphere.appserver.api.config; version="[1,1.3)"; type="jar"; location:="dev/api/ibm/", com.ibm.websphere.appserver.api.config_1.2-javadoc.zip; type="file"; location:="dev/api/ibm/javadoc/com.ibm.websphere.appserver.api.config_1.2-javadoc.zip", - com.ibm.ws.config.schemagen; version="[1,1.0.100)"; type="jar", - com.ibm.ws.config.server.schemagen; version="[1,1.0.100)"; type="jar", + com.ibm.ws.config.schemagen; version="[1,1.1)"; type="jar", + com.ibm.ws.config.server.schemagen; version="[1,1.1)"; type="jar", wlp-anttasks.jar; location:="dev/tools/ant/wlp-anttasks.jar"; type="file", bootstrap-agent.jar; location:="lib/bootstrap-agent.jar"; type="file", ws-launch.jar; location:="lib/ws-launch.jar"; type="file", defaults; location:="lib/platform/defaults"; type="file", - com.ibm.ws.kernel.boot; version="[1,1.0.100)", - com.ibm.ws.kernel.cmdline; version="[1,1.0.100)", - com.ibm.ws.kernel.boot.archive; version="[1,1.0.100)", - com.ibm.ws.product.utility; version="[1,1.0.100)"; type="jar", - com.ibm.ws.security.utility; version="[1,1.0.100)"; type="jar", - com.ibm.ws.security.audit.reader; version="[1,1.0.100)"; type="jar", - com.ibm.ws.install; version="[1,1.0.100)"; type="jar", - com.ibm.ws.install.featureUtility; version="[1,1.0.100)"; type="jar", - com.ibm.ws.install.map; version="[1,1.0.100)"; type="jar", - com.ibm.json4j; version="[1,1.0.100)", - com.ibm.ws.repository.liberty; version="[1,1.0.100)"; type="jar", - com.ibm.ws.repository.resolver; version="[1,1.0.100)"; type="jar", - com.ibm.ws.repository; version="[1,1.0.100)"; type="jar", - com.ibm.ws.repository.parsers; version="[1,1.0.100)"; type="jar", - com.ibm.websphere.javaee.jsonp.1.0; version="[1, 1.0.100)"; location:="dev/api/spec/"; type="jar", - com.ibm.ws.org.glassfish.json.1.0; version="[1,1.0.100)"; type="jar", - com.ibm.ws.crypto.certificateutil; version="[1,1.0.100)"; type="jar", - com.ibm.ws.crypto.ltpakeyutil; version="[1,1.0.100)"; type="jar" + com.ibm.ws.kernel.boot; version="[1,1.1)", + com.ibm.ws.kernel.cmdline; version="[1,1.1)", + com.ibm.ws.kernel.boot.archive; version="[1,1.1)", + com.ibm.ws.product.utility; version="[1,1.1)"; type="jar", + com.ibm.ws.security.utility; version="[1,1.1)"; type="jar", + com.ibm.ws.security.audit.reader; version="[1,1.1)"; type="jar", + com.ibm.ws.install; version="[1,1.1)"; type="jar", + com.ibm.ws.install.featureUtility; version="[1,1.1)"; type="jar", + com.ibm.ws.install.map; version="[1,1.1)"; type="jar", + com.ibm.json4j; version="[1,1.1)", + com.ibm.ws.repository.liberty; version="[1,1.1)"; type="jar", + com.ibm.ws.repository.resolver; version="[1,1.1)"; type="jar", + com.ibm.ws.repository; version="[1,1.1)"; type="jar", + com.ibm.ws.repository.parsers; version="[1,1.1)"; type="jar", + com.ibm.websphere.javaee.jsonp.1.0; version="[1, 1.1)"; location:="dev/api/spec/"; type="jar", + com.ibm.ws.org.glassfish.json.1.0; version="[1,1.1)"; type="jar", + com.ibm.ws.crypto.certificateutil; version="[1,1.1)"; type="jar", + com.ibm.ws.crypto.ltpakeyutil; version="[1,1.1)"; type="jar" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.kernel.boot_fat/publish/files/provisioningInterimFixTest-1.0.mf b/dev/com.ibm.ws.kernel.boot_fat/publish/files/provisioningInterimFixTest-1.0.mf index ebf1245cd20..063ca5dbfa1 100644 --- a/dev/com.ibm.ws.kernel.boot_fat/publish/files/provisioningInterimFixTest-1.0.mf +++ b/dev/com.ibm.ws.kernel.boot_fat/publish/files/provisioningInterimFixTest-1.0.mf @@ -1,6 +1,6 @@ Subsystem-ManifestVersion: 1.0 Subsystem-SymbolicName: provisioningInterimFixTest-1.0;visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: ProvisioningInterimFixesTestBundle4; version="[1,1.0.100)" +Subsystem-Content: ProvisioningInterimFixesTestBundle4; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.kernel.boot_fat/publish/files/provisioningInterimFixesTest-1.0.mf b/dev/com.ibm.ws.kernel.boot_fat/publish/files/provisioningInterimFixesTest-1.0.mf index ecf49f7ebd6..b9fa3b44a91 100644 --- a/dev/com.ibm.ws.kernel.boot_fat/publish/files/provisioningInterimFixesTest-1.0.mf +++ b/dev/com.ibm.ws.kernel.boot_fat/publish/files/provisioningInterimFixesTest-1.0.mf @@ -1,9 +1,9 @@ Subsystem-ManifestVersion: 1.0 Subsystem-SymbolicName: provisioningInterimFixesTest-1.0;visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: ProvisioningInterimFixesTestBundle1; version="[1,1.0.100)", - ProvisioningInterimFixesTestBundle2; version="[1,1.0.100)", - ProvisioningInterimFixesTestBundle3; version="[1,1.0.100)", - ProvisioningInterimFixesTestBundle4; version="[1,1.0.100)" +Subsystem-Content: ProvisioningInterimFixesTestBundle1; version="[1,1.1)", + ProvisioningInterimFixesTestBundle2; version="[1,1.1)", + ProvisioningInterimFixesTestBundle3; version="[1,1.1)", + ProvisioningInterimFixesTestBundle4; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.kernel.boot_test/test/test data/lbr/lib/platform/defaultLogging-1.0.mf b/dev/com.ibm.ws.kernel.boot_test/test/test data/lbr/lib/platform/defaultLogging-1.0.mf index f6f835186b7..522f7df482c 100644 --- a/dev/com.ibm.ws.kernel.boot_test/test/test data/lbr/lib/platform/defaultLogging-1.0.mf +++ b/dev/com.ibm.ws.kernel.boot_test/test/test data/lbr/lib/platform/defaultLogging-1.0.mf @@ -9,4 +9,4 @@ Subsystem-Content: a.b; version="[1,1.0.100)"; type="boot.jar", a.b; version="[1,1.0.100)" Subsystem-Type: osgi.subsystem.feature -IBM-Feature-Version: 2 \ No newline at end of file +IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.kernel.boot_test/test/test data/lbr/lib/platform/extension-1.0.mf b/dev/com.ibm.ws.kernel.boot_test/test/test data/lbr/lib/platform/extension-1.0.mf index de2a12fb769..59536163cd5 100644 --- a/dev/com.ibm.ws.kernel.boot_test/test/test data/lbr/lib/platform/extension-1.0.mf +++ b/dev/com.ibm.ws.kernel.boot_test/test/test data/lbr/lib/platform/extension-1.0.mf @@ -5,4 +5,4 @@ Subsystem-Version: 1.0.0 Subsystem-Content: a.b; version="[1,1.0.100)"; type="boot.jar", Subsystem-Type: osgi.subsystem.feature -IBM-Feature-Version: 2 \ No newline at end of file +IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.kernel.boot_test/test/test data/lbr/lib/platform/missingJar-1.0.mf b/dev/com.ibm.ws.kernel.boot_test/test/test data/lbr/lib/platform/missingJar-1.0.mf index 5ddf4899c71..4819b33d377 100644 --- a/dev/com.ibm.ws.kernel.boot_test/test/test data/lbr/lib/platform/missingJar-1.0.mf +++ b/dev/com.ibm.ws.kernel.boot_test/test/test data/lbr/lib/platform/missingJar-1.0.mf @@ -7,4 +7,4 @@ Subsystem-Content: com.ibm.websphere.appserver.kernel-1.0; type="osgi.subsystem. p.q; version="[1.0.0,1.0.100)"; type="boot.jar" Subsystem-Type: osgi.subsystem.feature -IBM-Feature-Version: 2 \ No newline at end of file +IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.kernel.feature.featurelist/bnd.bnd b/dev/com.ibm.ws.kernel.feature.featurelist/bnd.bnd index 6e8a3655247..7bee65790aa 100644 --- a/dev/com.ibm.ws.kernel.feature.featurelist/bnd.bnd +++ b/dev/com.ibm.ws.kernel.feature.featurelist/bnd.bnd @@ -1,5 +1,5 @@ #******************************************************************************* -# Copyright (c) 2017 IBM Corporation and others. +# Copyright (c) 2017, 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 @@ -15,13 +15,13 @@ bVersion=1.0 Bundle-Name: WebSphere Feature List Generator Bundle-SymbolicName: com.ibm.ws.kernel.feature.featurelist -Require-Bundle: com.ibm.ws.kernel.feature; version="[1,1.0.100)", \ - com.ibm.ws.org.apache.aries.util; version="[1,1.0.100)", \ - com.ibm.ws.config; version="[1,1.0.100)", \ - com.ibm.ws.kernel.service; version="[1.3,1.3.100)", \ - com.ibm.ws.logging; version="[1,1.0.100)", \ +Require-Bundle: com.ibm.ws.kernel.feature; version="[1,1.1)", \ + com.ibm.ws.org.apache.aries.util; version="[1,1.1)", \ + com.ibm.ws.config; version="[1,1.1)", \ + com.ibm.ws.kernel.service; version="[1.3,1.4)", \ + com.ibm.ws.logging; version="[1,1.1)", \ org.eclipse.osgi; version="[3.10, 4)", \ - com.ibm.ws.org.eclipse.equinox.metatype; version="[1.0.0, 1.0.100)" + com.ibm.ws.org.eclipse.equinox.metatype; version="[1.0.0, 1.1)" Command-Class: com.ibm.ws.kernel.feature.internal.generator.FeatureListGenerator -outputmask: ws-featurelist.jar diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/extension/lib/features/usertest.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/extension/lib/features/usertest.mf index e268d0c86e3..0d2a821891b 100755 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/extension/lib/features/usertest.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/extension/lib/features/usertest.mf @@ -1,6 +1,6 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: usertest;visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: usertest; version="[1,1.0.100)" +Subsystem-Content: usertest; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 \ No newline at end of file diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/features/isolation.KernelSPI.Test.Feature-1.0.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/features/isolation.KernelSPI.Test.Feature-1.0.mf index eb1330997a0..67fc576f974 100755 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/features/isolation.KernelSPI.Test.Feature-1.0.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/features/isolation.KernelSPI.Test.Feature-1.0.mf @@ -2,5 +2,5 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: isolation.KernelSPI.Test.Feature-1.0; visibility:=public Subsystem-Version: 1.0.0 Subsystem-Type: osgi.subsystem.feature -Subsystem-Content: test.feature.isolation.K1; version="[1,1.0.100)" +Subsystem-Content: test.feature.isolation.K1; version="[1,1.1)" IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/features/isolation.Product.Test.Feature-1.0.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/features/isolation.Product.Test.Feature-1.0.mf index cad3c705aec..9d6c3d9ff3c 100755 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/features/isolation.Product.Test.Feature-1.0.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/features/isolation.Product.Test.Feature-1.0.mf @@ -2,8 +2,8 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: isolation.Product.Test.Feature-1.0; visibility:=public Subsystem-Version: 1.0.0 Subsystem-Type: osgi.subsystem.feature -Subsystem-Content: test.feature.isolation.U4; version="[1,1.0.100)", - test.feature.isolation.U5; version="[1,1.0.100)", - test.feature.isolation.U6; version="[1,1.0.100)" +Subsystem-Content: test.feature.isolation.U4; version="[1,1.1)", + test.feature.isolation.U5; version="[1,1.1)", + test.feature.isolation.U6; version="[1,1.1)" IBM-Feature-Version: 2 IBM-SPI-Package: test.feature.isolation.p4a diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/features/isolation.Product.Test.Feature.Negative-1.0.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/features/isolation.Product.Test.Feature.Negative-1.0.mf index 88fb967f46f..f025d828a07 100755 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/features/isolation.Product.Test.Feature.Negative-1.0.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/features/isolation.Product.Test.Feature.Negative-1.0.mf @@ -2,5 +2,5 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: isolation.Product.Test.Feature.Negative-1.0; visibility:=public Subsystem-Version: 1.0.0 Subsystem-Type: osgi.subsystem.feature -Subsystem-Content: test.feature.isolation.U7; version="[1,1.0.100)" +Subsystem-Content: test.feature.isolation.U7; version="[1,1.1)" IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/features/override.systemFeature.providesSwing.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/features/override.systemFeature.providesSwing.mf index ad3593da3fe..3e18ad7b151 100755 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/features/override.systemFeature.providesSwing.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/features/override.systemFeature.providesSwing.mf @@ -2,6 +2,6 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: override.systemFeature.providesSwing-1.0; visibility:=public Subsystem-Version: 1.0.0 Subsystem-Type: osgi.subsystem.feature -Subsystem-Content: override.systemFeature.providesSwing; version="[1,1.0.100)" +Subsystem-Content: override.systemFeature.providesSwing; version="[1,1.1)" IBM-API-Package: javax.swing.plaf; type="spec" IBM-Feature-Version: 2 \ No newline at end of file diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/features/override.systemFeature.requiresSwing.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/features/override.systemFeature.requiresSwing.mf index b42a10a013d..9ff24dea37b 100755 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/features/override.systemFeature.requiresSwing.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/features/override.systemFeature.requiresSwing.mf @@ -2,5 +2,5 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: override.systemFeature.requiresSwing-1.0; visibility:=public; singleton:=true Subsystem-Version: 1.0.0 Subsystem-Type: osgi.subsystem.feature -Subsystem-Content: override.systemFeature.requiresSwing; version="[1,1.0.100)" +Subsystem-Content: override.systemFeature.requiresSwing; version="[1,1.1)" IBM-Feature-Version: 2 \ No newline at end of file diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/features/override.userFeature.providesSwing.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/features/override.userFeature.providesSwing.mf index d3fd666902f..504a1546b14 100755 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/features/override.userFeature.providesSwing.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/features/override.userFeature.providesSwing.mf @@ -2,6 +2,6 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: override.userFeature.providesSwing-1.0; visibility:=public Subsystem-Version: 1.0.0 Subsystem-Type: osgi.subsystem.feature -Subsystem-Content: override.userFeature.providesSwing; version="[1,1.0.100)" +Subsystem-Content: override.userFeature.providesSwing; version="[1,1.1)" IBM-API-Package: javax.swing.plaf; type="spec" IBM-Feature-Version: 2 \ No newline at end of file diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/features/test.activation.parallel.system-1.0.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/features/test.activation.parallel.system-1.0.mf index 3a1a3771bec..85dc0f6e86d 100755 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/features/test.activation.parallel.system-1.0.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/features/test.activation.parallel.system-1.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: test.activation.parallel.system-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: test.activation.type.parallel.system; version="[1,1.0.100)" +Subsystem-Content: test.activation.type.parallel.system; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-API-Package: test.feature.api IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/features/test.activation.parallel.user-1.0.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/features/test.activation.parallel.user-1.0.mf index 1834a7b1fc4..a24b92b3337 100755 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/features/test.activation.parallel.user-1.0.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/features/test.activation.parallel.user-1.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: test.activation.parallel.user-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: test.activation.type.parallel.user; version="[1,1.0.100)" +Subsystem-Content: test.activation.type.parallel.user; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-API-Package: test.feature.api IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/features/test.activation.sequential.system-1.0.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/features/test.activation.sequential.system-1.0.mf index 86e11f1b041..a4de3fbd91a 100755 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/features/test.activation.sequential.system-1.0.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/features/test.activation.sequential.system-1.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: test.activation.sequential.system-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: test.activation.type.sequential.system; version="[1,1.0.100)" +Subsystem-Content: test.activation.type.sequential.system; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-API-Package: test.feature.api IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/features/test.activation.sequential.user-1.0.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/features/test.activation.sequential.user-1.0.mf index b4b04566f39..9b82abb9abb 100755 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/features/test.activation.sequential.user-1.0.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/features/test.activation.sequential.user-1.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: test.activation.sequential.user-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: test.activation.type.sequential.user; version="[1,1.0.100)" +Subsystem-Content: test.activation.type.sequential.user; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-API-Package: test.feature.api IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/features/test.feature.api.internal-1.0.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/features/test.feature.api.internal-1.0.mf index 00a2f217513..3a86eaff881 100755 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/features/test.feature.api.internal-1.0.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/features/test.feature.api.internal-1.0.mf @@ -1,6 +1,6 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: test.feature.api.internal-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: test.feature.api; version="[1,1.0.100)" +Subsystem-Content: test.feature.api; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/features/test.origin.system-1.0.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/features/test.origin.system-1.0.mf index bf2f47272b5..4f5adf15203 100755 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/features/test.origin.system-1.0.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/features/test.origin.system-1.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: test.origin.system-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: test.origin.bundle.system; version="[1,1.0.100)" +Subsystem-Content: test.origin.bundle.system; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-API-Package: test.feature.api IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/features/test.origin.user-1.0.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/features/test.origin.user-1.0.mf index dc1d8d528b2..c3331ac787e 100755 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/features/test.origin.user-1.0.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/features/test.origin.user-1.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: test.origin.user-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: test.origin.bundle.user; version="[1,1.0.100)" +Subsystem-Content: test.origin.bundle.user; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-API-Package: test.feature.api IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/files/filesForPreMinify/lib/features/badPathTool-1.0.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/files/filesForPreMinify/lib/features/badPathTool-1.0.mf index b4f8aab7b32..c567e084050 100755 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/files/filesForPreMinify/lib/features/badPathTool-1.0.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/files/filesForPreMinify/lib/features/badPathTool-1.0.mf @@ -6,7 +6,7 @@ Subsystem-Type: osgi.subsystem.feature Subsystem-Description: This is the description text for a feature where the file specified in the the icon header has a bad path Subsystem-Vendor: IBM Subsystem-Icon: size=64;OSGI-INF/toolicon.png -Subsystem-Content: test.icons.badPathTool-1.0; version="[1,1.0.100)" +Subsystem-Content: test.icons.badPathTool-1.0; version="[1,1.1)" IBM-Screenshots: IBM-Feature-Version: 2 IBM-AppliesTo: com.ibm.websphere.appserver; productVersion=2014.2.0.0; productInstallType=Archive diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/files/filesForPreMinify/lib/features/emptyIconHeader-1.0.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/files/filesForPreMinify/lib/features/emptyIconHeader-1.0.mf index e07a63a2fe9..9272a8d9035 100755 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/files/filesForPreMinify/lib/features/emptyIconHeader-1.0.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/files/filesForPreMinify/lib/features/emptyIconHeader-1.0.mf @@ -6,7 +6,7 @@ Subsystem-Type: osgi.subsystem.feature Subsystem-Description: This is the description text for a feature where the file specified in the the icon header is empty Subsystem-Vendor: IBM Subsystem-Icon: -Subsystem-Content: test.icons.emptyIconHeader-1.0; version="[1,1.0.100)" +Subsystem-Content: test.icons.emptyIconHeader-1.0; version="[1,1.1)" IBM-Screenshots: IBM-Feature-Version: 2 IBM-AppliesTo: com.ibm.websphere.appserver; productVersion=2014.2.0.0; productInstallType=Archive diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/files/filesForPreMinify/lib/features/goldenPathTool-1.0.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/files/filesForPreMinify/lib/features/goldenPathTool-1.0.mf index 29b914de34c..78594bd4d0f 100755 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/files/filesForPreMinify/lib/features/goldenPathTool-1.0.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/files/filesForPreMinify/lib/features/goldenPathTool-1.0.mf @@ -6,7 +6,7 @@ Subsystem-Type: osgi.subsystem.feature Subsystem-Description: This is the description text for a feature where the file specified in the the icon header has a good path Subsystem-Vendor: IBM Subsystem-Icon: OSGI-INF/toolicon.png -Subsystem-Content: test.icons.goldenPathTool-1.0; version="[1,1.0.100)" +Subsystem-Content: test.icons.goldenPathTool-1.0; version="[1,1.1)" IBM-Screenshots: IBM-Feature-Version: 2 IBM-AppliesTo: com.ibm.websphere.appserver; productVersion=2014.2.0.0; productInstallType=Archive; productEdition="DEVELOPERS,ND,zOS,NOSHIP" diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/files/filesForPreMinify/lib/features/iconDirectivesTool-1.0.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/files/filesForPreMinify/lib/features/iconDirectivesTool-1.0.mf index c02e533f032..2a1181476b0 100755 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/files/filesForPreMinify/lib/features/iconDirectivesTool-1.0.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/files/filesForPreMinify/lib/features/iconDirectivesTool-1.0.mf @@ -6,7 +6,7 @@ Subsystem-Type: osgi.subsystem.feature Subsystem-Description: This is the description text for a feature where the directives are specified on the icon elements Subsystem-Vendor: IBM Subsystem-Icon: OSGI-INF/toolicon10.png;size=10,OSGI-INF/toolicon64.png;size=64 -Subsystem-Content: test.icons.iconDirectivesTool-1.0; version="[1,1.0.100)" +Subsystem-Content: test.icons.iconDirectivesTool-1.0; version="[1,1.1)" IBM-Screenshots: IBM-Feature-Version: 2 IBM-AppliesTo: com.ibm.websphere.appserver; productVersion=2014.2.0.0; productInstallType=Archive diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/files/filesForPreMinify/lib/features/missingIconsTool-1.0.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/files/filesForPreMinify/lib/features/missingIconsTool-1.0.mf index f7d0bc2654f..96a87b35244 100755 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/files/filesForPreMinify/lib/features/missingIconsTool-1.0.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/files/filesForPreMinify/lib/features/missingIconsTool-1.0.mf @@ -6,7 +6,7 @@ Subsystem-Type: osgi.subsystem.feature Subsystem-Description: This is the description text for a feature where all the files specified in the the icon header are missing Subsystem-Vendor: IBM Subsystem-Icon: OSGI-INF/missingtoolicon.png,OSGI-INF/toolicon.png -Subsystem-Content: test.icons.missingIconsTool-1.0; version="[1,1.0.100)" +Subsystem-Content: test.icons.missingIconsTool-1.0; version="[1,1.1)" IBM-Screenshots: IBM-Feature-Version: 2 IBM-AppliesTo: com.ibm.websphere.appserver; productVersion=2014.2.0.0; productInstallType=Archive diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/files/filesForPreMinify/lib/features/noHeaderTool-1.0.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/files/filesForPreMinify/lib/features/noHeaderTool-1.0.mf index 48193066778..6ad7d298166 100755 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/files/filesForPreMinify/lib/features/noHeaderTool-1.0.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/files/filesForPreMinify/lib/features/noHeaderTool-1.0.mf @@ -5,7 +5,7 @@ Subsystem-Version: 1.0.0 Subsystem-Type: osgi.subsystem.feature Subsystem-Description: This is the description text for a feature where the icon header is missing Subsystem-Vendor: IBM -Subsystem-Content: test.icons.noHeaderTool-1.0; version="[1,1.0.100)" +Subsystem-Content: test.icons.noHeaderTool-1.0; version="[1,1.1)" IBM-Screenshots: IBM-Feature-Version: 2 IBM-AppliesTo: com.ibm.websphere.appserver; productVersion=2014.2.0.0; productInstallType=Archive diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/files/isolation.Runtime.Test.Feature-1.0.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/files/isolation.Runtime.Test.Feature-1.0.mf index 2429231738d..4f3b2ab99b5 100755 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/files/isolation.Runtime.Test.Feature-1.0.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/files/isolation.Runtime.Test.Feature-1.0.mf @@ -2,8 +2,8 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: isolation.Runtime.Test.Feature-1.0; visibility:=public Subsystem-Version: 1.0.0 Subsystem-Type: osgi.subsystem.feature -Subsystem-Content: test.feature.isolation.L1; version="[1,1.0.100)", - test.feature.isolation.L2; version="[1,1.0.100)", - test.feature.isolation.L3; version="[1,1.0.100)" +Subsystem-Content: test.feature.isolation.L1; version="[1,1.1)", + test.feature.isolation.L2; version="[1,1.1)", + test.feature.isolation.L3; version="[1,1.1)" IBM-Feature-Version: 2 IBM-SPI-Package: test.feature.isolation.p1a diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/files/isolation.Runtime.Test.Feature.Negative-1.0.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/files/isolation.Runtime.Test.Feature.Negative-1.0.mf index 14edb36eba6..f7c4ef5883c 100755 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/files/isolation.Runtime.Test.Feature.Negative-1.0.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/files/isolation.Runtime.Test.Feature.Negative-1.0.mf @@ -2,5 +2,5 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: isolation.Runtime.Test.Feature.Negative-1.0; visibility:=public Subsystem-Version: 1.0.0 Subsystem-Type: osgi.subsystem.feature -Subsystem-Content: test.feature.isolation.L8; version="[1,1.0.100)" +Subsystem-Content: test.feature.isolation.L8; version="[1,1.1)" IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/files/test.InterimFixManagerTest-1.0.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/files/test.InterimFixManagerTest-1.0.mf index 7d4ba422868..0ac40da26f7 100644 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/files/test.InterimFixManagerTest-1.0.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/files/test.InterimFixManagerTest-1.0.mf @@ -1,6 +1,6 @@ Subsystem-ManifestVersion: 1.0 Subsystem-SymbolicName: test.InterimFixManagerTest-1.0;visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: ProvisioningInterimFixesTestBundle4; version="[1,1.0.100)" +Subsystem-Content: ProvisioningInterimFixesTestBundle4; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/files/test.InterimFixesManagerTest-1.0.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/files/test.InterimFixesManagerTest-1.0.mf index 28711da7212..9d284006bb5 100644 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/files/test.InterimFixesManagerTest-1.0.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/files/test.InterimFixesManagerTest-1.0.mf @@ -1,9 +1,9 @@ Subsystem-ManifestVersion: 1.0 Subsystem-SymbolicName: test.InterimFixesManagerTest-1.0;visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: ProvisioningInterimFixesTestBundle1; version="[1,1.0.100)", - ProvisioningInterimFixesTestBundle2; version="[1,1.0.100)", - ProvisioningInterimFixesTestBundle3; version="[1,1.0.100)", - ProvisioningInterimFixesTestBundle4; version="[1,1.0.100)" +Subsystem-Content: ProvisioningInterimFixesTestBundle1; version="[1,1.1)", + ProvisioningInterimFixesTestBundle2; version="[1,1.1)", + ProvisioningInterimFixesTestBundle3; version="[1,1.1)", + ProvisioningInterimFixesTestBundle4; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/files/test.TestFixManagerTest-1.0.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/files/test.TestFixManagerTest-1.0.mf index bc420e0d7b6..99a29f2d980 100644 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/files/test.TestFixManagerTest-1.0.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/files/test.TestFixManagerTest-1.0.mf @@ -1,6 +1,6 @@ Subsystem-ManifestVersion: 1.0 Subsystem-SymbolicName: test.TestFixManagerTest-1.0;visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: ProvisioningTestBundle; version="[1,1.0.100)" +Subsystem-Content: ProvisioningTestBundle; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/files/test.featurefixmanager-1.0.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/files/test.featurefixmanager-1.0.mf index b39d6a713f3..8b55c7a6e2a 100644 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/files/test.featurefixmanager-1.0.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/files/test.featurefixmanager-1.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: test.featurefixmanager-1.0;visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: test.feature.fix.manager; version="[1,1.0.100)", +Subsystem-Content: test.feature.fix.manager; version="[1,1.1)", com.ibm.wsspi.appserver.webBundle-1.0; type="osgi.subsystem.feature", com.ibm.websphere.appserver.servlet-3.1; ibm.tolerates:="4.0"; type="osgi.subsystem.feature" Subsystem-Type: osgi.subsystem.feature diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/files/test.featureprovisioner-1.0.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/files/test.featureprovisioner-1.0.mf index 8ff1aa40234..ca187ac7b1b 100755 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/files/test.featureprovisioner-1.0.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/files/test.featureprovisioner-1.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: test.featureprovisioner-1.0;visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: test.feature.provisioner; version="[1,1.0.100)", +Subsystem-Content: test.feature.provisioner; version="[1,1.1)", com.ibm.wsspi.appserver.webBundle-1.0; type="osgi.subsystem.feature", com.ibm.websphere.appserver.servlet-3.1; ibm.tolerates:="4.0"; type="osgi.subsystem.feature" Subsystem-Type: osgi.subsystem.feature diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/files/usertest.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/files/usertest.mf index e268d0c86e3..0d2a821891b 100755 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/files/usertest.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/files/usertest.mf @@ -1,6 +1,6 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: usertest;visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: usertest; version="[1,1.0.100)" +Subsystem-Content: usertest; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 \ No newline at end of file diff --git a/dev/com.ibm.ws.kernel.feature_fat/publish/files/usertestprivate-1.0.mf b/dev/com.ibm.ws.kernel.feature_fat/publish/files/usertestprivate-1.0.mf index c3d3eb9b681..02059a6f4f7 100755 --- a/dev/com.ibm.ws.kernel.feature_fat/publish/files/usertestprivate-1.0.mf +++ b/dev/com.ibm.ws.kernel.feature_fat/publish/files/usertestprivate-1.0.mf @@ -1,6 +1,6 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: usertestprivate-1.0; visibility:=private Subsystem-Version: 1.0.0 -Subsystem-Content: usertest; version="[1,1.0.100)" +Subsystem-Content: usertest; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 \ No newline at end of file diff --git a/dev/com.ibm.ws.kernel.filemonitor_fat/publish/features/monitoringPrintingFeature-1.0.mf b/dev/com.ibm.ws.kernel.filemonitor_fat/publish/features/monitoringPrintingFeature-1.0.mf index a9aa4f717fe..3509647c8a6 100755 --- a/dev/com.ibm.ws.kernel.filemonitor_fat/publish/features/monitoringPrintingFeature-1.0.mf +++ b/dev/com.ibm.ws.kernel.filemonitor_fat/publish/features/monitoringPrintingFeature-1.0.mf @@ -2,6 +2,6 @@ Subsystem-ManifestVersion: 1 IBM-ShortName: monitoringPrintingFeature-1.0 Subsystem-SymbolicName: io.openliberty.monitoringfeature-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: test.filemonitor.bundle; version="[1,1.0.100)", +Subsystem-Content: test.filemonitor.bundle; version="[1,1.1)", Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.logging.hpel.binarylogviewer/bnd.bnd b/dev/com.ibm.ws.logging.hpel.binarylogviewer/bnd.bnd index ca9bee6dcf2..e94ac83b3b2 100644 --- a/dev/com.ibm.ws.logging.hpel.binarylogviewer/bnd.bnd +++ b/dev/com.ibm.ws.logging.hpel.binarylogviewer/bnd.bnd @@ -1,5 +1,5 @@ #******************************************************************************* -# Copyright (c) 2017 IBM Corporation and others. +# Copyright (c) 2017, 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 @@ -15,7 +15,7 @@ bVersion=1.0 Bundle-Name: HPEL Log Viewer Bundle-SymbolicName: com.ibm.ws.logging.hpel.binarylogviewer -Require-Bundle: com.ibm.ws.logging.hpel; version="[1,1.0.100)" +Require-Bundle: com.ibm.ws.logging.hpel; version="[1,1.1)" Command-Class: com.ibm.ws.logging.hpel.viewer.BinaryLog -outputmask: ws-binarylogviewer.jar diff --git a/dev/com.ibm.ws.logging.hpel/publish/platform/binaryLogging-1.0.mf b/dev/com.ibm.ws.logging.hpel/publish/platform/binaryLogging-1.0.mf index 49d05c20a2f..591db6fae7a 100644 --- a/dev/com.ibm.ws.logging.hpel/publish/platform/binaryLogging-1.0.mf +++ b/dev/com.ibm.ws.logging.hpel/publish/platform/binaryLogging-1.0.mf @@ -2,13 +2,13 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: com.ibm.websphere.appserver.binary.logging-1.0; visibility:=private Subsystem-Version: 1.0.0 WebSphere-LogProvider: com.ibm.ws.logging.internal.hpel.HpelLogProviderImpl -Subsystem-Content: com.ibm.ws.logging.hpel; version="[1,1.0.100)"; type="boot.jar", - com.ibm.ws.logging.hpel.osgi; version="[1,1.0.100)"; start-phase:="BOOTSTRAP", +Subsystem-Content: com.ibm.ws.logging.hpel; version="[1,1.1)"; type="boot.jar", + com.ibm.ws.logging.hpel.osgi; version="[1,1.1)"; start-phase:="BOOTSTRAP", com.ibm.websphere.appserver.logging-1.0; location:="lib/platform/defaultLogging-1.0.mf"; type="osgi.subsystem.feature", binaryLog; location:="bin/binaryLog"; type="file", binaryLog.bat; location:="bin/binaryLog.bat"; type="file", ws-binarylogviewer.jar; location:="bin/tools/ws-binarylogviewer.jar"; type="file", - com.ibm.websphere.appserver.api.hpel; version="[2,2.0.100)"; location:="dev/api/ibm/"; type="jar", + com.ibm.websphere.appserver.api.hpel; version="[2,2.1)"; location:="dev/api/ibm/"; type="jar", com.ibm.websphere.appserver.api.hpel_2.0-javadoc.zip; location:="dev/api/ibm/javadoc/com.ibm.websphere.appserver.api.hpel_2.0-javadoc.zip"; type="file" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.logging/publish/platform/defaultLogging-1.0.mf b/dev/com.ibm.ws.logging/publish/platform/defaultLogging-1.0.mf index e196b09fe2c..0a5282d70e4 100644 --- a/dev/com.ibm.ws.logging/publish/platform/defaultLogging-1.0.mf +++ b/dev/com.ibm.ws.logging/publish/platform/defaultLogging-1.0.mf @@ -3,10 +3,10 @@ IBM-ShortName: defaultLogging-1.0 Subsystem-SymbolicName: com.ibm.websphere.appserver.logging-1.0; visibility:=private Subsystem-Version: 1.0.0 WebSphere-LogProvider: com.ibm.ws.logging.internal.impl.LogProviderImpl -Subsystem-Content: com.ibm.ws.logging; version="[1,1.0.100)"; type="boot.jar", - com.ibm.ws.logging.osgi; version="[1,1.0.100)"; start-phase:=BOOTSTRAP, - com.ibm.ws.collector.manager; version="[1,1.0.100)", - com.ibm.websphere.appserver.spi.logging; version="[1.1,1.1.100)"; location:="dev/spi/ibm/"; type="jar", +Subsystem-Content: com.ibm.ws.logging; version="[1,1.1)"; type="boot.jar", + com.ibm.ws.logging.osgi; version="[1,1.1)"; start-phase:=BOOTSTRAP, + com.ibm.ws.collector.manager; version="[1,1.1)", + com.ibm.websphere.appserver.spi.logging; version="[1.1,1.2)"; location:="dev/spi/ibm/"; type="jar", com.ibm.websphere.appserver.spi.logging_1.1-javadoc.zip; location:="dev/spi/ibm/javadoc/com.ibm.websphere.appserver.spi.logging_1.1-javadoc.zip"; type="file" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.logging_fat/publish/features/logServiceTest-1.0.mf b/dev/com.ibm.ws.logging_fat/publish/features/logServiceTest-1.0.mf index a8d506ff76b..d041a87925d 100644 --- a/dev/com.ibm.ws.logging_fat/publish/features/logServiceTest-1.0.mf +++ b/dev/com.ibm.ws.logging_fat/publish/features/logServiceTest-1.0.mf @@ -3,7 +3,7 @@ Subsystem-ManifestVersion: 1 IBM-ShortName: logServiceTest-1.0 Subsystem-SymbolicName: com.ibm.websphere.appserver.logServiceTest-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: logservice.tester; version="[1,1.0.100)", +Subsystem-Content: logservice.tester; version="[1,1.1)", com.ibm.wsspi.appserver.webBundle-1.0; type="osgi.subsystem.feature", com.ibm.websphere.appserver.servlet-3.1; ibm.tolerates:="4.0,5.0,6.0"; type="osgi.subsystem.feature" Subsystem-Type: osgi.subsystem.feature diff --git a/dev/com.ibm.ws.logging_fat/publish/features/sampleSourceHandler-1.0.mf b/dev/com.ibm.ws.logging_fat/publish/features/sampleSourceHandler-1.0.mf index a1d54019c70..46f18111ba6 100644 --- a/dev/com.ibm.ws.logging_fat/publish/features/sampleSourceHandler-1.0.mf +++ b/dev/com.ibm.ws.logging_fat/publish/features/sampleSourceHandler-1.0.mf @@ -3,7 +3,7 @@ Subsystem-ManifestVersion: 1 IBM-ShortName: sampleSourceHandler-1.0 Subsystem-SymbolicName: com.ibm.websphere.appserver.sampleSourceHandler-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: sample.source.handler; version="[1,1.0.100)" , ffdc.source.handler; version="[1,1.0.100)", message.source.handler; version="[1,1.0.100)" +Subsystem-Content: sample.source.handler; version="[1,1.1)" , ffdc.source.handler; version="[1,1.1)", message.source.handler; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 Subsystem-Localization: OSGI-INF/l10n/subsystem \ No newline at end of file diff --git a/dev/com.ibm.ws.logging_fat/publish/features/sampleTraceSourceHandler-1.0.mf b/dev/com.ibm.ws.logging_fat/publish/features/sampleTraceSourceHandler-1.0.mf index 37373ab651c..55a6e0d4b22 100644 --- a/dev/com.ibm.ws.logging_fat/publish/features/sampleTraceSourceHandler-1.0.mf +++ b/dev/com.ibm.ws.logging_fat/publish/features/sampleTraceSourceHandler-1.0.mf @@ -5,8 +5,8 @@ Subsystem-SymbolicName: com.ibm.websphere.appserver.sampleTraceSourceHandler-1.0 Subsystem-Version: 1.0.0 Subsystem-Content: com.ibm.websphere.appserver.restHandler-1.0; type="osgi.subsystem.feature", com.ibm.websphere.appserver.servlet-3.0; ibm.tolerates:="3.1,4.0,5.0,6.0"; type="osgi.subsystem.feature", - trace.source.handler; version="[1,1.0.100)", - accesslog.source.handler; version="[1,1.0.100)" + trace.source.handler; version="[1,1.1)", + accesslog.source.handler; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 Subsystem-Localization: OSGI-INF/l10n/subsystem \ No newline at end of file diff --git a/dev/com.ibm.ws.logging_fat/publish/features/unconfigurableIbmFeature-1.0.mf b/dev/com.ibm.ws.logging_fat/publish/features/unconfigurableIbmFeature-1.0.mf index db84826829b..c8df381f951 100644 --- a/dev/com.ibm.ws.logging_fat/publish/features/unconfigurableIbmFeature-1.0.mf +++ b/dev/com.ibm.ws.logging_fat/publish/features/unconfigurableIbmFeature-1.0.mf @@ -2,6 +2,6 @@ Subsystem-ManifestVersion: 1 IBM-ShortName: unconfigurableIbmFeature-1.0 Subsystem-SymbolicName: com.ibm.ws.logging.unconfigurableibmfeature-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: test.configuration.fallalloverthefloor.ibmfeature; version="[1,1.0.100)", +Subsystem-Content: test.configuration.fallalloverthefloor.ibmfeature; version="[1,1.1)", Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.logging_fat/publish/features/unconfigurableUserFeature-1.0.mf b/dev/com.ibm.ws.logging_fat/publish/features/unconfigurableUserFeature-1.0.mf index 79ee094debd..a6fce363cb8 100644 --- a/dev/com.ibm.ws.logging_fat/publish/features/unconfigurableUserFeature-1.0.mf +++ b/dev/com.ibm.ws.logging_fat/publish/features/unconfigurableUserFeature-1.0.mf @@ -2,6 +2,6 @@ Subsystem-ManifestVersion: 1 IBM-ShortName: unconfigurableUserFeature-1.0 Subsystem-SymbolicName: com.ibm.ws.logging.unconfigurableuserfeature-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: test.configuration.fallalloverthefloor.userfeature; version="[1,1.0.100)", +Subsystem-Content: test.configuration.fallalloverthefloor.userfeature; version="[1,1.1)", Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.microprofile.opentracing.1.1_fat_tck/publish/files/features/com.ibm.ws.opentracing.mock-1.1.mf b/dev/com.ibm.ws.microprofile.opentracing.1.1_fat_tck/publish/files/features/com.ibm.ws.opentracing.mock-1.1.mf index dc10fc1d9bd..26bac099adb 100644 --- a/dev/com.ibm.ws.microprofile.opentracing.1.1_fat_tck/publish/files/features/com.ibm.ws.opentracing.mock-1.1.mf +++ b/dev/com.ibm.ws.microprofile.opentracing.1.1_fat_tck/publish/files/features/com.ibm.ws.opentracing.mock-1.1.mf @@ -1,7 +1,7 @@ IBM-Feature-Version: 2 IBM-ShortName: opentracingMock-1.1 Subsystem-Content: com.ibm.websphere.appserver.opentracing-1.1; type="osgi.subsystem.feature", - com.ibm.ws.opentracing.mock-1.1; version="[1.0.0,1.0.200)" + com.ibm.ws.opentracing.mock-1.1; version="[1.0.0,1.1)" Subsystem-License: https://www.eclipse.org/legal/epl-2.0/ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: com.ibm.ws.opentracing.mock-1.1; visibility:=public; singleton:=true diff --git a/dev/com.ibm.ws.microprofile.opentracing.1.2_fat_tck/publish/files/features/com.ibm.ws.opentracing.mock-1.2.mf b/dev/com.ibm.ws.microprofile.opentracing.1.2_fat_tck/publish/files/features/com.ibm.ws.opentracing.mock-1.2.mf index 881fa0a8d4c..5d7fad65fbf 100644 --- a/dev/com.ibm.ws.microprofile.opentracing.1.2_fat_tck/publish/files/features/com.ibm.ws.opentracing.mock-1.2.mf +++ b/dev/com.ibm.ws.microprofile.opentracing.1.2_fat_tck/publish/files/features/com.ibm.ws.opentracing.mock-1.2.mf @@ -1,7 +1,7 @@ IBM-Feature-Version: 2 IBM-ShortName: opentracingMock-1.2 Subsystem-Content: com.ibm.websphere.appserver.opentracing-1.2; type="osgi.subsystem.feature", - com.ibm.ws.opentracing.mock-1.2; version="[1.0.0,1.0.200)" + com.ibm.ws.opentracing.mock-1.2; version="[1.0.0,1.1)" Subsystem-License: https://www.eclipse.org/legal/epl-2.0/ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: com.ibm.ws.opentracing.mock-1.2; visibility:=public; singleton:=true diff --git a/dev/com.ibm.ws.microprofile.opentracing.1.3_fat_tck/publish/files/features/com.ibm.ws.opentracing.mock-1.3.mf b/dev/com.ibm.ws.microprofile.opentracing.1.3_fat_tck/publish/files/features/com.ibm.ws.opentracing.mock-1.3.mf index ef77fa22ff1..f0f770f6242 100644 --- a/dev/com.ibm.ws.microprofile.opentracing.1.3_fat_tck/publish/files/features/com.ibm.ws.opentracing.mock-1.3.mf +++ b/dev/com.ibm.ws.microprofile.opentracing.1.3_fat_tck/publish/files/features/com.ibm.ws.opentracing.mock-1.3.mf @@ -1,7 +1,7 @@ IBM-Feature-Version: 2 IBM-ShortName: opentracingMock-1.3 Subsystem-Content: com.ibm.websphere.appserver.opentracing-1.3; type="osgi.subsystem.feature", - com.ibm.ws.opentracing.mock-1.3; version="[1.0.0,1.0.200)" + com.ibm.ws.opentracing.mock-1.3; version="[1.0.0,1.1)" Subsystem-License: https://www.eclipse.org/legal/epl-2.0/ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: com.ibm.ws.opentracing.mock-1.3; visibility:=public; singleton:=true diff --git a/dev/com.ibm.ws.microprofile.opentracing_fat_tck/publish/files/features/com.ibm.ws.opentracing.mock-0.30.mf b/dev/com.ibm.ws.microprofile.opentracing_fat_tck/publish/files/features/com.ibm.ws.opentracing.mock-0.30.mf index 9b28b6c8e85..8677bdf0eb6 100644 --- a/dev/com.ibm.ws.microprofile.opentracing_fat_tck/publish/files/features/com.ibm.ws.opentracing.mock-0.30.mf +++ b/dev/com.ibm.ws.microprofile.opentracing_fat_tck/publish/files/features/com.ibm.ws.opentracing.mock-0.30.mf @@ -1,7 +1,7 @@ IBM-Feature-Version: 2 IBM-ShortName: opentracingMock-0.30 Subsystem-Content: com.ibm.websphere.appserver.opentracing-1.0; type="osgi.subsystem.feature", - com.ibm.ws.opentracing.mock; version="[1.0.0,1.0.200)" + com.ibm.ws.opentracing.mock; version="[1.0.0,1.1)" Subsystem-License: https://www.eclipse.org/legal/epl-2.0/ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: com.ibm.ws.opentracing.mock-0.30; visibility:=public; singleton:=true diff --git a/dev/com.ibm.ws.opentracing.1.x_fat/publish/files/features/com.ibm.ws.opentracing.mock-1.1.mf b/dev/com.ibm.ws.opentracing.1.x_fat/publish/files/features/com.ibm.ws.opentracing.mock-1.1.mf index dc10fc1d9bd..26bac099adb 100644 --- a/dev/com.ibm.ws.opentracing.1.x_fat/publish/files/features/com.ibm.ws.opentracing.mock-1.1.mf +++ b/dev/com.ibm.ws.opentracing.1.x_fat/publish/files/features/com.ibm.ws.opentracing.mock-1.1.mf @@ -1,7 +1,7 @@ IBM-Feature-Version: 2 IBM-ShortName: opentracingMock-1.1 Subsystem-Content: com.ibm.websphere.appserver.opentracing-1.1; type="osgi.subsystem.feature", - com.ibm.ws.opentracing.mock-1.1; version="[1.0.0,1.0.200)" + com.ibm.ws.opentracing.mock-1.1; version="[1.0.0,1.1)" Subsystem-License: https://www.eclipse.org/legal/epl-2.0/ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: com.ibm.ws.opentracing.mock-1.1; visibility:=public; singleton:=true diff --git a/dev/com.ibm.ws.opentracing.1.x_fat/publish/files/features/com.ibm.ws.opentracing.mock-1.2.mf b/dev/com.ibm.ws.opentracing.1.x_fat/publish/files/features/com.ibm.ws.opentracing.mock-1.2.mf index 881fa0a8d4c..5d7fad65fbf 100644 --- a/dev/com.ibm.ws.opentracing.1.x_fat/publish/files/features/com.ibm.ws.opentracing.mock-1.2.mf +++ b/dev/com.ibm.ws.opentracing.1.x_fat/publish/files/features/com.ibm.ws.opentracing.mock-1.2.mf @@ -1,7 +1,7 @@ IBM-Feature-Version: 2 IBM-ShortName: opentracingMock-1.2 Subsystem-Content: com.ibm.websphere.appserver.opentracing-1.2; type="osgi.subsystem.feature", - com.ibm.ws.opentracing.mock-1.2; version="[1.0.0,1.0.200)" + com.ibm.ws.opentracing.mock-1.2; version="[1.0.0,1.1)" Subsystem-License: https://www.eclipse.org/legal/epl-2.0/ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: com.ibm.ws.opentracing.mock-1.2; visibility:=public; singleton:=true diff --git a/dev/com.ibm.ws.opentracing.1.x_fat/publish/files/features/com.ibm.ws.opentracing.mock-1.3.mf b/dev/com.ibm.ws.opentracing.1.x_fat/publish/files/features/com.ibm.ws.opentracing.mock-1.3.mf index ef77fa22ff1..f0f770f6242 100644 --- a/dev/com.ibm.ws.opentracing.1.x_fat/publish/files/features/com.ibm.ws.opentracing.mock-1.3.mf +++ b/dev/com.ibm.ws.opentracing.1.x_fat/publish/files/features/com.ibm.ws.opentracing.mock-1.3.mf @@ -1,7 +1,7 @@ IBM-Feature-Version: 2 IBM-ShortName: opentracingMock-1.3 Subsystem-Content: com.ibm.websphere.appserver.opentracing-1.3; type="osgi.subsystem.feature", - com.ibm.ws.opentracing.mock-1.3; version="[1.0.0,1.0.200)" + com.ibm.ws.opentracing.mock-1.3; version="[1.0.0,1.1)" Subsystem-License: https://www.eclipse.org/legal/epl-2.0/ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: com.ibm.ws.opentracing.mock-1.3; visibility:=public; singleton:=true diff --git a/dev/com.ibm.ws.opentracing_fat/publish/files/features/com.ibm.ws.opentracing.mock-0.30.mf b/dev/com.ibm.ws.opentracing_fat/publish/files/features/com.ibm.ws.opentracing.mock-0.30.mf index 9b28b6c8e85..8677bdf0eb6 100644 --- a/dev/com.ibm.ws.opentracing_fat/publish/files/features/com.ibm.ws.opentracing.mock-0.30.mf +++ b/dev/com.ibm.ws.opentracing_fat/publish/files/features/com.ibm.ws.opentracing.mock-0.30.mf @@ -1,7 +1,7 @@ IBM-Feature-Version: 2 IBM-ShortName: opentracingMock-0.30 Subsystem-Content: com.ibm.websphere.appserver.opentracing-1.0; type="osgi.subsystem.feature", - com.ibm.ws.opentracing.mock; version="[1.0.0,1.0.200)" + com.ibm.ws.opentracing.mock; version="[1.0.0,1.1)" Subsystem-License: https://www.eclipse.org/legal/epl-2.0/ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: com.ibm.ws.opentracing.mock-0.30; visibility:=public; singleton:=true diff --git a/dev/com.ibm.ws.persistence.utility.generateddlutil/bnd.bnd b/dev/com.ibm.ws.persistence.utility.generateddlutil/bnd.bnd index 6224f228d45..679792c9f6f 100644 --- a/dev/com.ibm.ws.persistence.utility.generateddlutil/bnd.bnd +++ b/dev/com.ibm.ws.persistence.utility.generateddlutil/bnd.bnd @@ -1,5 +1,5 @@ #******************************************************************************* -# Copyright (c) 2017 IBM Corporation and others. +# Copyright (c) 2017, 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 @@ -15,11 +15,11 @@ bVersion=1.0 Bundle-Name: WebSphere Persistence Service DDL Gen Utility Bundle-SymbolicName: com.ibm.ws.persistence.utility.generateddlutil -Require-Bundle: com.ibm.ws.persistence.utility; version="[1,1.0.100)", \ - com.ibm.ws.logging; version="[1,1.0.100)", \ - com.ibm.ws.persistence.mbean; version="[1,1.0.100)", \ - com.ibm.ws.kernel.service; version="[1.3,1.3.100)", \ - com.ibm.wsspi.org.osgi.core; location="dev/spi/spec/"; version="[1.2, 1.2.100)" +Require-Bundle: com.ibm.ws.persistence.utility; version="[1,1.1)", \ + com.ibm.ws.logging; version="[1,1.1)", \ + com.ibm.ws.persistence.mbean; version="[1,1.1)", \ + com.ibm.ws.kernel.service; version="[1.3,1.4)", \ + com.ibm.wsspi.org.osgi.core; location="dev/spi/spec/"; version="[1.2, 1.3)" Command-Class: com.ibm.ws.persistence.utility.DDLGenerationUtility diff --git a/dev/com.ibm.ws.persistence_fat/publish/features/com.ibm.ws.persistence.consumer-1.0.mf b/dev/com.ibm.ws.persistence_fat/publish/features/com.ibm.ws.persistence.consumer-1.0.mf index db474b5e70c..bd30f39283d 100755 --- a/dev/com.ibm.ws.persistence_fat/publish/features/com.ibm.ws.persistence.consumer-1.0.mf +++ b/dev/com.ibm.ws.persistence_fat/publish/features/com.ibm.ws.persistence.consumer-1.0.mf @@ -1,10 +1,10 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: com.ibm.ws.persistence.consumer-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.persistence.consumer; version="[1,1.0.100)", +Subsystem-Content: com.ibm.ws.persistence.consumer; version="[1,1.1)", com.ibm.websphere.appserver.transaction-1.2; type="osgi.subsystem.feature", com.ibm.ws.persistence-1.0; type="osgi.subsystem.feature", - com.ibm.ws.org.apache.commons.io; version="[1.0.0,1.0.200)", + com.ibm.ws.org.apache.commons.io; version="[1.0.0,1.1)", com.ibm.websphere.appserver.jdbc-4.1; ibm.tolerates:="4.0, 4.2"; type="osgi.subsystem.feature" IBM-Feature-Version: 2 Subsystem-Type: osgi.subsystem.feature diff --git a/dev/com.ibm.ws.persistence_fat/publish/features/com.ibm.ws.persistence.consumer.jakarta-1.0.mf b/dev/com.ibm.ws.persistence_fat/publish/features/com.ibm.ws.persistence.consumer.jakarta-1.0.mf index 722cb559993..66b4763eff0 100755 --- a/dev/com.ibm.ws.persistence_fat/publish/features/com.ibm.ws.persistence.consumer.jakarta-1.0.mf +++ b/dev/com.ibm.ws.persistence_fat/publish/features/com.ibm.ws.persistence.consumer.jakarta-1.0.mf @@ -1,10 +1,10 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: com.ibm.ws.persistence.consumer.jakarta-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.persistence.consumer.jakarta; version="[1,1.0.100)", +Subsystem-Content: com.ibm.ws.persistence.consumer.jakarta; version="[1,1.1)", com.ibm.websphere.appserver.transaction-2.0; type="osgi.subsystem.feature", io.openliberty.persistenceService-2.0; type="osgi.subsystem.feature", - com.ibm.ws.org.apache.commons.io; version="[1.0.0,1.0.200)", + com.ibm.ws.org.apache.commons.io; version="[1.0.0,1.1)", com.ibm.websphere.appserver.jdbc-4.1; ibm.tolerates:="4.0, 4.2"; type="osgi.subsystem.feature" IBM-Feature-Version: 2 Subsystem-Type: osgi.subsystem.feature diff --git a/dev/com.ibm.ws.product.utility.productutil/bnd.bnd b/dev/com.ibm.ws.product.utility.productutil/bnd.bnd index 9902e4998f7..7be311f843b 100644 --- a/dev/com.ibm.ws.product.utility.productutil/bnd.bnd +++ b/dev/com.ibm.ws.product.utility.productutil/bnd.bnd @@ -1,5 +1,5 @@ #******************************************************************************* -# Copyright (c) 2017 IBM Corporation and others. +# Copyright (c) 2017, 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 @@ -15,13 +15,13 @@ bVersion=1.0 Bundle-Name: WebSphere Product Utility Bundle-SymbolicName: com.ibm.ws.product.utility.productutil -Require-Bundle: com.ibm.ws.config; version="[1,1.0.100)", \ - com.ibm.ws.kernel.feature; version="[1,1.0.100)", \ - com.ibm.ws.org.apache.aries.util; version="[1,1.0.100)", \ - com.ibm.ws.product.utility; version="[1,1.0.100)", \ - com.ibm.ws.kernel.boot; version="[1,1.0.100)", \ - com.ibm.ws.kernel.service; version="[1.3,1.3.100)", \ - com.ibm.ws.logging; version="[1,1.0.100)", \ +Require-Bundle: com.ibm.ws.config; version="[1,1.1)", \ + com.ibm.ws.kernel.feature; version="[1,1.1)", \ + com.ibm.ws.org.apache.aries.util; version="[1,1.1)", \ + com.ibm.ws.product.utility; version="[1,1.1)", \ + com.ibm.ws.kernel.boot; version="[1,1.1)", \ + com.ibm.ws.kernel.service; version="[1.3,1.4)", \ + com.ibm.ws.logging; version="[1,1.1)", \ org.eclipse.osgi; version="[3.10, 4)" Command-Class: com.ibm.ws.product.utility.ProductUtility diff --git a/dev/com.ibm.ws.rest.handler.config_fat/publish/files/features/nestedFlat-1.0.mf b/dev/com.ibm.ws.rest.handler.config_fat/publish/files/features/nestedFlat-1.0.mf index 4e7d905b851..31d5cdd8595 100644 --- a/dev/com.ibm.ws.rest.handler.config_fat/publish/files/features/nestedFlat-1.0.mf +++ b/dev/com.ibm.ws.rest.handler.config_fat/publish/files/features/nestedFlat-1.0.mf @@ -2,5 +2,5 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: nestedFlat-1.0;visibility:=public Subsystem-Version: 1.0.0 Subsystem-Type: osgi.subsystem.feature -Subsystem-Content: test.config.nested.flat; version="[1,1.0.100)" +Subsystem-Content: test.config.nested.flat; version="[1,1.1)" IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.runtime.update_fat/publish/features/quiescelistener-1.0.mf b/dev/com.ibm.ws.runtime.update_fat/publish/features/quiescelistener-1.0.mf index b497198bdcf..3478df67b1d 100755 --- a/dev/com.ibm.ws.runtime.update_fat/publish/features/quiescelistener-1.0.mf +++ b/dev/com.ibm.ws.runtime.update_fat/publish/features/quiescelistener-1.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: quiescelistener-1.0;visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: test.server.quiesce; version="[1,1.0.100)" +Subsystem-Content: test.server.quiesce; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.security.audit.reader.auditreader/bnd.bnd b/dev/com.ibm.ws.security.audit.reader.auditreader/bnd.bnd index f43affe197d..da97d08bc29 100644 --- a/dev/com.ibm.ws.security.audit.reader.auditreader/bnd.bnd +++ b/dev/com.ibm.ws.security.audit.reader.auditreader/bnd.bnd @@ -1,5 +1,5 @@ #******************************************************************************* -# Copyright (c) 2018, 2019 IBM Corporation and others. +# Copyright (c) 2018, 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 @@ -16,24 +16,24 @@ Bundle-Name: WebSphere Audit Reader Utility Bundle-SymbolicName: com.ibm.ws.security.audit.reader.auditreader Require-Bundle: \ - com.ibm.ws.security.audit.reader; version="[1,1.0.100)", \ - com.ibm.ws.crypto.certificateutil; version="[1,1.0.100)", \ - com.ibm.ws.crypto.ltpakeyutil; version="[1,1.0.100)", \ - com.ibm.ws.crypto.passwordutil; version="[1,1.0.100)", \ - com.ibm.ws.kernel.service; version="[1.3,1.3.100)", \ - com.ibm.ws.kernel.boot; version="[1,1.0.100)", \ - com.ibm.ws.logging; version="[1,1.0.100)", \ - com.ibm.ws.org.apache.commons.io; version="[1,1.0.100)", \ - com.ibm.ws.logging; version="[1,1.0.100)", \ - com.ibm.ws.kernel.service; version="[1.3,1.3.100)", \ - com.ibm.json4j; version="[1,1.0.100)", \ - com.ibm.ws.frappe.utils; version="[1,1.0.100)", \ - com.ibm.ws.security.audit.source; version="[1,1.0.100)", \ - com.ibm.wsspi.security.audit; version="[1,1.0.100)", \ - com.ibm.websphere.security; version="[1,1.1.100)", \ - com.ibm.crypto.ibmkeycert; version="[1,1.1.100)", \ - com.ibm.wsspi.security.audit; version="[1,1.1.100)", \ - com.ibm.wsspi.org.osgi.core; location="dev/spi/spec/"; version="[1.0, 1.1.100)" + com.ibm.ws.security.audit.reader; version="[1,1.1)", \ + com.ibm.ws.crypto.certificateutil; version="[1,1.1)", \ + com.ibm.ws.crypto.ltpakeyutil; version="[1,1.1)", \ + com.ibm.ws.crypto.passwordutil; version="[1,1.1)", \ + com.ibm.ws.kernel.service; version="[1.3,1.4)", \ + com.ibm.ws.kernel.boot; version="[1,1.1)", \ + com.ibm.ws.logging; version="[1,1.1)", \ + com.ibm.ws.org.apache.commons.io; version="[1,1.1)", \ + com.ibm.ws.logging; version="[1,1.1)", \ + com.ibm.ws.kernel.service; version="[1.3,1.4)", \ + com.ibm.json4j; version="[1,1.1)", \ + com.ibm.ws.frappe.utils; version="[1,1.1)", \ + com.ibm.ws.security.audit.source; version="[1,1.1)", \ + com.ibm.wsspi.security.audit; version="[1,1.1)", \ + com.ibm.websphere.security; version="[1,1.2)", \ + com.ibm.crypto.ibmkeycert; version="[1,1.2)", \ + com.ibm.wsspi.security.audit; version="[1,1.2)", \ + com.ibm.wsspi.org.osgi.core; location="dev/spi/spec/"; version="[1.0, 1.2)" Command-Class: com.ibm.ws.security.audit.reader.AuditUtility diff --git a/dev/com.ibm.ws.security.audit.reader/bnd.bnd b/dev/com.ibm.ws.security.audit.reader/bnd.bnd index fbe1eb3ad37..163b09d2f45 100644 --- a/dev/com.ibm.ws.security.audit.reader/bnd.bnd +++ b/dev/com.ibm.ws.security.audit.reader/bnd.bnd @@ -1,5 +1,5 @@ #******************************************************************************* -# Copyright (c) 2018, 2022 IBM Corporation and others. +# Copyright (c) 2018, 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 @@ -36,14 +36,14 @@ instrument.disabled: true com.ibm.ws.kernel.boot.core;version=latest,\ com.ibm.ws.security.audit.reader.auditreader;version=latest,\ com.ibm.websphere.appserver.spi.logging;version=latest,\ - com.ibm.websphere.security;version="[1,1.1.100)", \ - com.ibm.ws.org.apache.commons.io;version="[1,1.0.100)", \ + com.ibm.websphere.security;version="[1,1.2)", \ + com.ibm.ws.org.apache.commons.io;version="[1,1.1)", \ com.ibm.websphere.appserver.spi.kernel.service;version=latest,\ - com.ibm.json4j;version="[1,1.0.100)", \ + com.ibm.json4j;version="[1,1.1)", \ com.ibm.ws.kernel.service;version=latest,\ - com.ibm.ws.logging;version="[1,1.0.100)", \ + com.ibm.ws.logging;version="[1,1.1)", \ com.ibm.ws.webcontainer.security;version=latest,\ - com.ibm.ws.security.audit.source;version="[1,1.0.100)", \ + com.ibm.ws.security.audit.source;version="[1,1.1)", \ com.ibm.ws.org.osgi.annotation.versioning;version=latest diff --git a/dev/com.ibm.ws.security.authorization.jacc.testprovider/publish/usr/extension/lib/features/jaccTestProvider-1.0.mf b/dev/com.ibm.ws.security.authorization.jacc.testprovider/publish/usr/extension/lib/features/jaccTestProvider-1.0.mf index 7bd4c3eb58e..afa2c8ebc31 100755 --- a/dev/com.ibm.ws.security.authorization.jacc.testprovider/publish/usr/extension/lib/features/jaccTestProvider-1.0.mf +++ b/dev/com.ibm.ws.security.authorization.jacc.testprovider/publish/usr/extension/lib/features/jaccTestProvider-1.0.mf @@ -7,6 +7,6 @@ Subsystem-Version: 1.0.0 Subsystem-ManifestVersion: 1.0 Subsystem-SymbolicName: jaccTestProvider-1.0;visibility:=public IBM-App-ForceRestart: install,uninstall -Subsystem-Content: com.ibm.websphere.appserver.jacc-1.5;version="[1,1.0.100)"; type="osgi.subsystem.feature", - com.ibm.ws.security.authorization.jacc.testprovider; version="[1,1.0.100)" +Subsystem-Content: com.ibm.websphere.appserver.jacc-1.5;version="[1,1.1)"; type="osgi.subsystem.feature", + com.ibm.ws.security.authorization.jacc.testprovider; version="[1,1.1)" diff --git a/dev/com.ibm.ws.security.authorization.jacc.testprovider/publish/usr/extension/lib/features/jaccTestProvider-2.0.mf b/dev/com.ibm.ws.security.authorization.jacc.testprovider/publish/usr/extension/lib/features/jaccTestProvider-2.0.mf index 309b2fe53de..c08cda952ae 100755 --- a/dev/com.ibm.ws.security.authorization.jacc.testprovider/publish/usr/extension/lib/features/jaccTestProvider-2.0.mf +++ b/dev/com.ibm.ws.security.authorization.jacc.testprovider/publish/usr/extension/lib/features/jaccTestProvider-2.0.mf @@ -7,6 +7,6 @@ Subsystem-Version: 2.0.0 Subsystem-ManifestVersion: 1.0 Subsystem-SymbolicName: jaccTestProvider-2.0;visibility:=public IBM-App-ForceRestart: install,uninstall -Subsystem-Content: io.openliberty.appAuthorization-2.0;version="[1,1.0.100)"; type="osgi.subsystem.feature", - com.ibm.ws.security.authorization.jacc.testprovider.jakarta; version="[1,1.0.100)" +Subsystem-Content: io.openliberty.appAuthorization-2.0;version="[1,1.1)"; type="osgi.subsystem.feature", + com.ibm.ws.security.authorization.jacc.testprovider.jakarta; version="[1,1.1)" diff --git a/dev/com.ibm.ws.security.authorization.jacc.testprovider/publish/usr/extension/lib/features/jaccTestProvider-2.1.mf b/dev/com.ibm.ws.security.authorization.jacc.testprovider/publish/usr/extension/lib/features/jaccTestProvider-2.1.mf index 17343666844..5f9d9ecb57f 100644 --- a/dev/com.ibm.ws.security.authorization.jacc.testprovider/publish/usr/extension/lib/features/jaccTestProvider-2.1.mf +++ b/dev/com.ibm.ws.security.authorization.jacc.testprovider/publish/usr/extension/lib/features/jaccTestProvider-2.1.mf @@ -7,6 +7,6 @@ Subsystem-Version: 2.1.0 Subsystem-ManifestVersion: 1.0 Subsystem-SymbolicName: jaccTestProvider-2.1;visibility:=public IBM-App-ForceRestart: install,uninstall -Subsystem-Content: io.openliberty.appAuthorization-2.1;version="[1,1.0.100)"; type="osgi.subsystem.feature", - com.ibm.ws.security.authorization.jacc.testprovider.jakarta; version="[1,1.0.100)" +Subsystem-Content: io.openliberty.appAuthorization-2.1;version="[1,1.1)"; type="osgi.subsystem.feature", + com.ibm.ws.security.authorization.jacc.testprovider.jakarta; version="[1,1.1)" diff --git a/dev/com.ibm.ws.security.jaspic.test/publish/features/jaspicUserTestFeature-1.0.mf b/dev/com.ibm.ws.security.jaspic.test/publish/features/jaspicUserTestFeature-1.0.mf index e97c4b8853a..60dd465e36c 100644 --- a/dev/com.ibm.ws.security.jaspic.test/publish/features/jaspicUserTestFeature-1.0.mf +++ b/dev/com.ibm.ws.security.jaspic.test/publish/features/jaspicUserTestFeature-1.0.mf @@ -3,7 +3,7 @@ IBM-ShortName: jaspicUserTestFeature-1.0 Subsystem-SymbolicName: com.ibm.websphere.appserver.jaspicUserTestFeature-1.0;visibility:=public Subsystem-Version: 1.0.0 Subsystem-Content: - com.ibm.ws.security.jaspic.test; version="[1,1.0.100)", + com.ibm.ws.security.jaspic.test; version="[1,1.1)", com.ibm.websphere.appserver.servlet-3.0; ibm.tolerates:="3.1"; type="osgi.subsystem.feature", com.ibm.websphere.appserver.jaspic-1.1; type="osgi.subsystem.feature" Subsystem-Type: osgi.subsystem.feature diff --git a/dev/com.ibm.ws.security.jaspic.test/publish/features/jaspicUserTestFeature-2.0.mf b/dev/com.ibm.ws.security.jaspic.test/publish/features/jaspicUserTestFeature-2.0.mf index e39ac6f7b2f..4d83567d7b9 100644 --- a/dev/com.ibm.ws.security.jaspic.test/publish/features/jaspicUserTestFeature-2.0.mf +++ b/dev/com.ibm.ws.security.jaspic.test/publish/features/jaspicUserTestFeature-2.0.mf @@ -3,7 +3,7 @@ IBM-ShortName: jaspicUserTestFeature-2.0 Subsystem-SymbolicName: com.ibm.websphere.appserver.jaspicUserTestFeature-2.0;visibility:=public Subsystem-Version: 2.0.0 Subsystem-Content: - com.ibm.ws.security.jaspic.test.jakarta; version="[1,1.0.100)", + com.ibm.ws.security.jaspic.test.jakarta; version="[1,1.1)", com.ibm.websphere.appserver.servlet-5.0; type="osgi.subsystem.feature", io.openliberty.appAuthentication-2.0; type="osgi.subsystem.feature" Subsystem-Type: osgi.subsystem.feature diff --git a/dev/com.ibm.ws.security.jaspic.test/publish/features/jaspicUserTestFeature-3.0.mf b/dev/com.ibm.ws.security.jaspic.test/publish/features/jaspicUserTestFeature-3.0.mf index 13b1298b753..27efd7162a9 100644 --- a/dev/com.ibm.ws.security.jaspic.test/publish/features/jaspicUserTestFeature-3.0.mf +++ b/dev/com.ibm.ws.security.jaspic.test/publish/features/jaspicUserTestFeature-3.0.mf @@ -3,7 +3,7 @@ IBM-ShortName: jaspicUserTestFeature-3.0 Subsystem-SymbolicName: com.ibm.websphere.appserver.jaspicUserTestFeature-3.0;visibility:=public Subsystem-Version: 2.0.0 Subsystem-Content: - com.ibm.ws.security.jaspic.test.jakarta; version="[1,1.0.100)", + com.ibm.ws.security.jaspic.test.jakarta; version="[1,1.1)", com.ibm.websphere.appserver.servlet-6.0; type="osgi.subsystem.feature", io.openliberty.appAuthentication-3.0; type="osgi.subsystem.feature" Subsystem-Type: osgi.subsystem.feature diff --git a/dev/com.ibm.ws.security.oauth.oidc_fat.common/publish/test-features/oauth20JwtMediator-1.0.mf b/dev/com.ibm.ws.security.oauth.oidc_fat.common/publish/test-features/oauth20JwtMediator-1.0.mf index cb9c18677bf..e7f2945ef00 100644 --- a/dev/com.ibm.ws.security.oauth.oidc_fat.common/publish/test-features/oauth20JwtMediator-1.0.mf +++ b/dev/com.ibm.ws.security.oauth.oidc_fat.common/publish/test-features/oauth20JwtMediator-1.0.mf @@ -2,6 +2,6 @@ Subsystem-ManifestVersion: 1 IBM-ShortName: oauth20JwtMediator-1.0 Subsystem-SymbolicName: com.ibm.ws.security.oauth20.jwt.mediator; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.security.oauth20.jwt.mediator; version="[1,1.0.100)"; start-phase:=SERVICE +Subsystem-Content: com.ibm.ws.security.oauth20.jwt.mediator; version="[1,1.1)"; start-phase:=SERVICE Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.security.oauth.oidc_fat.common/publish/test-features/oauth20TokenIntrospectProvider-1.0.mf b/dev/com.ibm.ws.security.oauth.oidc_fat.common/publish/test-features/oauth20TokenIntrospectProvider-1.0.mf index b93a3b52392..ce06785eb0c 100644 --- a/dev/com.ibm.ws.security.oauth.oidc_fat.common/publish/test-features/oauth20TokenIntrospectProvider-1.0.mf +++ b/dev/com.ibm.ws.security.oauth.oidc_fat.common/publish/test-features/oauth20TokenIntrospectProvider-1.0.mf @@ -2,7 +2,7 @@ Subsystem-ManifestVersion: 1 IBM-ShortName: oauth20TokenIntrospectProvider-1.0 Subsystem-SymbolicName: com.ibm.ws.security.oauth20.tokenintrospectprovider; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.security.oauth20.tokenintrospectprovider; version="[1,1.0.100)"; start-phase:=SERVICE +Subsystem-Content: com.ibm.ws.security.oauth20.tokenintrospectprovider; version="[1,1.1)"; start-phase:=SERVICE Subsystem-Type: osgi.subsystem.feature Subsystem-Description: %description Subsystem-Localization: OSGI-INF/l10n/subsystem diff --git a/dev/com.ibm.ws.security.oauth.oidc_fat.common/publish/test-features/oauth20TokenMapping-1.0.mf b/dev/com.ibm.ws.security.oauth.oidc_fat.common/publish/test-features/oauth20TokenMapping-1.0.mf index a6dd48a543e..00b1cd6741d 100644 --- a/dev/com.ibm.ws.security.oauth.oidc_fat.common/publish/test-features/oauth20TokenMapping-1.0.mf +++ b/dev/com.ibm.ws.security.oauth.oidc_fat.common/publish/test-features/oauth20TokenMapping-1.0.mf @@ -2,6 +2,6 @@ Subsystem-ManifestVersion: 1 IBM-ShortName: oauth20TokenMapping-1.0 Subsystem-SymbolicName: com.ibm.ws.security.oauth20.token.mapping; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.security.oauth20.token.mapping; version="[1,1.0.100)"; start-phase:=SERVICE +Subsystem-Content: com.ibm.ws.security.oauth20.token.mapping; version="[1,1.1)"; start-phase:=SERVICE Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.security.oauth.oidc_fat.common/publish/test-features/oauth20TokenMapping-2.0.mf b/dev/com.ibm.ws.security.oauth.oidc_fat.common/publish/test-features/oauth20TokenMapping-2.0.mf index 7d5eecaca3c..91e1b7ae894 100644 --- a/dev/com.ibm.ws.security.oauth.oidc_fat.common/publish/test-features/oauth20TokenMapping-2.0.mf +++ b/dev/com.ibm.ws.security.oauth.oidc_fat.common/publish/test-features/oauth20TokenMapping-2.0.mf @@ -2,6 +2,6 @@ Subsystem-ManifestVersion: 1 IBM-ShortName: oauth20TokenMapping-2.0 Subsystem-SymbolicName: com.ibm.ws.security.oauth20.token.mapping; visibility:=public Subsystem-Version: 2.0.0 -Subsystem-Content: com.ibm.ws.security.oauth20.token.mapping.jakarta; version="[1,1.0.100)"; start-phase:=SERVICE +Subsystem-Content: com.ibm.ws.security.oauth20.token.mapping.jakarta; version="[1,1.1)"; start-phase:=SERVICE Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.security.oauth.oidc_fat.common/publish/test-features/oidcIdtokenMediator-1.0.mf b/dev/com.ibm.ws.security.oauth.oidc_fat.common/publish/test-features/oidcIdtokenMediator-1.0.mf index b46710f4560..77efe66f5ec 100644 --- a/dev/com.ibm.ws.security.oauth.oidc_fat.common/publish/test-features/oidcIdtokenMediator-1.0.mf +++ b/dev/com.ibm.ws.security.oauth.oidc_fat.common/publish/test-features/oidcIdtokenMediator-1.0.mf @@ -2,6 +2,6 @@ Subsystem-ManifestVersion: 1 IBM-ShortName: oidcIdtokenMediator-1.0 Subsystem-SymbolicName: com.ibm.ws.security.oidc.idtoken.mediator; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.security.oidc.idtoken.mediator; version="[1,1.0.100)"; start-phase:=SERVICE +Subsystem-Content: com.ibm.ws.security.oidc.idtoken.mediator; version="[1,1.1)"; start-phase:=SERVICE Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.security.oidc.server_fat/publish/test-features/oidcTai-1.0.mf b/dev/com.ibm.ws.security.oidc.server_fat/publish/test-features/oidcTai-1.0.mf index e6d6efce729..b99fb7896ca 100644 --- a/dev/com.ibm.ws.security.oidc.server_fat/publish/test-features/oidcTai-1.0.mf +++ b/dev/com.ibm.ws.security.oidc.server_fat/publish/test-features/oidcTai-1.0.mf @@ -4,6 +4,6 @@ Subsystem-SymbolicName: com.ibm.ws.security.tai-1.0; visibility:=public IBM-ShortName: oidcTai-1.0 Subsystem-Version: 1.0.0 Subsystem-Content: com.ibm.websphere.security; version="[1,2)", - com.ibm.ws.security.tai; version="[1,1.0.100)" + com.ibm.ws.security.tai; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.security.oidc.server_fat/publish/test-features/oidcTai-2.0.mf b/dev/com.ibm.ws.security.oidc.server_fat/publish/test-features/oidcTai-2.0.mf index 151f1b68ef3..0964915de64 100644 --- a/dev/com.ibm.ws.security.oidc.server_fat/publish/test-features/oidcTai-2.0.mf +++ b/dev/com.ibm.ws.security.oidc.server_fat/publish/test-features/oidcTai-2.0.mf @@ -4,6 +4,6 @@ Subsystem-SymbolicName: com.ibm.ws.security.tai-2.0; visibility:=public IBM-ShortName: oidcTai-2.0 Subsystem-Version: 2.0.0 Subsystem-Content: com.ibm.websphere.security; version="[1,2)", - com.ibm.ws.security.tai.jakarta; version="[1,1.0.100)" + com.ibm.ws.security.tai.jakarta; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.security.oidc.server_fat/publish/test-features/sampleTai-1.0.mf b/dev/com.ibm.ws.security.oidc.server_fat/publish/test-features/sampleTai-1.0.mf index fae6fea94fe..609ca3130df 100644 --- a/dev/com.ibm.ws.security.oidc.server_fat/publish/test-features/sampleTai-1.0.mf +++ b/dev/com.ibm.ws.security.oidc.server_fat/publish/test-features/sampleTai-1.0.mf @@ -4,6 +4,6 @@ Subsystem-SymbolicName: com.ibm.ws.security.tai.sample-1.0; visibility:=public IBM-ShortName: sampleTai-1.0 Subsystem-Version: 1.0.0 Subsystem-Content: com.ibm.websphere.security; version="[1,2)", - com.ibm.ws.security.tai.sample; version="[1,1.0.100)" + com.ibm.ws.security.tai.sample; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.security.oidc.server_fat/publish/test-features/sampleTai-2.0.mf b/dev/com.ibm.ws.security.oidc.server_fat/publish/test-features/sampleTai-2.0.mf index 6fda05fa1cc..2cec52be9c7 100644 --- a/dev/com.ibm.ws.security.oidc.server_fat/publish/test-features/sampleTai-2.0.mf +++ b/dev/com.ibm.ws.security.oidc.server_fat/publish/test-features/sampleTai-2.0.mf @@ -4,6 +4,6 @@ Subsystem-SymbolicName: com.ibm.ws.security.tai.sample-2.0; visibility:=public IBM-ShortName: sampleTai-2.0 Subsystem-Version: 2.0.0 Subsystem-Content: com.ibm.websphere.security; version="[1,2)", - com.ibm.ws.security.tai.sample.jakarta; version="[1,1.0.100)" + com.ibm.ws.security.tai.sample.jakarta; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.security.saml.sso_fat.common/publish/features/samlUserResolver-1.0.mf b/dev/com.ibm.ws.security.saml.sso_fat.common/publish/features/samlUserResolver-1.0.mf index fd75f5bd986..3c505df946e 100644 --- a/dev/com.ibm.ws.security.saml.sso_fat.common/publish/features/samlUserResolver-1.0.mf +++ b/dev/com.ibm.ws.security.saml.sso_fat.common/publish/features/samlUserResolver-1.0.mf @@ -3,6 +3,6 @@ IBM-Test-Feature: true IBM-ShortName: samlUserResolver-1.0 Subsystem-SymbolicName: com.ibm.ws.security.saml.resolver.sample; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.security.saml.resolver.sample; version="[1,1.0.100)"; start-phase:=SERVICE +Subsystem-Content: com.ibm.ws.security.saml.resolver.sample; version="[1,1.1)"; start-phase:=SERVICE Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.security.utility.securityutil/bnd.bnd b/dev/com.ibm.ws.security.utility.securityutil/bnd.bnd index c73d0db385b..7f6d4983f00 100644 --- a/dev/com.ibm.ws.security.utility.securityutil/bnd.bnd +++ b/dev/com.ibm.ws.security.utility.securityutil/bnd.bnd @@ -1,5 +1,5 @@ #******************************************************************************* -# Copyright (c) 2017 IBM Corporation and others. +# Copyright (c) 2017, 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 @@ -17,14 +17,14 @@ Bundle-Name: WebSphere Security Utility Bundle-SymbolicName: com.ibm.ws.security.utility.securityutil Require-Bundle: \ - com.ibm.ws.security.utility; version="[1,1.0.100)", \ - com.ibm.ws.crypto.certificateutil; version="[1,1.0.100)", \ - com.ibm.ws.crypto.ltpakeyutil; version="[1,1.0.100)", \ - com.ibm.ws.crypto.passwordutil; version="[1,1.0.100)", \ - com.ibm.ws.kernel.service; version="[1.3,1.3.100)", \ - com.ibm.ws.logging; version="[1,1.0.100)", \ - com.ibm.ws.org.apache.commons.io; version="[1,1.0.100)", \ - com.ibm.json4j; version="[1,1.0.100)" + com.ibm.ws.security.utility; version="[1,1.1)", \ + com.ibm.ws.crypto.certificateutil; version="[1,1.1)", \ + com.ibm.ws.crypto.ltpakeyutil; version="[1,1.1)", \ + com.ibm.ws.crypto.passwordutil; version="[1,1.1)", \ + com.ibm.ws.kernel.service; version="[1.3,1.4)", \ + com.ibm.ws.logging; version="[1,1.1)", \ + com.ibm.ws.org.apache.commons.io; version="[1,1.1)", \ + com.ibm.json4j; version="[1,1.1)" Command-Class: com.ibm.ws.security.utility.SecurityUtility IBM-RequiredExtensions: ws-customPasswordEncryption diff --git a/dev/com.ibm.ws.security.wim.adapter.file/publish/features/com.ibm.websphere.appserver.wimfileadapter-1.0.mf b/dev/com.ibm.ws.security.wim.adapter.file/publish/features/com.ibm.websphere.appserver.wimfileadapter-1.0.mf index 9c3962d2317..e8e2bad8d74 100644 --- a/dev/com.ibm.ws.security.wim.adapter.file/publish/features/com.ibm.websphere.appserver.wimfileadapter-1.0.mf +++ b/dev/com.ibm.ws.security.wim.adapter.file/publish/features/com.ibm.websphere.appserver.wimfileadapter-1.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: com.ibm.websphere.appserver.wimfileadapter-1.0 Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.security.wim.adapter.file; version="[1,1.0.100)" +Subsystem-Content: com.ibm.ws.security.wim.adapter.file; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Test-Feature: true IBM-Feature-Version: 2 \ No newline at end of file diff --git a/dev/com.ibm.ws.security.wim.adapter.file_fat/publish/files/internalfeatures/testfileadapter-1.0.mf b/dev/com.ibm.ws.security.wim.adapter.file_fat/publish/files/internalfeatures/testfileadapter-1.0.mf index 13475c77f27..36e6fb30da2 100755 --- a/dev/com.ibm.ws.security.wim.adapter.file_fat/publish/files/internalfeatures/testfileadapter-1.0.mf +++ b/dev/com.ibm.ws.security.wim.adapter.file_fat/publish/files/internalfeatures/testfileadapter-1.0.mf @@ -2,7 +2,7 @@ Subsystem-ManifestVersion: 1 IBM-ShortName: testfileadapter-1.0 Subsystem-SymbolicName: com.ibm.websphere.appserver.testfileadapter-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.security.wim.adapter.file; version="[1,1.0.100)", +Subsystem-Content: com.ibm.ws.security.wim.adapter.file; version="[1,1.1)", com.ibm.websphere.appserver.federatedRegistry-1.0; type="osgi.subsystem.feature" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 \ No newline at end of file diff --git a/dev/com.ibm.ws.security.wim.repository_test.custom.delay/publish/usr/extension/lib/features/customRepositorySampleDelay-1.0.mf b/dev/com.ibm.ws.security.wim.repository_test.custom.delay/publish/usr/extension/lib/features/customRepositorySampleDelay-1.0.mf index b98f214129f..ec47be05146 100644 --- a/dev/com.ibm.ws.security.wim.repository_test.custom.delay/publish/usr/extension/lib/features/customRepositorySampleDelay-1.0.mf +++ b/dev/com.ibm.ws.security.wim.repository_test.custom.delay/publish/usr/extension/lib/features/customRepositorySampleDelay-1.0.mf @@ -3,6 +3,6 @@ IBM-Test-Feature: true Subsystem-SymbolicName: customRepositorySampleDelay-1.0;visibility:=public Subsystem-Version: 1.0.0 Subsystem-Content: com.ibm.websphere.appserver.federatedRegistry-1.0; type="osgi.subsystem.feature", - com.ibm.ws.security.wim.repository_test.custom.delay; version="[1,1.0.100)" + com.ibm.ws.security.wim.repository_test.custom.delay; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 \ No newline at end of file diff --git a/dev/com.ibm.ws.security.wim.repository_test.custom/publish/usr/extension/lib/features/customRepositorySample-1.0.mf b/dev/com.ibm.ws.security.wim.repository_test.custom/publish/usr/extension/lib/features/customRepositorySample-1.0.mf index 2036dcd1e45..9fab0a30ad2 100755 --- a/dev/com.ibm.ws.security.wim.repository_test.custom/publish/usr/extension/lib/features/customRepositorySample-1.0.mf +++ b/dev/com.ibm.ws.security.wim.repository_test.custom/publish/usr/extension/lib/features/customRepositorySample-1.0.mf @@ -3,6 +3,6 @@ IBM-Test-Feature: true Subsystem-SymbolicName: customRepositorySample-1.0;visibility:=public Subsystem-Version: 1.0.0 Subsystem-Content: com.ibm.websphere.appserver.federatedRegistry-1.0; type="osgi.subsystem.feature", - com.ibm.ws.security.wim.repository_test.custom; version="[1,1.0.100)" + com.ibm.ws.security.wim.repository_test.custom; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 \ No newline at end of file diff --git a/dev/com.ibm.ws.springboot.utility.springbootutil/bnd.bnd b/dev/com.ibm.ws.springboot.utility.springbootutil/bnd.bnd index c088c76112c..d4373120770 100644 --- a/dev/com.ibm.ws.springboot.utility.springbootutil/bnd.bnd +++ b/dev/com.ibm.ws.springboot.utility.springbootutil/bnd.bnd @@ -1,5 +1,5 @@ #******************************************************************************* -# Copyright (c) 2017 IBM Corporation and others. +# Copyright (c) 2017, 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 @@ -17,11 +17,11 @@ Bundle-Name: WebSphere Spring Boot Utility Bundle-SymbolicName: com.ibm.ws.springboot.utility.springbootutil Require-Bundle: \ - com.ibm.ws.springboot.utility; version="[1,1.0.100)", \ - com.ibm.ws.app.manager.springboot; version="[1,1.0.100)", \ - com.ibm.ws.app.manager.springboot.jakarta; version="[1,1.0.100)", \ - com.ibm.ws.kernel.service; version="[1.3,1.3.100)", \ - com.ibm.ws.logging; version="[1,1.0.100)" + com.ibm.ws.springboot.utility; version="[1,1.1)", \ + com.ibm.ws.app.manager.springboot; version="[1,1.1)", \ + com.ibm.ws.app.manager.springboot.jakarta; version="[1,1.1)", \ + com.ibm.ws.kernel.service; version="[1.3,1.4)", \ + com.ibm.ws.logging; version="[1,1.1)" Command-Class: com.ibm.ws.springboot.utility.SpringBootUtility diff --git a/dev/com.ibm.ws.timedexit/publish/features/com.ibm.websphere.appserver.timedexit-1.0.mf b/dev/com.ibm.ws.timedexit/publish/features/com.ibm.websphere.appserver.timedexit-1.0.mf index 542f479d1ff..5b7d9a72285 100644 --- a/dev/com.ibm.ws.timedexit/publish/features/com.ibm.websphere.appserver.timedexit-1.0.mf +++ b/dev/com.ibm.ws.timedexit/publish/features/com.ibm.websphere.appserver.timedexit-1.0.mf @@ -3,7 +3,7 @@ IBM-Test-Feature: true IBM-ShortName: timedexit-1.0 Subsystem-SymbolicName: com.ibm.websphere.appserver.timedexit-1.0;visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.timedexit.internal; version="[1,1.0.100)" +Subsystem-Content: com.ibm.ws.timedexit.internal; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 IBM-Process-Types: server,client diff --git a/dev/com.ibm.ws.transaction.core_fat.misc/publish/files/features/eventListener-1.0.mf b/dev/com.ibm.ws.transaction.core_fat.misc/publish/files/features/eventListener-1.0.mf index 9b5ac904470..24ccacf5c86 100644 --- a/dev/com.ibm.ws.transaction.core_fat.misc/publish/files/features/eventListener-1.0.mf +++ b/dev/com.ibm.ws.transaction.core_fat.misc/publish/files/features/eventListener-1.0.mf @@ -2,7 +2,7 @@ Subsystem-ManifestVersion: 1 IBM-Test-Feature: true Subsystem-SymbolicName: eventListener-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.transaction.fat.eventListener; version="[1,1.0.100)"; location:="lib/com.ibm.ws.transaction.fat.eventListener.jar" +Subsystem-Content: com.ibm.ws.transaction.fat.eventListener; version="[1,1.1)"; location:="lib/com.ibm.ws.transaction.fat.eventListener.jar" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 IBM-API-Package: com.ibm.tx.fat.eventListener; type="internal" diff --git a/dev/com.ibm.ws.transaction.core_fat.misc/publish/files/features/remoteTester-1.0.mf b/dev/com.ibm.ws.transaction.core_fat.misc/publish/files/features/remoteTester-1.0.mf index cd5381a51d5..d07427ad065 100644 --- a/dev/com.ibm.ws.transaction.core_fat.misc/publish/files/features/remoteTester-1.0.mf +++ b/dev/com.ibm.ws.transaction.core_fat.misc/publish/files/features/remoteTester-1.0.mf @@ -2,7 +2,7 @@ Subsystem-ManifestVersion: 1 IBM-Test-Feature: true Subsystem-SymbolicName: remoteTester-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.transaction.fat.remoteTester; version="[1,1.0.100)"; location:="lib/com.ibm.ws.transaction.fat.remoteTester_1.0.jar" +Subsystem-Content: com.ibm.ws.transaction.fat.remoteTester; version="[1,1.1)"; location:="lib/com.ibm.ws.transaction.fat.remoteTester_1.0.jar" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 IBM-API-Package: com.ibm.tx.fat.remoteTester; type="internal" \ No newline at end of file diff --git a/dev/com.ibm.ws.transaction.core_fat.misc/publish/files/features/utdecorator-1.0.mf b/dev/com.ibm.ws.transaction.core_fat.misc/publish/files/features/utdecorator-1.0.mf index 9233cbf0242..f2c91b0ff6b 100644 --- a/dev/com.ibm.ws.transaction.core_fat.misc/publish/files/features/utdecorator-1.0.mf +++ b/dev/com.ibm.ws.transaction.core_fat.misc/publish/files/features/utdecorator-1.0.mf @@ -2,9 +2,9 @@ Subsystem-ManifestVersion: 1 IBM-Test-Feature: true Subsystem-SymbolicName: utdecorator-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.transaction.fat.utdecorator; version="[1,1.0.100)"; location:="lib/com.ibm.ws.transaction.fat.utdecorator_1.0.jar", - com.ibm.websphere.javaee.transaction.1.2; version="[1,1.0.100)"; location:="dev/api/spec/,lib/", - com.ibm.ws.tx.embeddable; version="[1,1.1.100)", +Subsystem-Content: com.ibm.ws.transaction.fat.utdecorator; version="[1,1.1)"; location:="lib/com.ibm.ws.transaction.fat.utdecorator_1.0.jar", + com.ibm.websphere.javaee.transaction.1.2; version="[1,1.1)"; location:="dev/api/spec/,lib/", + com.ibm.ws.tx.embeddable; version="[1,1.2)", Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 IBM-API-Package: com.ibm.tx.jta.ut.util; type="internal", diff --git a/dev/com.ibm.ws.transaction.recovery_fat.3/publish/files/features/xaflow-1.0.mf b/dev/com.ibm.ws.transaction.recovery_fat.3/publish/files/features/xaflow-1.0.mf index ccb22fa2f13..d5bc26df092 100644 --- a/dev/com.ibm.ws.transaction.recovery_fat.3/publish/files/features/xaflow-1.0.mf +++ b/dev/com.ibm.ws.transaction.recovery_fat.3/publish/files/features/xaflow-1.0.mf @@ -2,7 +2,7 @@ Subsystem-ManifestVersion: 1 IBM-Test-Feature: true Subsystem-SymbolicName: xaflow-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.tx.test.impl; version="[1,1.0.100)" +Subsystem-Content: com.ibm.ws.tx.test.impl; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 IBM-SPI-Package: com.ibm.ws.tx.test; type="internal" diff --git a/dev/com.ibm.ws.transaction.test.util/publish/features/txtest-1.0.mf b/dev/com.ibm.ws.transaction.test.util/publish/features/txtest-1.0.mf index 4f09993023c..22affe87662 100644 --- a/dev/com.ibm.ws.transaction.test.util/publish/features/txtest-1.0.mf +++ b/dev/com.ibm.ws.transaction.test.util/publish/features/txtest-1.0.mf @@ -2,9 +2,9 @@ Subsystem-ManifestVersion: 1 IBM-Test-Feature: true Subsystem-SymbolicName: txtest-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.transaction.test.util; version="[1,1.0.100)"; location:="lib/com.ibm.ws.transaction.test.util.jar", - com.ibm.websphere.javaee.transaction.1.2; version="[1,1.0.100)"; location:="dev/api/spec/,lib/", - com.ibm.ws.tx.embeddable; version="[1,1.1.100)" +Subsystem-Content: com.ibm.ws.transaction.test.util; version="[1,1.1)"; location:="lib/com.ibm.ws.transaction.test.util.jar", + com.ibm.websphere.javaee.transaction.1.2; version="[1,1.1)"; location:="dev/api/spec/,lib/", + com.ibm.ws.tx.embeddable; version="[1,1.2)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 IBM-API-Package: com.ibm.tx.jta.ut.util; type="internal", diff --git a/dev/com.ibm.ws.transaction.test.util/publish/features/txtest-2.0.mf b/dev/com.ibm.ws.transaction.test.util/publish/features/txtest-2.0.mf index c88d8463526..be0b93bfac8 100644 --- a/dev/com.ibm.ws.transaction.test.util/publish/features/txtest-2.0.mf +++ b/dev/com.ibm.ws.transaction.test.util/publish/features/txtest-2.0.mf @@ -2,9 +2,9 @@ Subsystem-ManifestVersion: 1 IBM-Test-Feature: true Subsystem-SymbolicName: txtest-2.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.transaction.test.util.jakarta; version="[1,1.0.100)"; location:="lib/com.ibm.ws.transaction.test.util.jakarta.jar", - io.openliberty.jakarta.transaction.2.0; version="[1,1.0.100)"; location:="dev/api/spec/,lib/", - com.ibm.ws.tx.embeddable.jakarta; version="[1,1.1.100)" +Subsystem-Content: com.ibm.ws.transaction.test.util.jakarta; version="[1,1.1)"; location:="lib/com.ibm.ws.transaction.test.util.jakarta.jar", + io.openliberty.jakarta.transaction.2.0; version="[1,1.1)"; location:="dev/api/spec/,lib/", + com.ibm.ws.tx.embeddable.jakarta; version="[1,1.2)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 IBM-API-Package: com.ibm.tx.jta.ut.util; type="internal", diff --git a/dev/com.ibm.ws.transport.iiop.open_fat/publish/features/test.iiop-1.0.mf b/dev/com.ibm.ws.transport.iiop.open_fat/publish/features/test.iiop-1.0.mf index 98c3bb111e4..8ceb3d51dd7 100644 --- a/dev/com.ibm.ws.transport.iiop.open_fat/publish/features/test.iiop-1.0.mf +++ b/dev/com.ibm.ws.transport.iiop.open_fat/publish/features/test.iiop-1.0.mf @@ -3,6 +3,6 @@ Subsystem-SymbolicName: test.iiop-1.0;visibility:=public Subsystem-Version: 1.0.0 Subsystem-Content: test.iiop; version="1.0.0", com.ibm.websphere.appserver.iioptransport-1.0; type="osgi.subsystem.feature", - com.ibm.websphere.javaee.annotation.1.3; location:="dev/api/spec/,lib/"; mavenCoordinates="javax.annotation:javax.annotation-api:1.3.2"; version="[1.0.0,1.0.200)" + com.ibm.websphere.javaee.annotation.1.3; location:="dev/api/spec/,lib/"; mavenCoordinates="javax.annotation:javax.annotation-api:1.3.2"; version="[1.0.0,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.transport.iiop.open_fat/publish/features/test.iiop.client-1.0.mf b/dev/com.ibm.ws.transport.iiop.open_fat/publish/features/test.iiop.client-1.0.mf index 31c1855ba27..9904f5bfa83 100644 --- a/dev/com.ibm.ws.transport.iiop.open_fat/publish/features/test.iiop.client-1.0.mf +++ b/dev/com.ibm.ws.transport.iiop.open_fat/publish/features/test.iiop.client-1.0.mf @@ -8,8 +8,8 @@ Subsystem-Content: com.ibm.websphere.appserver.javax.ejb-3.2; type="osgi.subsystem.feature", com.ibm.websphere.appserver.javaeePlatform-7.0; type="osgi.subsystem.feature", com.ibm.websphere.appserver.javax.interceptor-1.2; type="osgi.subsystem.feature", - com.ibm.ws.ejbcontainer.v32; version="[1.0.0,1.0.200)", - com.ibm.ws.ejbcontainer.remote; version="[1.0.0,1.0.200)" + com.ibm.ws.ejbcontainer.v32; version="[1.0.0,1.1)", + com.ibm.ws.ejbcontainer.remote; version="[1.0.0,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 IBM-API-Package: test.iiop.common; type="ibm-api" diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/features/IBMShortNameManifest.mf b/dev/com.ibm.ws.ui_rest_fat/publish/features/IBMShortNameManifest.mf index 4ca8c690649..35e96504d99 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/features/IBMShortNameManifest.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/features/IBMShortNameManifest.mf @@ -7,7 +7,7 @@ Subsystem-Category: adminCenter Subsystem-Icon: icons/toolicon48.png;size=48,icons/toolicon64.png;size=64,icons/toolicon128.png;size=128 Subsystem-Description: This is the description for IBMShortName. It is used to test that the IBMShort name is used as the tool display n ame when there is no Subsystem-Name. -Subsystem-Content: com.ibm.ws.appserver.toolbundle1; version="[1,1.0.100)" +Subsystem-Content: com.ibm.ws.appserver.toolbundle1; version="[1,1.1)" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" IBM-Install-Policy: manual Subsystem-Vendor: IBM diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/features/SubsystemNameManifest.mf b/dev/com.ibm.ws.ui_rest_fat/publish/features/SubsystemNameManifest.mf index 78ef64f0a78..42193085e99 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/features/SubsystemNameManifest.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/features/SubsystemNameManifest.mf @@ -6,7 +6,7 @@ Subsystem-Type: osgi.subsystem.feature Subsystem-Category: adminCenter Subsystem-Icon: icons/toolicon48.png;size=48,icons/toolicon64.png;size=64,icons/toolicon128.png;size=128 Subsystem-Description: This is the description for SubsystemName. It is used to test that the Subsystem name is used as the Tool display name. -Subsystem-Content: com.ibm.ws.appserver.toolbundle1; version="[1,1.0.100)" +Subsystem-Content: com.ibm.ws.appserver.toolbundle1; version="[1,1.1)" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" IBM-Install-Policy: manual Subsystem-Vendor: IBM diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/features/SubsystemSymbolicNameManifest.mf b/dev/com.ibm.ws.ui_rest_fat/publish/features/SubsystemSymbolicNameManifest.mf index d207c488284..252faefabe4 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/features/SubsystemSymbolicNameManifest.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/features/SubsystemSymbolicNameManifest.mf @@ -6,7 +6,7 @@ Subsystem-Category: adminCenter Subsystem-Icon: icons/toolicon48.png;size=48,icons/toolicon64.png;size=64,icons/toolicon128.png;size=128 Subsystem-Description: This is the description for SubsystemSymbolicName. It is used to test that the symbolic name is used as the tool display n ame when there is no Subsystem-Name, or IBMShortName specified. -Subsystem-Content: com.ibm.ws.appserver.toolbundle1; version="[1,1.0.100)" +Subsystem-Content: com.ibm.ws.appserver.toolbundle1; version="[1,1.1)" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" IBM-Install-Policy: manual Subsystem-Vendor: IBM diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/features/basicAutoFeatureTool.mf b/dev/com.ibm.ws.ui_rest_fat/publish/features/basicAutoFeatureTool.mf index 2e40e6decfa..215af2730a4 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/features/basicAutoFeatureTool.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/features/basicAutoFeatureTool.mf @@ -8,7 +8,7 @@ Subsystem-Localization: OSGI-INF/l10n/subsystem Subsystem-Type: osgi.subsystem.feature Subsystem-Category: adminCenter Subsystem-Icon: icons/toolicon48.png;size=48,icons/toolicon64.png;size=64,icons/toolicon128.png;size=128 -Subsystem-Content: com.ibm.ws.appserver.basicAutoFeatureTool; version="[1,1.0.100)", +Subsystem-Content: com.ibm.ws.appserver.basicAutoFeatureTool; version="[1,1.1)", com.ibm.websphere.appserver.restConnector-1.0; ibm.tolerates:="2.0"; type="osgi.subsystem.feature", com.ibm.websphere.appserver.servlet-3.0; ibm.tolerates:="3.1,4.0,5.0,6.0"; type="osgi.subsystem.feature" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/features/basicProtectedAutoFeatureTool.mf b/dev/com.ibm.ws.ui_rest_fat/publish/features/basicProtectedAutoFeatureTool.mf index eb415ba1302..b4e2ec0e61f 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/features/basicProtectedAutoFeatureTool.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/features/basicProtectedAutoFeatureTool.mf @@ -8,7 +8,7 @@ Subsystem-Category: adminCenter Subsystem-Icon: icons/toolicon48.png;size=48,icons/toolicon64.png;size=64,icons/toolicon128.png;size=128 Subsystem-Description: This is the description for BasicProtectedAutoFeatureTool. It is used to test that we can install a tool feature into t he liberty runtime. -Subsystem-Content: com.ibm.ws.appserver.toolbundle1; version="[1,1.0.100)" +Subsystem-Content: com.ibm.ws.appserver.toolbundle1; version="[1,1.1)" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" Subsystem-Vendor: IBM IBM-Feature-Version: 2 diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/features/basicPublicAutoFeatureTool.mf b/dev/com.ibm.ws.ui_rest_fat/publish/features/basicPublicAutoFeatureTool.mf index bd38845d3b1..e045bff6c7c 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/features/basicPublicAutoFeatureTool.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/features/basicPublicAutoFeatureTool.mf @@ -8,7 +8,7 @@ Subsystem-Category: adminCenter Subsystem-Icon: icons/toolicon48.png;size=48,icons/toolicon64.png;size=64,icons/toolicon128.png;size=128 Subsystem-Description: This is the description for BasicPublicAutoFeatureTool. It is used to test that we can install a tool feature into t he liberty runtime. -Subsystem-Content: com.ibm.ws.appserver.toolbundle1; version="[1,1.0.100)" +Subsystem-Content: com.ibm.ws.appserver.toolbundle1; version="[1,1.1)" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" IBM-Install-Policy: manual Subsystem-Vendor: IBM diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/features/emptyIconHeaderManifest.mf b/dev/com.ibm.ws.ui_rest_fat/publish/features/emptyIconHeaderManifest.mf index bba71fd2ae2..d74106c1984 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/features/emptyIconHeaderManifest.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/features/emptyIconHeaderManifest.mf @@ -6,7 +6,7 @@ Subsystem-Type: osgi.subsystem.feature Subsystem-Category: adminCenter Subsystem-Description: This is the description for No Sized IconHeader. Subsystem-Icon: -Subsystem-Content: com.ibm.ws.appserver.toolbundle1; version="[1,1.0.100)", +Subsystem-Content: com.ibm.ws.appserver.toolbundle1; version="[1,1.1)", com.ibm.websphere.appserver.restConnector-1.0; ibm.tolerates:="2.0"; type="osgi.subsystem.feature", com.ibm.websphere.appserver.servlet-3.0; ibm.tolerates:="3.1,4.0,5.0,6.0"; type="osgi.subsystem.feature" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/features/gifIconHeaderManifest.mf b/dev/com.ibm.ws.ui_rest_fat/publish/features/gifIconHeaderManifest.mf index fe046fb9348..21205b02db1 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/features/gifIconHeaderManifest.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/features/gifIconHeaderManifest.mf @@ -6,7 +6,7 @@ Subsystem-Type: osgi.subsystem.feature Subsystem-Category: adminCenter Subsystem-Description: This is the description for gif IconHeader. Subsystem-Icon: icons/toolicon9.gif -Subsystem-Content: com.ibm.ws.appserver.toolbundle1; version="[1,1.0.100)", +Subsystem-Content: com.ibm.ws.appserver.toolbundle1; version="[1,1.1)", com.ibm.websphere.appserver.restConnector-1.0; ibm.tolerates:="2.0"; type="osgi.subsystem.feature", com.ibm.websphere.appserver.servlet-3.0; ibm.tolerates:="3.1,4.0,5.0,6.0"; type="osgi.subsystem.feature" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/features/invalidRelativeIconURIHeaderManifest.mf b/dev/com.ibm.ws.ui_rest_fat/publish/features/invalidRelativeIconURIHeaderManifest.mf index d154b1b5c90..e54f048325c 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/features/invalidRelativeIconURIHeaderManifest.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/features/invalidRelativeIconURIHeaderManifest.mf @@ -6,7 +6,7 @@ Subsystem-Type: osgi.subsystem.feature Subsystem-Category: adminCenter Subsystem-Description: This is the description for Invalid Relative Icon URI Header. Subsystem-Icon: /../../icons/toolicon1.jpg -Subsystem-Content: com.ibm.ws.appserver.toolbundle1; version="[1,1.0.100)", +Subsystem-Content: com.ibm.ws.appserver.toolbundle1; version="[1,1.1)", com.ibm.websphere.appserver.restConnector-1.0; ibm.tolerates:="2.0"; type="osgi.subsystem.feature", com.ibm.websphere.appserver.servlet-3.0; ibm.tolerates:="3.1,4.0,5.0,6.0"; type="osgi.subsystem.feature" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/features/jpegIconHeaderManifest.mf b/dev/com.ibm.ws.ui_rest_fat/publish/features/jpegIconHeaderManifest.mf index aa4ef7ebcf6..bb72cdf4c06 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/features/jpegIconHeaderManifest.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/features/jpegIconHeaderManifest.mf @@ -6,7 +6,7 @@ Subsystem-Type: osgi.subsystem.feature Subsystem-Category: adminCenter Subsystem-Description: This is the description for Jpg IconHeader. Subsystem-Icon: icons/toolicon9.jpg -Subsystem-Content: com.ibm.ws.appserver.toolbundle1; version="[1,1.0.100)", +Subsystem-Content: com.ibm.ws.appserver.toolbundle1; version="[1,1.1)", com.ibm.websphere.appserver.restConnector-1.0; ibm.tolerates:="2.0"; type="osgi.subsystem.feature", com.ibm.websphere.appserver.servlet-3.0; ibm.tolerates:="3.1,4.0,5.0,6.0"; type="osgi.subsystem.feature" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/features/mixedSizedIconHeaderManifest.mf b/dev/com.ibm.ws.ui_rest_fat/publish/features/mixedSizedIconHeaderManifest.mf index 3e7c401f130..691b6088022 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/features/mixedSizedIconHeaderManifest.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/features/mixedSizedIconHeaderManifest.mf @@ -6,7 +6,7 @@ Subsystem-Type: osgi.subsystem.feature Subsystem-Category: adminCenter Subsystem-Description: This is the description for mixedsized IconHeader. Subsystem-Icon: icons/toolicon1.png;size=142, icons/toolicon2.png;size=77 -Subsystem-Content: com.ibm.ws.appserver.toolbundle1; version="[1,1.0.100)", +Subsystem-Content: com.ibm.ws.appserver.toolbundle1; version="[1,1.1)", com.ibm.websphere.appserver.restConnector-1.0; ibm.tolerates:="2.0"; type="osgi.subsystem.feature", com.ibm.websphere.appserver.servlet-3.0; ibm.tolerates:="3.1,4.0,5.0,6.0"; type="osgi.subsystem.feature" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/features/mixedSizedWithUnsizedIconHeaderManifest.mf b/dev/com.ibm.ws.ui_rest_fat/publish/features/mixedSizedWithUnsizedIconHeaderManifest.mf index 74993164ac8..ca83f639e5f 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/features/mixedSizedWithUnsizedIconHeaderManifest.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/features/mixedSizedWithUnsizedIconHeaderManifest.mf @@ -6,7 +6,7 @@ Subsystem-Type: osgi.subsystem.feature Subsystem-Category: adminCenter Subsystem-Description: This is the description for mixedsizedwithunsized IconHeader. Subsystem-Icon: icons/toolicon1.png, icons/toolicon2.png;size=142 -Subsystem-Content: com.ibm.ws.appserver.toolbundle1; version="[1,1.0.100)", +Subsystem-Content: com.ibm.ws.appserver.toolbundle1; version="[1,1.1)", com.ibm.websphere.appserver.restConnector-1.0; ibm.tolerates:="2.0"; type="osgi.subsystem.feature", com.ibm.websphere.appserver.servlet-3.0; ibm.tolerates:="3.1,4.0,5.0,6.0"; type="osgi.subsystem.feature" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/features/multiUIEndpointManifestHeader.mf b/dev/com.ibm.ws.ui_rest_fat/publish/features/multiUIEndpointManifestHeader.mf index 4c40fd63b81..1712f5b1689 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/features/multiUIEndpointManifestHeader.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/features/multiUIEndpointManifestHeader.mf @@ -7,8 +7,8 @@ Subsystem-Type: osgi.subsystem.feature Subsystem-Category: adminCenter Subsystem-Icon: icons/uriManifesttoolicon48.png Subsystem-Description: This is the description for Multi UI Endpoint Manifest Header It is used to test that we can use the Tool URL defined in the manifest header. -Subsystem-Content: com.ibm.ws.appserver.adminCenterEndpoint1; version="[1,1.0.100)", - com.ibm.ws.appserver.adminCenterEndpoint2; version="[1,1.0.100)" +Subsystem-Content: com.ibm.ws.appserver.adminCenterEndpoint1; version="[1,1.1)", + com.ibm.ws.appserver.adminCenterEndpoint2; version="[1,1.1)" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" IBM-Install-Policy: manual Subsystem-Vendor: IBM diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/features/multiUnsizedIconHeaderManifest.mf b/dev/com.ibm.ws.ui_rest_fat/publish/features/multiUnsizedIconHeaderManifest.mf index a95f752d88b..c287fb2723e 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/features/multiUnsizedIconHeaderManifest.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/features/multiUnsizedIconHeaderManifest.mf @@ -6,7 +6,7 @@ Subsystem-Type: osgi.subsystem.feature Subsystem-Category: adminCenter Subsystem-Description: This is the description for multiunsized IconHeader. Subsystem-Icon: icons/toolicon1.png, icons/toolicon2.png -Subsystem-Content: com.ibm.ws.appserver.toolbundle1; version="[1,1.0.100)", +Subsystem-Content: com.ibm.ws.appserver.toolbundle1; version="[1,1.1)", com.ibm.websphere.appserver.restConnector-1.0; ibm.tolerates:="2.0"; type="osgi.subsystem.feature", com.ibm.websphere.appserver.servlet-3.0; ibm.tolerates:="3.1,4.0,5.0,6.0"; type="osgi.subsystem.feature" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/features/noIconHeaderManifest.mf b/dev/com.ibm.ws.ui_rest_fat/publish/features/noIconHeaderManifest.mf index c41d6518616..113a7017d57 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/features/noIconHeaderManifest.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/features/noIconHeaderManifest.mf @@ -5,7 +5,7 @@ Subsystem-Version: 1.0.0 Subsystem-Type: osgi.subsystem.feature Subsystem-Category: adminCenter Subsystem-Description: This is the description for No IconHeader. -Subsystem-Content: com.ibm.ws.appserver.toolbundle1; version="[1,1.0.100)", +Subsystem-Content: com.ibm.ws.appserver.toolbundle1; version="[1,1.1)", com.ibm.websphere.appserver.restConnector-1.0; ibm.tolerates:="2.0"; type="osgi.subsystem.feature", com.ibm.websphere.appserver.servlet-3.0; ibm.tolerates:="3.1,4.0,5.0,6.0"; type="osgi.subsystem.feature" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/features/noSizedIconHeaderManifest.mf b/dev/com.ibm.ws.ui_rest_fat/publish/features/noSizedIconHeaderManifest.mf index a6ee23c068b..c00802b8342 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/features/noSizedIconHeaderManifest.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/features/noSizedIconHeaderManifest.mf @@ -6,7 +6,7 @@ Subsystem-Type: osgi.subsystem.feature Subsystem-Category: adminCenter Subsystem-Description: This is the description for No Sized IconHeader. Subsystem-Icon: icons/toolicon1.png -Subsystem-Content: com.ibm.ws.appserver.toolbundle1; version="[1,1.0.100)", +Subsystem-Content: com.ibm.ws.appserver.toolbundle1; version="[1,1.1)", com.ibm.websphere.appserver.restConnector-1.0; ibm.tolerates:="2.0"; type="osgi.subsystem.feature", com.ibm.websphere.appserver.servlet-3.0; ibm.tolerates:="3.1,4.0,5.0,6.0"; type="osgi.subsystem.feature" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/features/originalUpdateAutoFeatureTool.mf b/dev/com.ibm.ws.ui_rest_fat/publish/features/originalUpdateAutoFeatureTool.mf index 8c5c92aa445..2c2d9bf4b01 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/features/originalUpdateAutoFeatureTool.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/features/originalUpdateAutoFeatureTool.mf @@ -7,7 +7,7 @@ Subsystem-Type: osgi.subsystem.feature Subsystem-Category: adminCenter Subsystem-Icon: icons/toolicon48.png;size=48,icons/toolicon64.png;size=64,icons/toolicon128.png;size=128 Subsystem-Description: This is the description for UpdateAutoFeatureTool. It is the original tool in the update test. -Subsystem-Content: com.ibm.ws.appserver.basicbundle1; version="[1,2.0.100)" +Subsystem-Content: com.ibm.ws.appserver.basicbundle1; version="[1,2.1)" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" IBM-Install-Policy: manual Subsystem-Vendor: IBM diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/features/singleUIEndpointAndNonEndpointWABManifestHeader.mf b/dev/com.ibm.ws.ui_rest_fat/publish/features/singleUIEndpointAndNonEndpointWABManifestHeader.mf index e7a2d766ea8..06e7ddd7247 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/features/singleUIEndpointAndNonEndpointWABManifestHeader.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/features/singleUIEndpointAndNonEndpointWABManifestHeader.mf @@ -7,8 +7,8 @@ Subsystem-Type: osgi.subsystem.feature Subsystem-Category: adminCenter Subsystem-Icon: icons/uriManifesttoolicon48.png Subsystem-Description: This is the description for Single UIEndpoint And Non Endpoint WAB Manifest Header It is used to test that we can use the Tool URL defined in the manifest header. -Subsystem-Content: com.ibm.ws.appserver.adminCenterEndpoint1; version="[1,1.0.100)", - com.ibm.ws.appserver.basicbundle1; version="[1,1.0.100)" +Subsystem-Content: com.ibm.ws.appserver.adminCenterEndpoint1; version="[1,1.1)", + com.ibm.ws.appserver.basicbundle1; version="[1,1.1)" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" IBM-Install-Policy: manual Subsystem-Vendor: IBM diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/features/singleUIEndpointManifestHeader.mf b/dev/com.ibm.ws.ui_rest_fat/publish/features/singleUIEndpointManifestHeader.mf index d375654207e..095b9385706 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/features/singleUIEndpointManifestHeader.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/features/singleUIEndpointManifestHeader.mf @@ -7,7 +7,7 @@ Subsystem-Type: osgi.subsystem.feature Subsystem-Category: adminCenter Subsystem-Icon: icons/uriManifesttoolicon48.png Subsystem-Description: This is the description for Single UI Endpoint Manifest Header It is used to test that we can use the Tool URL defined in the manifest header. -Subsystem-Content: com.ibm.ws.appserver.adminCenterEndpoint1; version="[1,1.0.100)" +Subsystem-Content: com.ibm.ws.appserver.adminCenterEndpoint1; version="[1,1.1)" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" IBM-Install-Policy: manual Subsystem-Vendor: IBM diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/features/updatedUpdateAutoFeatureTool.mf b/dev/com.ibm.ws.ui_rest_fat/publish/features/updatedUpdateAutoFeatureTool.mf index 58e3ed2961a..938cfe9fb7d 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/features/updatedUpdateAutoFeatureTool.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/features/updatedUpdateAutoFeatureTool.mf @@ -7,7 +7,7 @@ Subsystem-Type: osgi.subsystem.feature Subsystem-Category: adminCenter Subsystem-Icon: icons/toolicon48.png;size=48,icons/toolicon64.png;size=64,icons/toolicon128.png;size=128 Subsystem-Description: This is the description for UpdateAutoFeatureTool. It is the updated tool in the update test. -Subsystem-Content: com.ibm.ws.appserver.testbundle1; version="[1,1.0.100)" +Subsystem-Content: com.ibm.ws.appserver.testbundle1; version="[1,1.1)" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" IBM-Install-Policy: manual Subsystem-Vendor: IBM diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/features/urlInMultipleWabs.mf b/dev/com.ibm.ws.ui_rest_fat/publish/features/urlInMultipleWabs.mf index 366fd318a9a..dcf11849cda 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/features/urlInMultipleWabs.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/features/urlInMultipleWabs.mf @@ -7,8 +7,8 @@ Subsystem-Type: osgi.subsystem.feature Subsystem-Category: adminCenter Subsystem-Icon: icons/urlInMultipleWabicon48.png Subsystem-Description: This is the description for uri in multiple wabs. It is used to test that we can read the Tool URL from multiple wabs in the subsystem content manifest header. -Subsystem-Content: com.ibm.ws.appserver.testbundle1; version="[1,1.0.100)", - com.ibm.ws.appserver.basicbundle1; version="[1,1.0.100)" +Subsystem-Content: com.ibm.ws.appserver.testbundle1; version="[1,1.1)", + com.ibm.ws.appserver.basicbundle1; version="[1,1.1)" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" IBM-Install-Policy: manual Subsystem-Vendor: IBM diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/features/urlInSingleWab.mf b/dev/com.ibm.ws.ui_rest_fat/publish/features/urlInSingleWab.mf index ab13deb48b3..cd106a84b31 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/features/urlInSingleWab.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/features/urlInSingleWab.mf @@ -7,7 +7,7 @@ Subsystem-Type: osgi.subsystem.feature Subsystem-Category: adminCenter Subsystem-Icon: icons/urlInSingleWabicon48.png Subsystem-Description: This is the description for uri in single wab. It is used to test that we can read the Tool URL from a single wab in the subsystem content manifest header -Subsystem-Content: com.ibm.ws.appserver.testbundle1; version="[1,1.0.100)" +Subsystem-Content: com.ibm.ws.appserver.testbundle1; version="[1,1.1)" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" IBM-Install-Policy: manual Subsystem-Vendor: IBM diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/features/usr.mf b/dev/com.ibm.ws.ui_rest_fat/publish/features/usr.mf index 058cfe43b20..9089d3322bf 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/features/usr.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/features/usr.mf @@ -9,7 +9,7 @@ Subsystem-Type: osgi.subsystem.feature Subsystem-Category: adminCenter Subsystem-Icon: icons/toolicon7.png,icons/toolicon8.png;size=58 IBM-AdminCenter-Endpoint: usrtool/welcome -Subsystem-Content: com.ibm.ws.appserver.usrtoolbundle; version="[1,1.0.100)", +Subsystem-Content: com.ibm.ws.appserver.usrtoolbundle; version="[1,1.1)", com.ibm.websphere.appserver.restConnector-1.0; ibm.tolerates:="2.0"; type="osgi.subsystem.feature", com.ibm.websphere.appserver.servlet-3.0; ibm.tolerates:="3.1,4.0,5.0,6.0"; type="osgi.subsystem.feature" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/productfeatures/prodextn1.mf b/dev/com.ibm.ws.ui_rest_fat/publish/productfeatures/prodextn1.mf index 3eef9cda5b0..da3406e64c4 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/productfeatures/prodextn1.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/productfeatures/prodextn1.mf @@ -9,7 +9,7 @@ Subsystem-Type: osgi.subsystem.feature Subsystem-Category: adminCenter Subsystem-Icon: icons/toolicon3.png,icons/toolicon4.png;size=58 IBM-AdminCenter-Endpoint: prodextn1/welcome -Subsystem-Content: com.ibm.ws.appserver.prodextn1toolbundle; version="[1,1.0.100)", +Subsystem-Content: com.ibm.ws.appserver.prodextn1toolbundle; version="[1,1.1)", com.ibm.websphere.appserver.restConnector-1.0; ibm.tolerates:="2.0"; type="osgi.subsystem.feature", com.ibm.websphere.appserver.servlet-3.0; ibm.tolerates:="3.1,4.0,5.0,6.0"; type="osgi.subsystem.feature" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/productfeatures/prodextn1originalUpdateAutoFeatureTool.mf b/dev/com.ibm.ws.ui_rest_fat/publish/productfeatures/prodextn1originalUpdateAutoFeatureTool.mf index c1366534c8b..496f6f609eb 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/productfeatures/prodextn1originalUpdateAutoFeatureTool.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/productfeatures/prodextn1originalUpdateAutoFeatureTool.mf @@ -7,7 +7,7 @@ Subsystem-Type: osgi.subsystem.feature Subsystem-Category: adminCenter Subsystem-Icon: icons/toolicon48.png;size=48,icons/toolicon64.png;size=64,icons/toolicon128.png;size=128 Subsystem-Description: This is the description for ProdExtn1 Update AutoFeatureTool. It is the original tool in the update test. -Subsystem-Content: com.ibm.ws.appserver.prodextn1basicbundle1; version="[1,1.0.100)" +Subsystem-Content: com.ibm.ws.appserver.prodextn1basicbundle1; version="[1,1.1)" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" IBM-Install-Policy: manual Subsystem-Vendor: IBM diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/productfeatures/prodextn1updatedUpdateAutoFeatureTool.mf b/dev/com.ibm.ws.ui_rest_fat/publish/productfeatures/prodextn1updatedUpdateAutoFeatureTool.mf index 50fb1ad7907..8c1da963873 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/productfeatures/prodextn1updatedUpdateAutoFeatureTool.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/productfeatures/prodextn1updatedUpdateAutoFeatureTool.mf @@ -7,7 +7,7 @@ Subsystem-Type: osgi.subsystem.feature Subsystem-Category: adminCenter Subsystem-Icon: icons/toolicon48.png;size=48,icons/toolicon64.png;size=64,icons/toolicon128.png;size=128 Subsystem-Description: This is the description for ProdExtn1 Update AutoFeatureTool. It is the updated tool in the update test. -Subsystem-Content: com.ibm.ws.appserver.prodextn1testbundle1; version="[1,1.0.100)" +Subsystem-Content: com.ibm.ws.appserver.prodextn1testbundle1; version="[1,1.1)" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" IBM-Install-Policy: manual Subsystem-Vendor: IBM diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/productfeatures/prodextn2.mf b/dev/com.ibm.ws.ui_rest_fat/publish/productfeatures/prodextn2.mf index 5bd4d6589fa..c9c004cf6b0 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/productfeatures/prodextn2.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/productfeatures/prodextn2.mf @@ -8,7 +8,7 @@ Subsystem-Category: adminCenter Subsystem-Icon: icons/toolicon5.png,icons/toolicon6.png;size=58 Subsystem-Description: This is the description for prodextn2. It is used to test that we can read from product Extensions feature directories. IBM-AdminCenter-Endpoint: prodextn2/welcome -Subsystem-Content: com.ibm.ws.appserver.prodextn2toolbundle; version="[1,1.0.100)", +Subsystem-Content: com.ibm.ws.appserver.prodextn2toolbundle; version="[1,1.1)", com.ibm.websphere.appserver.restConnector-1.0; ibm.tolerates:="2.0"; type="osgi.subsystem.feature", com.ibm.websphere.appserver.servlet-3.0; ibm.tolerates:="3.1,4.0,5.0,6.0"; type="osgi.subsystem.feature" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/productfeatures/prodextn3.mf b/dev/com.ibm.ws.ui_rest_fat/publish/productfeatures/prodextn3.mf index 43dc4f35ae6..2a0ac98ae31 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/productfeatures/prodextn3.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/productfeatures/prodextn3.mf @@ -7,7 +7,7 @@ Subsystem-Type: osgi.subsystem.feature Subsystem-Category: adminCenter Subsystem-Icon: icons/prodextn3toolicon48.png;size=48 Subsystem-Description: This is the description for prodextn3. It is used to test that we can read from product Extensions feature directories. -Subsystem-Content: com.ibm.ws.appserver.prodextn3toolbundle; version="[1,1.0.100)" +Subsystem-Content: com.ibm.ws.appserver.prodextn3toolbundle; version="[1,1.1)" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" IBM-Install-Policy: manual Subsystem-Vendor: IBM diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/productfeatures/protectedprodextn.mf b/dev/com.ibm.ws.ui_rest_fat/publish/productfeatures/protectedprodextn.mf index 50aba13a01a..bfc1fc36a1a 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/productfeatures/protectedprodextn.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/productfeatures/protectedprodextn.mf @@ -7,7 +7,7 @@ Subsystem-Type: osgi.subsystem.feature Subsystem-Category: adminCenter Subsystem-Icon: icons/prodextn1toolicon48.png;size=48,icons/prodextn1toolicon64.png;size=64,icons/prodextn1toolicon128.png;size=128 Subsystem-Description: This is the description for public prodextn1. It is used to test the feature name. Protected features use symbolicname -Subsystem-Content: com.ibm.ws.appserver.prodextn1toolbundle; version="[1,1.0.100)" +Subsystem-Content: com.ibm.ws.appserver.prodextn1toolbundle; version="[1,1.1)" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" IBM-Install-Policy: manual Subsystem-Vendor: IBM diff --git a/dev/com.ibm.ws.ui_rest_fat/publish/productfeatures/publicprodextn.mf b/dev/com.ibm.ws.ui_rest_fat/publish/productfeatures/publicprodextn.mf index 1d134b1111a..82faf8aee89 100755 --- a/dev/com.ibm.ws.ui_rest_fat/publish/productfeatures/publicprodextn.mf +++ b/dev/com.ibm.ws.ui_rest_fat/publish/productfeatures/publicprodextn.mf @@ -7,7 +7,7 @@ Subsystem-Type: osgi.subsystem.feature Subsystem-Category: adminCenter Subsystem-Icon: icons/prodextn1toolicon48.png;size=48,icons/prodextn1toolicon64.png;size=64,icons/prodextn1toolicon128.png;size=128 Subsystem-Description: This is the description for public prodextn1. It is used to test the feature name. Public features use IBM shortname -Subsystem-Content: com.ibm.ws.appserver.prodextn1toolbundle; version="[1,1.0.100)" +Subsystem-Content: com.ibm.ws.appserver.prodextn1toolbundle; version="[1,1.1)" IBM-Provision-Capability: osgi.identity; filter:="(&(type=osgi.subsystem.feature)(osgi.identity=com.ibm.websphere.appserver.adminCenter-1.0))" IBM-Install-Policy: manual Subsystem-Vendor: IBM diff --git a/dev/com.ibm.ws.webserver.plugin.utility.webserverPluginutil/bnd.bnd b/dev/com.ibm.ws.webserver.plugin.utility.webserverPluginutil/bnd.bnd index 842052fa094..b4cf123d602 100644 --- a/dev/com.ibm.ws.webserver.plugin.utility.webserverPluginutil/bnd.bnd +++ b/dev/com.ibm.ws.webserver.plugin.utility.webserverPluginutil/bnd.bnd @@ -1,5 +1,5 @@ #******************************************************************************* -# Copyright (c) 2017 IBM Corporation and others. +# Copyright (c) 2017, 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 @@ -16,14 +16,14 @@ bVersion=1.0 Bundle-Name: WebServer Plugin Utility Bundle-SymbolicName: com.ibm.ws.webserver.plugin.utility.webserverPluginutil -Require-Bundle: com.ibm.ws.webserver.plugin.utility; version="[1,1.0.100)", \ - com.ibm.ws.logging; version="[1,1.0.100)", \ - com.ibm.ws.kernel.service; version="[1.3,1.3.100)", \ - com.ibm.ws.kernel.boot; version="[1,1.0.100)", \ - com.ibm.ws.product.utility; version="[1,1.0.100)", \ - com.ibm.ws.jmx.connector.client.rest; version="[1,1.0.100)", \ - com.ibm.ws.http.plugin.merge; version="[1,1.0.100)", \ - com.ibm.json4j; version="[1,1.0.100)" +Require-Bundle: com.ibm.ws.webserver.plugin.utility; version="[1,1.1)", \ + com.ibm.ws.logging; version="[1,1.1)", \ + com.ibm.ws.kernel.service; version="[1.3,1.4)", \ + com.ibm.ws.kernel.boot; version="[1,1.1)", \ + com.ibm.ws.product.utility; version="[1,1.1)", \ + com.ibm.ws.jmx.connector.client.rest; version="[1,1.1)", \ + com.ibm.ws.http.plugin.merge; version="[1,1.1)", \ + com.ibm.json4j; version="[1,1.1)" Command-Class: com.ibm.ws.webserver.plugin.utility.WebServerPluginUtility diff --git a/dev/com.ibm.ws.wssecurity_fat.wsscxf.1/publish/files/features/wsseccbh-1.0.mf b/dev/com.ibm.ws.wssecurity_fat.wsscxf.1/publish/files/features/wsseccbh-1.0.mf index c5a304c98af..e01d0718052 100644 --- a/dev/com.ibm.ws.wssecurity_fat.wsscxf.1/publish/files/features/wsseccbh-1.0.mf +++ b/dev/com.ibm.ws.wssecurity_fat.wsscxf.1/publish/files/features/wsseccbh-1.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: wsseccbh-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.wssecurity.example.cbh; version="[1,1.0.100)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY +Subsystem-Content: com.ibm.ws.wssecurity.example.cbh; version="[1,1.1)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY IBM-ShortName: wsseccbh-1.0 Subsystem-Name: wssecurity Test diff --git a/dev/com.ibm.ws.wssecurity_fat.wsscxf.1/publish/files/features/wsseccbh-2.0.mf b/dev/com.ibm.ws.wssecurity_fat.wsscxf.1/publish/files/features/wsseccbh-2.0.mf index 596005f728d..2a07d23a65d 100644 --- a/dev/com.ibm.ws.wssecurity_fat.wsscxf.1/publish/files/features/wsseccbh-2.0.mf +++ b/dev/com.ibm.ws.wssecurity_fat.wsscxf.1/publish/files/features/wsseccbh-2.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: wsseccbh-2.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.wssecurity.example.cbhwss4j; version="[1,1.0.100)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY +Subsystem-Content: com.ibm.ws.wssecurity.example.cbhwss4j; version="[1,1.1)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY IBM-ShortName: wsseccbh-2.0 Subsystem-Name: wssecurity Test diff --git a/dev/com.ibm.ws.wssecurity_fat.wsscxf.2/publish/files/features/wsseccbh-1.0.mf b/dev/com.ibm.ws.wssecurity_fat.wsscxf.2/publish/files/features/wsseccbh-1.0.mf index c5a304c98af..e01d0718052 100644 --- a/dev/com.ibm.ws.wssecurity_fat.wsscxf.2/publish/files/features/wsseccbh-1.0.mf +++ b/dev/com.ibm.ws.wssecurity_fat.wsscxf.2/publish/files/features/wsseccbh-1.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: wsseccbh-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.wssecurity.example.cbh; version="[1,1.0.100)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY +Subsystem-Content: com.ibm.ws.wssecurity.example.cbh; version="[1,1.1)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY IBM-ShortName: wsseccbh-1.0 Subsystem-Name: wssecurity Test diff --git a/dev/com.ibm.ws.wssecurity_fat.wsscxf.2/publish/files/features/wsseccbh-2.0.mf b/dev/com.ibm.ws.wssecurity_fat.wsscxf.2/publish/files/features/wsseccbh-2.0.mf index 596005f728d..2a07d23a65d 100644 --- a/dev/com.ibm.ws.wssecurity_fat.wsscxf.2/publish/files/features/wsseccbh-2.0.mf +++ b/dev/com.ibm.ws.wssecurity_fat.wsscxf.2/publish/files/features/wsseccbh-2.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: wsseccbh-2.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.wssecurity.example.cbhwss4j; version="[1,1.0.100)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY +Subsystem-Content: com.ibm.ws.wssecurity.example.cbhwss4j; version="[1,1.1)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY IBM-ShortName: wsseccbh-2.0 Subsystem-Name: wssecurity Test diff --git a/dev/com.ibm.ws.wssecurity_fat.wsscxf.3/publish/files/features/wsseccbh-1.0.mf b/dev/com.ibm.ws.wssecurity_fat.wsscxf.3/publish/files/features/wsseccbh-1.0.mf index c5a304c98af..e01d0718052 100644 --- a/dev/com.ibm.ws.wssecurity_fat.wsscxf.3/publish/files/features/wsseccbh-1.0.mf +++ b/dev/com.ibm.ws.wssecurity_fat.wsscxf.3/publish/files/features/wsseccbh-1.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: wsseccbh-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.wssecurity.example.cbh; version="[1,1.0.100)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY +Subsystem-Content: com.ibm.ws.wssecurity.example.cbh; version="[1,1.1)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY IBM-ShortName: wsseccbh-1.0 Subsystem-Name: wssecurity Test diff --git a/dev/com.ibm.ws.wssecurity_fat.wsscxf.3/publish/files/features/wsseccbh-2.0.mf b/dev/com.ibm.ws.wssecurity_fat.wsscxf.3/publish/files/features/wsseccbh-2.0.mf index 596005f728d..2a07d23a65d 100644 --- a/dev/com.ibm.ws.wssecurity_fat.wsscxf.3/publish/files/features/wsseccbh-2.0.mf +++ b/dev/com.ibm.ws.wssecurity_fat.wsscxf.3/publish/files/features/wsseccbh-2.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: wsseccbh-2.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.wssecurity.example.cbhwss4j; version="[1,1.0.100)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY +Subsystem-Content: com.ibm.ws.wssecurity.example.cbhwss4j; version="[1,1.1)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY IBM-ShortName: wsseccbh-2.0 Subsystem-Name: wssecurity Test diff --git a/dev/com.ibm.ws.wssecurity_fat.wsscxf.4/publish/files/features/wsseccbh-1.0.mf b/dev/com.ibm.ws.wssecurity_fat.wsscxf.4/publish/files/features/wsseccbh-1.0.mf index c5a304c98af..e01d0718052 100644 --- a/dev/com.ibm.ws.wssecurity_fat.wsscxf.4/publish/files/features/wsseccbh-1.0.mf +++ b/dev/com.ibm.ws.wssecurity_fat.wsscxf.4/publish/files/features/wsseccbh-1.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: wsseccbh-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.wssecurity.example.cbh; version="[1,1.0.100)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY +Subsystem-Content: com.ibm.ws.wssecurity.example.cbh; version="[1,1.1)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY IBM-ShortName: wsseccbh-1.0 Subsystem-Name: wssecurity Test diff --git a/dev/com.ibm.ws.wssecurity_fat.wsscxf.4/publish/files/features/wsseccbh-2.0.mf b/dev/com.ibm.ws.wssecurity_fat.wsscxf.4/publish/files/features/wsseccbh-2.0.mf index 596005f728d..2a07d23a65d 100644 --- a/dev/com.ibm.ws.wssecurity_fat.wsscxf.4/publish/files/features/wsseccbh-2.0.mf +++ b/dev/com.ibm.ws.wssecurity_fat.wsscxf.4/publish/files/features/wsseccbh-2.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: wsseccbh-2.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.wssecurity.example.cbhwss4j; version="[1,1.0.100)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY +Subsystem-Content: com.ibm.ws.wssecurity.example.cbhwss4j; version="[1,1.1)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY IBM-ShortName: wsseccbh-2.0 Subsystem-Name: wssecurity Test diff --git a/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.1/publish/files/features/wsseccbh-1.0.mf b/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.1/publish/files/features/wsseccbh-1.0.mf index c5a304c98af..e01d0718052 100644 --- a/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.1/publish/files/features/wsseccbh-1.0.mf +++ b/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.1/publish/files/features/wsseccbh-1.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: wsseccbh-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.wssecurity.example.cbh; version="[1,1.0.100)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY +Subsystem-Content: com.ibm.ws.wssecurity.example.cbh; version="[1,1.1)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY IBM-ShortName: wsseccbh-1.0 Subsystem-Name: wssecurity Test diff --git a/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.1/publish/files/features/wsseccbh-2.0.mf b/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.1/publish/files/features/wsseccbh-2.0.mf index ebbaa59f3ba..442372d2afa 100644 --- a/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.1/publish/files/features/wsseccbh-2.0.mf +++ b/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.1/publish/files/features/wsseccbh-2.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: wsseccbh-2.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.wssecurity.example.cbhwss4j; version="[1,1.0.100)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY +Subsystem-Content: com.ibm.ws.wssecurity.example.cbhwss4j; version="[1,1.1)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY IBM-ShortName: wsseccbh-2.0 Subsystem-Name: wssecurity Test diff --git a/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.2/publish/files/features/wsseccbh-1.0.mf b/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.2/publish/files/features/wsseccbh-1.0.mf index c5a304c98af..e01d0718052 100644 --- a/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.2/publish/files/features/wsseccbh-1.0.mf +++ b/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.2/publish/files/features/wsseccbh-1.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: wsseccbh-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.wssecurity.example.cbh; version="[1,1.0.100)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY +Subsystem-Content: com.ibm.ws.wssecurity.example.cbh; version="[1,1.1)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY IBM-ShortName: wsseccbh-1.0 Subsystem-Name: wssecurity Test diff --git a/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.2/publish/files/features/wsseccbh-2.0.mf b/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.2/publish/files/features/wsseccbh-2.0.mf index ebbaa59f3ba..442372d2afa 100644 --- a/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.2/publish/files/features/wsseccbh-2.0.mf +++ b/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.2/publish/files/features/wsseccbh-2.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: wsseccbh-2.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.wssecurity.example.cbhwss4j; version="[1,1.0.100)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY +Subsystem-Content: com.ibm.ws.wssecurity.example.cbhwss4j; version="[1,1.1)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY IBM-ShortName: wsseccbh-2.0 Subsystem-Name: wssecurity Test diff --git a/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.3/publish/files/features/wsseccbh-1.0.mf b/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.3/publish/files/features/wsseccbh-1.0.mf index c5a304c98af..e01d0718052 100644 --- a/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.3/publish/files/features/wsseccbh-1.0.mf +++ b/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.3/publish/files/features/wsseccbh-1.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: wsseccbh-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.wssecurity.example.cbh; version="[1,1.0.100)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY +Subsystem-Content: com.ibm.ws.wssecurity.example.cbh; version="[1,1.1)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY IBM-ShortName: wsseccbh-1.0 Subsystem-Name: wssecurity Test diff --git a/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.3/publish/files/features/wsseccbh-2.0.mf b/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.3/publish/files/features/wsseccbh-2.0.mf index ebbaa59f3ba..442372d2afa 100644 --- a/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.3/publish/files/features/wsseccbh-2.0.mf +++ b/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.3/publish/files/features/wsseccbh-2.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: wsseccbh-2.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.wssecurity.example.cbhwss4j; version="[1,1.0.100)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY +Subsystem-Content: com.ibm.ws.wssecurity.example.cbhwss4j; version="[1,1.1)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY IBM-ShortName: wsseccbh-2.0 Subsystem-Name: wssecurity Test diff --git a/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.5/publish/files/features/wsseccbh-1.0.mf b/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.5/publish/files/features/wsseccbh-1.0.mf index c5a304c98af..e01d0718052 100644 --- a/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.5/publish/files/features/wsseccbh-1.0.mf +++ b/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.5/publish/files/features/wsseccbh-1.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: wsseccbh-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.wssecurity.example.cbh; version="[1,1.0.100)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY +Subsystem-Content: com.ibm.ws.wssecurity.example.cbh; version="[1,1.1)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY IBM-ShortName: wsseccbh-1.0 Subsystem-Name: wssecurity Test diff --git a/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.5/publish/files/features/wsseccbh-2.0.mf b/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.5/publish/files/features/wsseccbh-2.0.mf index ebbaa59f3ba..442372d2afa 100644 --- a/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.5/publish/files/features/wsseccbh-2.0.mf +++ b/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.5/publish/files/features/wsseccbh-2.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: wsseccbh-2.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.wssecurity.example.cbhwss4j; version="[1,1.0.100)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY +Subsystem-Content: com.ibm.ws.wssecurity.example.cbhwss4j; version="[1,1.1)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY IBM-ShortName: wsseccbh-2.0 Subsystem-Name: wssecurity Test diff --git a/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.6/publish/files/features/wsseccbh-1.0.mf b/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.6/publish/files/features/wsseccbh-1.0.mf index c5a304c98af..e01d0718052 100644 --- a/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.6/publish/files/features/wsseccbh-1.0.mf +++ b/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.6/publish/files/features/wsseccbh-1.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: wsseccbh-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.wssecurity.example.cbh; version="[1,1.0.100)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY +Subsystem-Content: com.ibm.ws.wssecurity.example.cbh; version="[1,1.1)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY IBM-ShortName: wsseccbh-1.0 Subsystem-Name: wssecurity Test diff --git a/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.6/publish/files/features/wsseccbh-2.0.mf b/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.6/publish/files/features/wsseccbh-2.0.mf index ebbaa59f3ba..442372d2afa 100644 --- a/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.6/publish/files/features/wsseccbh-2.0.mf +++ b/dev/com.ibm.ws.wssecurity_fat.wsscxf.saml.6/publish/files/features/wsseccbh-2.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: wsseccbh-2.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: com.ibm.ws.wssecurity.example.cbhwss4j; version="[1,1.0.100)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY +Subsystem-Content: com.ibm.ws.wssecurity.example.cbhwss4j; version="[1,1.1)"; location:="lib/"; type="osgi.bundle"; start-phase:=APPLICATION_EARLY IBM-ShortName: wsseccbh-2.0 Subsystem-Name: wssecurity Test diff --git a/dev/io.openliberty.checkpoint_fat/publish/files/features/test.checkpoint.config-1.0.mf b/dev/io.openliberty.checkpoint_fat/publish/files/features/test.checkpoint.config-1.0.mf index b1105defbd1..f557404151c 100644 --- a/dev/io.openliberty.checkpoint_fat/publish/files/features/test.checkpoint.config-1.0.mf +++ b/dev/io.openliberty.checkpoint_fat/publish/files/features/test.checkpoint.config-1.0.mf @@ -1,7 +1,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: test.checkpoint.config-1.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: test.checkpoint.config.bundle; version="[1,1.0.100)" +Subsystem-Content: test.checkpoint.config.bundle; version="[1,1.1)" Subsystem-Type: osgi.subsystem.feature IBM-API-Package: test.feature.api IBM-Feature-Version: 2 diff --git a/dev/io.openliberty.checkpoint_fat_security_oidc_social/publish/features/jaspicUserTestFeature-1.0.mf b/dev/io.openliberty.checkpoint_fat_security_oidc_social/publish/features/jaspicUserTestFeature-1.0.mf index 7fdd5cf67e9..579d72854ed 100644 --- a/dev/io.openliberty.checkpoint_fat_security_oidc_social/publish/features/jaspicUserTestFeature-1.0.mf +++ b/dev/io.openliberty.checkpoint_fat_security_oidc_social/publish/features/jaspicUserTestFeature-1.0.mf @@ -3,7 +3,7 @@ IBM-ShortName: jaspicUserTestFeature-1.0 Subsystem-SymbolicName: com.ibm.websphere.appserver.jaspicUserTestFeature-1.0;visibility:=public Subsystem-Version: 1.0.0 Subsystem-Content: - com.ibm.ws.security.jaspic.test; version="[1,1.0.100)", + com.ibm.ws.security.jaspic.test; version="[1,1.1)", com.ibm.websphere.appserver.servlet-3.1; ibm.tolerates:="4.0"; type="osgi.subsystem.feature", com.ibm.websphere.appserver.jaspic-1.1; type="osgi.subsystem.feature" Subsystem-Type: osgi.subsystem.feature diff --git a/dev/io.openliberty.checkpoint_fat_security_oidc_social/publish/features/jaspicUserTestFeature-2.0.mf b/dev/io.openliberty.checkpoint_fat_security_oidc_social/publish/features/jaspicUserTestFeature-2.0.mf index b533d64a2b4..3b9dceff916 100644 --- a/dev/io.openliberty.checkpoint_fat_security_oidc_social/publish/features/jaspicUserTestFeature-2.0.mf +++ b/dev/io.openliberty.checkpoint_fat_security_oidc_social/publish/features/jaspicUserTestFeature-2.0.mf @@ -3,7 +3,7 @@ IBM-ShortName: jaspicUserTestFeature-2.0 Subsystem-SymbolicName: com.ibm.websphere.appserver.jaspicUserTestFeature-2.0;visibility:=public Subsystem-Version: 2.0.0 Subsystem-Content: - com.ibm.ws.security.jaspic.test.jakarta; version="[1,1.0.100)", + com.ibm.ws.security.jaspic.test.jakarta; version="[1,1.1)", com.ibm.websphere.appserver.servlet-5.0; type="osgi.subsystem.feature", io.openliberty.appAuthentication-2.0; type="osgi.subsystem.feature" Subsystem-Type: osgi.subsystem.feature diff --git a/dev/io.openliberty.checkpoint_fat_security_oidc_social/publish/features/jaspicUserTestFeature-3.0.mf b/dev/io.openliberty.checkpoint_fat_security_oidc_social/publish/features/jaspicUserTestFeature-3.0.mf index 2b3900df340..96c3bc669e4 100644 --- a/dev/io.openliberty.checkpoint_fat_security_oidc_social/publish/features/jaspicUserTestFeature-3.0.mf +++ b/dev/io.openliberty.checkpoint_fat_security_oidc_social/publish/features/jaspicUserTestFeature-3.0.mf @@ -3,7 +3,7 @@ IBM-ShortName: jaspicUserTestFeature-3.0 Subsystem-SymbolicName: com.ibm.websphere.appserver.jaspicUserTestFeature-3.0;visibility:=public Subsystem-Version: 2.0.0 Subsystem-Content: - com.ibm.ws.security.jaspic.test.jakarta; version="[1,1.0.100)", + com.ibm.ws.security.jaspic.test.jakarta; version="[1,1.1)", com.ibm.websphere.appserver.servlet-6.0; type="osgi.subsystem.feature", io.openliberty.appAuthentication-3.0; type="osgi.subsystem.feature" Subsystem-Type: osgi.subsystem.feature diff --git a/dev/io.openliberty.ejbcontainer.jakarta.fat_tools/publish/features/io.openliberty.enterpriseBeansTest-2.0.mf b/dev/io.openliberty.ejbcontainer.jakarta.fat_tools/publish/features/io.openliberty.enterpriseBeansTest-2.0.mf index cc11548718c..1e4111f72a9 100644 --- a/dev/io.openliberty.ejbcontainer.jakarta.fat_tools/publish/features/io.openliberty.enterpriseBeansTest-2.0.mf +++ b/dev/io.openliberty.ejbcontainer.jakarta.fat_tools/publish/features/io.openliberty.enterpriseBeansTest-2.0.mf @@ -3,7 +3,7 @@ IBM-ShortName: enterpriseBeansTest-2.0 IBM-Test-Feature: true Subsystem-SymbolicName: io.openliberty.enterpriseBeansTest-2.0; visibility:=public Subsystem-Version: 1.0.0 -Subsystem-Content: io.openliberty.ejbcontainer.jakarta.fat_tools; version="[1,1.0.100)"; type="osgi.subsystem.feature" +Subsystem-Content: io.openliberty.ejbcontainer.jakarta.fat_tools; version="[1,1.1)"; type="osgi.subsystem.feature" IBM-Feature-Version: 2 IBM-API-Package: io.openliberty.ejbcontainer.jakarta.test.tools, io.openliberty.ejbcontainer.jakarta.test.osgi.pmi diff --git a/dev/io.openliberty.microprofile.opentracing.2.0.internal_fat_tck/publish/files/features/io.openliberty.opentracing.mock-2.0.mf b/dev/io.openliberty.microprofile.opentracing.2.0.internal_fat_tck/publish/files/features/io.openliberty.opentracing.mock-2.0.mf index 0bbb512e417..a040afdece8 100644 --- a/dev/io.openliberty.microprofile.opentracing.2.0.internal_fat_tck/publish/files/features/io.openliberty.opentracing.mock-2.0.mf +++ b/dev/io.openliberty.microprofile.opentracing.2.0.internal_fat_tck/publish/files/features/io.openliberty.opentracing.mock-2.0.mf @@ -6,5 +6,5 @@ Subsystem-SymbolicName: io.openliberty.opentracing.mock-2.0; visibility:=public; Subsystem-Type: osgi.subsystem.feature Subsystem-Version: 1.0.0 Subsystem-Content: com.ibm.websphere.appserver.opentracing-2.0; type="osgi.subsystem.feature", - io.openliberty.opentracing.mock-2.0; version="[1.0.0,1.0.200)" + io.openliberty.opentracing.mock-2.0; version="[1.0.0,1.1)" diff --git a/dev/io.openliberty.microprofile.opentracing.3.0.internal_fat_tck/publish/files/features/io.openliberty.opentracing.mock-3.0.mf b/dev/io.openliberty.microprofile.opentracing.3.0.internal_fat_tck/publish/files/features/io.openliberty.opentracing.mock-3.0.mf index 131afec2dda..a76d7defb2c 100644 --- a/dev/io.openliberty.microprofile.opentracing.3.0.internal_fat_tck/publish/files/features/io.openliberty.opentracing.mock-3.0.mf +++ b/dev/io.openliberty.microprofile.opentracing.3.0.internal_fat_tck/publish/files/features/io.openliberty.opentracing.mock-3.0.mf @@ -6,5 +6,5 @@ Subsystem-SymbolicName: io.openliberty.opentracing.mock-3.0; visibility:=public; Subsystem-Type: osgi.subsystem.feature Subsystem-Version: 1.0.0 Subsystem-Content: io.openliberty.mpOpenTracing-3.0; type="osgi.subsystem.feature", - io.openliberty.opentracing.mock-3.0; version="[1.0.0,1.0.200)" + io.openliberty.opentracing.mock-3.0; version="[1.0.0,1.1)" diff --git a/dev/io.openliberty.opentracing.2.x_fat/publish/files/features/io.openliberty.opentracing.mock-2.0.mf b/dev/io.openliberty.opentracing.2.x_fat/publish/files/features/io.openliberty.opentracing.mock-2.0.mf index 0bbb512e417..a040afdece8 100644 --- a/dev/io.openliberty.opentracing.2.x_fat/publish/files/features/io.openliberty.opentracing.mock-2.0.mf +++ b/dev/io.openliberty.opentracing.2.x_fat/publish/files/features/io.openliberty.opentracing.mock-2.0.mf @@ -6,5 +6,5 @@ Subsystem-SymbolicName: io.openliberty.opentracing.mock-2.0; visibility:=public; Subsystem-Type: osgi.subsystem.feature Subsystem-Version: 1.0.0 Subsystem-Content: com.ibm.websphere.appserver.opentracing-2.0; type="osgi.subsystem.feature", - io.openliberty.opentracing.mock-2.0; version="[1.0.0,1.0.200)" + io.openliberty.opentracing.mock-2.0; version="[1.0.0,1.1)" diff --git a/dev/io.openliberty.opentracing.3.x_fat/publish/files/features/io.openliberty.opentracing.mock-3.0.mf b/dev/io.openliberty.opentracing.3.x_fat/publish/files/features/io.openliberty.opentracing.mock-3.0.mf index 131afec2dda..a76d7defb2c 100644 --- a/dev/io.openliberty.opentracing.3.x_fat/publish/files/features/io.openliberty.opentracing.mock-3.0.mf +++ b/dev/io.openliberty.opentracing.3.x_fat/publish/files/features/io.openliberty.opentracing.mock-3.0.mf @@ -6,5 +6,5 @@ Subsystem-SymbolicName: io.openliberty.opentracing.mock-3.0; visibility:=public; Subsystem-Type: osgi.subsystem.feature Subsystem-Version: 1.0.0 Subsystem-Content: io.openliberty.mpOpenTracing-3.0; type="osgi.subsystem.feature", - io.openliberty.opentracing.mock-3.0; version="[1.0.0,1.0.200)" + io.openliberty.opentracing.mock-3.0; version="[1.0.0,1.1)" diff --git a/dev/io.openliberty.xmlBinding.3.0.internal.tools.schemagen/bnd.bnd b/dev/io.openliberty.xmlBinding.3.0.internal.tools.schemagen/bnd.bnd index c4e29f63921..ca3fdbf493f 100644 --- a/dev/io.openliberty.xmlBinding.3.0.internal.tools.schemagen/bnd.bnd +++ b/dev/io.openliberty.xmlBinding.3.0.internal.tools.schemagen/bnd.bnd @@ -1,5 +1,5 @@ #******************************************************************************* -# Copyright (c) 2021 IBM Corporation and others. +# Copyright (c) 2021, 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 @@ -19,10 +19,10 @@ Bundle-Name: IBM XML Binding SchemaGen Tool Require-Compiler: true -Require-Bundle: io.openliberty.xmlBinding.3.0.internal.tools; version="[1,1.0.100)", \ - io.openliberty.jakarta.xmlBinding.3.0; version="[1,1.0.100)"; location="dev/api/spec/", \ - io.openliberty.jakarta.activation.2.0; version="[1,1.0.100)"; location="dev/api/spec/", \ - com.ibm.ws.logging; version="[1,1.0.100)" +Require-Bundle: io.openliberty.xmlBinding.3.0.internal.tools; version="[1,1.1)", \ + io.openliberty.jakarta.xmlBinding.3.0; version="[1,1.1)"; location="dev/api/spec/", \ + io.openliberty.jakarta.activation.2.0; version="[1,1.1)"; location="dev/api/spec/", \ + com.ibm.ws.logging; version="[1,1.1)" Command-Class: io.openliberty.xmlbinding.tools.SchemaGen diff --git a/dev/io.openliberty.xmlBinding.3.0.internal.tools.xjc/bnd.bnd b/dev/io.openliberty.xmlBinding.3.0.internal.tools.xjc/bnd.bnd index fafc00d2f59..0e118814a18 100644 --- a/dev/io.openliberty.xmlBinding.3.0.internal.tools.xjc/bnd.bnd +++ b/dev/io.openliberty.xmlBinding.3.0.internal.tools.xjc/bnd.bnd @@ -1,5 +1,5 @@ #******************************************************************************* -# Copyright (c) 2021 IBM Corporation and others. +# Copyright (c) 2021, 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 @@ -19,10 +19,10 @@ Bundle-Name: IBM XML Binding XJC Tool Require-Compiler: true -Require-Bundle: io.openliberty.xmlBinding.3.0.internal.tools; version="[1,1.0.100)", \ - io.openliberty.jakarta.xmlBinding.3.0; version="[1,1.0.100)"; location="dev/api/spec/", \ - io.openliberty.jakarta.activation.2.0; version="[1,1.0.100)"; location="dev/api/spec/", \ - com.ibm.ws.logging; version="[1,1.0.100)" +Require-Bundle: io.openliberty.xmlBinding.3.0.internal.tools; version="[1,1.1)", \ + io.openliberty.jakarta.xmlBinding.3.0; version="[1,1.1)"; location="dev/api/spec/", \ + io.openliberty.jakarta.activation.2.0; version="[1,1.1)"; location="dev/api/spec/", \ + com.ibm.ws.logging; version="[1,1.1)" Command-Class: io.openliberty.xmlbinding.tools.XJC diff --git a/dev/io.openliberty.xmlWS.3.0.internal.tools.wsgen/bnd.bnd b/dev/io.openliberty.xmlWS.3.0.internal.tools.wsgen/bnd.bnd index a6f87c0d77b..21b5e1280cb 100644 --- a/dev/io.openliberty.xmlWS.3.0.internal.tools.wsgen/bnd.bnd +++ b/dev/io.openliberty.xmlWS.3.0.internal.tools.wsgen/bnd.bnd @@ -1,5 +1,5 @@ #******************************************************************************* -# Copyright (c) 2020 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 @@ -19,15 +19,15 @@ Bundle-SymbolicName: io.openliberty.xmlWS.3.0.internal.tools.wsgen Require-Compiler: true Require-Bundle:\ - io.openliberty.xmlWS.3.0.internal.tools; version="[1,1.0.100)", \ - io.openliberty.xmlBinding.3.0.internal.tools; version="[1,1.0.100)", \ - io.openliberty.jakarta.activation.2.0;version="[1,1.0.100)";location="dev/api/spec/", \ - io.openliberty.jakarta.jws.3.0;version="[1,1.0.100)";location="dev/api/spec/", \ - io.openliberty.jakarta.soap.2.0;version="[1,1.0.100)";location="dev/api/spec/", \ - io.openliberty.jakarta.xmlWS.3.0;version="[1,1.0.100)";location="dev/api/spec/", \ - io.openliberty.jakarta.xmlBinding.3.0;version="[1,1.0.100)";location="dev/api/spec/", \ - io.openliberty.com.sun.xml.messaging.saaj.2.0; version="[1,1.0.100)", \ - com.ibm.ws.logging; version="[1,1.0.100)" + io.openliberty.xmlWS.3.0.internal.tools; version="[1,1.1)", \ + io.openliberty.xmlBinding.3.0.internal.tools; version="[1,1.1)", \ + io.openliberty.jakarta.activation.2.0;version="[1,1.1)";location="dev/api/spec/", \ + io.openliberty.jakarta.jws.3.0;version="[1,1.1)";location="dev/api/spec/", \ + io.openliberty.jakarta.soap.2.0;version="[1,1.1)";location="dev/api/spec/", \ + io.openliberty.jakarta.xmlWS.3.0;version="[1,1.1)";location="dev/api/spec/", \ + io.openliberty.jakarta.xmlBinding.3.0;version="[1,1.1)";location="dev/api/spec/", \ + io.openliberty.com.sun.xml.messaging.saaj.2.0; version="[1,1.1)", \ + com.ibm.ws.logging; version="[1,1.1)" Command-Class: io.openliberty.xmlWS30.tools.WsGen diff --git a/dev/io.openliberty.xmlWS.3.0.internal.tools.wsimport/bnd.bnd b/dev/io.openliberty.xmlWS.3.0.internal.tools.wsimport/bnd.bnd index 3c157dbb6fe..f5a28c279d3 100644 --- a/dev/io.openliberty.xmlWS.3.0.internal.tools.wsimport/bnd.bnd +++ b/dev/io.openliberty.xmlWS.3.0.internal.tools.wsimport/bnd.bnd @@ -1,5 +1,5 @@ #******************************************************************************* -# Copyright (c) 2020 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 @@ -19,14 +19,14 @@ Bundle-SymbolicName: io.openliberty.xmlWS.3.0.internal.tools.wsimport Require-Compiler: true Require-Bundle:\ - io.openliberty.xmlWS.3.0.internal.tools; version="[1,1.0.100)", \ - io.openliberty.xmlBinding.3.0.internal.tools; version="[1,1.0.100)", \ - io.openliberty.jakarta.activation.2.0;version="[1,1.0.100)";location="dev/api/spec/", \ - io.openliberty.jakarta.jws.3.0;version="[1,1.0.100)";location="dev/api/spec/", \ - io.openliberty.jakarta.soap.2.0;version="[1,1.0.100)";location="dev/api/spec/", \ - io.openliberty.jakarta.xmlWS.3.0;version="[1,1.0.100)";location="dev/api/spec/", \ - io.openliberty.jakarta.xmlBinding.3.0;version="[1,1.0.100)";location="dev/api/spec/", \ - com.ibm.ws.logging; version="[1,1.0.100)" + io.openliberty.xmlWS.3.0.internal.tools; version="[1,1.1)", \ + io.openliberty.xmlBinding.3.0.internal.tools; version="[1,1.1)", \ + io.openliberty.jakarta.activation.2.0;version="[1,1.1)";location="dev/api/spec/", \ + io.openliberty.jakarta.jws.3.0;version="[1,1.1)";location="dev/api/spec/", \ + io.openliberty.jakarta.soap.2.0;version="[1,1.1)";location="dev/api/spec/", \ + io.openliberty.jakarta.xmlWS.3.0;version="[1,1.1)";location="dev/api/spec/", \ + io.openliberty.jakarta.xmlBinding.3.0;version="[1,1.1)";location="dev/api/spec/", \ + com.ibm.ws.logging; version="[1,1.1)" Command-Class: io.openliberty.xmlWS30.tools.WsImport diff --git a/dev/wlp-featureTasks/src/com/ibm/ws/wlp/feature/tasks/FeatureBnd.java b/dev/wlp-featureTasks/src/com/ibm/ws/wlp/feature/tasks/FeatureBnd.java index dc77481e6a9..7d66f082eb5 100755 --- a/dev/wlp-featureTasks/src/com/ibm/ws/wlp/feature/tasks/FeatureBnd.java +++ b/dev/wlp-featureTasks/src/com/ibm/ws/wlp/feature/tasks/FeatureBnd.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2020 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: @@ -503,22 +503,18 @@ private String generateVersionRange(String v) { int major = ver.getMajor(); int minor = ver.getMinor(); int micro = ver.getMicro(); - int floor = micro - (micro % 200); - int ceiling = floor + 200; StringBuilder vRange = new StringBuilder("["); vRange.append(major); vRange.append('.'); vRange.append(minor); vRange.append('.'); - vRange.append(floor); + vRange.append(micro); vRange.append(','); vRange.append(major); vRange.append('.'); - vRange.append(minor); - vRange.append('.'); - vRange.append(ceiling); - vRange.append(')'); + vRange.append(minor + 1); + vRange.append(".0)"); return vRange.toString(); } diff --git a/dev/wlp.lib.extract_test/inputs/manifests/adminSecurity-1.0.mf b/dev/wlp.lib.extract_test/inputs/manifests/adminSecurity-1.0.mf index e27f808d6c3..cdc04e6d9f1 100644 --- a/dev/wlp.lib.extract_test/inputs/manifests/adminSecurity-1.0.mf +++ b/dev/wlp.lib.extract_test/inputs/manifests/adminSecurity-1.0.mf @@ -2,13 +2,13 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: com.ibm.websphere.appserver.adminSecurity-1.0 Subsystem-Version: 1.0.0 Subsystem-Content: com.ibm.websphere.security; version="[1,2)", - com.ibm.ws.security.authentication.tai; version="[1,1.0.100)", - com.ibm.ws.webcontainer.security; version="[1.0.0,1.0.100)", - com.ibm.ws.webcontainer.security.admin; version="[1,1.0.100)", + com.ibm.ws.security.authentication.tai; version="[1,1.1)", + com.ibm.ws.webcontainer.security; version="[1.0.0,1.1)", + com.ibm.ws.webcontainer.security.admin; version="[1,1.1)", com.ibm.websphere.appserver.servlet-3.0; ibm.tolerates:="3.1"; type="osgi.subsystem.feature", com.ibm.websphere.appserver.security-1.0; type="osgi.subsystem.feature", com.ibm.websphere.appserver.distributedMap-1.0; type="osgi.subsystem.feature", - com.ibm.ws.javaee.jaspic.1.1; version="[1,1.0.100)"; location:="dev/api/spec/" + com.ibm.ws.javaee.jaspic.1.1; version="[1,1.1)"; location:="dev/api/spec/" Subsystem-Type: osgi.subsystem.feature IBM-Feature-Version: 2 IBM-ProductID: com.ibm.websphere.appserver diff --git a/dev/wlp.lib.extract_test/samples/dummyInstallerWithFeature/jarcontent/wlp/lib/features/permtest.mf b/dev/wlp.lib.extract_test/samples/dummyInstallerWithFeature/jarcontent/wlp/lib/features/permtest.mf index 13dba47d48f..fb17ade4ba0 100644 --- a/dev/wlp.lib.extract_test/samples/dummyInstallerWithFeature/jarcontent/wlp/lib/features/permtest.mf +++ b/dev/wlp.lib.extract_test/samples/dummyInstallerWithFeature/jarcontent/wlp/lib/features/permtest.mf @@ -2,7 +2,7 @@ Subsystem-ManifestVersion: 1 Subsystem-SymbolicName: permtest;visibility:=public Subsystem-Version: 1.0.0 Subsystem-Vendor: IBM -Subsystem-Content: permtest; version="[1,1.0.100)", +Subsystem-Content: permtest; version="[1,1.1)", file1; location:="script/file1"; type="file", file2exe; location:="script/file2exe"; type="file"; ibm.executable:="true" Subsystem-Type: osgi.subsystem.feature