From ae7d708492143ef761949f2b8e6619e220b3e748 Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Thu, 29 Jun 2023 13:22:53 +0200
Subject: [PATCH] Move XStream dependencies to BMotionStudio and stop exporting
them
Because they're only used by BMotionStudio, not in the core or any of
the other components.
---
build.gradle | 15 ++++++++--
de.bmotionstudio.gef.editor/.classpath | 3 ++
.../META-INF/MANIFEST.MF | 4 ++-
de.bmotionstudio.gef.editor/build.properties | 2 +-
de.prob.core/.classpath | 3 --
de.prob.core/META-INF/MANIFEST.MF | 28 ++-----------------
de.prob.core/build.properties | 3 +-
7 files changed, 23 insertions(+), 35 deletions(-)
diff --git a/build.gradle b/build.gradle
index c479d454..17947e8f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,12 +38,23 @@ project(':de.prob.core') {
implementation group: "de.hhu.stups", name: "prologlib", version: parser_version
implementation group: "de.hhu.stups", name: "unicode", version: parser_version
implementation group: "de.hhu.stups", name: "theorymapping", version: parser_version
- implementation 'com.thoughtworks.xstream:xstream:1.4.19'
+ }
+}
+
+project(":de.bmotionstudio.gef.editor") {
+ apply(plugin: "java")
+
+ repositories {
+ mavenCentral()
+ }
+
+ dependencies {
+ implementation group: "com.thoughtworks.xstream", name: "xstream", version: "1.4.19"
// Current versions of XStream depend on MXParser, but not any specific version of it.
// To avoid the version number changing unexpectedly and breaking the MANIFEST.MF classpath entries,
// hardcode a specific MXParser version here.
// It *should* be safe to update this when a new version is released.
- implementation group: 'io.github.x-stream', name: 'mxparser', version: '1.2.2'
+ implementation group: "io.github.x-stream", name: "mxparser", version: "1.2.2"
}
}
diff --git a/de.bmotionstudio.gef.editor/.classpath b/de.bmotionstudio.gef.editor/.classpath
index 2d8dd8c2..bb3c0f50 100644
--- a/de.bmotionstudio.gef.editor/.classpath
+++ b/de.bmotionstudio.gef.editor/.classpath
@@ -7,4 +7,7 @@
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
+ <classpathentry exported="true" kind="lib" path="lib/dependencies/mxparser-1.2.2.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/dependencies/xmlpull-1.1.3.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/dependencies/xstream-1.4.19.jar"/>
</classpath>
diff --git a/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF b/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF
index 46c115aa..2a744d8b 100644
--- a/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF
+++ b/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF
@@ -42,7 +42,6 @@ Export-Package: de.bmotionstudio.gef.editor;
org.eclipse.ui.views.properties,
org.eclipse.ui.plugin,
de.bmotionstudio.gef.editor.part,
- com.thoughtworks.xstream,
org.eclipse.ui.part,
org.eclipse.draw2d,
de.prob.core.domainobjects,
@@ -150,6 +149,9 @@ Export-Package: de.bmotionstudio.gef.editor;
org.eclipse.swt.widgets,
de.bmotionstudio.gef.editor"
Bundle-ClassPath: .,
+ lib/dependencies/mxparser-1.2.2.jar,
+ lib/dependencies/xmlpull-1.1.3.1.jar,
+ lib/dependencies/xstream-1.4.19.jar,
lib/ext/groovy-2.0.5.jar,
lib/ext/asm-4.0.jar,
lib/ext/antlr-2.7.7.jar
diff --git a/de.bmotionstudio.gef.editor/build.properties b/de.bmotionstudio.gef.editor/build.properties
index d5ce6d7a..bb491748 100644
--- a/de.bmotionstudio.gef.editor/build.properties
+++ b/de.bmotionstudio.gef.editor/build.properties
@@ -5,5 +5,5 @@ bin.includes = plugin.xml,\
.,\
icons/,\
schema/,\
- lib/ext/
+ lib/
diff --git a/de.prob.core/.classpath b/de.prob.core/.classpath
index 17e8abd7..976607f8 100644
--- a/de.prob.core/.classpath
+++ b/de.prob.core/.classpath
@@ -11,12 +11,9 @@
<classpathentry exported="true" kind="lib" path="lib/dependencies/answerparser-2.12.4.jar"/>
<classpathentry exported="true" kind="lib" path="lib/dependencies/bparser-2.12.4.jar"/>
<classpathentry exported="true" kind="lib" path="lib/dependencies/ltlparser-2.12.4.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/dependencies/mxparser-1.2.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/dependencies/parserbase-2.12.4.jar"/>
<classpathentry exported="true" kind="lib" path="lib/dependencies/prologlib-2.12.4.jar"/>
<classpathentry exported="true" kind="lib" path="lib/dependencies/sablecc-runtime-3.4.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/dependencies/theorymapping-2.12.4.jar"/>
<classpathentry exported="true" kind="lib" path="lib/dependencies/unicode-2.12.4.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/dependencies/xmlpull-1.1.3.1.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/dependencies/xstream-1.4.19.jar"/>
</classpath>
diff --git a/de.prob.core/META-INF/MANIFEST.MF b/de.prob.core/META-INF/MANIFEST.MF
index 55cb5bf5..7d0f730f 100644
--- a/de.prob.core/META-INF/MANIFEST.MF
+++ b/de.prob.core/META-INF/MANIFEST.MF
@@ -14,28 +14,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
Bundle-ActivationPolicy: lazy
Eclipse-BundleShape: dir
Bundle-Vendor: HHU Dusseldorf STUPS Group
-Export-Package: com.thoughtworks.xstream,
- com.thoughtworks.xstream.annotations,
- com.thoughtworks.xstream.converters,
- com.thoughtworks.xstream.converters.basic,
- com.thoughtworks.xstream.converters.collections,
- com.thoughtworks.xstream.converters.enums,
- com.thoughtworks.xstream.converters.extended,
- com.thoughtworks.xstream.converters.javabean,
- com.thoughtworks.xstream.converters.reflection,
- com.thoughtworks.xstream.core,
- com.thoughtworks.xstream.core.util,
- com.thoughtworks.xstream.io,
- com.thoughtworks.xstream.io.binary,
- com.thoughtworks.xstream.io.copy,
- com.thoughtworks.xstream.io.json,
- com.thoughtworks.xstream.io.naming,
- com.thoughtworks.xstream.io.path,
- com.thoughtworks.xstream.io.xml,
- com.thoughtworks.xstream.io.xml.xppdom,
- com.thoughtworks.xstream.mapper,
- com.thoughtworks.xstream.persistence,
- de.be4.classicalb.core.parser,
+Export-Package: de.be4.classicalb.core.parser,
de.be4.classicalb.core.parser.analysis,
de.be4.classicalb.core.parser.analysis.checking,
de.be4.classicalb.core.parser.analysis.prolog,
@@ -104,7 +83,4 @@ Bundle-ClassPath: .,
lib/dependencies/parserbase-2.12.4.jar,
lib/dependencies/ltlparser-2.12.4.jar,
lib/dependencies/bparser-2.12.4.jar,
- lib/dependencies/answerparser-2.12.4.jar,
- lib/dependencies/xstream-1.4.19.jar,
- lib/dependencies/mxparser-1.2.2.jar,
- lib/dependencies/xmlpull-1.1.3.1.jar
+ lib/dependencies/answerparser-2.12.4.jar
diff --git a/de.prob.core/build.properties b/de.prob.core/build.properties
index e6e9ffdc..a095d0ef 100644
--- a/de.prob.core/build.properties
+++ b/de.prob.core/build.properties
@@ -4,5 +4,4 @@ bin.includes = META-INF/,\
plugin.xml,\
.,\
prob/,\
- lib/,\
- lib/dependencies/xmlpull-1.1.3.1.jar
+ lib/
--
GitLab