Skip to content

Commit c95fc84

Browse files
FKHalsFKHals
authored andcommitted
[DO NOT MERGE] Move xpp3 to libratory
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"
1 parent 6197b2b commit c95fc84

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

core/META-INF/MANIFEST.MF

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,12 @@ Export-Package: com.thoughtworks.xstream,
9595
org.apache.commons.lang3,
9696
org.apache.commons.lang3.exception,
9797
org.apache.commons.lang3.time,
98-
org.apache.commons.lang3.tuple,
99-
org.xmlpull.mxp1,
100-
org.xmlpull.v1
98+
org.apache.commons.lang3.tuple
10199
Bundle-ClassPath: .,
102100
lib/commons-codec-1.3.jar,
103101
lib/commons-io-2.0.1.jar,
104102
lib/commons-lang3-3.8.1.jar,
105103
lib/xstream-1.4.10.jar,
106-
lib/xpp3-1.1.4c.jar,
107104
lib/libidn-1.15.jar,
108105
log4j2.component.properties
109106
Bundle-Vendor: Saros Project

core/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ dependencies {
4141
releaseDep("org.apache.commons:commons-lang3:3.8.1")
4242

4343
releaseDep("javax.jmdns:jmdns:3.4.1")
44-
releaseDep("xpp3:xpp3:1.1.4c")
4544
releaseDep("com.thoughtworks.xstream:xstream:1.4.10")
4645
releaseDep("org.gnu.inet:libidn:1.15")
4746
}

libratory/META-INF/MANIFEST.MF

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ Export-Package: org.apache.log4j,
2727
org.jivesoftware.smackx.bytestreams,
2828
org.jivesoftware.smackx.bytestreams.ibb,
2929
org.jivesoftware.smackx.bytestreams.socks5,
30+
org.jivesoftware.smackx.entitycaps,
31+
org.jivesoftware.smackx.entitycaps.packet,
3032
org.jivesoftware.smackx.filetransfer,
3133
org.jivesoftware.smackx.muc,
3234
org.jivesoftware.smackx.packet,
@@ -46,13 +48,16 @@ Export-Package: org.apache.log4j,
4648
saros.repackaged.picocontainer.paranamer,
4749
saros.repackaged.picocontainer.references,
4850
saros.repackaged.picocontainer.security,
49-
saros.repackaged.picocontainer.visitors
51+
saros.repackaged.picocontainer.visitors,
52+
org.xmlpull.mxp1,
53+
org.xmlpull.v1
5054
Bundle-ClassPath: .,
5155
lib/smack-3.4.1.jar,
5256
lib/log4j-core-2.13.3.jar,
5357
lib/log4j-api-2.13.3.jar,
5458
lib/log4j-1.2-api-2.13.3.jar,
5559
lib/smackx-3.4.1.jar,
60+
lib/xpp3-1.1.4c.jar,
5661
lib/picocontainer-2.11.2-patched_relocated.jar,
5762
lib/weupnp.jar
5863
Bundle-Vendor: Saros Project

libratory/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ dependencies {
4242
// Workaround until we updated to a newer smack version
4343
releaseDep(files("libs/smack-3.4.1.jar"))
4444
releaseDep(files("libs/smackx-3.4.1.jar"))
45+
releaseDep("xpp3:xpp3:1.1.4c")
4546
// Workaround until we can publish and use (without a user token) the repackaged jar in GitHub Packages
4647
releaseDep(rootProject.files("libs/picocontainer-2.11.2-patched_relocated.jar"))
4748
}

0 commit comments

Comments
 (0)