Skip to content

Commit

Permalink
[DO NOT MERGE] Move xpp3 to libratory
Browse files Browse the repository at this point in the history
to avoid that org.xmlpull is contained in both the libratory and the core
bundle at the same time which seemed to cause the following error:

ERROR 08:52:29,916 [saros-connect-xmpp] (ThreadUtils.java:39) Internal Fatal Error:
java.lang.LinkageError: loader constraint violation: loader (instance of org/eclipse/osgi/internal/loader/EquinoxClassLoader) previously initiated loading for a different type with name "org/xmlpull/v1/XmlPullParser"
  • Loading branch information
FKHals authored and FKHals committed Feb 2, 2021
1 parent 6197b2b commit c95fc84
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
5 changes: 1 addition & 4 deletions core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,12 @@ Export-Package: com.thoughtworks.xstream,
org.apache.commons.lang3,
org.apache.commons.lang3.exception,
org.apache.commons.lang3.time,
org.apache.commons.lang3.tuple,
org.xmlpull.mxp1,
org.xmlpull.v1
org.apache.commons.lang3.tuple
Bundle-ClassPath: .,
lib/commons-codec-1.3.jar,
lib/commons-io-2.0.1.jar,
lib/commons-lang3-3.8.1.jar,
lib/xstream-1.4.10.jar,
lib/xpp3-1.1.4c.jar,
lib/libidn-1.15.jar,
log4j2.component.properties
Bundle-Vendor: Saros Project
1 change: 0 additions & 1 deletion core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ dependencies {
releaseDep("org.apache.commons:commons-lang3:3.8.1")

releaseDep("javax.jmdns:jmdns:3.4.1")
releaseDep("xpp3:xpp3:1.1.4c")
releaseDep("com.thoughtworks.xstream:xstream:1.4.10")
releaseDep("org.gnu.inet:libidn:1.15")
}
Expand Down
7 changes: 6 additions & 1 deletion libratory/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ Export-Package: org.apache.log4j,
org.jivesoftware.smackx.bytestreams,
org.jivesoftware.smackx.bytestreams.ibb,
org.jivesoftware.smackx.bytestreams.socks5,
org.jivesoftware.smackx.entitycaps,
org.jivesoftware.smackx.entitycaps.packet,
org.jivesoftware.smackx.filetransfer,
org.jivesoftware.smackx.muc,
org.jivesoftware.smackx.packet,
Expand All @@ -46,13 +48,16 @@ Export-Package: org.apache.log4j,
saros.repackaged.picocontainer.paranamer,
saros.repackaged.picocontainer.references,
saros.repackaged.picocontainer.security,
saros.repackaged.picocontainer.visitors
saros.repackaged.picocontainer.visitors,
org.xmlpull.mxp1,
org.xmlpull.v1
Bundle-ClassPath: .,
lib/smack-3.4.1.jar,
lib/log4j-core-2.13.3.jar,
lib/log4j-api-2.13.3.jar,
lib/log4j-1.2-api-2.13.3.jar,
lib/smackx-3.4.1.jar,
lib/xpp3-1.1.4c.jar,
lib/picocontainer-2.11.2-patched_relocated.jar,
lib/weupnp.jar
Bundle-Vendor: Saros Project
Expand Down
1 change: 1 addition & 0 deletions libratory/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ dependencies {
// Workaround until we updated to a newer smack version
releaseDep(files("libs/smack-3.4.1.jar"))
releaseDep(files("libs/smackx-3.4.1.jar"))
releaseDep("xpp3:xpp3:1.1.4c")
// Workaround until we can publish and use (without a user token) the repackaged jar in GitHub Packages
releaseDep(rootProject.files("libs/picocontainer-2.11.2-patched_relocated.jar"))
}
Expand Down

0 comments on commit c95fc84

Please sign in to comment.