KOGITO-1546 XStreamUtils kie-soup refactoring (kiegroup#2078)

* KOGITO-1546 XStreamUtils kie-soup refactoring * Update DateObject kie-soup XStream converters (kie-server-api) * kie-server-api dependency update * update OSGi features-core.xml Please notice bundle kie-soup-commons is still required, as it's required by bundles kie-soup-project-datamodel-api and kie-soup-project-datamodel-commons
gmunozfe · May 4, 2020 · d2bf659 · d2bf659
1 parent 7c71fa6
commit d2bf659
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 10 deletions.
diff --git a/kie-osgi/kie-karaf-features/src/main/filtered-resources/repository/features-core.xml b/kie-osgi/kie-karaf-features/src/main/filtered-resources/repository/features-core.xml
@@ -35,6 +35,7 @@
 
   <feature name="kie" version="${project.version}" description="KIE API" start-level="70">
     <feature version="${project.version}">drools-common</feature>
+    <bundle>mvn:org.kie.soup/kie-soup-xstream/${version.org.kie}</bundle>
     <bundle>mvn:org.kie.soup/kie-soup-commons/${version.org.kie}</bundle>
     <bundle>mvn:org.kie.soup/kie-soup-project-datamodel-api/${version.org.kie}</bundle>
     <bundle>mvn:org.kie.soup/kie-soup-project-datamodel-commons/${version.org.kie}</bundle>

diff --git a/kie-server-parent/kie-server-api/pom.xml b/kie-server-parent/kie-server-api/pom.xml
@@ -53,7 +53,7 @@
     </dependency>
     <dependency>
       <groupId>org.kie.soup</groupId>
-      <artifactId>kie-soup-commons</artifactId>
+      <artifactId>kie-soup-xstream</artifactId>
     </dependency>
 
     <!-- we need to find a way to remove the following 2 dependencies from this jar -->

diff --git a/...ie-server-api/src/main/java/org/kie/server/api/marshalling/xstream/XStreamMarshaller.java b/...ie-server-api/src/main/java/org/kie/server/api/marshalling/xstream/XStreamMarshaller.java
@@ -77,7 +77,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.kie.soup.commons.xstream.XStreamUtils.createNonTrustingXStream;
+import static org.kie.soup.xstream.XStreamUtils.createNonTrustingXStream;
 
 public class XStreamMarshaller implements Marshaller {
 

diff --git a/...rver-api/src/test/java/org/kie/server/api/marshalling/CustomXstreamMarshallerBuilder.java b/...rver-api/src/test/java/org/kie/server/api/marshalling/CustomXstreamMarshallerBuilder.java
@@ -23,7 +23,7 @@
 import com.thoughtworks.xstream.io.xml.XmlFriendlyNameCoder;
 import com.thoughtworks.xstream.security.WildcardTypePermission;
 import org.kie.server.api.marshalling.xstream.XStreamMarshaller;
-import org.kie.soup.commons.xstream.XStreamUtils;
+import org.kie.soup.xstream.XStreamUtils;
 
 public class CustomXstreamMarshallerBuilder extends BaseMarshallerBuilder {
 

diff --git a/...arent/kie-server-api/src/test/java/org/kie/server/api/marshalling/objects/DateObject.java b/...arent/kie-server-api/src/test/java/org/kie/server/api/marshalling/objects/DateObject.java
@@ -32,10 +32,10 @@
 import org.kie.internal.jaxb.LocalDateXmlAdapter;
 import org.kie.internal.jaxb.LocalTimeXmlAdapter;
 import org.kie.internal.jaxb.OffsetDateTimeXmlAdapter;
-import org.kie.soup.commons.xstream.LocalDateTimeXStreamConverter;
-import org.kie.soup.commons.xstream.LocalDateXStreamConverter;
-import org.kie.soup.commons.xstream.LocalTimeXStreamConverter;
-import org.kie.soup.commons.xstream.OffsetDateTimeXStreamConverter;
+import org.kie.soup.xstream.LocalDateTimeXStreamConverter;
+import org.kie.soup.xstream.LocalDateXStreamConverter;
+import org.kie.soup.xstream.LocalTimeXStreamConverter;
+import org.kie.soup.xstream.OffsetDateTimeXStreamConverter;
 
 /**
  * TODO Remove @XStreamConverter for java.time attributes once converters are provided by XStream out of the box.

diff --git a/...c/main/java/org/kie/server/controller/impl/storage/FileBasedKieServerTemplateStorage.java b/...c/main/java/org/kie/server/controller/impl/storage/FileBasedKieServerTemplateStorage.java
@@ -27,7 +27,7 @@
 import org.kie.server.controller.api.model.spec.ServerTemplate;
 import org.kie.server.controller.api.model.spec.ServerTemplateKey;
 import org.kie.server.controller.api.storage.KieServerTemplateStorage;
-import org.kie.soup.commons.xstream.XStreamUtils;
+import org.kie.soup.xstream.XStreamUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...src/main/java/org/kie/server/services/impl/storage/file/KieServerStateFileRepository.java b/...src/main/java/org/kie/server/services/impl/storage/file/KieServerStateFileRepository.java
@@ -32,7 +32,7 @@
 import org.kie.server.services.impl.storage.KieServerState;
 import org.kie.server.services.impl.storage.KieServerStateRepository;
 import org.kie.server.services.impl.storage.KieServerStateRepositoryUtils;
-import org.kie.soup.commons.xstream.XStreamUtils;
+import org.kie.soup.xstream.XStreamUtils;
 
 public class KieServerStateFileRepository implements KieServerStateRepository {
 

diff --git a/...a/org/kie/server/services/openshift/impl/storage/cloud/KieServerStateCloudRepository.java b/...a/org/kie/server/services/openshift/impl/storage/cloud/KieServerStateCloudRepository.java
@@ -21,7 +21,7 @@
 import org.kie.server.api.model.KieServerConfigItem;
 import org.kie.server.services.impl.storage.KieServerState;
 import org.kie.server.services.impl.storage.KieServerStateRepository;
-import org.kie.soup.commons.xstream.XStreamUtils;
+import org.kie.soup.xstream.XStreamUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;