Author: cwiklik
Date: Wed Apr 9 18:59:23 2014
New Revision: 1586083
URL: http://svn.apache.org/r1586083
Log:
UIMA-3546 added missing jars to enable http protocol
Modified:
uima/uima-as/trunk/src/main/assembly/bin.xml
uima/uima-as/trunk/uima-as-parent/pom.xml
Modified: uima/uima-as/trunk/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/src/main/assembly/bin.xml?rev=1586083&r1=1586082&r2=1586083&view=diff
==============================================================================
--- uima/uima-as/trunk/src/main/assembly/bin.xml (original)
+++ uima/uima-as/trunk/src/main/assembly/bin.xml Wed Apr 9 18:59:23 2014
@@ -68,6 +68,7 @@
<include>org.apache.activemq:activemq-console</include>
<include>org.apache.activemq:activemq-core</include>
<include>org.apache.activemq:activemq-spring</include>
+
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec
</include>
@@ -102,6 +103,9 @@
<include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec
</include>
<include>log4j:log4j</include>
+ <include>xpp3:xpp3</include>
+
<include>org.apache.httpcomponents:httpclient</include>
+
<include>org.apache.httpcomponents:httpcore</include>
</includes>
<useTransitiveDependencies>false</useTransitiveDependencies>
<outputDirectory>apache-activemq/lib/optional</outputDirectory>
@@ -352,7 +356,7 @@
</fileSet -->
<fileSet>
-
<directory>target/apache-activemq-linux/apache-activemq-5.6.0</directory>
+
<directory>target/apache-activemq-linux/apache-activemq-5.7.0</directory>
<outputDirectory>apache-activemq</outputDirectory>
<includes>
<include>bin/*</include>
@@ -390,7 +394,7 @@
</fileSet -->
<fileSet>
-
<directory>target/apache-activemq-win/apache-activemq-5.6.0</directory>
+
<directory>target/apache-activemq-win/apache-activemq-5.7.0</directory>
<outputDirectory>apache-activemq</outputDirectory>
<includes>
<include>bin/*</include>
Modified: uima/uima-as/trunk/uima-as-parent/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-parent/pom.xml?rev=1586083&r1=1586082&r2=1586083&view=diff
==============================================================================
--- uima/uima-as/trunk/uima-as-parent/pom.xml (original)
+++ uima/uima-as/trunk/uima-as-parent/pom.xml Wed Apr 9 18:59:23 2014
@@ -144,6 +144,13 @@
<slf4j.version>1.6.4</slf4j.version>
<http.client.version>3.1</http.client.version>
+
+ <xpp3.version>1.1.4c</xpp3.version>
+
+ <http.commons.client.version>4.2.1</http.commons.client.version>
+
+ <http.commons.core.version>4.2.1</http.commons.core.version>
+
</properties>
<!-- dependencyManagement is a declaration section naming each artifact
the uima-as components depends on. -->
@@ -334,9 +341,26 @@
<version>${http.client.version}</version>
</dependency>
- </dependencies>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ <version>${xpp3.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${http.commons.client.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${http.commons.core.version}</version>
+ </dependency>
+
+ </dependencies>
</dependencyManagement>
