logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mattsic...@apache.org
Subject svn commit: r1608333 - in /logging/log4j/log4j2/branches/messaging-module: log4j-mom/pom.xml pom.xml
Date Mon, 07 Jul 2014 04:26:03 GMT
Author: mattsicker
Date: Mon Jul  7 04:26:03 2014
New Revision: 1608333

URL: http://svn.apache.org/r1608333
Log:
Add ActiveMQ as a test dependency.

  - Update dependencies in log4j-mom.
  - Add Proton library for AMQP (LOG4J2-701).

Modified:
    logging/log4j/log4j2/branches/messaging-module/log4j-mom/pom.xml
    logging/log4j/log4j2/branches/messaging-module/pom.xml

Modified: logging/log4j/log4j2/branches/messaging-module/log4j-mom/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/branches/messaging-module/log4j-mom/pom.xml?rev=1608333&r1=1608332&r2=1608333&view=diff
==============================================================================
--- logging/log4j/log4j2/branches/messaging-module/log4j-mom/pom.xml (original)
+++ logging/log4j/log4j2/branches/messaging-module/log4j-mom/pom.xml Mon Jul  7 04:26:03 2014
@@ -27,6 +27,12 @@
       <artifactId>jboss-jms-api_1.1_spec</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.apache.qpid</groupId>
+      <artifactId>proton-j</artifactId>
+    </dependency>
+
+    <!-- tests -->
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
@@ -37,17 +43,31 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-core</artifactId>
-      <type>test-jar</type>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- integration tests -->
     <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-broker</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
\ No newline at end of file

Modified: logging/log4j/log4j2/branches/messaging-module/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/branches/messaging-module/pom.xml?rev=1608333&r1=1608332&r2=1608333&view=diff
==============================================================================
--- logging/log4j/log4j2/branches/messaging-module/pom.xml (original)
+++ logging/log4j/log4j2/branches/messaging-module/pom.xml Mon Jul  7 04:26:03 2014
@@ -160,6 +160,7 @@
     <spring.version>3.2.8.RELEASE</spring.version>
     <flumeVersion>1.5.0</flumeVersion>
     <disruptor.version>3.2.1</disruptor.version>
+    <activemq.version>5.10.0</activemq.version>
     <!-- Configuration properties for the OSGi maven-bundle-plugin -->
     <project.version.osgi>2.0.0.RC2-SNAPSHOT</project.version.osgi>
     <osgi.symbolicName>org.apache.logging.${project.artifactId}</osgi.symbolicName>
@@ -493,6 +494,16 @@
         <scope>provided</scope>
       </dependency>
       <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-broker</artifactId>
+        <version>${activemq.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.qpid</groupId>
+        <artifactId>proton-j</artifactId>
+        <version>0.7</version>
+      </dependency>
+      <dependency>
         <groupId>org.mockejb</groupId>
         <artifactId>mockejb</artifactId>
         <version>0.6-beta2</version>



Mime
View raw message