Skip to content

Fix/osgi slf4j issues #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Vogel612 wants to merge 1 commit into from
Closed

Fix/osgi slf4j issues #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions org.eclipse.winery.repository.rest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,19 +221,6 @@
<version>1.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-ext</artifactId>
<version>${org.slf4j}</version>
<scope>compile</scope>
<!-- not approved by Eclipse legal -->
<exclusions>
<exclusion>
<groupId>ch.qos.cal10n</groupId>
<artifactId>cal10n-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions ...se.winery.repository.rest/src/main/java/org/eclipse/winery/repository/rest/RestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <em>not</em> related only to the repository, but
Expand All @@ -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 ":"
Expand Down
13 changes: 0 additions & 13 deletions org.eclipse.winery.repository/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,19 +99,6 @@
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>2.7.7</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-ext</artifactId>
<version>${org.slf4j}</version>
<scope>compile</scope>
<!-- not approved by Eclipse legal -->
<exclusions>
<exclusion>
<groupId>ch.qos.cal10n</groupId>
<artifactId>cal10n-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.winery</groupId>
<artifactId>org.eclipse.winery.common</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions ...e.winery.repository/src/main/java/org/eclipse/winery/repository/backend/BackendUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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");

Expand Down
6 changes: 3 additions & 3 deletions .../main/java/org/eclipse/winery/repository/backend/xsd/RepositoryBasedXsdImportManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ...winery.repository/src/main/java/org/eclipse/winery/repository/export/ToscaExportUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading