You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by da...@apache.org on 2012/09/17 13:23:22 UTC

svn commit: r1386554 - /activemq/trunk/activemq-optional/pom.xml

Author: davsclaus
Date: Mon Sep 17 11:23:22 2012
New Revision: 1386554

URL: http://svn.apache.org/viewvc?rev=1386554&view=rev
Log:
Upgraded seleniumhq, and polished pom.xml

Modified:
    activemq/trunk/activemq-optional/pom.xml

Modified: activemq/trunk/activemq-optional/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/pom.xml?rev=1386554&r1=1386553&r2=1386554&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/pom.xml (original)
+++ activemq/trunk/activemq-optional/pom.xml Mon Sep 17 11:23:22 2012
@@ -36,10 +36,15 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>
-    <dependency>
+	<dependency>
+	  <groupId>org.slf4j</groupId>
+	  <artifactId>slf4j-api</artifactId>
+	</dependency>
+	<dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
       <type>test-jar</type>
+	  <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -105,11 +110,19 @@
       <artifactId>commons-logging</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
+	<!-- log4j jms appender and test tool needs this -->
+	<dependency>
+      <groupId>log4j</groupId>
+	  <artifactId>log4j</artifactId>
+	  <scope>compile</scope>
+	  <optional>true</optional>
+	</dependency>
+	<dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>compile</scope>
-    </dependency>
+      <optional>true</optional>
+	</dependency>
     <dependency>
       <groupId>org.apache.xmlbeans</groupId>
       <artifactId>xmlbeans</artifactId>
@@ -144,12 +157,6 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
@@ -188,19 +195,19 @@
     <dependency>
       <groupId>org.seleniumhq.selenium</groupId>
       <artifactId>selenium-java</artifactId>
-      <version>2.21.0</version>
+      <version>2.25.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.seleniumhq.selenium</groupId>
       <artifactId>selenium-chrome-driver</artifactId>
-      <version>2.21.0</version>
+      <version>2.25.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.seleniumhq.selenium</groupId>
       <artifactId>selenium-firefox-driver</artifactId>
-      <version>2.21.0</version>
+      <version>2.25.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -226,7 +233,7 @@
                     org.apache.activemq.transport.https*;version=${project.version};-noimport:=;-split-package:=merge-last
                 </Export-Package>
                 <Import-Package>
-                    org.eclipse.jetty*;version="[7.0,8.0)";resolution:=optional,
+                    org.eclipse.jetty*;version="[7.5,8.0)";resolution:=optional,
                     !org.apache.activemq.transport.ws*;version=${project.version};,
                     !org.apache.activemq.transport.xstream;version=${project.version};,
                     !org.apache.activemq.transport.util;version=${project.version};,