Author: kwright
Date: Sat Mar 18 14:16:14 2017
New Revision: 1787558
URL: http://svn.apache.org/viewvc?rev=1787558&view=rev
Log:
Move guava, gson, jna, commons-exec to standard dependencies
Modified:
manifoldcf/branches/CONNECTORS-1196-2/connectors/alfresco-webscript/build.xml
manifoldcf/branches/CONNECTORS-1196-2/connectors/confluence/build.xml
manifoldcf/branches/CONNECTORS-1196-2/connectors/hdfs/build.xml
manifoldcf/branches/CONNECTORS-1196-2/connectors/searchblox/build.xml
manifoldcf/branches/CONNECTORS-1196-2/framework/build.xml
manifoldcf/branches/CONNECTORS-1196-2/framework/buildfiles/connector-build.xml
Modified:
manifoldcf/branches/CONNECTORS-1196-2/connectors/alfresco-webscript/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/connectors/alfresco-webscript/build.xml?rev=1787558&r1=1787557&r2=1787558&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196-2/connectors/alfresco-webscript/build.xml
(original)
+++
manifoldcf/branches/CONNECTORS-1196-2/connectors/alfresco-webscript/build.xml
Sat Mar 18 14:16:14 2017
@@ -36,8 +36,6 @@
<path refid="mcf-connector-build.connector-classpath"/>
<fileset dir="../../lib">
<include name="alfresco-indexer-client*.jar"/>
- <include name="gson*.jar"/>
- <include name="guava*.jar"/>
</fileset>
</path>
@@ -62,8 +60,6 @@
<copy todir="dist/lib">
<fileset dir="../../lib">
<include name="alfresco-indexer-client*.jar"/>
- <include name="gson*.jar"/>
- <include name="guava*.jar"/>
</fileset>
</copy>
</target>
Modified: manifoldcf/branches/CONNECTORS-1196-2/connectors/confluence/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/connectors/confluence/build.xml?rev=1787558&r1=1787557&r2=1787558&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/connectors/confluence/build.xml
(original)
+++ manifoldcf/branches/CONNECTORS-1196-2/connectors/confluence/build.xml Sat
Mar 18 14:16:14 2017
@@ -33,21 +33,11 @@
<path id="connector-classpath">
<path refid="mcf-connector-build.connector-classpath" />
<fileset dir="../../lib">
- <include name="guava-*.jar" />
<include name="httpcore*.jar" />
<include name="httpclient*.jar" />
</fileset>
</path>
- <target name="lib" depends="mcf-connector-build.lib,precompile-check"
if="canBuild">
- <mkdir dir="dist/lib" />
- <copy todir="dist/lib">
- <fileset dir="../../lib">
- <include name="guava-*.jar" />
- </fileset>
- </copy>
- </target>
-
<target name="deliver-connector"
depends="mcf-connector-build.deliver-connector">
<antcall target="general-add-repository-connector">
<param name="connector-label" value="Confluence" />
Modified: manifoldcf/branches/CONNECTORS-1196-2/connectors/hdfs/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/connectors/hdfs/build.xml?rev=1787558&r1=1787557&r2=1787558&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/connectors/hdfs/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/connectors/hdfs/build.xml Sat Mar 18
14:16:14 2017
@@ -39,7 +39,6 @@
<include name="hadoop-annotations*.jar"/>
<include name="hadoop-auth*.jar"/>
<include name="hadoop-hdfs*.jar"/>
- <include name="guava*.jar"/>
<include name="htrace-core*.jar"/>
<include name="protobuf-java*.jar"/>
</fileset>
@@ -55,7 +54,6 @@
<include name="hadoop-annotations*.jar"/>
<include name="hadoop-auth*.jar"/>
<include name="hadoop-hdfs*.jar"/>
- <include name="guava*.jar"/>
<include name="htrace-core*.jar"/>
<include name="protobuf-java*.jar"/>
</fileset>
Modified: manifoldcf/branches/CONNECTORS-1196-2/connectors/searchblox/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/connectors/searchblox/build.xml?rev=1787558&r1=1787557&r2=1787558&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/connectors/searchblox/build.xml
(original)
+++ manifoldcf/branches/CONNECTORS-1196-2/connectors/searchblox/build.xml Sat
Mar 18 14:16:14 2017
@@ -34,7 +34,6 @@
<fileset dir="../../lib">
<include name="jsoup*.jar" />
<include name="resteasy-*.jar" />
- <include name="guava-*.jar" />
</fileset>
</path>
@@ -44,7 +43,6 @@
<fileset dir="../../lib">
<include name="jsoup*.jar" />
<include name="resteasy-*.jar" />
- <include name="guava-*.jar" />
</fileset>
</copy>
</target>
Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/build.xml?rev=1787558&r1=1787557&r2=1787558&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/build.xml Sat Mar 18
14:16:14 2017
@@ -57,6 +57,10 @@
<include name="xml-apis*.jar"/>
<include name="velocity*.jar"/>
<include name="mail*.jar"/>
+ <include name="commons-exec*.jar"/>
+ <include name="gson*.jar"/>
+ <include name="guava*.jar"/>
+ <include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -64,6 +68,8 @@
</fileset>
<fileset dir="../lib">
<include name="junit*.jar"/>
+ <include name="selenium*.jar"/>
+ <include name="cglib-nodep*.jar"/>
<include name="hamcrest-core*.jar"/>
<include name="mockito-core*.jar"/>
<include name="wiremock*.jar"/>
@@ -99,11 +105,9 @@
<include name="plexus-utils*.jar"/>
<include name="regexp*.jar"/>
<include name="commons-csv*.jar"/>
- <include name="commons-exec*.jar"/>
<include name="netcdf4*.jar"/>
<include name="httpservices*.jar"/>
<include name="grib*.jar"/>
- <include name="jna*.jar"/>
<include name="cdm*.jar"/>
<include name="udunits*.jar"/>
<include name="jcommander*.jar"/>
@@ -456,6 +460,10 @@
<include name="xml-apis*.jar"/>
<include name="slf4j*.jar"/>
<include name="mail*.jar"/>
+ <include name="commons-exec*.jar"/>
+ <include name="gson*.jar"/>
+ <include name="guava*.jar"/>
+ <include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -495,6 +503,10 @@
<include name="xml-apis*.jar"/>
<include name="slf4j*.jar"/>
<include name="mail*.jar"/>
+ <include name="commons-exec*.jar"/>
+ <include name="gson*.jar"/>
+ <include name="guava*.jar"/>
+ <include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -540,6 +552,10 @@
<include name="xml-apis*.jar"/>
<include name="slf4j*.jar"/>
<include name="mail*.jar"/>
+ <include name="commons-exec*.jar"/>
+ <include name="gson*.jar"/>
+ <include name="guava*.jar"/>
+ <include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -580,6 +596,10 @@
<include name="xml-apis*.jar"/>
<include name="slf4j*.jar"/>
<include name="mail*.jar"/>
+ <include name="commons-exec*.jar"/>
+ <include name="gson*.jar"/>
+ <include name="guava*.jar"/>
+ <include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -628,6 +648,10 @@
<include name="velocity*.jar"/>
<include name="slf4j*.jar"/>
<include name="mail*.jar"/>
+ <include name="commons-exec*.jar"/>
+ <include name="gson*.jar"/>
+ <include name="guava*.jar"/>
+ <include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -676,6 +700,10 @@
<include name="velocity*.jar"/>
<include name="slf4j*.jar"/>
<include name="mail*.jar"/>
+ <include name="commons-exec*.jar"/>
+ <include name="gson*.jar"/>
+ <include name="guava*.jar"/>
+ <include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -732,6 +760,10 @@
<include name="velocity*.jar"/>
<include name="slf4j*.jar"/>
<include name="mail*.jar"/>
+ <include name="commons-exec*.jar"/>
+ <include name="gson*.jar"/>
+ <include name="guava*.jar"/>
+ <include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -782,6 +814,10 @@
<include name="velocity*.jar"/>
<include name="slf4j*.jar"/>
<include name="mail*.jar"/>
+ <include name="commons-exec*.jar"/>
+ <include name="gson*.jar"/>
+ <include name="guava*.jar"/>
+ <include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -902,6 +938,10 @@
<include name="velocity*.jar"/>
<include name="slf4j*.jar"/>
<include name="mail*.jar"/>
+ <include name="commons-exec*.jar"/>
+ <include name="gson*.jar"/>
+ <include name="guava*.jar"/>
+ <include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="jetty*.jar"/>
@@ -1146,6 +1186,10 @@
<include name="httpcore*.jar"/>
<include name="httpclient*.jar"/>
<include name="mail*.jar"/>
+ <include name="commons-exec*.jar"/>
+ <include name="gson*.jar"/>
+ <include name="guava*.jar"/>
+ <include name="jna*.jar"/>
<include name="zookeeper*.jar"/>
</fileset>
</path>
@@ -1411,11 +1455,9 @@
<include name="plexus-utils*.jar"/>
<include name="regexp*.jar"/>
<include name="commons-csv*.jar"/>
- <include name="commons-exec*.jar"/>
<include name="netcdf4*.jar"/>
<include name="httpservices*.jar"/>
<include name="grib*.jar"/>
- <include name="jna*.jar"/>
<include name="jj2000*.jar"/>
<include name="cdm*.jar"/>
<include name="udunits*.jar"/>
@@ -1817,6 +1859,8 @@
<copy todir="dist/test-lib">
<fileset dir="../lib">
<include name="junit*.jar"/>
+ <include name="selenium*.jar"/>
+ <include name="cglib-nodep*.jar"/>
<include name="hamcrest-core*.jar"/>
<include name="mockito-core*.jar"/>
<include name="wiremock*.jar"/>
Modified:
manifoldcf/branches/CONNECTORS-1196-2/framework/buildfiles/connector-build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/buildfiles/connector-build.xml?rev=1787558&r1=1787557&r2=1787558&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196-2/framework/buildfiles/connector-build.xml
(original)
+++
manifoldcf/branches/CONNECTORS-1196-2/framework/buildfiles/connector-build.xml
Sat Mar 18 14:16:14 2017
@@ -116,6 +116,10 @@
</fileset>
<fileset dir="${mcf-dist}/lib">
<include name="mail*.jar"/>
+ <include name="commons-exec*.jar"/>
+ <include name="guava*.jar"/>
+ <include name="gson*.jar"/>
+ <include name="jna*.jar"/>
<include name="json*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
@@ -133,6 +137,8 @@
<include name="jsp-2.1*.jar"/>
<include name="jsp-api*.jar"/>
<include name="junit*.jar"/>
+ <include name="selenium*.jar"/>
+ <include name="cglib-nodep*.jar"/>
<include name="hamcrest-core*.jar"/>
<include name="log4j*.jar"/>
<include name="serializer*.jar"/>
