diff --git a/dev/cnf/build.gradle b/dev/cnf/build.gradle index d9cf6999b945..8e5a3a9cf902 100644 --- a/dev/cnf/build.gradle +++ b/dev/cnf/build.gradle @@ -235,7 +235,15 @@ task createGradleBootstrap { version = getVersionFromReleaseRepo(org, bsn) } catch (GradleException e) { if (bsn.endsWith(".javaee")) { - bsn = bsn.substring(0, bsn.length() -7) + try { + bsn = bsn.substring(0, bsn.length() - 7) + ".jakarta" + version = getVersionFromReleaseRepo(org, bsn) + } catch (GradleException e2) { + bsn = bsn.substring(0, bsn.length() - 8) + version = getVersionFromReleaseRepo(org, bsn) + } + } else if (bsn.endsWith(".javaee.thirdparty")){ + bsn = bsn.substring(0, bsn.length() - 18) + ".jakarta.thirdparty" version = getVersionFromReleaseRepo(org, bsn) } else { throw e diff --git a/dev/com.ibm.websphere.appserver.api.ejbcontainer/bnd.bnd b/dev/com.ibm.websphere.appserver.api.ejbcontainer/bnd.bnd index 0c0ff228bc9c..ae6b966c9bd4 100644 --- a/dev/com.ibm.websphere.appserver.api.ejbcontainer/bnd.bnd +++ b/dev/com.ibm.websphere.appserver.api.ejbcontainer/bnd.bnd @@ -28,4 +28,5 @@ Export-Package: \ publish.wlp.jar.suffix: dev/api/ibm -buildpath: \ - com.ibm.ws.ejbcontainer + com.ibm.ws.ejbcontainer, \ + com.ibm.ws.ejbcontainer.remote.portable.core diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.grpcClient1.0.internal.ee-9.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.grpcClient1.0.internal.ee-9.0.feature index 236e2027734a..c7a3ac800a52 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.grpcClient1.0.internal.ee-9.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.grpcClient1.0.internal.ee-9.0.feature @@ -10,7 +10,7 @@ Subsystem-Name: Jakarta gRPC Client 1.0 io.openliberty.grpc.1.0.internal.common.jakarta, \ io.openliberty.grpc.1.0.internal.client.jakarta, \ io.openliberty.io.grpc.1.0.jakarta; location:="dev/api/stable/,lib/"; mavenCoordinates="io.grpc:grpc-api:1.38.1", \ - io.openliberty.grpc.client.1.0.thirdparty.jakarta; location:="dev/api/third-party/,lib/" + io.openliberty.grpc.client.1.0.jakarta.thirdparty; location:="dev/api/third-party/,lib/" kind=ga edition=core WLP-Activation-Type: parallel diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.xmlws.common-3.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.xmlws.common-3.0.feature index 5e5620d3f96b..6cadf4699cd1 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.xmlws.common-3.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.xmlws.common-3.0.feature @@ -28,7 +28,7 @@ IBM-API-Package:\ com.ibm.websphere.appserver.injection-2.0, \ com.ibm.websphere.appserver.internal.slf4j-1.7.7 -bundles=\ - com.ibm.websphere.org.osgi.service.http.jakarta; location:="dev/api/spec/,lib/", \ + io.openliberty.org.osgi.service.http; location:="dev/api/spec/,lib/", \ com.ibm.ws.cxf.client, \ com.ibm.ws.org.apache.cxf.cxf.rt.bindings.soap.3.2.jakarta, \ com.ibm.ws.org.apache.cxf.cxf.rt.bindings.xml.3.2.jakarta, \ diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/pages-3.0/io.openliberty.pages-3.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/public/pages-3.0/io.openliberty.pages-3.0.feature index 2e3b0e706fe8..3b6927abd0c5 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/pages-3.0/io.openliberty.pages-3.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/pages-3.0/io.openliberty.pages-3.0.feature @@ -44,7 +44,7 @@ Subsystem-Name: Jakarta Server Pages 3.0 io.openliberty.jstl.facade; start-phase:=CONTAINER_EARLY, \ io.openliberty.org.apache.taglibs.standard -jars=com.ibm.websphere.appserver.spi.jsp; location:=dev/spi/ibm/, \ - com.ibm.websphere.javaee.jsp.tld.2.2.jakarta; location:=dev/api/spec/ + io.openliberty.jakarta.pages.tld.3.0; location:=dev/api/spec/ -files=dev/spi/ibm/javadoc/com.ibm.websphere.appserver.spi.jsp_1.0-javadoc.zip kind=ga edition=core diff --git a/dev/com.ibm.websphere.javaee.jsp.tld.2.2/bnd.bnd b/dev/com.ibm.websphere.javaee.jsp.tld.2.2/bnd.bnd index b8ac06b03fbb..437f366b1c45 100644 --- a/dev/com.ibm.websphere.javaee.jsp.tld.2.2/bnd.bnd +++ b/dev/com.ibm.websphere.javaee.jsp.tld.2.2/bnd.bnd @@ -14,8 +14,6 @@ bVersion=1.2 Bundle-SymbolicName: com.ibm.websphere.javaee.jsp.tld.2.2 -jakartaeeMe: true - Export-Package: \ org.apache.taglibs.standard.tag.common.core;version="1.0.0", \ org.apache.taglibs.standard.tag.common.xml;version="1.0.0", \ diff --git a/dev/com.ibm.websphere.org.osgi.service.http/bnd.bnd b/dev/com.ibm.websphere.org.osgi.service.http/bnd.bnd index a8aed980124f..2bcd7167e4c0 100644 --- a/dev/com.ibm.websphere.org.osgi.service.http/bnd.bnd +++ b/dev/com.ibm.websphere.org.osgi.service.http/bnd.bnd @@ -19,5 +19,3 @@ instrument.disabled: true -buildpath: \ org.osgi:org.osgi.service.http;version=1.2.1 - -jakartaeeMe: true diff --git a/dev/io.openliberty.cdi.spi/bnd.bnd b/dev/io.openliberty.cdi.spi/bnd.bnd index 3251c477e79b..123394dfc18e 100644 --- a/dev/io.openliberty.cdi.spi/bnd.bnd +++ b/dev/io.openliberty.cdi.spi/bnd.bnd @@ -27,6 +27,7 @@ jakartaFinalBundleId: io.openliberty.cdi.spi # Only publish the Jakarta one publish.wlp.jar.include: io.openliberty.cdi.spi.jar +publish.wlp.javadoc.include: io.openliberty.cdi.spi.javadoc.zip publish.wlp.jar.suffix: dev/spi/ibm diff --git a/dev/io.openliberty.ejbcontainer/bnd.bnd b/dev/io.openliberty.ejbcontainer/bnd.bnd index 4bd73295ded1..3c20b0c48bb2 100644 --- a/dev/io.openliberty.ejbcontainer/bnd.bnd +++ b/dev/io.openliberty.ejbcontainer/bnd.bnd @@ -26,6 +26,7 @@ jakartaFinalBundleId: io.openliberty.ejbcontainer # Only publish the Jakarta one publish.wlp.jar.include: io.openliberty.ejbcontainer.jar +publish.wlp.javadoc.include: io.openliberty.ejbcontainer.javadoc.zip Import-Package: \ com.ibm.websphere.ejbcontainer.mbean,\ @@ -40,4 +41,5 @@ Export-Package: \ publish.wlp.jar.suffix: dev/api/ibm -buildpath: \ - com.ibm.ws.ejbcontainer + com.ibm.ws.ejbcontainer, \ + com.ibm.ws.ejbcontainer.remote.portable.core diff --git a/dev/io.openliberty.federatedRepository.spi/bnd.bnd b/dev/io.openliberty.federatedRepository.spi/bnd.bnd index 6fa431a10e1b..f1ff1fbaf97b 100644 --- a/dev/io.openliberty.federatedRepository.spi/bnd.bnd +++ b/dev/io.openliberty.federatedRepository.spi/bnd.bnd @@ -23,6 +23,7 @@ jakartaFinalBundleId: io.openliberty.federatedRepository.spi # Only publish the Jakarta one publish.wlp.jar.include: io.openliberty.federatedRepository.spi.jar +publish.wlp.javadoc.include: io.openliberty.federatedRepository.spi.javadoc.zip Import-Package: com.ibm.wsspi.security.wim,com.ibm.wsspi.security.wim.exception,com.ibm.wsspi.security.wim.model diff --git a/dev/io.openliberty.globalhandler.spi/bnd.bnd b/dev/io.openliberty.globalhandler.spi/bnd.bnd index 340efde91396..ea73a8790edd 100644 --- a/dev/io.openliberty.globalhandler.spi/bnd.bnd +++ b/dev/io.openliberty.globalhandler.spi/bnd.bnd @@ -34,3 +34,4 @@ jakartaFinalBundleId: io.openliberty.globalhandler.spi # Only publish the Jakarta one publish.wlp.jar.include: io.openliberty.globalhandler.spi.jar +publish.wlp.javadoc.include: io.openliberty.globalhandler.spi.javadoc.zip diff --git a/dev/io.openliberty.grpc.client.1.0.jakarta.thirdparty/.classpath b/dev/io.openliberty.grpc.client.1.0.jakarta.thirdparty/.classpath new file mode 100644 index 000000000000..bd52baaf243d --- /dev/null +++ b/dev/io.openliberty.grpc.client.1.0.jakarta.thirdparty/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/dev/io.openliberty.grpc.client.1.0.jakarta.thirdparty/.project b/dev/io.openliberty.grpc.client.1.0.jakarta.thirdparty/.project new file mode 100644 index 000000000000..59fb8e7692c4 --- /dev/null +++ b/dev/io.openliberty.grpc.client.1.0.jakarta.thirdparty/.project @@ -0,0 +1,23 @@ + + + io.openliberty.grpc.client.1.0.jakarta.thirdparty + + + + + + org.eclipse.jdt.core.javabuilder + + + + + bndtools.core.bndbuilder + + + + + + org.eclipse.jdt.core.javanature + bndtools.core.bndnature + + diff --git a/dev/io.openliberty.grpc.client.1.0.jakarta.thirdparty/.settings/bndtools.core.prefs b/dev/io.openliberty.grpc.client.1.0.jakarta.thirdparty/.settings/bndtools.core.prefs new file mode 100644 index 000000000000..789fa99991ac --- /dev/null +++ b/dev/io.openliberty.grpc.client.1.0.jakarta.thirdparty/.settings/bndtools.core.prefs @@ -0,0 +1,2 @@ +compileErrorAction=build +eclipse.preferences.version=1 diff --git a/dev/io.openliberty.grpc.client.1.0.jakarta.thirdparty/.settings/org.eclipse.jdt.core.prefs b/dev/io.openliberty.grpc.client.1.0.jakarta.thirdparty/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000000..3a21537071bf --- /dev/null +++ b/dev/io.openliberty.grpc.client.1.0.jakarta.thirdparty/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,11 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/dev/io.openliberty.grpc.client.1.0.jakarta.thirdparty/bnd.bnd b/dev/io.openliberty.grpc.client.1.0.jakarta.thirdparty/bnd.bnd new file mode 100644 index 000000000000..13bd37917ba6 --- /dev/null +++ b/dev/io.openliberty.grpc.client.1.0.jakarta.thirdparty/bnd.bnd @@ -0,0 +1,75 @@ +#******************************************************************************* +# Copyright (c) 2020, 2021 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +#******************************************************************************* +-include= ~../cnf/resources/bnd/bundle.props +bVersion=1.0 +grpcVersion=1.38.1 +nettyVersion=4.1.68.Final + +Bundle-Name: Open Liberty gRPC Client Third Party API +Bundle-SymbolicName: io.openliberty.grpc.client.1.0.javaee.thirdparty +Bundle-Description: Open Liberty gRPC Client Third Party API; Jakarta enabled + +-pom: artifactid=io.openliberty.grpc.client.1.0.jakarta.thirdparty + +jakartaeeMe: true +jakartaFinalJarName: io.openliberty.grpc.client.1.0.jakarta.thirdparty.jar +jakartaFinalBundleId: io.openliberty.grpc.client.1.0.jakarta.thirdparty + +# Only publish the Jakarta one +publish.wlp.jar.include: io.openliberty.grpc.client.1.0.jakarta.thirdparty.jar + +# Using version=! in order to not have a version attached to the import for packages that were removed +# from Java after Java 8. Doing this keeps the import like before Java 11 support. It will get the +# packages from Java when using Java 8 or earlier and from the new shipped bundles for Java 9 and later. +Import-Package: \ + !com.aayushatharva.brotli4j*,\ + !com.github.luben.zstd,\ + !com.google.code.gson,\ + !org.checkerframework,\ + !com.google.protobuf.nano,\ + !com.jcraft.jzlib,\ + !com.ning.*,\ + !com.oracle.svm.core.annotate,\ + !io.netty.internal.tcnative,\ + !lzma.*,\ + !net.jpountz.*,\ + !org.apache.log4j.*,\ + !org.apache.logging.*,\ + !org.bouncycastle.*,\ + !org.conscrypt,\ + !org.eclipse.jetty.*,\ + !org.jboss.*,\ + !reactor.blockhound.*,\ + !sun.*,\ + javax.annotation;version=!,\ + * + +Export-Package:\ + io.grpc.netty;version=${grpcVersion}, \ + io.netty.handler.ssl;version=${nettyVersion} + +publish.wlp.jar.suffix: dev/api/third-party + +-buildpath: \ + com.google.errorprone:error_prone_annotations;version=2.4.0,\ + io.grpc:grpc-netty;version=${grpcVersion},\ + io.netty:netty-buffer;version=${nettyVersion},\ + io.netty:netty-codec;version=${nettyVersion},\ + io.netty:netty-codec-http;version=${nettyVersion},\ + io.netty:netty-codec-http2;version=${nettyVersion},\ + io.netty:netty-codec-socks;version=${nettyVersion},\ + io.netty:netty-common;version=${nettyVersion},\ + io.netty:netty-handler;version=${nettyVersion},\ + io.netty:netty-handler-proxy;version=${nettyVersion},\ + io.netty:netty-resolver;version=${nettyVersion},\ + io.netty:netty-transport;version=${nettyVersion},\ + io.openliberty.grpc.1.0.internal.common;version=latest + diff --git a/dev/io.openliberty.grpc.client.1.0.thirdparty/bnd.bnd b/dev/io.openliberty.grpc.client.1.0.thirdparty/bnd.bnd index 232621b32099..e1e84f52c113 100644 --- a/dev/io.openliberty.grpc.client.1.0.thirdparty/bnd.bnd +++ b/dev/io.openliberty.grpc.client.1.0.thirdparty/bnd.bnd @@ -17,8 +17,6 @@ Bundle-Name: Open Liberty gRPC Client Third Party API Bundle-SymbolicName: io.openliberty.grpc.client.1.0.thirdparty Bundle-Description: Open Liberty gRPC Client Third Party API -jakartaeeMe: true - # Using version=! in order to not have a version attached to the import for packages that were removed # from Java after Java 8. Doing this keeps the import like before Java 11 support. It will get the # packages from Java when using Java 8 or earlier and from the new shipped bundles for Java 9 and later. diff --git a/dev/io.openliberty.io.grpc.1.0.jakarta/.classpath b/dev/io.openliberty.io.grpc.1.0.jakarta/.classpath new file mode 100644 index 000000000000..bd52baaf243d --- /dev/null +++ b/dev/io.openliberty.io.grpc.1.0.jakarta/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/dev/io.openliberty.io.grpc.1.0.jakarta/.project b/dev/io.openliberty.io.grpc.1.0.jakarta/.project new file mode 100644 index 000000000000..596d14798d97 --- /dev/null +++ b/dev/io.openliberty.io.grpc.1.0.jakarta/.project @@ -0,0 +1,23 @@ + + + io.openliberty.io.grpc.1.0.jakarta + + + + + + org.eclipse.jdt.core.javabuilder + + + + + bndtools.core.bndbuilder + + + + + + org.eclipse.jdt.core.javanature + bndtools.core.bndnature + + diff --git a/dev/io.openliberty.io.grpc.1.0.jakarta/.settings/bndtools.core.prefs b/dev/io.openliberty.io.grpc.1.0.jakarta/.settings/bndtools.core.prefs new file mode 100644 index 000000000000..789fa99991ac --- /dev/null +++ b/dev/io.openliberty.io.grpc.1.0.jakarta/.settings/bndtools.core.prefs @@ -0,0 +1,2 @@ +compileErrorAction=build +eclipse.preferences.version=1 diff --git a/dev/io.openliberty.io.grpc.1.0.jakarta/.settings/org.eclipse.jdt.core.prefs b/dev/io.openliberty.io.grpc.1.0.jakarta/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000000..3a21537071bf --- /dev/null +++ b/dev/io.openliberty.io.grpc.1.0.jakarta/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,11 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/dev/io.openliberty.io.grpc.1.0.jakarta/bnd.bnd b/dev/io.openliberty.io.grpc.1.0.jakarta/bnd.bnd new file mode 100644 index 000000000000..2d7a2bb0b615 --- /dev/null +++ b/dev/io.openliberty.io.grpc.1.0.jakarta/bnd.bnd @@ -0,0 +1,38 @@ +#******************************************************************************* +# Copyright (c) 2020, 2021 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation +# This wraps the external JAR. +#******************************************************************************* +-include= ~../cnf/resources/bnd/bundle.props +bVersion=1.0 +grpcVersion=1.38.1 + +Bundle-SymbolicName: io.openliberty.io.grpc.1.0.javaee; singleton:=true + +-pom: artifactid=io.openliberty.io.grpc.1.0.jakarta + +jakartaeeMe: true +jakartaFinalJarName: io.openliberty.io.grpc.1.0.jakarta.jar +jakartaFinalBundleId: io.openliberty.io.grpc.1.0.jakarta + +# Only publish the Jakarta one +publish.wlp.jar.include: io.openliberty.io.grpc.1.0.jakarta.jar + +Import-Package: \ + * + +Export-Package: \ + io.grpc; version=${grpcVersion} + +instrument.disabled: true + +publish.wlp.jar.suffix: dev/api/stable + +Include-Resource: \ + @${repo;io.grpc:grpc-api;${grpcVersion};EXACT} diff --git a/dev/io.openliberty.io.grpc.1.0/bnd.bnd b/dev/io.openliberty.io.grpc.1.0/bnd.bnd index 63335d6548d7..a3c76bbd8d72 100644 --- a/dev/io.openliberty.io.grpc.1.0/bnd.bnd +++ b/dev/io.openliberty.io.grpc.1.0/bnd.bnd @@ -15,8 +15,6 @@ grpcVersion=1.38.1 Bundle-SymbolicName: io.openliberty.io.grpc.1.0; singleton:=true -jakartaeeMe: true - Import-Package: \ * diff --git a/dev/io.openliberty.jacc/bnd.bnd b/dev/io.openliberty.jacc/bnd.bnd index 5581d8eccbab..8ff3785304eb 100644 --- a/dev/io.openliberty.jacc/bnd.bnd +++ b/dev/io.openliberty.jacc/bnd.bnd @@ -26,6 +26,7 @@ jakartaFinalBundleId: io.openliberty.jacc # Only publish the Jakarta one publish.wlp.jar.include: io.openliberty.jacc.jar +publish.wlp.javadoc.include: io.openliberty.jacc.javadoc.zip Import-Package: com.ibm.wsspi.security.authorization.jacc diff --git a/dev/io.openliberty.jakarta.pages.tld.3.0/.classpath b/dev/io.openliberty.jakarta.pages.tld.3.0/.classpath new file mode 100644 index 000000000000..bd52baaf243d --- /dev/null +++ b/dev/io.openliberty.jakarta.pages.tld.3.0/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/dev/io.openliberty.jakarta.pages.tld.3.0/.gitignore b/dev/io.openliberty.jakarta.pages.tld.3.0/.gitignore new file mode 100644 index 000000000000..05ee82b1e374 --- /dev/null +++ b/dev/io.openliberty.jakarta.pages.tld.3.0/.gitignore @@ -0,0 +1,3 @@ +/bin/ +/build/ +/generated/ diff --git a/dev/io.openliberty.jakarta.pages.tld.3.0/.project b/dev/io.openliberty.jakarta.pages.tld.3.0/.project new file mode 100644 index 000000000000..f49fb4328b1a --- /dev/null +++ b/dev/io.openliberty.jakarta.pages.tld.3.0/.project @@ -0,0 +1,23 @@ + + + io.openliberty.jakarta.pages.tld.3.0 + + + + + + org.eclipse.jdt.core.javabuilder + + + + + bndtools.core.bndbuilder + + + + + + org.eclipse.jdt.core.javanature + bndtools.core.bndnature + + diff --git a/dev/io.openliberty.jakarta.pages.tld.3.0/.settings/bndtools.core.prefs b/dev/io.openliberty.jakarta.pages.tld.3.0/.settings/bndtools.core.prefs new file mode 100644 index 000000000000..789fa99991ac --- /dev/null +++ b/dev/io.openliberty.jakarta.pages.tld.3.0/.settings/bndtools.core.prefs @@ -0,0 +1,2 @@ +compileErrorAction=build +eclipse.preferences.version=1 diff --git a/dev/io.openliberty.jakarta.pages.tld.3.0/.settings/org.eclipse.core.resources.prefs b/dev/io.openliberty.jakarta.pages.tld.3.0/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000000..1554c6f848a1 --- /dev/null +++ b/dev/io.openliberty.jakarta.pages.tld.3.0/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/bnd.bnd=UTF-8 diff --git a/dev/io.openliberty.jakarta.pages.tld.3.0/.settings/org.eclipse.jdt.core.prefs b/dev/io.openliberty.jakarta.pages.tld.3.0/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000000..3a21537071bf --- /dev/null +++ b/dev/io.openliberty.jakarta.pages.tld.3.0/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,11 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/dev/io.openliberty.jakarta.pages.tld.3.0/bnd.bnd b/dev/io.openliberty.jakarta.pages.tld.3.0/bnd.bnd new file mode 100644 index 000000000000..982d464701dd --- /dev/null +++ b/dev/io.openliberty.jakarta.pages.tld.3.0/bnd.bnd @@ -0,0 +1,40 @@ +#******************************************************************************* +# Copyright (c) 2021 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +#******************************************************************************* +-include= ~../cnf/resources/bnd/bundle.props +bVersion=1.0 +-nouses=true + +Bundle-SymbolicName: io.openliberty.jakarta.pages.tld.3.0 +Bundle-Description: Jakarta Standard Tag Library, version 2.0 + +Import-Package: \ + !com.oracle.wls.shaded.org.apache.xml.serialize,\ + !com.oracle.wls.shaded.org.apache.xml.serializer,\ + !org.apache.xerces*, \ + * + +Export-Package: \ + org.apache.taglibs.standard.tag.common.core;version="2.0.0", \ + org.apache.taglibs.standard.tag.common.xml;version="2.0.0", \ + org.apache.taglibs.standard.tag.el.core;version="2.0.0", \ + org.apache.taglibs.standard.tag.el.fmt;version="2.0.0", \ + org.apache.taglibs.standard.tag.el.sql;version="2.0.0", \ + org.apache.taglibs.standard.tag.el.xml;version="2.0.0", \ + org.apache.taglibs.standard.tag.rt.core;version="2.0.0", \ + org.apache.taglibs.standard.tag.rt.fmt;version="2.0.0", \ + org.apache.taglibs.standard.tag.rt.sql;version="2.0.0", \ + org.apache.taglibs.standard.tag.rt.xml;version="2.0.0" + +-includeresource: @${repo;org.glassfish.web:jakarta.servlet.jsp.jstl;2.0}!/!com/oracle/wls/shaded/* + +instrument.disabled: true + +publish.wlp.jar.suffix: dev/api/spec diff --git a/dev/io.openliberty.jaspic.spi/bnd.bnd b/dev/io.openliberty.jaspic.spi/bnd.bnd index 5cbd4149cf55..0474b504efad 100644 --- a/dev/io.openliberty.jaspic.spi/bnd.bnd +++ b/dev/io.openliberty.jaspic.spi/bnd.bnd @@ -26,6 +26,7 @@ jakartaFinalBundleId: io.openliberty.jaspic.spi # Only publish the Jakarta one publish.wlp.jar.include: io.openliberty.jaspic.spi.jar +publish.wlp.javadoc.include: io.openliberty.jaspic.spi.javadoc.zip Import-Package: com.ibm.wsspi.security.jaspi diff --git a/dev/io.openliberty.jaxrs30/bnd.bnd b/dev/io.openliberty.jaxrs30/bnd.bnd index fecfbcf1ab90..32d00f273f3e 100644 --- a/dev/io.openliberty.jaxrs30/bnd.bnd +++ b/dev/io.openliberty.jaxrs30/bnd.bnd @@ -61,3 +61,4 @@ jakartaFinalBundleId: io.openliberty.jaxrs30 # Only publish the Jakarta one publish.wlp.jar.include: io.openliberty.jaxrs30.jar +publish.wlp.javadoc.include: io.openliberty.jaxrs30.javadoc.zip diff --git a/dev/io.openliberty.jwt/bnd.bnd b/dev/io.openliberty.jwt/bnd.bnd index b19c85530f55..28e967abe8ac 100644 --- a/dev/io.openliberty.jwt/bnd.bnd +++ b/dev/io.openliberty.jwt/bnd.bnd @@ -26,6 +26,7 @@ jakartaFinalBundleId: io.openliberty.jwt # Only publish the Jakarta one publish.wlp.jar.include: io.openliberty.jwt.jar +publish.wlp.javadoc.include: io.openliberty.jwt.javadoc.zip Import-Package: com.ibm.websphere.security.jwt diff --git a/dev/io.openliberty.oauth/bnd.bnd b/dev/io.openliberty.oauth/bnd.bnd index 62c0e17887de..54b747c58435 100644 --- a/dev/io.openliberty.oauth/bnd.bnd +++ b/dev/io.openliberty.oauth/bnd.bnd @@ -26,6 +26,7 @@ jakartaFinalBundleId: io.openliberty.oauth # Only publish the Jakarta one publish.wlp.jar.include: io.openliberty.oauth.jar +publish.wlp.javadoc.include: io.openliberty.oauth.javadoc.zip Import-Package: com.ibm.oauth.core.api.attributes,com.ibm.oauth.core.api.config,com.ibm.oauth.core.api.error,com.ibm.oauth.core.api.error.oauth20,com.ibm.oauth.core.api.oauth20.mediator,com.ibm.websphere.security.oauth20,com.ibm.websphere.security.oauth20.store,com.ibm.websphere.security.openidconnect.token,com.ibm.wsspi.security.oauth20.token,com.ibm.ws.security.oauth20.resources,* diff --git a/dev/io.openliberty.org.osgi.service.http/.classpath b/dev/io.openliberty.org.osgi.service.http/.classpath new file mode 100644 index 000000000000..bd52baaf243d --- /dev/null +++ b/dev/io.openliberty.org.osgi.service.http/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/dev/io.openliberty.org.osgi.service.http/.gitignore b/dev/io.openliberty.org.osgi.service.http/.gitignore new file mode 100644 index 000000000000..57b341172a1b --- /dev/null +++ b/dev/io.openliberty.org.osgi.service.http/.gitignore @@ -0,0 +1,2 @@ +/bin/ +/generated/ diff --git a/dev/io.openliberty.org.osgi.service.http/.project b/dev/io.openliberty.org.osgi.service.http/.project new file mode 100644 index 000000000000..c36c9b9386ee --- /dev/null +++ b/dev/io.openliberty.org.osgi.service.http/.project @@ -0,0 +1,23 @@ + + + io.openliberty.org.osgi.service.http + + + + + + org.eclipse.jdt.core.javabuilder + + + + + bndtools.core.bndbuilder + + + + + + org.eclipse.jdt.core.javanature + bndtools.core.bndnature + + diff --git a/dev/io.openliberty.org.osgi.service.http/.settings/bndtools.core.prefs b/dev/io.openliberty.org.osgi.service.http/.settings/bndtools.core.prefs new file mode 100644 index 000000000000..789fa99991ac --- /dev/null +++ b/dev/io.openliberty.org.osgi.service.http/.settings/bndtools.core.prefs @@ -0,0 +1,2 @@ +compileErrorAction=build +eclipse.preferences.version=1 diff --git a/dev/io.openliberty.org.osgi.service.http/.settings/org.eclipse.core.resources.prefs b/dev/io.openliberty.org.osgi.service.http/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000000..25d9425fe34e --- /dev/null +++ b/dev/io.openliberty.org.osgi.service.http/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +#Ant properties +#Automatically generated by the ant prepare.settings.files task +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/dev/io.openliberty.org.osgi.service.http/.settings/org.eclipse.jdt.core.prefs b/dev/io.openliberty.org.osgi.service.http/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000000..a69cbbe9a9d6 --- /dev/null +++ b/dev/io.openliberty.org.osgi.service.http/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,276 @@ +#Ant properties +#Automatically generated by the ant prepare.settings.files task +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=18 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=2 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=2 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=18 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=2 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=18 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=18 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=18 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=18 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=20 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=4 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=false +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=false +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=180 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=4 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=4 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=8 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=false +org.eclipse.jdt.core.formatter.join_wrapped_lines=false +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=180 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=true +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/dev/io.openliberty.org.osgi.service.http/.settings/org.eclipse.jdt.ui.prefs b/dev/io.openliberty.org.osgi.service.http/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 000000000000..8eccb3d9cdfa --- /dev/null +++ b/dev/io.openliberty.org.osgi.service.http/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,62 @@ +#Ant properties +#Automatically generated by the ant prepare.settings.files task +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=java;javax;org;com; +org.eclipse.jdt.ui.javadoc=true +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates= +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=true +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_missing_override_annotations_interface_methods=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=true +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.make_local_variable_final=false +sp_cleanup.make_parameters_final=false +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=true +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=true +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_unnecessary_nls_tags=true +sp_cleanup.remove_unused_imports=true +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/dev/io.openliberty.org.osgi.service.http/bnd.bnd b/dev/io.openliberty.org.osgi.service.http/bnd.bnd new file mode 100644 index 000000000000..8af71ef10db7 --- /dev/null +++ b/dev/io.openliberty.org.osgi.service.http/bnd.bnd @@ -0,0 +1,25 @@ +#******************************************************************************* +# Copyright (c) 2017 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +#******************************************************************************* +-include= jar:${fileuri;${repo;org.osgi:org.osgi.service.http;1.2.1}}!/META-INF/MANIFEST.MF,bnd.overrides + +-includeresource: \ + @${repo;org.osgi:org.osgi.service.http;1.2.1}!/!(OSGI-OPT/src|META-INF/maven)/* + +# Unlike the non Jakarta 9 one, do not publish to dev/api/spec. It isn't needed +# there since no Jakarta 9 features expose the API +# publish.wlp.jar.suffix: dev/api/spec + +instrument.disabled: true + +-buildpath: \ + org.osgi:org.osgi.service.http;version=1.2.1 + +jakartaeeMe: true diff --git a/dev/io.openliberty.org.osgi.service.http/bnd.overrides b/dev/io.openliberty.org.osgi.service.http/bnd.overrides new file mode 100644 index 000000000000..510d89e2fd5b --- /dev/null +++ b/dev/io.openliberty.org.osgi.service.http/bnd.overrides @@ -0,0 +1,13 @@ +-include= ~../cnf/resources/bnd/rejar.props +bVersion=1.0 + +Bundle-SymbolicName: io.openliberty.org.osgi.service.http.javaee + +-pom: artifactid=io.openliberty.org.osgi.service.http + +jakartaeeMe: true +jakartaFinalJarName: io.openliberty.org.osgi.service.http.jar +jakartaFinalBundleId: io.openliberty.org.osgi.service.http + +# Only publish the Jakarta one +publish.wlp.jar.include: io.openliberty.org.osgi.service.http.jar diff --git a/dev/io.openliberty.security/bnd.bnd b/dev/io.openliberty.security/bnd.bnd index 1831305b9306..f126dfa1647a 100644 --- a/dev/io.openliberty.security/bnd.bnd +++ b/dev/io.openliberty.security/bnd.bnd @@ -23,6 +23,7 @@ jakartaFinalBundleId: io.openliberty.security # Only publish the Jakarta one publish.wlp.jar.include: io.openliberty.security.jar +publish.wlp.javadoc.include: io.openliberty.security.javadoc.zip Import-Package: com.ibm.websphere.security.auth.callback,com.ibm.wsspi.security.auth.callback,com.ibm.wsspi.security.common.auth.module,com.ibm.wsspi.security.tai,com.ibm.wsspi.security.token diff --git a/dev/io.openliberty.securityClient/bnd.bnd b/dev/io.openliberty.securityClient/bnd.bnd index 2526efc04b09..5eddda07d81f 100644 --- a/dev/io.openliberty.securityClient/bnd.bnd +++ b/dev/io.openliberty.securityClient/bnd.bnd @@ -23,6 +23,7 @@ jakartaFinalBundleId: io.openliberty.securityClient # Only publish the Jakarta one publish.wlp.jar.include: io.openliberty.securityClient.jar +publish.wlp.javadoc.include: io.openliberty.securityClient.javadoc.zip Import-Package: com.ibm.websphere.security,com.ibm.websphere.security.auth.callback,com.ibm.wsspi.security.auth.callback diff --git a/dev/io.openliberty.servlet.spi/bnd.bnd b/dev/io.openliberty.servlet.spi/bnd.bnd index ffd5f49fb106..080e55f62717 100644 --- a/dev/io.openliberty.servlet.spi/bnd.bnd +++ b/dev/io.openliberty.servlet.spi/bnd.bnd @@ -23,6 +23,7 @@ jakartaFinalBundleId: io.openliberty.servlet.spi # Only publish the Jakarta one publish.wlp.jar.include: io.openliberty.servlet.spi.jar +publish.wlp.javadoc.include: io.openliberty.servlet.spi.javadoc.zip Import-Package: com.ibm.wsspi.webcontainer.extension,com.ibm.wsspi.webcontainer.webapp,com.ibm.wsspi.webcontainer.filter,com.ibm.wsspi.webcontainer.collaborator,com.ibm.wsspi.webcontainer.osgi.extension,com.ibm.wsspi.webcontainer.servlet,com.ibm.ws.webcontainer.extension,com.ibm.websphere.servlet.filter,com.ibm.wsspi.webcontainer,com.ibm.wsspi.webcontainer.metadata,com.ibm.websphere.servlet.response,com.ibm.ws.webcontainer.spiadapter.collaborator diff --git a/dev/io.openliberty.servlet/bnd.bnd b/dev/io.openliberty.servlet/bnd.bnd index 6675a9e2d96d..f023b9f0d932 100644 --- a/dev/io.openliberty.servlet/bnd.bnd +++ b/dev/io.openliberty.servlet/bnd.bnd @@ -23,6 +23,7 @@ jakartaFinalBundleId: io.openliberty.servlet # Only publish the Jakarta one publish.wlp.jar.include: io.openliberty.servlet.jar +publish.wlp.javadoc.include: io.openliberty.servlet.javadoc.zip Import-Package: com.ibm.websphere.servlet.container,com.ibm.websphere.servlet.context,com.ibm.websphere.servlet.error,com.ibm.websphere.servlet.event,com.ibm.websphere.servlet.session,com.ibm.websphere.webcontainer,com.ibm.wsspi.servlet.session diff --git a/dev/io.openliberty.transaction/bnd.bnd b/dev/io.openliberty.transaction/bnd.bnd index e12c12cff404..3c956f451288 100644 --- a/dev/io.openliberty.transaction/bnd.bnd +++ b/dev/io.openliberty.transaction/bnd.bnd @@ -26,6 +26,7 @@ jakartaFinalBundleId: io.openliberty.transaction # Only publish the Jakarta one publish.wlp.jar.include: io.openliberty.transaction.jar +publish.wlp.javadoc.include: io.openliberty.transaction.javadoc.zip Import-Package: com.ibm.tx.jta,com.ibm.websphere.jtaextensions,com.ibm.websphere.uow,com.ibm.wsspi.uow diff --git a/dev/io.openliberty.webCache/bnd.bnd b/dev/io.openliberty.webCache/bnd.bnd index d3576c97bdee..e96557e026a5 100644 --- a/dev/io.openliberty.webCache/bnd.bnd +++ b/dev/io.openliberty.webCache/bnd.bnd @@ -23,6 +23,7 @@ jakartaFinalBundleId: io.openliberty.webCache # Only publish the Jakarta one publish.wlp.jar.include: io.openliberty.webCache.jar +publish.wlp.javadoc.include: io.openliberty.webCache.javadoc.zip Import-Package: com.ibm.websphere.command,com.ibm.websphere.command.web,com.ibm.websphere.servlet.cache diff --git a/dev/io.openliberty.webcontainer.security.app/bnd.bnd b/dev/io.openliberty.webcontainer.security.app/bnd.bnd index 5acb91c7071e..5dcaa20bde3a 100644 --- a/dev/io.openliberty.webcontainer.security.app/bnd.bnd +++ b/dev/io.openliberty.webcontainer.security.app/bnd.bnd @@ -23,6 +23,7 @@ jakartaFinalBundleId: io.openliberty.webcontainer.security.app # Only publish the Jakarta one publish.wlp.jar.include: io.openliberty.webcontainer.security.app.jar +publish.wlp.javadoc.include: io.openliberty.webcontainer.security.app.javadoc.zip Import-Package: com.ibm.websphere.security.web diff --git a/dev/io.openliberty.wsat.spi/bnd.bnd b/dev/io.openliberty.wsat.spi/bnd.bnd index b15831801685..e70e4ab4dca4 100644 --- a/dev/io.openliberty.wsat.spi/bnd.bnd +++ b/dev/io.openliberty.wsat.spi/bnd.bnd @@ -23,6 +23,7 @@ jakartaFinalBundleId: io.openliberty.wsat.spi # Only publish the Jakarta one publish.wlp.jar.include: io.openliberty.wsat.spi.jar +publish.wlp.javadoc.include: io.openliberty.wsat.spi.javadoc.zip Import-Package: com.ibm.wsspi.webservices.wsat diff --git a/dev/io.openliberty.wsoc/bnd.bnd b/dev/io.openliberty.wsoc/bnd.bnd index b21b6d6e147f..f97fb740bc89 100644 --- a/dev/io.openliberty.wsoc/bnd.bnd +++ b/dev/io.openliberty.wsoc/bnd.bnd @@ -23,6 +23,7 @@ jakartaFinalBundleId: io.openliberty.wsoc # Only publish the Jakarta one publish.wlp.jar.include: io.openliberty.wsoc.jar +publish.wlp.javadoc.include: io.openliberty.wsoc.javadoc.zip Import-Package: com.ibm.websphere.wsoc diff --git a/dev/wlp-gradle/subprojects/assemble.gradle b/dev/wlp-gradle/subprojects/assemble.gradle index 2e5d1a8e3779..404be25d825b 100644 --- a/dev/wlp-gradle/subprojects/assemble.gradle +++ b/dev/wlp-gradle/subprojects/assemble.gradle @@ -114,6 +114,7 @@ if (bnd('publish.wlp.jar.suffix', 'lib').contains('api/ibm') || bnd('publish.wlp task publishJavadoc(type: Copy) { dependsOn zipJavadoc from new File(project.buildDir, 'distributions') + include bnd('publish.wlp.javadoc.include', '*javadoc.zip') into rootProject.file("build.image/wlp/" + bnd('publish.wlp.jar.suffix', 'lib') + "/javadoc") rename '.javadoc.zip', "_${bnd.bVersion}-javadoc.zip" } diff --git a/dev/wlp-jakartaee-transform/rules/jakarta-renames.properties b/dev/wlp-jakartaee-transform/rules/jakarta-renames.properties index 133d71fbef1a..0c38355194f4 100644 --- a/dev/wlp-jakartaee-transform/rules/jakarta-renames.properties +++ b/dev/wlp-jakartaee-transform/rules/jakarta-renames.properties @@ -64,6 +64,8 @@ com.sun.xml.internal.messaging.saaj.soap.name=com.sun.xml.messaging.saaj.soap.na com.sun.xml.internal.messaging.saaj.util=com.sun.xml.messaging.saaj.util com.sun.xml.internal.messaging.saaj.util.stax=com.sun.xml.messaging.saaj.util.stax com.sun.xml.internal.messaging.saaj.util.transform=com.sun.xml.messaging.saaj.util.transform +io.grpc=io.grpc +io.grpc.netty=io.grpc.netty io.openliberty.cdi.spi=io.openliberty.cdi.spi javax.activation=jakarta.activation javax.annotation=jakarta.annotation @@ -293,4 +295,4 @@ org.jboss.weld.resources.spi=org.jboss.weld.resources.spi org.jboss.weld.security.spi=org.jboss.weld.security.spi org.jboss.weld.serialization.spi=org.jboss.weld.serialization.spi org.jboss.weld.transaction.spi=org.jboss.weld.transaction.spi -org.jboss.weld.util.collections=org.jboss.weld.util.collections +org.jboss.weld.util.collections=org.jboss.weld.util.collections \ No newline at end of file diff --git a/dev/wlp-jakartaee-transform/rules/jakarta-versions.properties b/dev/wlp-jakartaee-transform/rules/jakarta-versions.properties index 75d6448d9722..9fbc0e58e18f 100644 --- a/dev/wlp-jakartaee-transform/rules/jakarta-versions.properties +++ b/dev/wlp-jakartaee-transform/rules/jakarta-versions.properties @@ -34,6 +34,8 @@ com.ibm.wsspi.webcontainer.webapp=[10.0,11);Export-Package=10.0 com.ibm.wsspi.webservices.handler=[10.0,11);Export-Package=10.0 com.ibm.wsspi.webservices.wsat=[10.0,11);Export-Package=10.0 com.ibm.ws.webcontainer.extension=[10.0,11);Export-Package=10.0 +io.grpc=[10.0,11);Export-Package=10.0 +io.grpc.netty=[10.0,11);Export-Package=10.0 io.openliberty.cdi.spi=[10.0,11);Export-Package=10.0 jakarta.activation=[2.0,3) jakarta.annotation=[2.0,3) @@ -262,4 +264,4 @@ org.jboss.weld.resources.spi=[4.0,5) org.jboss.weld.security.spi=[4.0,5) org.jboss.weld.serialization.spi=[4.0,5) org.jboss.weld.transaction.spi=[4.0,5) -org.jboss.weld.util.collections=[4.0,5) +org.jboss.weld.util.collections=[4.0,5) \ No newline at end of file