From 02e20cc97d7b0b95d2c20561dc34364f17547b36 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <timm.fitschen@ds.mpg.de>
Date: Thu, 14 Feb 2019 12:53:27 +0100
Subject: [PATCH] MAINT diverent logging framework for restlet
---
caosdb-webui | 2 +-
pom.xml | 16 +++++++++++++---
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/caosdb-webui b/caosdb-webui
index 403c977e..e27ab256 160000
--- a/caosdb-webui
+++ b/caosdb-webui
@@ -1 +1 @@
-Subproject commit 403c977e465774ba1dadc5bbedf4bec774a6d73d
+Subproject commit e27ab2564b50c703181b9ddce2e23cd879149287
diff --git a/pom.xml b/pom.xml
index 50c7e246..69c5b366 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,6 +54,16 @@
</repositories>
<dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.8.0-beta2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.8.0-beta2</version>
+ </dependency>
<dependency>
<groupId>de.timmfitschen</groupId>
<artifactId>easy-units</artifactId>
@@ -78,12 +88,12 @@
<dependency>
<groupId>org.restlet.jse</groupId>
<artifactId>org.restlet</artifactId>
- <version>2.3.9</version>
+ <version>2.3.12</version>
</dependency>
<dependency>
<groupId>org.restlet.jse</groupId>
<artifactId>org.restlet.ext.fileupload</artifactId>
- <version>2.3.9</version>
+ <version>2.3.12</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
@@ -118,7 +128,7 @@
<dependency>
<groupId>org.restlet.jse</groupId>
<artifactId>org.restlet.ext.jetty</artifactId>
- <version>2.3.9</version>
+ <version>2.3.12</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
--
GitLab