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 2015/09/10 11:55:17 UTC
svn commit: r1702202 - in /manifoldcf/branches/CONNECTORS-1236: build.xml
dist-license/LICENSE.txt framework/build.xml lib-license/LICENSE.txt pom.xml
Author: kwright
Date: Thu Sep 10 09:55:16 2015
New Revision: 1702202
URL: http://svn.apache.org/r1702202
Log:
Fix the problems Abe-san identified
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
manifoldcf/branches/CONNECTORS-1236/pom.xml
Modified: manifoldcf/branches/CONNECTORS-1236/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1236/build.xml?rev=1702202&r1=1702201&r2=1702202&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1236/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1236/build.xml Thu Sep 10 09:55:16 2015
@@ -68,7 +68,7 @@
<property name="jaxws.version" value="2.2.6"/>
<property name="chemistry.version" value="0.11.0"/>
<property name="glassfish.version" value="2.1.v20091210"/>
- <property name="junit.version" value="4.12"/>
+ <property name="junit.version" value="4.8.2"/>
<property name="log4j.version" value="1.2.16"/>
<property name="mail.version" value="1.4.5"/>
<property name="mimepull.version" value="1.3"/>
@@ -1858,7 +1858,7 @@ Use Apache Forrest version forrest-0.9-d
<antcall target="download-via-maven">
<param name="target" value="lib"/>
<param name="project-path" value="com/google/protobuf"/>
- <param name="artifact-version" value="2.5.0"/>
+ <param name="artifact-version" value="${protobuf.version}"/>
<param name="artifact-name" value="protobuf-java"/>
<param name="artifact-type" value="jar"/>
</antcall>
@@ -1925,12 +1925,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="com/google/protobuf"/>
- <param name="artifact-version" value="${protobuf.version}"/>
- <param name="artifact-name" value="protobuf-java"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="target" value="lib"/>
<param name="project-path" value="net/jcip"/>
<param name="artifact-name" value="jcip-annotations"/>
<param name="artifact-version" value="${jcip-annotations.version}"/>
Modified: manifoldcf/branches/CONNECTORS-1236/dist-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1236/dist-license/LICENSE.txt?rev=1702202&r1=1702201&r2=1702202&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1236/dist-license/LICENSE.txt (original)
+++ manifoldcf/branches/CONNECTORS-1236/dist-license/LICENSE.txt Thu Sep 10 09:55:16 2015
@@ -401,7 +401,7 @@ License: Open Geospatial license (https:
This product includes a junrar.jar.
License: Junrar license (https://raw.github.com/junrar/junrar/master/license.txt)
-This product includes a netcdf4.jar, httpservices.jar, grib.jar, and cdm.jar.
+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 jetty-server.jar, jetty-servlet.jar, jetty-io.jar, jetty-jndi.jar, jetty-webapp.jar,
@@ -1932,6 +1932,7 @@ The following license applies to:
netcdf4.jar
grib.jar
cdm.jar
+udunits.jar
httpservices.jar
--------------------------------------------------------------------------
Copyright 1993-2015 University Corporation for Atmospheric Research/Unidata
Modified: manifoldcf/branches/CONNECTORS-1236/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1236/framework/build.xml?rev=1702202&r1=1702201&r2=1702202&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1236/framework/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1236/framework/build.xml Thu Sep 10 09:55:16 2015
@@ -102,7 +102,6 @@
<include name="cdm*.jar"/>
<include name="udunits*.jar"/>
<include name="jcommander*.jar"/>
- <include name="protobuf-java*.jar"/>
<include name="jcip-annotations*.jar"/>
<include name="ehcache-core*.jar"/>
<include name="bzip2*.jar"/>
@@ -1392,7 +1391,6 @@
<include name="cdm*.jar"/>
<include name="udunits*.jar"/>
<include name="jcommander*.jar"/>
- <include name="protobuf-java*.jar"/>
<include name="jcip-annotations*.jar"/>
<include name="ehcache-core*.jar"/>
<include name="bzip2*.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=1702202&r1=1702201&r2=1702202&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1236/lib-license/LICENSE.txt (original)
+++ manifoldcf/branches/CONNECTORS-1236/lib-license/LICENSE.txt Thu Sep 10 09:55:16 2015
@@ -416,7 +416,7 @@ License: Open Geospatial license (https:
This product includes a junrar.jar.
License: Junrar license (https://raw.github.com/junrar/junrar/master/license.txt)
-This product includes a netcdf4.jar, httpservices.jar, grib.jar, and cdm.jar.
+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 may include pdf files that embed IPA-licensed fonts.
@@ -1941,6 +1941,7 @@ The following license applies to:
netcdf4.jar
grib.jar
cdm.jar
+udunits.jar
httpservices.jar
--------------------------------------------------------------------------
Copyright 1993-2015 University Corporation for Atmospheric Research/Unidata
Modified: manifoldcf/branches/CONNECTORS-1236/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1236/pom.xml?rev=1702202&r1=1702201&r2=1702202&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1236/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1236/pom.xml Thu Sep 10 09:55:16 2015
@@ -41,7 +41,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- dependency versions -->
- <junit.version>4.12</junit.version>
+ <junit.version>4.8.2</junit.version>
<mockito.version>1.9.5</mockito.version>
<wiremock.version>1.34</wiremock.version>
<postgresql.version>9.1-901.jdbc4</postgresql.version>