You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2015/02/17 12:54:37 UTC

[29/49] incubator-taverna-workbench-product git commit: Specified slf4j implementation version. Removed version 1.2.17 of log4j (using 1.2.16).

Specified slf4j implementation version. Removed version 1.2.17 of log4j (using 1.2.16).

git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@16064 bf327186-88b3-11dd-a302-d386e5130c1c


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/361caa75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/361caa75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/361caa75

Branch: refs/heads/master
Commit: 361caa759ffb896c9668cf7edd38010fd9b19ebd
Parents: ee4fefd
Author: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Tue Sep 24 15:15:25 2013 +0000
Committer: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Tue Sep 24 15:15:25 2013 +0000

----------------------------------------------------------------------
 pom.xml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/361caa75/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d72f869..85c229e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,17 +158,18 @@
 	</distributionManagement>
 	<dependencies>
 
-		<!-- Workaround for slf4j api/impl version mismatch -->
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>1.7.5</version>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.17</version>
+			<scope>provided</scope>
 		</dependency>
+
+		<!-- slf4j implementation -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.7.5</version>
-			<scope>runtime</scope>
+			<version>1.7.4</version>
 		</dependency>
 
 		<!-- Spring DM -->
@@ -623,8 +624,8 @@
             <artifactId>jena-bundle</artifactId>
             <version>2.11.0-SNAPSHOT</version>
         </dependency>
-        
-        
+
+
 
 		<!-- Taverna Security -->
 		<dependency>