manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1783961 - in /manifoldcf/trunk: build.xml connectors/amazoncloudsearch/pom.xml connectors/tika/pom.xml pom.xml
Date Wed, 22 Feb 2017 01:20:01 GMT
Author: kwright
Date: Wed Feb 22 01:20:01 2017
New Revision: 1783961

URL: http://svn.apache.org/viewvc?rev=1783961&view=rev
Log:
Update poms etc so that we depend on more modern versions of jackson.

Modified:
    manifoldcf/trunk/build.xml
    manifoldcf/trunk/connectors/amazoncloudsearch/pom.xml
    manifoldcf/trunk/connectors/tika/pom.xml
    manifoldcf/trunk/pom.xml

Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1783961&r1=1783960&r2=1783961&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Wed Feb 22 01:20:01 2017
@@ -99,7 +99,7 @@
     <property name="gson.version" value="2.6.2"/>
     <property name="guava.version" value="18.0"/>
     <property name="mockito.version" value="1.9.5"/>
-    <property name="wiremock.version" value="1.34"/>
+    <property name="wiremock.version" value="2.5.1"/>
     <property name="objenesis.version" value="2.1"/>
     <property name="tika.version" value="1.13"/>
     <property name="tagsoup.version" value="1.2.1"/>
@@ -135,8 +135,8 @@
     <property name="jmatio.version" value="1.0"/>
     <property name="java-libpst.version" value="0.8.1"/>
     <property name="commons-httpclient.version" value="3.1"/>
-    <property name="jackson-databind.version" value="2.1.3"/>
-    <property name="jackson-annotations.version" value="2.1.2"/>
+    <property name="jackson-databind.version" value="2.6.1"/>
+    <property name="jackson-annotations.version" value="2.6.1"/>
     <property name="resteasy.client.version" value="3.0.16.Final"/>
     <property name="jsoup.version" value="1.8.1"/>
     <property name="hadoop.version" value="2.6.0"/>

Modified: manifoldcf/trunk/connectors/amazoncloudsearch/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/amazoncloudsearch/pom.xml?rev=1783961&r1=1783960&r2=1783961&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/amazoncloudsearch/pom.xml (original)
+++ manifoldcf/trunk/connectors/amazoncloudsearch/pom.xml Wed Feb 22 01:20:01 2017
@@ -213,17 +213,17 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.1.3</version>
+      <version>2.6.1</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.3.2</version>
+      <version>2.6.1</version>
     </dependency>
     <dependency>
-	  <groupId>com.fasterxml.jackson.core</groupId>
-	  <artifactId>jackson-annotations</artifactId>
-	  <version>2.3.0</version>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <version>2.6.1</version>
     </dependency>
     
     <!-- Testing dependencies -->

Modified: manifoldcf/trunk/connectors/tika/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/tika/pom.xml?rev=1783961&r1=1783960&r2=1783961&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/tika/pom.xml (original)
+++ manifoldcf/trunk/connectors/tika/pom.xml Wed Feb 22 01:20:01 2017
@@ -203,7 +203,8 @@
       <artifactId>httpclient</artifactId>
       <version>${httpcomponent.httpclient.version}</version>
     </dependency>
-    <dependency>
+    <!--Removed, because these are not needed and mess up the dependency tree.
+     dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
       <version>2.1.3</version>
@@ -217,7 +218,7 @@
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-annotations</artifactId>
         <version>2.3.0</version>
-    </dependency>
+    </dependency -->
     <dependency>
         <groupId>org.apache.tika</groupId>
         <artifactId>tika-core</artifactId>

Modified: manifoldcf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/pom.xml?rev=1783961&r1=1783960&r2=1783961&view=diff
==============================================================================
--- manifoldcf/trunk/pom.xml (original)
+++ manifoldcf/trunk/pom.xml Wed Feb 22 01:20:01 2017
@@ -43,7 +43,7 @@
     <!-- dependency versions -->
     <junit.version>4.12</junit.version>
     <mockito.version>1.9.5</mockito.version>
-    <wiremock.version>1.34</wiremock.version>
+    <wiremock.version>2.5.1</wiremock.version>
     <postgresql.version>9.1-901.jdbc4</postgresql.version>
     <mysql.version>5.1.33</mysql.version>
     <hsqldb.version>2.3.2</hsqldb.version>



Mime
View raw message