Merge pull request #19259 from jhanders34/perf-improvement4

Transformed third party and stable API bundle updates and other updates (try 2)

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

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

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

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, \

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

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", \

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

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
 

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

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
 

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

dev/io.openliberty.grpc.client.1.0.jakarta.thirdparty/.classpath

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

dev/io.openliberty.grpc.client.1.0.jakarta.thirdparty/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>io.openliberty.grpc.client.1.0.jakarta.thirdparty</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>bndtools.core.bndbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>bndtools.core.bndnature</nature>
+	</natures>
+</projectDescription>

dev/io.openliberty.grpc.client.1.0.jakarta.thirdparty/.settings/bndtools.core.prefs

@@ -0,0 +1,2 @@
+compileErrorAction=build
+eclipse.preferences.version=1

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

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
+

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.

dev/io.openliberty.io.grpc.1.0.jakarta/.classpath

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

dev/io.openliberty.io.grpc.1.0.jakarta/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>io.openliberty.io.grpc.1.0.jakarta</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>bndtools.core.bndbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>bndtools.core.bndnature</nature>
+	</natures>
+</projectDescription>

dev/io.openliberty.io.grpc.1.0.jakarta/.settings/bndtools.core.prefs

@@ -0,0 +1,2 @@
+compileErrorAction=build
+eclipse.preferences.version=1

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

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}

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: \
   *
 

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
 

dev/io.openliberty.jakarta.pages.tld.3.0/.classpath

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

dev/io.openliberty.jakarta.pages.tld.3.0/.gitignore

@@ -0,0 +1,3 @@
+/bin/
+/build/
+/generated/

dev/io.openliberty.jakarta.pages.tld.3.0/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>io.openliberty.jakarta.pages.tld.3.0</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>bndtools.core.bndbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>bndtools.core.bndnature</nature>
+	</natures>
+</projectDescription>

dev/io.openliberty.jakarta.pages.tld.3.0/.settings/bndtools.core.prefs

@@ -0,0 +1,2 @@
+compileErrorAction=build
+eclipse.preferences.version=1

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

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