Skip to content
Permalink
Browse files

Updated a number of dependency versions

  • Loading branch information
Ian Emmons
Ian Emmons committed Apr 30, 2019
1 parent 95204ff commit 93aaa8828652ee50dfbabe13cce70f0f43f31e1a
@@ -1,30 +1,30 @@
Application/Product,Developer/Company,Source (US/Foreign),org,name,rev,Dist. With,Top-Level?,Web Site,License,License URL
Ant-Contrib,Matt Inger and Curt Arnold,US,ant-contrib,ant-contrib,1.0b3,Dependencies,Y,http://ant-contrib.sourceforge.net,Apache license 1.1,http://ant-contrib.sourceforge.net/tasks/LICENSE.txt
Apache Commons Daemon,Apache Commons Project,Foreign?,commons-daemon,commons-daemon,1.1.0,Binaries,Y,http://commons.apache.org/proper/commons-daemon/,Apache license 2.0,http://www.apache.org/licenses/
Apache Commons DBCP,Apache Commons Project,Foreign?,commons-dbcp,commons-dbcp,1.3,Binaries,Y,http://commons.apache.org/proper/commons-dbcp/,Apache license 2.0,http://www.apache.org/licenses/
Apache Commons DBCP,Apache Commons Project,Foreign?,commons-dbcp,commons-dbcp,1.4,Binaries,Y,http://commons.apache.org/proper/commons-dbcp/,Apache license 2.0,http://www.apache.org/licenses/
Apache Commons FileUpload,Apache Commons Project,Foreign?,commons-fileupload,commons-fileupload,1.3.3,Binaries,Y,http://commons.apache.org/proper/commons-fileupload/,Apache license 2.0,http://www.apache.org/licenses/
Berkeley DB,Oracle,US,,,5.3.28,"Dependencies, Binaries",Y,http://www.oracle.com/,Berkeley DB License (BSD-like),
"Berkeley DB, Java",Oracle,US,com.sleepycat,je,5.0.73,Binaries,Y,http://www.oracle.com/,Sleepycat License,http://download.oracle.com/maven/com/sleepycat/je/license.txt
"Berkeley DB, Java Edition",Oracle,US,com.sleepycat,je,18.3.12,Binaries,Y,http://www.oracle.com/,Apache license 2.0,https://docs.oracle.com/cd/E17277_02/html/LICENSE.txt
Boost Libraries,Boost Community,"Mixed, US Chair",,,1.69.0,Binaries,Y,https://www.boost.org/,Boost software license,http://www.boost.org/users/license.html
GeoTools EPSG Extensions,GeoTools Project,Foreign (Italy),org.geotools,gt-epsg-extension,2.7.2,Binaries,Y,http://www.geotools.org/,LGPL,http://www.gnu.org/copyleft/lesser.html
GeoTools EPSG HSQL Authority,GeoTools Project,Foreign (Italy),org.geotools,gt-epsg-hsql,2.7.2,Binaries,Y,http://www.geotools.org/,LGPL,http://www.gnu.org/copyleft/lesser.html
GeoTools EPSG WKT Authority,GeoTools Project,Foreign (Italy),org.geotools,gt-epsg-wkt,2.7.2,Binaries,Y,http://www.geotools.org/,LGPL,http://www.gnu.org/copyleft/lesser.html
GeoTools GML3 XML Support,GeoTools Project,Foreign (Italy),org.geotools.xsd,gt-xsd-gml3,2.7.2,Binaries,Y,http://www.geotools.org/,LGPL,http://www.gnu.org/copyleft/lesser.html
GeoTools KML XML Support,GeoTools Project,Foreign (Italy),org.geotools.xsd,gt-xsd-kml,2.7.2,Binaries,Y,http://www.geotools.org/,LGPL,http://www.gnu.org/copyleft/lesser.html
httpclient,Apache HttpComponents Project,Mixed,org.apache.httpcomponents,httpclient,4.3.6,Binaries,Y,http://hc.apache.org/,Apache license 2.0,http://www.apache.org/licenses/
httpclient,Apache HttpComponents Project,Mixed,org.apache.httpcomponents,httpclient,4.5.2,Binaries,Y,http://hc.apache.org/,Apache license 2.0,http://www.apache.org/licenses/
Jena ARQ,Andy Seabourne,Foreign (Britain),org.apache.jena,jena-arq,2.9.4,Binaries,Y,http://jena.apache.org/,Apache license 2.0,http://www.apache.org/licenses/
Jetty (apache-jsp),Eclipse Foundation,Mixed,org.eclipse.jetty,apache-jsp,9.3.6.v20151106,Binaries,Y,http://www.eclipse.org/jetty,Apache license 2.0 or Eclipse Public License 1.0,"http://www.apache.org/licenses/, http://www.eclipse.org/legal/epl-v10.html"
Jetty (apache-jstl),Eclipse Foundation,Mixed,org.eclipse.jetty,apache-jstl,9.3.6.v20151106,Binaries,Y,http://www.eclipse.org/jetty,Apache license 2.0 or Eclipse Public License 1.0,"http://www.apache.org/licenses/, http://www.eclipse.org/legal/epl-v10.html"
Jetty (jetty-annotations),Eclipse Foundation,Mixed,org.eclipse.jetty,jetty-annotations,9.3.6.v20151106,Binaries,Y,http://www.eclipse.org/jetty,Apache license 2.0 or Eclipse Public License 1.0,"http://www.apache.org/licenses/, http://www.eclipse.org/legal/epl-v10.html"
Jetty (jetty-deploy),Eclipse Foundation,Mixed,org.eclipse.jetty,jetty-deploy,9.3.6.v20151106,Binaries,Y,http://www.eclipse.org/jetty,Apache license 2.0 or Eclipse Public License 1.0,"http://www.apache.org/licenses/, http://www.eclipse.org/legal/epl-v10.html"
Jetty (jetty-jmx),Eclipse Foundation,Mixed,org.eclipse.jetty,jetty-jmx,9.3.6.v20151106,Binaries,Y,http://www.eclipse.org/jetty,Apache license 2.0 or Eclipse Public License 1.0,"http://www.apache.org/licenses/, http://www.eclipse.org/legal/epl-v10.html"
Jetty (jetty-security),Eclipse Foundation,Mixed,org.eclipse.jetty,jetty-security,9.3.6.v20151106,Binaries,Y,http://www.eclipse.org/jetty,Apache license 2.0 or Eclipse Public License 1.0,"http://www.apache.org/licenses/, http://www.eclipse.org/legal/epl-v10.html"
Jetty (jetty-server),Eclipse Foundation,Mixed,org.eclipse.jetty,jetty-server,9.3.6.v20151106,Binaries,Y,http://www.eclipse.org/jetty,Apache license 2.0 or Eclipse Public License 1.0,"http://www.apache.org/licenses/, http://www.eclipse.org/legal/epl-v10.html"
Jetty (jetty-servlet),Eclipse Foundation,Mixed,org.eclipse.jetty,jetty-servlet,9.3.6.v20151106,Binaries,Y,http://www.eclipse.org/jetty,Apache license 2.0 or Eclipse Public License 1.0,"http://www.apache.org/licenses/, http://www.eclipse.org/legal/epl-v10.html"
Jetty (jetty-util),Eclipse Foundation,Mixed,org.eclipse.jetty,jetty-util,9.3.6.v20151106,Binaries,Y,http://www.eclipse.org/jetty,Apache license 2.0 or Eclipse Public License 1.0,"http://www.apache.org/licenses/, http://www.eclipse.org/legal/epl-v10.html"
Jetty (jetty-webapp),Eclipse Foundation,Mixed,org.eclipse.jetty,jetty-webapp,9.3.6.v20151106,Binaries,Y,http://www.eclipse.org/jetty,Apache license 2.0 or Eclipse Public License 1.0,"http://www.apache.org/licenses/, http://www.eclipse.org/legal/epl-v10.html"
Jetty (apache-jsp),Eclipse Foundation,Mixed,org.eclipse.jetty,apache-jsp,9.4.12.v20180830,Binaries,Y,http://www.eclipse.org/jetty,Apache license 2.0 or Eclipse Public License 1.0,"http://www.apache.org/licenses/, http://www.eclipse.org/legal/epl-v10.html"
Jetty (apache-jstl),Eclipse Foundation,Mixed,org.eclipse.jetty,apache-jstl,9.4.12.v20180830,Binaries,Y,http://www.eclipse.org/jetty,Apache license 2.0 or Eclipse Public License 1.0,"http://www.apache.org/licenses/, http://www.eclipse.org/legal/epl-v10.html"
Jetty (jetty-annotations),Eclipse Foundation,Mixed,org.eclipse.jetty,jetty-annotations,9.4.12.v20180830,Binaries,Y,http://www.eclipse.org/jetty,Apache license 2.0 or Eclipse Public License 1.0,"http://www.apache.org/licenses/, http://www.eclipse.org/legal/epl-v10.html"
Jetty (jetty-deploy),Eclipse Foundation,Mixed,org.eclipse.jetty,jetty-deploy,9.4.12.v20180830,Binaries,Y,http://www.eclipse.org/jetty,Apache license 2.0 or Eclipse Public License 1.0,"http://www.apache.org/licenses/, http://www.eclipse.org/legal/epl-v10.html"
Jetty (jetty-jmx),Eclipse Foundation,Mixed,org.eclipse.jetty,jetty-jmx,9.4.12.v20180830,Binaries,Y,http://www.eclipse.org/jetty,Apache license 2.0 or Eclipse Public License 1.0,"http://www.apache.org/licenses/, http://www.eclipse.org/legal/epl-v10.html"
Jetty (jetty-security),Eclipse Foundation,Mixed,org.eclipse.jetty,jetty-security,9.4.12.v20180830,Binaries,Y,http://www.eclipse.org/jetty,Apache license 2.0 or Eclipse Public License 1.0,"http://www.apache.org/licenses/, http://www.eclipse.org/legal/epl-v10.html"
Jetty (jetty-server),Eclipse Foundation,Mixed,org.eclipse.jetty,jetty-server,9.4.12.v20180830,Binaries,Y,http://www.eclipse.org/jetty,Apache license 2.0 or Eclipse Public License 1.0,"http://www.apache.org/licenses/, http://www.eclipse.org/legal/epl-v10.html"
Jetty (jetty-servlet),Eclipse Foundation,Mixed,org.eclipse.jetty,jetty-servlet,9.4.12.v20180830,Binaries,Y,http://www.eclipse.org/jetty,Apache license 2.0 or Eclipse Public License 1.0,"http://www.apache.org/licenses/, http://www.eclipse.org/legal/epl-v10.html"
Jetty (jetty-util),Eclipse Foundation,Mixed,org.eclipse.jetty,jetty-util,9.4.12.v20180830,Binaries,Y,http://www.eclipse.org/jetty,Apache license 2.0 or Eclipse Public License 1.0,"http://www.apache.org/licenses/, http://www.eclipse.org/legal/epl-v10.html"
Jetty (jetty-webapp),Eclipse Foundation,Mixed,org.eclipse.jetty,jetty-webapp,9.4.12.v20180830,Binaries,Y,http://www.eclipse.org/jetty,Apache license 2.0 or Eclipse Public License 1.0,"http://www.apache.org/licenses/, http://www.eclipse.org/legal/epl-v10.html"
Joseki,Andy Seabourne,Foreign (Britain),,,3.4.4,"Dependencies, Binaries",Y,,BSD,
jsonld-java,Peter Ansell,Foreign (Australia),com.github.jsonld-java,jsonld-java,0.5.1,Binaries,Y,https://github.com/jsonld-java/jsonld-java,BSD,https://github.com/jsonld-java/jsonld-java/blob/master/LICENCE
jsonld-java,Peter Ansell,Foreign (Australia),com.github.jsonld-java,jsonld-java,0.8.3,Binaries,Y,https://github.com/jsonld-java/jsonld-java,BSD,https://github.com/jsonld-java/jsonld-java/blob/master/LICENCE
JUnit 4,JUnit Project,Mixed,junit,junit,4.12,,Y,https://junit.org/junit4/,EPL 1.0,https://junit.org/junit4/license.html
JUnit 5,JUnit Lambda Project,Foreign,org.junit.jupiter,junit-jupiter-api,5.1.0,,Y,https://junit.org/junit5/,EPL 2.0,https://github.com/junit-team/junit5/blob/master/LICENSE.md
JUnit 5,JUnit Lambda Project,Foreign,org.junit.jupiter,junit-jupiter-params,5.1.0,,Y,https://junit.org/junit5/,EPL 2.0,https://github.com/junit-team/junit5/blob/master/LICENSE.md
@@ -35,5 +35,5 @@ Lucene,Apache Lucene Project,Mixed,org.apache.lucene,lucene-core,2.2.0,,Y,http:/
PostgreSQL JDBC Driver,Planet PostgreSQL,Mixed,org.postgresql,postgresql,9.4.1208,Binaries,Y,https://www.postgresql.org/,BSD- and MIT-like,https://opensource.org/licenses/postgresql
Servlet API,Oracle,US,javax.servlet,javax.servlet-api,3.1.0,Binaries,Y,https://glassfish.dev.java.net/,CDDL + GPLv2 with classpath exception,https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html
Sesame,Eclipse Foundation,Foreign,org.openrdf,sesame,1.2.7,,Y,http://rdf4j.org/,LGPL,http://www.gnu.org/copyleft/lesser.html
SLF4J (jcl-over-slf4j),"SLF4J Project, Quality Open Software",Foreign (Swiss),org.slf4j,jcl-over-slf4j,1.7.7,Binaries,Y,https://www.slf4j.org/,MIT,https://www.slf4j.org/license.html
SLF4J (slf4j-log4j12),"SLF4J Project, Quality Open Software",Foreign (Swiss),org.slf4j,slf4j-log4j12,1.7.7,Binaries,Y,https://www.slf4j.org/,MIT,https://www.slf4j.org/license.html
SLF4J (jcl-over-slf4j),"SLF4J Project, Quality Open Software",Foreign (Swiss),org.slf4j,jcl-over-slf4j,1.7.21,Binaries,Y,https://www.slf4j.org/,MIT,https://www.slf4j.org/license.html
SLF4J (slf4j-log4j12),"SLF4J Project, Quality Open Software",Foreign (Swiss),org.slf4j,slf4j-log4j12,1.7.21,Binaries,Y,https://www.slf4j.org/,MIT,https://www.slf4j.org/license.html
@@ -176,11 +176,13 @@
<target name="buildNativeForOneParamSet">
<exec executable="b2" dir="${basedir}/KbCore" failonerror="true">
<arg value="-q"/>
<arg value="-j3"/>
<arg line="${buildParams}"/>
</exec>
<delete dir="${targetDir}/drop-box" quiet="true"/>
<exec executable="b2" dir="${basedir}/AdminClient" failonerror="true">
<arg value="-q"/>
<arg value="-j3"/>
<arg line="${buildParams}"/>
<env key="ADMIN_CLIENT_INSTALL_DIR" value="${targetDir}/${deployableSvrDir}/bin"/>
</exec>
@@ -197,6 +199,7 @@
<else>
<exec executable="b2" dir="${basedir}/Test" failonerror="true">
<arg value="-q"/>
<arg value="-j3"/>
<arg line="${buildParams}"/>
</exec>
</else>
@@ -19,9 +19,9 @@
<dependencies>
<dependency org="org.apache.jena" name="jena-arq" rev="2.9.4"
conf="default->default"/>
<dependency org="org.slf4j" name="jcl-over-slf4j" rev="1.7.7"
<dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j.version}"
conf="default->default"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.7"
<dependency org="org.slf4j" name="jcl-over-slf4j" rev="${slf4j.version}"
conf="default->default"/>

<dependency org="commons-daemon" name="commons-daemon" rev="1.1.0" conf="native->default">
@@ -97,8 +97,8 @@
<ant dir="${basedir}/jena/JenaGraph" target="runTests" inheritAll="false"/>
<ant dir="${basedir}/jena/JosekiExtensions" target="runTests" inheritAll="false"/>
<ant dir="${basedir}/jena/NumericIndex" target="runTests" inheritAll="false"/>
<!-- ant dir="${basedir}/jena/SpatialIndexProcessor" target="runTests" inheritAll="false"/ -->
<ant dir="${basedir}/jena/TemporalIndexProcessor" target="runTests" inheritAll="false"/>
<ant dir="${basedir}/jena/SpatialIndexProcessor" target="runTests" inheritAll="false"/>
<!--
<ant dir="${basedir}/Sesame/CSameAsSail" target="runTests" inheritAll="false"/>
<ant dir="${basedir}/Sesame/ParliamentSail" target="runTests" inheritAll="false"/>
@@ -41,13 +41,13 @@
<dependencies>
<dependency org="org.apache.jena" name="jena-arq" rev="2.9.4"
conf="compile-ide->master;runtime-ide->default;test->default"/>
<dependency org="com.github.jsonld-java" name="jsonld-java" rev="0.5.1"
<dependency org="com.github.jsonld-java" name="jsonld-java" rev="${jsonld-java.version}"
conf="compile-ide->master;runtime-ide->default;test->default"/>
<dependency name="junit" org="junit" rev="4.12"
conf="test->default"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.7"
<dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j.version}"
conf="compile-ide->master;runtime-ide->default"/>
<dependency org="org.slf4j" name="jcl-over-slf4j" rev="1.7.7"
<dependency org="org.slf4j" name="jcl-over-slf4j" rev="${slf4j.version}"
conf="compile-ide->master;runtime-ide->default"/>
<dependency name="Parliament" org="com.bbn.parliament" rev="latest.integration"
conf="compile->master;runtime->default"/>
@@ -41,9 +41,9 @@
<dependencies>
<dependency org="org.apache.jena" name="jena-arq" rev="2.9.4"
conf="compile-ide->master;runtime-ide->default"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.7"
<dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j.version}"
conf="compile-ide->master;runtime-ide->default"/>
<dependency org="org.slf4j" name="jcl-over-slf4j" rev="1.7.7"
<dependency org="org.slf4j" name="jcl-over-slf4j" rev="${slf4j.version}"
conf="compile-ide->master;runtime-ide->default"/>
<dependency org="org.apache.httpcomponents" name="httpclient" rev="4.3.6"
conf="compile-ide->master;runtime-ide->default"/>
@@ -41,9 +41,9 @@
<dependencies>
<dependency org="org.apache.jena" name="jena-arq" rev="2.9.4"
conf="compile-ide->master;runtime-ide->default;test->default"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.7"
<dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j.version}"
conf="compile-ide->master;runtime-ide->default"/>
<dependency org="org.slf4j" name="jcl-over-slf4j" rev="1.7.7"
<dependency org="org.slf4j" name="jcl-over-slf4j" rev="${slf4j.version}"
conf="compile-ide->master;runtime-ide->default"/>
<dependency name="junit" org="junit" rev="4.12"
conf="test->default"/>
@@ -3,9 +3,16 @@
<ivysettings>
<property name="ivy.ssh.keyfile" value="${ivy.default.ivy.user.dir}/loki.keyfile"/>
<property name="ivy.retrieve.pattern" value="${ivy.lib.dir}/[conf]/[artifact]-[revision].[ext]"/>
<property name="httpclient-cache.version" value="4.3.6"/>
<property name="httpclient.version" value="4.3.6"/>
<property name="httpcore.version" value="4.3.3"/>

<property name="berkeleydb-je.version" value="18.3.12"/>
<property name="commons-dbcp.version" value="1.4"/>
<property name="geotools.version" value="2.7.2"/>
<property name="httpclient-cache.version" value="4.5.2"/>
<property name="httpclient.version" value="4.5.2"/>
<property name="httpcore.version" value="4.4.4"/>
<property name="jetty.version" value="9.4.12.v20180830"/>
<property name="jsonld-java.version" value="0.8.3"/>
<property name="slf4j.version" value="1.7.21"/>

<!-- If no resolver is specified, use the default chain -->
<settings defaultResolver="default"/>
@@ -17,11 +17,11 @@
<dependencies>
<dependency org="org.apache.jena" name="jena-arq" rev="2.9.4"
conf="default->default"/>
<dependency org="com.github.jsonld-java" name="jsonld-java" rev="0.5.1"
<dependency org="com.github.jsonld-java" name="jsonld-java" rev="${jsonld-java.version}"
conf="default->default"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.7"
<dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j.version}"
conf="default->default"/>
<dependency org="org.slf4j" name="jcl-over-slf4j" rev="1.7.7"
<dependency org="org.slf4j" name="jcl-over-slf4j" rev="${slf4j.version}"
conf="default->default"/>

<!-- dependency org="junit" name="junit" rev="4.12" conf="test->default"/ -->
@@ -52,7 +52,7 @@ public Object setProperty(String propName, Object propValue) {
@Override
public void read(Model model, String url) {
try {
Object jsonObj = JsonUtils.fromURL(new URL(url));
Object jsonObj = JsonUtils.fromURL(new URL(url), JsonUtils.getDefaultHttpClient());
insertJsonIntoModel(model, url, jsonObj);
} catch (IOException | JsonLdError ex) {
error(ex);

0 comments on commit 93aaa88

Please sign in to comment.
You can’t perform that action at this time.