Author: dkulp
Date: Mon Sep 24 20:05:30 2012
New Revision: 1389553
URL: http://svn.apache.org/viewvc?rev=1389553&view=rev
Log:
Stick mina version in parent pom, separate http core and client versions
Modified:
cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
cxf/trunk/parent/pom.xml
cxf/trunk/rt/bindings/soap/pom.xml
cxf/trunk/rt/transports/udp/pom.xml
Modified: cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/osgi/karaf/features/src/main/resources/features.xml?rev=1389553&r1=1389552&r2=1389553&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Mon Sep 24
20:05:30 2012
@@ -129,7 +129,7 @@
<feature name="cxf-http-async" version="${project.version}"
resolver='(obr)'>
<feature version="[2,3)">cxf-http</feature>
<bundle start-level='40'>
mvn:org.apache.httpcomponents/httpcore-osgi/${cxf.httpcomponents.core.version}</bundle>
- <bundle start-level='40'>
mvn:org.apache.httpcomponents/httpclient-osgi/${cxf.httpcomponents.core.version}</bundle>
+ <bundle start-level='40'>
mvn:org.apache.httpcomponents/httpclient-osgi/${cxf.httpcomponents.client.version}</bundle>
<bundle start-level='40'>
mvn:org.apache.httpcomponents/httpasyncclient-osgi/${cxf.httpcomponents.asyncclient.version}</bundle>
<bundle
start-level='40'>mvn:org.apache.cxf/cxf-rt-transports-http-hc/${project.version}</bundle>
</feature>
Modified: cxf/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1389553&r1=1389552&r2=1389553&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Mon Sep 24 20:05:30 2012
@@ -139,7 +139,8 @@
<cxf.opensaml.xmltooling.version>1.3.2-1</cxf.opensaml.xmltooling.version>
<cxf.neethi.version>3.0.2</cxf.neethi.version>
<cxf.velocity.version>1.7</cxf.velocity.version>
-
<cxf.httpcomponents.core.version>4.2.1</cxf.httpcomponents.core.version>
+
<cxf.httpcomponents.core.version>4.2.2</cxf.httpcomponents.core.version>
+
<cxf.httpcomponents.client.version>4.2.1</cxf.httpcomponents.client.version>
<cxf.httpcomponents.core.version.range>[4.2.1,4.3.0)</cxf.httpcomponents.core.version.range>
<cxf.httpcomponents.asyncclient.version>4.0-beta3-SNAPSHOT</cxf.httpcomponents.asyncclient.version>
<cxf.httpcomponents.asyncclient.version.range>[4.0-beta3-SNAPSHOT,4.1)</cxf.httpcomponents.asyncclient.version.range>
@@ -591,9 +592,14 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ <version>2.0.5</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${cxf.httpcomponents.core.version}</version>
+ <version>${cxf.httpcomponents.client.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Modified: cxf/trunk/rt/bindings/soap/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/pom.xml?rev=1389553&r1=1389552&r2=1389553&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/pom.xml (original)
+++ cxf/trunk/rt/bindings/soap/pom.xml Mon Sep 24 20:05:30 2012
@@ -89,7 +89,6 @@
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>2.0.0-M6</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
Modified: cxf/trunk/rt/transports/udp/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/udp/pom.xml?rev=1389553&r1=1389552&r2=1389553&view=diff
==============================================================================
--- cxf/trunk/rt/transports/udp/pom.xml (original)
+++ cxf/trunk/rt/transports/udp/pom.xml Mon Sep 24 20:05:30 2012
@@ -52,7 +52,6 @@
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>2.0.4</version>
</dependency>
