manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1702216 - in /manifoldcf/branches/CONNECTORS-1236: build.xml dist-license/LICENSE.txt framework/build.xml lib-license/LICENSE.txt
Date Thu, 10 Sep 2015 10:58:05 GMT
Author: kwright
Date: Thu Sep 10 10:58:04 2015
New Revision: 1702216

URL: http://svn.apache.org/r1702216
Log:
Another update

Modified:
    manifoldcf/branches/CONNECTORS-1236/build.xml
    manifoldcf/branches/CONNECTORS-1236/dist-license/LICENSE.txt
    manifoldcf/branches/CONNECTORS-1236/framework/build.xml
    manifoldcf/branches/CONNECTORS-1236/lib-license/LICENSE.txt

Modified: manifoldcf/branches/CONNECTORS-1236/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1236/build.xml?rev=1702216&r1=1702215&r2=1702216&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1236/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1236/build.xml Thu Sep 10 10:58:04 2015
@@ -148,6 +148,7 @@
     <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"/>
     
     <target name="downloaded-condition">
         <!-- Spot check a few of the dependent jars; no point including ALL of them here...
-->
@@ -1919,6 +1920,12 @@ 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="c3p0"/>
+            <param name="artifact-version" value="${c3p0.version}"/>
+            <param name="artifact-name" value="c3p0"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="com/beust"/>
             <param name="artifact-version" value="${jcommander.version}"/>
             <param name="artifact-name" value="jcommander"/>

Modified: manifoldcf/branches/CONNECTORS-1236/dist-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1236/dist-license/LICENSE.txt?rev=1702216&r1=1702215&r2=1702216&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1236/dist-license/LICENSE.txt (original)
+++ manifoldcf/branches/CONNECTORS-1236/dist-license/LICENSE.txt Thu Sep 10 10:58:04 2015
@@ -404,6 +404,28 @@ License: Junrar license (https://raw.git
 This product includes a netcdf4.jar, httpservices.jar, grib.jar, cdm.jar, and udunits.jar.
 License: UCAR license (http://www.unidata.ucar.edu/software/netcdf/copyright.html)
 
+This product includes a jcommander.jar.
+License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a jcip-annotations.jar.
+License: Apache 2 (https://github.com/stephenc/jcip-annotations/blob/master/LICENSE.txt)
+
+This product includes a ehcache-core.jar.
+License: Apache 2 (src/assemble/EHCACHE-CORE-LICENSE.txt)
+
+This product includes a bzip2.jar.
+License: MIT license (http://opensource.org/licenses/mit-license.php)
+
+This product includes a jdom2.jar.
+License: Apache 2 without acknowledgment clause (https://raw.github.com/hunterhacker/jdom/master/LICENSE.txt)
+
+This product includes a quartz.jar.
+License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a c3p0.jar.
+License: Dual license consisting of LGPL v2.1 and EPL v1.0 ((http://www.gnu.org/licenses/lgpl-2.1.html
and http://www.eclipse.org/org/documents/epl-v10.php)
+Jar included under terms of EPL v1.0 license.
+
 This product includes a jetty-server.jar, jetty-servlet.jar, jetty-io.jar, jetty-jndi.jar,
jetty-webapp.jar,
 jetty-plus.jar, jetty-util.jar, jetty-http.jar, jetty-security.jar, jetty-continuation.jar,
jetty-xml.jar,
 jetty-jsp-jdt.jar, and jetty-schemas.jar.
@@ -675,8 +697,10 @@ resulting litigation.
 
 
 ==========================================================================
-The following license applies to eclipse-ecj.jar, and
-h2.jar:
+The following license applies to:
+eclipse-ecj.jar
+h2.jar
+c3p0.jar
 --------------------------------------------------------------------------
 
 Eclipse Public License - v 1.0
@@ -2028,3 +2052,4 @@ The name and trademarks of copyright hol
 publicity pertaining to the software without specific, written prior permission.
 Title to copyright in this software and any associated documentation will at all
 times remain with copyright holders.
+

Modified: manifoldcf/branches/CONNECTORS-1236/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1236/framework/build.xml?rev=1702216&r1=1702215&r2=1702216&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1236/framework/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1236/framework/build.xml Thu Sep 10 10:58:04 2015
@@ -107,6 +107,7 @@
             <include name="bzip2*.jar"/>
             <include name="jdom2*.jar"/>
             <include name="quartz*.jar"/>
+            <include name="c3p0*.jar"/>
             <include name="tagsoup*.jar"/>
             <include name="poi*.jar"/>
             <include name="vorbis-java*.jar"/>
@@ -1396,6 +1397,7 @@
                 <include name="bzip2*.jar"/>
                 <include name="jdom2*.jar"/>
                 <include name="quartz*.jar"/>
+                <include name="c3p0*.jar"/>
                 <include name="tagsoup*.jar"/>
                 <include name="poi*.jar"/>
                 <include name="vorbis-java*.jar"/>

Modified: manifoldcf/branches/CONNECTORS-1236/lib-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1236/lib-license/LICENSE.txt?rev=1702216&r1=1702215&r2=1702216&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1236/lib-license/LICENSE.txt (original)
+++ manifoldcf/branches/CONNECTORS-1236/lib-license/LICENSE.txt Thu Sep 10 10:58:04 2015
@@ -419,6 +419,28 @@ License: Junrar license (https://raw.git
 This product includes a netcdf4.jar, httpservices.jar, grib.jar, cdm.jar, and udunits.jar.
 License: UCAR license (http://www.unidata.ucar.edu/software/netcdf/copyright.html)
 
+This product includes a jcommander.jar.
+License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a jcip-annotations.jar.
+License: Apache 2 (https://github.com/stephenc/jcip-annotations/blob/master/LICENSE.txt)
+
+This product includes a ehcache-core.jar.
+License: Apache 2 (src/assemble/EHCACHE-CORE-LICENSE.txt)
+
+This product includes a bzip2.jar.
+License: MIT license (http://opensource.org/licenses/mit-license.php)
+
+This product includes a jdom2.jar.
+License: Apache 2 without acknowledgment clause (https://raw.github.com/hunterhacker/jdom/master/LICENSE.txt)
+
+This product includes a quartz.jar.
+License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a c3p0.jar.
+License: Dual license consisting of LGPL v2.1 and EPL v1.0 (http://www.gnu.org/licenses/lgpl-2.1.html
and http://www.eclipse.org/org/documents/epl-v10.php)
+Jar included under terms of EPL v1.0 license.
+
 This product may include pdf files that embed IPA-licensed fonts.
 License: IPA Font License Agreement v1.0 (http://ossipedia.ipa.go.jp/ipafont/index.html#LicenseEng)
 
@@ -684,8 +706,10 @@ resulting litigation.
 
 
 ==========================================================================
-The following license applies to eclipse-ecj.jar, and
-h2.jar:
+The following license applies to:
+eclipse-ecj.jar
+h2.jar
+c3p0.jar
 --------------------------------------------------------------------------
 
 Eclipse Public License - v 1.0



Mime
View raw message