Author: cwiklik
Date: Tue Jan  8 14:33:12 2019
New Revision: 1850754

URL: http://svn.apache.org/viewvc?rev=1850754&view=rev
Log:
UIMA-5949 upgraded cassandra server,driver and some dependencies

Modified:
    uima/uima-ducc/trunk/src/main/assembly/bin.xml
    uima/uima-ducc/trunk/uima-ducc-common/pom.xml
    uima/uima-ducc/trunk/uima-ducc-database/pom.xml
    uima/uima-ducc/trunk/uima-ducc-parent/pom.xml
    uima/uima-ducc/trunk/uima-ducc-web/pom.xml

Modified: uima/uima-ducc/trunk/src/main/assembly/bin.xml
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/src/main/assembly/bin.xml?rev=1850754&r1=1850753&r2=1850754&view=diff
==============================================================================
--- uima/uima-ducc/trunk/src/main/assembly/bin.xml (original)
+++ uima/uima-ducc/trunk/src/main/assembly/bin.xml Tue Jan  8 14:33:12 2019
@@ -137,7 +137,7 @@ under the License.
       <useStrictFiltering>true</useStrictFiltering>
       <includes>
         <include>com.datastax.cassandra:cassandra-driver-core</include>
-        <include>com.datastax.cassandra:cassandra-driver-dse</include>
+        <!--include>com.datastax.cassandra:cassandra-driver-dse</include-->
         <include>com.datastax.cassandra:cassandra-driver-mapping</include>
         <include>io.netty:netty-buffer</include>
         <include>io.netty:netty-codec</include>

Modified: uima/uima-ducc/trunk/uima-ducc-common/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-common/pom.xml?rev=1850754&r1=1850753&r2=1850754&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-common/pom.xml (original)
+++ uima/uima-ducc/trunk/uima-ducc-common/pom.xml Tue Jan  8 14:33:12 2019
@@ -98,8 +98,8 @@
     </dependency>
 
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
     </dependency>
 
        <dependency>

Modified: uima/uima-ducc/trunk/uima-ducc-database/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-database/pom.xml?rev=1850754&r1=1850753&r2=1850754&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-database/pom.xml (original)
+++ uima/uima-ducc/trunk/uima-ducc-database/pom.xml Tue Jan  8 14:33:12 2019
@@ -69,11 +69,11 @@
           <version>${cassandra.driver.version}</version>
         </dependency>
 
-        <dependency>
+        <!--dependency>
           <groupId>com.datastax.cassandra</groupId>
           <artifactId>cassandra-driver-dse</artifactId>
           <version>${cassandra.driver.version}</version>
-        </dependency>
+        </dependency-->
 
         <dependency>
           <groupId>com.datastax.cassandra</groupId>
@@ -81,6 +81,12 @@
           <version>${cassandra.driver.version}</version>
         </dependency>
 
+           <dependency>
+              <groupId>com.codahale.metrics</groupId>
+              <artifactId>metrics-core</artifactId>
+              <version>${metrics.version}</version>
+            </dependency>
+ 
         <dependency>
           <groupId>org.xerial.snappy</groupId>
           <artifactId>snappy-java</artifactId>

Modified: uima/uima-ducc/trunk/uima-ducc-parent/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-parent/pom.xml?rev=1850754&r1=1850753&r2=1850754&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-parent/pom.xml (original)
+++ uima/uima-ducc/trunk/uima-ducc-parent/pom.xml Tue Jan  8 14:33:12 2019
@@ -135,14 +135,14 @@
                <org.apache.camel.version>2.19.3</org.apache.camel.version>
                <org.apache.uima.version>2.10.2</org.apache.uima.version> 
<!--Same as uima-as-->
                <org.apache.uima.as.version>2.10.2</org.apache.uima.as.version>
-               <com.google.guava.version>14.0.1</com.google.guava.version>     
   <!-- updated from r09 for cassandra -->
+               <com.google.guava.version>18.0</com.google.guava.version>       
 <!-- updated from r09 for cassandra -->
                <commons.cli.version>1.2</commons.cli.version>
-               <joda.time.version>2.1</joda.time.version>
+               <joda.time.version>2.4</joda.time.version>
                <jsch.version>0.1.29</jsch.version>
                <commons.codec.version>1.9</commons.codec.version>
                <commons.collections.version>3.2.2</commons.collections.version>
-               <commons.lang.version>2.6</commons.lang.version>
-               <commons.math.version>2.0</commons.math.version>
+               <commons.lang.version>3.1</commons.lang.version>
+               <commons.math.version>3.2</commons.math.version>
                <log4j.version>1.2.17</log4j.version>
                <slf4j.version>1.7.25</slf4j.version>                <!-- 
updated from 1.6.4 for cassandra -->
                <xmlbeans.version>2.5.0</xmlbeans.version>
@@ -166,15 +166,15 @@
                <servlet-api.version>2.5</servlet-api.version>
 
         <!-- These are all cassandra client -->
-        <cassandra.driver.version>2.1.8</cassandra.driver.version>
-        <netty.version>4.0.27.Final</netty.version>
+        <cassandra.driver.version>3.6.0</cassandra.driver.version>
+        <netty.version>4.0.44.Final</netty.version>
         <hdr.version>2.1.4</hdr.version>
         <metrics.version>3.0.2</metrics.version>
-        <snappy.version>1.0.5</snappy.version>
+        <snappy.version>1.1.1.7</snappy.version>
         <lz4.version>1.3.0</lz4.version>
         <hdr.version>2.1.4</hdr.version>
         <!-- end of cassandra client -->
-        <cassandra.server.version>2.1.11</cassandra.server.version>
+        <cassandra.server.version>3.11.3</cassandra.server.version>
         
<apache.httpcomponents.httpclient.version>4.3.5</apache.httpcomponents.httpclient.version>
                <http.commons.client.version>4.5.3</http.commons.client.version>
                
<http.commons.client-cache.version>4.3.5</http.commons.client-cache.version>
@@ -377,8 +377,8 @@ ${uimaDUCCNoticeText}
 
 
                        <dependency>
-                               <groupId>commons-lang</groupId>
-                               <artifactId>commons-lang</artifactId>
+                               <groupId>org.apache.commons</groupId>
+                               <artifactId>commons-lang3</artifactId>
                                <version>${commons.lang.version}</version>
                        </dependency>
 

Modified: uima/uima-ducc/trunk/uima-ducc-web/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/pom.xml?rev=1850754&r1=1850753&r2=1850754&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/pom.xml (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/pom.xml Tue Jan  8 14:33:12 2019
@@ -226,7 +226,11 @@
                        <groupId>org.apache.uima</groupId>
                        <artifactId>uima-ducc-orchestrator</artifactId>
                </dependency>
-
+        <dependency>
+           <groupId>com.google.code.gson</groupId>
+           <artifactId>gson</artifactId>
+   
+        </dependency>
                <dependency>
                        <groupId>org.apache.uima</groupId>
                        <artifactId>uima-ducc-cli</artifactId>


Reply via email to