activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1431109 - in /activemq/trunk: activemq-web-console/pom.xml activemq-web/pom.xml
Date Wed, 09 Jan 2013 21:51:00 GMT
Author: tabish
Date: Wed Jan  9 21:50:59 2013
New Revision: 1431109

URL: http://svn.apache.org/viewvc?rev=1431109&view=rev
Log:
removing dependencies on activemq-core

Modified:
    activemq/trunk/activemq-web-console/pom.xml
    activemq/trunk/activemq-web/pom.xml

Modified: activemq/trunk/activemq-web-console/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/pom.xml?rev=1431109&r1=1431108&r2=1431109&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/pom.xml (original)
+++ activemq/trunk/activemq-web-console/pom.xml Wed Jan  9 21:50:59 2013
@@ -30,11 +30,11 @@
   <name>ActiveMQ :: Web Console</name>
   <description>Web Console for ActiveMQ</description>
 
-	<properties>
-		<jetty.port>8080</jetty.port>
-	</properties>
+    <properties>
+        <jetty.port>8080</jetty.port>
+    </properties>
 
-	<build>
+    <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -145,7 +145,7 @@
                 org.slf4j.spi;version="[1.6,2)";resolution:=optional,
                 org.apache.log4j;version="[1.2.14,2)";resolution:=optional,
                 org.apache.log4j.spi;version="[1.2.14,2)";resolution:=optional,
-				org.eclipse.jetty.continuation;resolution:=optional
+                org.eclipse.jetty.continuation;resolution:=optional
             </Import-Package>
           </instructions>
         </configuration>
@@ -196,26 +196,6 @@
       <artifactId>activemq-console</artifactId>
       <version>${project.version}</version>
     </dependency>
-
-    <!-- TODO this should not be needed, but transitive dependencies are not working -->
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>activemq-core</artifactId>
-        <exclusions>
-            <exclusion>
-                <artifactId>servlet-api</artifactId>
-                <groupId>org.mortbay.jetty</groupId>
-            </exclusion>
-            <exclusion>
-                <artifactId>servlet-api-2.5</artifactId>
-                <groupId>org.mortbay.jetty</groupId>
-            </exclusion>
-            <exclusion>
-                <artifactId>ecj</artifactId>
-                <groupId>org.eclipse.jdt.core.compiler</groupId>
-            </exclusion>
-        </exclusions>
-    </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-jaas</artifactId>

Modified: activemq/trunk/activemq-web/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web/pom.xml?rev=1431109&r1=1431108&r2=1431109&view=diff
==============================================================================
--- activemq/trunk/activemq-web/pom.xml (original)
+++ activemq/trunk/activemq-web/pom.xml Wed Jan  9 21:50:59 2013
@@ -48,15 +48,11 @@
     <!-- activemq -->
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>activemq-core</artifactId>
-    </dependency>
-    <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>activemq-camel</artifactId>
+      <artifactId>activemq-camel</artifactId>
     </dependency>
     <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>activemq-pool</artifactId>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>activemq-pool</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -71,19 +67,16 @@
       <artifactId>geronimo-servlet_2.5_spec</artifactId>
       <scope>provided</scope>
     </dependency>
-
     <dependency>
       <groupId>org.eclipse.jetty.aggregate</groupId>
       <artifactId>jetty-all-server</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-websocket</artifactId>
-        <version>${jetty-version}</version>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-websocket</artifactId>
+      <version>${jetty-version}</version>
     </dependency>
-
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-continuation</artifactId>
@@ -101,41 +94,32 @@
       <groupId>jdom</groupId>
       <artifactId>jdom</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-spring</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
       <optional>false</optional>
     </dependency>
-
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
       <optional>false</optional>
     </dependency>
-
     <dependency>
       <groupId>xpp3</groupId>
       <artifactId>xpp3</artifactId>
     </dependency>
-
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream</artifactId>
     </dependency>
-
-
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
-
 </project>
\ No newline at end of file



Mime
View raw message