From 28a8abaacc96ac6c3b52d1a94c3248ebbb936f09 Mon Sep 17 00:00:00 2001
From: Sonia Zorba <zorba@oats.inaf.it>
Date: Fri, 26 Jan 2018 16:16:22 +0100
Subject: [PATCH] Dependencies issue fixed
---
TASMAN-bom/pom.xml | 15 ++++++++++-----
TASMAN-core/pom.xml | 4 ++++
TASMAN-webapp/pom.xml | 8 ++++++--
3 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/TASMAN-bom/pom.xml b/TASMAN-bom/pom.xml
index 7e85167..3e089cd 100644
--- a/TASMAN-bom/pom.xml
+++ b/TASMAN-bom/pom.xml
@@ -16,12 +16,17 @@
<maven.test.skip>true</maven.test.skip>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.7.21</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.7.21</version>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/TASMAN-core/pom.xml b/TASMAN-core/pom.xml
index 23781de..20cf190 100644
--- a/TASMAN-core/pom.xml
+++ b/TASMAN-core/pom.xml
@@ -24,6 +24,10 @@
<version>5.1.37</version>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
diff --git a/TASMAN-webapp/pom.xml b/TASMAN-webapp/pom.xml
index 06cbf40..ac9def7 100644
--- a/TASMAN-webapp/pom.xml
+++ b/TASMAN-webapp/pom.xml
@@ -88,6 +88,10 @@
<!-- http://stackoverflow.com/a/33420995/771431 -->
<version>3.0.1-b08</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
@@ -111,9 +115,9 @@
</properties>
<dependencies>
<dependency>
- <groupId>it.inaf.ia2.tap</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tasman-core</artifactId>
- <version>1.3.2</version>
+ <version>${project.version}</version>
<exclusions>
<!-- exclusion due to tomcat-jdbc dependency conflicting with Jetty -->
<exclusion>
--
GitLab