Merge pull request #24765 from arjantijms/patch_tyrus

Patch Tyrus manifest to export org.glassfish.tyrus.client.exception
eclipse-ee4j · Jan 27, 2024 · 78a3424 · 78a3424
2 parents 2fa41c0 + 94ac44a
commit 78a3424
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 2 deletions.
diff --git a/appserver/distributions/glassfish/pom.xml b/appserver/distributions/glassfish/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2021, 2023 Contributors to Eclipse Foundation.
+    Copyright (c) 2021, 2024 Contributors to Eclipse Foundation.
     Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -110,6 +110,10 @@
                                     basedir="${patches}/microprofile-rest-client-api" includes="META-INF/MANIFEST.MF"
                                     destfile="${glassfish.modules}/microprofile-rest-client-api.jar"
                                 />
+                                <jarupdate
+                                    basedir="${patches}/tyrus-client" includes="META-INF/MANIFEST.MF"
+                                    destfile="${glassfish.modules}/tyrus-client.jar"
+                                />
                             </target>
                         </configuration>
                     </execution>

diff --git a/appserver/distributions/glassfish/src/main/patches/tyrus-client/META-INF/MANIFEST.MF b/appserver/distributions/glassfish/src/main/patches/tyrus-client/META-INF/MANIFEST.MF
@@ -0,0 +1,27 @@
+Manifest-Version: 1.0
+Build-Jdk-Spec: 11
+Bundle-Description: Tyrus is the reference implementation of Java API 
+ for WebSocket (JSR-356)
+Bundle-DocURL: http://www.oracle.com/
+Bundle-License: https://projects.eclipse.org/license/epl-2.0, https://
+ projects.eclipse.org/license/secondary-gpl-2.0-cp
+Bundle-ManifestVersion: 2
+Bundle-Name: Tyrus Client
+Bundle-SymbolicName: org.glassfish.tyrus.client
+Bundle-Vendor: Oracle Corporation
+Bundle-Version: 2.1.5
+Created-By: Apache Maven Bundle Plugin 5.1.4
+Export-Package: org.glassfish.tyrus.client;version="2.1.5";uses:="jaka
+ rta.websocket,javax.net.ssl,org.glassfish.tyrus.core,org.glassfish.ty
+ rus.spi",org.glassfish.tyrus.client.exception;version="2.1.5"
+Import-Package: jakarta.websocket;version="[2.1,3)",jakarta.websocket.
+ server;version="[2.1,3)",javax.net.ssl,org.glassfish.tyrus.core;versi
+ on="[2.1,3)",org.glassfish.tyrus.core.cluster;version="[2.1,3)",org.g
+ lassfish.tyrus.core.collection;version="[2.1,3)",org.glassfish.tyrus.
+ core.extension;version="[2.1,3)",org.glassfish.tyrus.core.frame;versi
+ on="[2.1,3)",org.glassfish.tyrus.core.l10n;version="[2.1,3)",org.glas
+ sfish.tyrus.core.monitoring;version="[2.1,3)",org.glassfish.tyrus.spi
+ ;version="[2.1,3)"
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=11))"
+Tool: Bnd-5.1.1.202006162103
+
diff --git a/appserver/distributions/web/pom.xml b/appserver/distributions/web/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2022 Contributors to the Eclipse Foundation. All rights reserved.
+    Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation.
     Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -113,6 +113,10 @@
                                     basedir="${patches}/jersey-hk2" includes="META-INF/MANIFEST.MF"
                                     destfile="${glassfish.modules}/jersey-hk2.jar"
                                 />
+                                <jarupdate
+                                    basedir="${patches}/tyrus-client" includes="META-INF/MANIFEST.MF"
+                                    destfile="${glassfish.modules}/tyrus-client.jar"
+                                />
                             </target>
                         </configuration>
                     </execution>

diff --git a/appserver/distributions/web/src/main/patches/tyrus-client/META-INF/MANIFEST.MF b/appserver/distributions/web/src/main/patches/tyrus-client/META-INF/MANIFEST.MF
@@ -0,0 +1,27 @@
+Manifest-Version: 1.0
+Build-Jdk-Spec: 11
+Bundle-Description: Tyrus is the reference implementation of Java API 
+ for WebSocket (JSR-356)
+Bundle-DocURL: http://www.oracle.com/
+Bundle-License: https://projects.eclipse.org/license/epl-2.0, https://
+ projects.eclipse.org/license/secondary-gpl-2.0-cp
+Bundle-ManifestVersion: 2
+Bundle-Name: Tyrus Client
+Bundle-SymbolicName: org.glassfish.tyrus.client
+Bundle-Vendor: Oracle Corporation
+Bundle-Version: 2.1.5
+Created-By: Apache Maven Bundle Plugin 5.1.4
+Export-Package: org.glassfish.tyrus.client;version="2.1.5";uses:="jaka
+ rta.websocket,javax.net.ssl,org.glassfish.tyrus.core,org.glassfish.ty
+ rus.spi",org.glassfish.tyrus.client.exception;version="2.1.5"
+Import-Package: jakarta.websocket;version="[2.1,3)",jakarta.websocket.
+ server;version="[2.1,3)",javax.net.ssl,org.glassfish.tyrus.core;versi
+ on="[2.1,3)",org.glassfish.tyrus.core.cluster;version="[2.1,3)",org.g
+ lassfish.tyrus.core.collection;version="[2.1,3)",org.glassfish.tyrus.
+ core.extension;version="[2.1,3)",org.glassfish.tyrus.core.frame;versi
+ on="[2.1,3)",org.glassfish.tyrus.core.l10n;version="[2.1,3)",org.glas
+ sfish.tyrus.core.monitoring;version="[2.1,3)",org.glassfish.tyrus.spi
+ ;version="[2.1,3)"
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=11))"
+Tool: Bnd-5.1.1.202006162103
+