You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2016/04/30 19:38:56 UTC

svn commit: r1741782 - in /manifoldcf/branches/CONNECTORS-1308: build.xml framework/build.xml framework/buildfiles/connector-build.xml

Author: kwright
Date: Sat Apr 30 17:38:56 2016
New Revision: 1741782

URL: http://svn.apache.org/viewvc?rev=1741782&view=rev
Log:
Get it to build

Modified:
    manifoldcf/branches/CONNECTORS-1308/build.xml
    manifoldcf/branches/CONNECTORS-1308/framework/build.xml
    manifoldcf/branches/CONNECTORS-1308/framework/buildfiles/connector-build.xml

Modified: manifoldcf/branches/CONNECTORS-1308/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1308/build.xml?rev=1741782&r1=1741781&r2=1741782&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1308/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1308/build.xml Sat Apr 30 17:38:56 2016
@@ -147,7 +147,6 @@
     <property name="opennlp.version" value="1.6.0"/>
     <property name="sis.version" value="0.6"/>
     <property name="opengis.version" value="3.0.0"/>
-    <property name="javaee-api.version" value="6.0"/>
     <property name="commons-vfs2.version" value="2.0"/>
     <property name="c3p0.version" value="0.9.5.1"/>
     <property name="cxf.version" value="3.1.6"/>
@@ -2000,12 +1999,6 @@ Use Apache Forrest version forrest-0.9-d
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
-            <param name="project-path" value="javax"/>
-            <param name="artifact-version" value="${javaee-api.version}"/>
-            <param name="artifact-name" value="javaee-api"/>
-            <param name="artifact-type" value="jar"/>
-        </antcall>
-        <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="org/opengis"/>
             <param name="artifact-version" value="${opengis.version}"/>
             <param name="artifact-name" value="geoapi"/>

Modified: manifoldcf/branches/CONNECTORS-1308/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1308/framework/build.xml?rev=1741782&r1=1741781&r2=1741782&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1308/framework/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1308/framework/build.xml Sat Apr 30 17:38:56 2016
@@ -85,7 +85,6 @@
             <include name="jackson-databind*.jar"/>
             <include name="jackson-annotations*.jar"/>
             <include name="tika-parsers*.jar"/>
-            <include name="javaee-api*.jar"/>
             <include name="geoapi*.jar"/>
             <include name="sis-metadata*.jar"/>
             <include name="sis-utility*.jar"/>
@@ -1391,7 +1390,6 @@
                 <include name="jackson-databind*.jar"/>
                 <include name="jackson-annotations*.jar"/>
                 <include name="tika-parsers*.jar"/>
-                <include name="javaee-api*.jar"/>
                 <include name="geoapi*.jar"/>
                 <include name="sis-metadata*.jar"/>
                 <include name="sis-utility*.jar"/>

Modified: manifoldcf/branches/CONNECTORS-1308/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1308/framework/buildfiles/connector-build.xml?rev=1741782&r1=1741781&r2=1741782&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1308/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1308/framework/buildfiles/connector-build.xml Sat Apr 30 17:38:56 2016
@@ -149,7 +149,6 @@
             <include name="jackson-databind*.jar"/>
             <include name="jackson-annotations*.jar"/>
             <include name="tika-parsers*.jar"/>
-            <include name="javaee-api*.jar"/>
             <include name="geoapi*.jar"/>
             <include name="sis-metadata*.jar"/>
             <include name="sis-utility*.jar"/>