manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1835662 - in /manifoldcf/trunk: build.xml framework/build.xml framework/buildfiles/connector-build.xml pom.xml
Date Wed, 11 Jul 2018 18:50:42 GMT
Author: kwright
Date: Wed Jul 11 18:50:41 2018
New Revision: 1835662

URL: http://svn.apache.org/viewvc?rev=1835662&view=rev
Log:
Upgrade to latest version of ui testing software

Modified:
    manifoldcf/trunk/build.xml
    manifoldcf/trunk/framework/build.xml
    manifoldcf/trunk/framework/buildfiles/connector-build.xml
    manifoldcf/trunk/pom.xml

Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1835662&r1=1835661&r2=1835662&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Wed Jul 11 18:50:41 2018
@@ -73,7 +73,7 @@
     <property name="chemistry.version" value="1.1.0"/>
     <property name="glassfish.version" value="2.1.v20091210"/>
     <property name="junit.version" value="4.12"/>
-    <property name="selenium.version" value="3.3.1"/>
+    <property name="selenium.version" value="3.13.0"/>
     <property name="hamcrest.version" value="1.3"/>
     <property name="log4j12.version" value="1.2.17"/>
     <property name="log4j.version" value="2.4.1"/>
@@ -104,7 +104,7 @@
     <property name="jetty-schemas.version" value="3.1.M0"/>
     <property name="alfresco-indexer.version" value="0.8.1"/>
     <property name="gson.version" value="2.8.0"/>
-    <property name="guava.version" value="21.0"/>
+    <property name="guava.version" value="25.1-jre"/>
     <property name="mockito.version" value="1.9.5"/>
     <property name="wiremock.version" value="2.5.1"/>
     <property name="objenesis.version" value="2.1"/>
@@ -880,7 +880,7 @@ Use Apache Forrest version forrest-0.9-d
         <get src="${nuxeo-base-url}/${project-path}/${artifact-name}/${artifact-version}/${artifact-name}-${artifact-version}.${artifact-type}"
dest="${target}/${artifact-name}-${artifact-version}.${artifact-type}"/>
     </target>
 
-    <target name="download-nuxeo-client">
+    <target name="download-nuxeo-client" depends="download-okhttp">
         <mkdir dir="lib"/>
         <antcall target="download-via-nuxeo">
             <param name="project-path" value="org/nuxeo/client"/>
@@ -896,20 +896,6 @@ Use Apache Forrest version forrest-0.9-d
             <param name="artifact-name" value="retrofit"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-maven">
-            <param name="project-path" value="com/squareup/okhttp3"/>
-            <param name="artifact-version" value="3.9.1"/>
-            <param name="target" value="lib"/>
-            <param name="artifact-name" value="okhttp"/>
-            <param name="artifact-type" value="jar"/>
-        </antcall>
-        <antcall target="download-via-maven">
-            <param name="project-path" value="com/squareup/okio"/>
-            <param name="artifact-version" value="1.13.0"/>
-            <param name="target" value="lib"/>
-            <param name="artifact-name" value="okio"/>
-            <param name="artifact-type" value="jar"/>
-        </antcall>
     </target>
     
     <target name="download-resteasy">
@@ -1621,7 +1607,24 @@ Use Apache Forrest version forrest-0.9-d
         </antcall>
     </target>
 
-    <target name="download-selenium" depends="download-gson,download-guava,download-commons-exec">
+    <target name="download-okhttp">
+        <antcall target="download-via-maven">
+            <param name="project-path" value="com/squareup/okhttp3"/>
+            <param name="artifact-version" value="3.10.0"/>
+            <param name="target" value="lib"/>
+            <param name="artifact-name" value="okhttp"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven">
+            <param name="project-path" value="com/squareup/okio"/>
+            <param name="artifact-version" value="1.14.1"/>
+            <param name="target" value="lib"/>
+            <param name="artifact-name" value="okio"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+    </target>
+
+    <target name="download-selenium" depends="download-gson,download-guava,download-commons-exec,download-okhttp">
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="org/seleniumhq/selenium"/>
@@ -1689,6 +1692,12 @@ Use Apache Forrest version forrest-0.9-d
             <param name="artifact-name" value="cglib-nodep"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="net/bytebuddy"/>
+            <param name="artifact-version" value="1.8.3"/>
+            <param name="artifact-name" value="byte-buddy"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
     </target>
 
     <target name="download-mockito">

Modified: manifoldcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1835662&r1=1835661&r2=1835662&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Wed Jul 11 18:50:41 2018
@@ -83,6 +83,9 @@
         <fileset dir="../lib">
             <include name="junit*.jar"/>
             <include name="selenium*.jar"/>
+            <include name="okhttp*.jar"/>
+            <include name="okio*.jar"/>
+            <include name="byte-buddy*.jar"/>
             <include name="cglib-nodep*.jar"/>
             <include name="hamcrest-core*.jar"/>
             <include name="mockito-core*.jar"/>
@@ -1932,6 +1935,9 @@
             <fileset dir="../lib">
                 <include name="junit*.jar"/>
                 <include name="selenium*.jar"/>
+                <include name="okhttp*.jar"/>
+                <include name="okio*.jar"/>
+                <include name="byte-buddy*.jar"/>
                 <include name="cglib-nodep*.jar"/>
                 <include name="hamcrest-core*.jar"/>
                 <include name="mockito-core*.jar"/>

Modified: manifoldcf/trunk/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/buildfiles/connector-build.xml?rev=1835662&r1=1835661&r2=1835662&view=diff
==============================================================================
--- manifoldcf/trunk/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/trunk/framework/buildfiles/connector-build.xml Wed Jul 11 18:50:41 2018
@@ -140,6 +140,9 @@
             <include name="jsp-api*.jar"/>
             <include name="junit*.jar"/>
             <include name="selenium*.jar"/>
+            <include name="okhttp*.jar"/>
+            <include name="okio*.jar"/>
+            <include name="byte-buddy*.jar"/>
             <include name="cglib-nodep*.jar"/>
             <include name="hamcrest-core*.jar"/>
             <include name="log4j*.jar"/>

Modified: manifoldcf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/pom.xml?rev=1835662&r1=1835661&r2=1835662&view=diff
==============================================================================
--- manifoldcf/trunk/pom.xml (original)
+++ manifoldcf/trunk/pom.xml Wed Jul 11 18:50:41 2018
@@ -42,7 +42,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <!-- dependency versions -->
     <junit.version>4.12</junit.version>
-    <selenium.version>3.3.1</selenium.version>
+    <selenium.version>3.13.0</selenium.version>
     <mockito.version>1.9.5</mockito.version>
     <wiremock.version>2.5.1</wiremock.version>
     <postgresql.version>42.1.3</postgresql.version>



Mime
View raw message