Merge remote-tracking branch 'MSTR/2.0.x' into fix.client.osgi.21

jansupol · Jan 31, 2024 · 444b8b8 · 444b8b8
2 parents 98ac834 + 4c70258
commit 444b8b8
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 73 deletions.
diff --git a/client/pom.xml b/client/pom.xml
@@ -54,10 +54,6 @@
                 <inherited>true</inherited>
                 <extensions>true</extensions>
                 <configuration>
-                    <instructions>
-                        <Export-Package>org.glassfish.tyrus.client;version=${project.version}</Export-Package>
-<!--                        <Import-Package>jakarta.websocket;version=${apijar.bundle.version},*</Import-Package>-->
-                    </instructions>
                     <unpackBundle>true</unpackBundle>
                 </configuration>
             </plugin>

diff --git a/containers/grizzly/pom.xml b/containers/grizzly/pom.xml
diff --git a/tests/servlet/embedded-glassfish-test/pom.xml b/tests/servlet/embedded-glassfish-test/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2021, 2023 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2021, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at