diff --git a/org.eclipse.winery.repository.rest/pom.xml b/org.eclipse.winery.repository.rest/pom.xml
index 674124f5e6..5b7b21622d 100644
--- a/org.eclipse.winery.repository.rest/pom.xml
+++ b/org.eclipse.winery.repository.rest/pom.xml
@@ -221,19 +221,6 @@
1.2
compile
-
- org.slf4j
- slf4j-ext
- ${org.slf4j}
- compile
-
-
-
- ch.qos.cal10n
- cal10n-api
-
-
-
org.apache.commons
commons-configuration2
diff --git a/org.eclipse.winery.repository.rest/src/main/java/org/eclipse/winery/repository/rest/RestUtils.java b/org.eclipse.winery.repository.rest/src/main/java/org/eclipse/winery/repository/rest/RestUtils.java
index 43755d8cb8..ec5a4a727e 100644
--- a/org.eclipse.winery.repository.rest/src/main/java/org/eclipse/winery/repository/rest/RestUtils.java
+++ b/org.eclipse.winery.repository.rest/src/main/java/org/eclipse/winery/repository/rest/RestUtils.java
@@ -104,8 +104,8 @@
import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataBodyPart;
import org.eclipse.jgit.api.errors.GitAPIException;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Contains utility functionality concerning with everything that is not related only to the repository, but
@@ -114,7 +114,7 @@
*/
public class RestUtils {
- private static final XLogger LOGGER = XLoggerFactory.getXLogger(RestUtils.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(RestUtils.class);
// RegExp inspired by http://stackoverflow.com/a/5396246/873282
// NameStartChar without ":"
diff --git a/org.eclipse.winery.repository/pom.xml b/org.eclipse.winery.repository/pom.xml
index df497e400d..4ad9343fd9 100644
--- a/org.eclipse.winery.repository/pom.xml
+++ b/org.eclipse.winery.repository/pom.xml
@@ -99,19 +99,6 @@
jackson-jaxrs-json-provider
2.7.7
-
- org.slf4j
- slf4j-ext
- ${org.slf4j}
- compile
-
-
-
- ch.qos.cal10n
- cal10n-api
-
-
-
org.eclipse.winery
org.eclipse.winery.common
diff --git a/org.eclipse.winery.repository/src/main/java/org/eclipse/winery/repository/backend/BackendUtils.java b/org.eclipse.winery.repository/src/main/java/org/eclipse/winery/repository/backend/BackendUtils.java
index f89132c96a..4fecf06a3b 100644
--- a/org.eclipse.winery.repository/src/main/java/org/eclipse/winery/repository/backend/BackendUtils.java
+++ b/org.eclipse.winery.repository/src/main/java/org/eclipse/winery/repository/backend/BackendUtils.java
@@ -159,8 +159,8 @@
import org.apache.xerces.xs.XSTypeDefinition;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jgit.api.errors.GitAPIException;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.ls.LSInput;
@@ -182,7 +182,7 @@ public class BackendUtils {
*/
public static final ObjectMapper mapper = getObjectMapper();
- private static final XLogger LOGGER = XLoggerFactory.getXLogger(BackendUtils.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(BackendUtils.class);
private static final MediaType MEDIATYPE_APPLICATION_OCTET_STREAM = MediaType.parse("application/octet-stream");
diff --git a/org.eclipse.winery.repository/src/main/java/org/eclipse/winery/repository/backend/xsd/RepositoryBasedXsdImportManager.java b/org.eclipse.winery.repository/src/main/java/org/eclipse/winery/repository/backend/xsd/RepositoryBasedXsdImportManager.java
index 42e3fadca5..00d76b7b4f 100644
--- a/org.eclipse.winery.repository/src/main/java/org/eclipse/winery/repository/backend/xsd/RepositoryBasedXsdImportManager.java
+++ b/org.eclipse.winery.repository/src/main/java/org/eclipse/winery/repository/backend/xsd/RepositoryBasedXsdImportManager.java
@@ -29,8 +29,8 @@
import org.eclipse.winery.repository.backend.ImportUtils;
import org.eclipse.winery.repository.backend.RepositoryFactory;
import org.eclipse.winery.repository.backend.constants.MediaTypes;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.InputStream;
@@ -39,7 +39,7 @@
public class RepositoryBasedXsdImportManager implements XsdImportManager {
- private static final XLogger LOGGER = XLoggerFactory.getXLogger(BackendUtils.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(BackendUtils.class);
/**
* Finds out all imports belonging to the given namespace
diff --git a/org.eclipse.winery.repository/src/main/java/org/eclipse/winery/repository/export/ToscaExportUtil.java b/org.eclipse.winery.repository/src/main/java/org/eclipse/winery/repository/export/ToscaExportUtil.java
index ef07e507df..749e23b6da 100644
--- a/org.eclipse.winery.repository/src/main/java/org/eclipse/winery/repository/export/ToscaExportUtil.java
+++ b/org.eclipse.winery.repository/src/main/java/org/eclipse/winery/repository/export/ToscaExportUtil.java
@@ -62,13 +62,13 @@
import org.eclipse.winery.repository.datatypes.ids.elements.VisualAppearanceId;
import org.eclipse.winery.repository.exceptions.RepositoryCorruptException;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
public class ToscaExportUtil {
- private static final XLogger LOGGER = XLoggerFactory.getXLogger(ToscaExportUtil.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(ToscaExportUtil.class);
/*
* these two are GLOBAL VARIABLES leading to the fact that this class has to
diff --git a/pom.xml b/pom.xml
index 1f3481c9d6..58b67dcd6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,6 +68,7 @@
1.8
checkstyle.xml
UTF-8
+ 2.0.0
1.2.3
@@ -267,184 +268,263 @@
- org.eclipse.winery:org.eclipse.winery.model.bpmn4tosca:2.0.0-SNAPSHOT
+ org.eclipse.winery:org.eclipse.winery.model.bpmn4tosca:${project.version}
true
- false
+ true
+
+ org.eclipse.winery::
+
*;resolution:=optional
- org.eclipse.winery.bpmn2bpel.model.*;-noimport:=true
+ org.eclipse.winery.bpmn2bpel.model.*;-noimport:=true;version:=${project.version.osgi}
- org.eclipse.winery:org.eclipse.winery.model.csar.toscametafile:2.0.0-SNAPSHOT
+ org.eclipse.winery:org.eclipse.winery.model.csar.toscametafile:${project.version}
true
- false
+ true
+
+ org.eclipse.winery::
+
*;resolution:=optional
- org.eclipse.winery.model.csar.toscametafile.*;-noimport:=true
+ org.eclipse.winery.model.csar.toscametafile.*;-noimport:=true;version:=${project.version.osgi}
- org.eclipse.winery:org.eclipse.winery.model.selfservice:2.0.0-SNAPSHOT
+ org.eclipse.winery:org.eclipse.winery.model.selfservice:${project.version}
true
- false
+ true
+
+ org.eclipse.winery::
+
*;resolution:=optional
- org.eclipse.winery.model.selfservice.*;-noimport:=true
+ org.eclipse.winery.model.selfservice.*;-noimport:=true;version:=${project.version.osgi}
- org.eclipse.winery:org.eclipse.winery.model.tosca:2.0.0-SNAPSHOT
+ org.eclipse.winery:org.eclipse.winery.model.tosca:${project.version}
true
- false
+ true
+
+ org.eclipse.winery::
+
*;resolution:=optional
- org.eclipse.winery.model.tosca.*;-noimport:=true
+ org.eclipse.winery.model.tosca.*;-noimport:=true;version:=${project.version.osgi}
- org.eclipse.winery:org.eclipse.winery.model.tosca.yaml:2.0.0-SNAPSHOT
+ org.eclipse.winery:org.eclipse.winery.model.tosca.yaml:${project.version}
true
- false
+ true
+
+ org.eclipse.winery::
+
*;resolution:=optional
- org.eclipse.winery.model.tosca.yaml.*;-noimport:=true
+ org.eclipse.winery.model.tosca.yaml.*;-noimport:=true;version:=${project.version.osgi}
- org.eclipse.winery:org.eclipse.winery.common:2.0.0-SNAPSHOT
+ org.eclipse.winery:org.eclipse.winery.common:${project.version}
true
- false
+ true
+
+ org.eclipse.winery::
+
+ de.danielbechler:java-object-diff:${de.danielbechler.java-object-diff}
+
*;resolution:=optional
- org.eclipse.winery.common.*;-noimport:=true
+ org.eclipse.winery.common.*;-noimport:=true;version:=${project.version.osgi}
- org.eclipse.winery:org.eclipse.winery.yaml.common:2.0.0-SNAPSHOT
+ org.eclipse.winery:org.eclipse.winery.yaml.common:${project.version}
true
- false
+ true
+
+ org.eclipse.winery::
+
*;resolution:=optional
- org.eclipse.winery.yaml.common.*;-noimport:=true
+ org.eclipse.winery.yaml.common.*;-noimport:=true;version:=${project.version.osgi}
- org.eclipse.winery:org.eclipse.winery.yaml.converter:2.0.0-SNAPSHOT
+ org.eclipse.winery:org.eclipse.winery.yaml.converter:${project.version}
true
- false
+ true
+
+ org.eclipse.winery::
+
*;resolution:=optional
- org.eclipse.winery.yaml.converter.*;-noimport:=true
+ org.eclipse.winery.yaml.converter.*;-noimport:=true;version:=${project.version.osgi}
- org.eclipse.winery:org.eclipse.winery.cli:2.0.0-SNAPSHOT
+
+ org.eclipse.winery:org.eclipse.winery.bpmn4tosca.converter.tobpel:${project.version}
+
true
- false
+ true
+
+ org.eclipse.winery::
+
*;resolution:=optional
- org.eclipse.winery.cli.*;-noimport:=true
+ org.eclipse.winery.bpmn2bpel.*;-noimport:=true;version:=${project.version.osgi}
-
- org.eclipse.winery:org.eclipse.winery.bpmn4tosca.converter.tobpel:2.0.0-SNAPSHOT
-
+ org.eclipse.winery:org.eclipse.winery.repository:${project.version}
true
- false
+
+ org.eclipse.winery:::
+
+ true
*;resolution:=optional
- org.eclipse.winery.bpmn2bpel.*;-noimport:=true
+ org.eclipse.winery.repository.*;-noimport:=true;version:=${project.version.osgi}
- org.eclipse.winery:org.eclipse.winery.repository:2.0.0-SNAPSHOT
+
+ org.eclipse.winery:org.eclipse.winery.repository.client:${project.version}
+
true
+ true
- org.slf4j:::
- org.eclipse.collections:eclipse-collections*::
+ org.eclipse.winery::
- true
- *;resolution:=optional
- org.eclipse.winery.repository.*;-noimport:=true
+
+ !com.sun.org.apache.xalan.*,
+ *;resolution:=optional
+
+ org.eclipse.winery.repository.client.*;-noimport:=true;version:=${project.version.osgi}
- org.eclipse.winery:org.eclipse.winery.repository.client:2.0.0-SNAPSHOT
+ org.eclipse.winery:org.eclipse.winery.repository.configuration:${project.version}
true
- false
+ true
+
+ org.eclipse.winery::
+
*;resolution:=optional
- org.eclipse.winery.repository.client.*;-noimport:=true
+ org.eclipse.winery.repository.configuration.*;-noimport:=true;version:=${project.version.osgi}
-
- org.eclipse.winery:org.eclipse.winery.repository.configuration:2.0.0-SNAPSHOT
-
+ org.eclipse.winery:org.eclipse.winery.compliance:${project.version}
true
- false
+ true
+
+ org.eclipse.winery::
+
*;resolution:=optional
- org.eclipse.winery.repository.configuration.*;-noimport:=true
+ org.eclipse.winery.compliance.*;-noimport:=true;version:=${project.version.osgi}
- org.eclipse.winery:org.eclipse.winery.compliance:2.0.0-SNAPSHOT
+ org.eclipse.winery:org.eclipse.winery.topologygraph:${project.version}
true
- false
+ true
+
+ org.eclipse.winery::
+
*;resolution:=optional
- org.eclipse.winery.compliance.*;-noimport:=true
+ org.eclipse.winery.topologygraph.*;-noimport:=true;version:=${project.version.osgi}
- org.eclipse.winery:org.eclipse.winery.generators.ia:2.0.0-SNAPSHOT
+ org.eclipse.winery:org.eclipse.winery.generators.ia:${project.version}
true
- false
+ true
+
+ org.eclipse.winery::
+
*;resolution:=optional
- org.eclipse.winery.generators.ia.*;-noimport:=true
+ org.eclipse.winery.generators.ia.*;-noimport:=true;version:=${project.version.osgi}
- org.eclipse.winery:org.eclipse.winery.highlevelrestapi:2.0.0-SNAPSHOT
+ org.eclipse.winery:org.eclipse.winery.highlevelrestapi:${project.version}
true
- false
+ true
+
+ org.eclipse.winery::
+
*;resolution:=optional
- org.eclipse.winery.highlevelrestapi.*;-noimport:=true
+ org.eclipse.winery.highlevelrestapi.*;-noimport:=true;version:=${project.version.osgi}
- org.eclipse.winery:org.eclipse.winery.provenance:2.0.0-SNAPSHOT
+ org.eclipse.winery:org.eclipse.winery.provenance:${project.version}
true
- false
+ true
+
+ org.eclipse.winery::
+
+
+ *;resolution:=optional
+ org.eclipse.winery.provenance.*;-noimport:=true;version:=${project.version.osgi}
+
+
+
+
+
+ com.diffplug.osgi:com.diffplug.osgi.extension.sun.misc:0.0.0
+
+
+
+ de.danielbechler:java-object-diff:${de.danielbechler.java-object-diff}
+ true
+ true
+ true
+
+ Daniel Bechler
+ https://github.com/SQiShER/java-object-diff
*;resolution:=optional
- org.eclipse.winery.provenance.*;-noimport:=true
+ de.danielbechler.diff.*;-noimport:=true
+
+ org.slf4j:jul-to-slf4j:${org.slf4j}
+ true
+ true
+