Author: jbonofre
Date: Wed Dec 1 08:57:38 2010
New Revision: 1040904
URL: http://svn.apache.org/viewvc?rev=1040904&view=rev
Log:
Use components POM dependencies.
Modified:
servicemix/components/bindings/servicemix-http/trunk/.gitignore
servicemix/components/bindings/servicemix-http/trunk/pom.xml
Modified: servicemix/components/bindings/servicemix-http/trunk/.gitignore
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/.gitignore?rev=1040904&r1=1040903&r2=1040904&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-http/trunk/.gitignore (original)
+++ servicemix/components/bindings/servicemix-http/trunk/.gitignore Wed Dec 1
08:57:38 2010
@@ -1,3 +1,5 @@
-*.ipr
-*.iws
-*.iml
\ No newline at end of file
+target
+.project
+.classpath
+.settings
+*.i??
\ No newline at end of file
Modified: servicemix/components/bindings/servicemix-http/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/pom.xml?rev=1040904&r1=1040903&r2=1040904&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-http/trunk/pom.xml (original)
+++ servicemix/components/bindings/servicemix-http/trunk/pom.xml Wed Dec 1
08:57:38 2010
@@ -42,13 +42,6 @@
</scm>
<properties>
- <activemq.version>5.4.1</activemq.version>
- <commons-httpclient.version>3.1</commons-httpclient.version>
- <geronimo-activation.version>2.0.1</geronimo-activation.version>
- <geronimo-servlet.version>1.1.2</geronimo-servlet.version>
- <jetty.version>6.1.25</jetty.version>
- <xstream.version>1.3</xstream.version>
-
<servicemix.osgi.import>
!org.apache.servicemix.http*,
!META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.http,
@@ -85,46 +78,20 @@
<dependencies>
<dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <scope>provided</scope>
- <version>${xstream.version}</version>
- <exclusions>
- <exclusion>
- <!-- xom is an optional dependency of xstream. Its also
LGPL, so its really not ASF compatible. -->
- <groupId>xom</groupId>
- <artifactId>xom</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>${commons-httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-activation</artifactId>
- <version>${geronimo-activation.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>${geronimo-servlet.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
@@ -135,20 +102,8 @@
<artifactId>servicemix-shared</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-utils</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>${jetty.version}</version>
<exclusions>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
@@ -159,7 +114,6 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-management</artifactId>
- <version>${jetty.version}</version>
<exclusions>
<exclusion>
<groupId>mx4j</groupId>
@@ -178,7 +132,40 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-client</artifactId>
- <version>${jetty.version}</version>
+ </dependency>
+
+ <!-- provided -->
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <!-- xom is an optional dependency of xstream. Its also
LGPL, so its really not ASF compatible. -->
+ <groupId>xom</groupId>
+ <artifactId>xom</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-activation</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix-utils</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -207,12 +194,11 @@
<optional>true</optional>
</dependency>
- <!-- testing -->
+ <!-- test -->
<dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
<scope>test</scope>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
