Fixed: IPFS client library not compatible with Joget Cloud

jogetoss · Mar 2, 2023 · 6b0d7f8 · 6b0d7f8
1 parent a233151
commit 6b0d7f8
Show file tree

Hide file tree

Showing 4 changed files with 1,036 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.joget.marketplace</groupId>
     <artifactId>ipfs-file-upload</artifactId>
     <packaging>bundle</packaging>
-    <version>7.0.1</version>
+    <version>7.0.2</version>
     <name>ipfs-file-upload</name>
     <url>http://www.joget.org</url>
     <build>
@@ -46,7 +46,7 @@
                     <instructions>
                         <!-- Change package and plugin class here -->
                         <Export-Package>org.joget.marketplace</Export-Package>
-                        <Private-Package>org.joget.marketplace.*</Private-Package>
+                        <Private-Package>org.joget.marketplace.*,okhttp3.internal.http2.*</Private-Package>
                         <Bundle-Activator>org.joget.marketplace.Activator</Bundle-Activator>
                         <Import-Package>!*,org.joget.report.dao,org.joget.report.model,org.joget.report.service,org.joget.commons.util,org.joget.plugin.base,org.joget.plugin.property.model,org.joget.plugin.property.service,org.joget.directory.model,org.joget.directory.model.service,org.joget.directory.dao,org.joget.workflow.model,org.joget.workflow.model.dao,org.joget.workflow.model.service,org.joget.workflow.util,org.joget.apps.app.dao,org.joget.apps.app.lib,org.joget.apps.app.model,org.joget.apps.app.service,org.joget.apps.datalist.lib,org.joget.apps.datalist.model,org.joget.apps.datalist.service,org.joget.apps.form.lib,org.joget.apps.form.dao,org.joget.apps.form.model,org.joget.apps.form.service,org.joget.apps.list.service,org.joget.apps.userview.lib,org.joget.apps.userview.model,org.joget.apps.userview.service,org.joget.apps.workflow.lib,javax.servlet,javax.servlet.http,org.osgi.framework;version="1.3.0"</Import-Package>
                         <!-- End change package and plugin class here -->
@@ -98,6 +98,17 @@
             <groupId>io.blockfrost</groupId>
             <artifactId>blockfrost-java</artifactId>
             <version>0.1.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.squareup.okhttp3</groupId>
+                    <artifactId>okhttp</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>3.14.9</version>
         </dependency>
         <!-- End change plugin specific dependencies here -->
     </dependencies>