Commit graph

72 commits

Author SHA1 Message Date
Ralph O'Flinn
777fa43864 [maven-scm-plugin] prepare development vitro-1.11.2-SNAPSHOT 2020-03-07 10:31:59 -06:00
Ralph O'Flinn
850cc6adbf [maven-scm-plugin] prepare release vivo-1.11.1 2020-03-07 10:29:22 -06:00
Ralph O'Flinn
b1b620d927 [maven-scm-plugin] prepare development vitro-1.11.1-SNAPSHOT 2019-10-21 00:49:31 -05:00
Ralph O'Flinn
0f25660b42 [maven-scm-plugin] prepare release vitro-1.11.0 2019-10-21 00:45:50 -05:00
Ralph O'Flinn
d8649a60ad Merge branch 'sprint-search' into dev-search
# Conflicts:
#	home/src/main/resources/solr/README.txt
#	home/src/main/resources/solr/conf/admin-extra.html
#	home/src/main/resources/solr/conf/clustering/carrot2/kmeans-attributes.xml
#	home/src/main/resources/solr/conf/clustering/carrot2/lingo-attributes.xml
#	home/src/main/resources/solr/conf/clustering/carrot2/stc-attributes.xml
#	home/src/main/resources/solr/conf/currency.xml
#	home/src/main/resources/solr/conf/elevate.xml
#	home/src/main/resources/solr/conf/lang/contractions_it.txt
#	home/src/main/resources/solr/conf/lang/stoptags_ja.txt
#	home/src/main/resources/solr/conf/lang/stopwords_ar.txt
#	home/src/main/resources/solr/conf/lang/stopwords_ca.txt
#	home/src/main/resources/solr/conf/lang/stopwords_el.txt
#	home/src/main/resources/solr/conf/lang/stopwords_fi.txt
#	home/src/main/resources/solr/conf/lang/stopwords_hi.txt
#	home/src/main/resources/solr/conf/lang/stopwords_hu.txt
#	home/src/main/resources/solr/conf/lang/stopwords_lv.txt
#	home/src/main/resources/solr/conf/lang/stopwords_ro.txt
#	home/src/main/resources/solr/conf/mapping-FoldToASCII.txt
#	home/src/main/resources/solr/conf/schema-old.xml
#	home/src/main/resources/solr/conf/schema.xml
#	home/src/main/resources/solr/conf/solrconfig-old.xml
#	home/src/main/resources/solr/conf/solrconfig.xml
#	home/src/main/resources/solr/conf/stopwords-name.txt
#	home/src/main/resources/solr/conf/velocity/VM_global_library.vm
#	home/src/main/resources/solr/conf/velocity/jquery.autocomplete.css
#	home/src/main/resources/solr/conf/velocity/jquery.autocomplete.js
#	home/src/main/resources/solr/conf/velocity/main.css
#	home/src/main/resources/solr/conf/velocity/query_group.vm
#	home/src/main/resources/solr/conf/velocity/query_spatial.vm
#	home/src/main/resources/solr/conf/velocity/richtext_doc.vm
#	home/src/main/resources/solr/conf/xslt/example.xsl
#	home/src/main/resources/solr/conf/xslt/example_atom.xsl
#	home/src/main/resources/solr/conf/xslt/example_rss.xsl
#	home/src/main/resources/solr/conf/xslt/luke.xsl
#	home/src/main/resources/solr/conf/xslt/updateXml.xsl
#	home/src/main/resources/solr/solr.xml
#	home/src/main/resources/solr/solr_newversion.xml
2019-06-21 12:04:45 -05:00
Graham Triggs
47ae42c019 Upgrade Jena to 3.11.0 (#119)
Resolves: https://jira.duraspace.org/browse/VIVO-1693
2019-05-07 15:54:31 -04:00
Andrew Woods
da16a4156d [VIVO-1592] Upgrade Solr library to 7.4.0 (#82)
* Upgrade Solr library to 7.4.0

Related to: https://jira.duraspace.org/browse/VIVO-1589

* Fix SolrSmokeTest : home page connection

Related to: https://jira.duraspace.org/browse/VIVO-1589
2018-10-17 22:14:05 -04:00
vivo-uab
f2656ba3d8 [maven-scm-plugin] prepare development vitro-1.11.0-SNAPSHOT 2018-07-09 17:17:08 -04:00
vivo-uab
2c3c97be5e [maven-scm-plugin] prepare release vitro-1.10.0 2018-07-09 17:17:08 -04:00
Jim Blake
b406f99fec VIVO-1478 mysql driver throws exception (#69)
* VIVO-1478 Add time zone to the MySQL URL, to avoid an InvalidConnectionAttributeOption. 
* Go with proven driver version, rather than the most recent.
2018-05-04 08:44:43 -06:00
Ben
efe8f265dc Upgrade to Jena 3.6.0 (#67)
Resolves: https://jira.duraspace.org/browse/VIVO-1458
2018-05-03 10:26:06 -04:00
Andrew Woods
80625e3b4c Change project version from 2.0.0-SNAPSHOT to 1.10.0-SNAPSHOT
Resolves: https://jira.duraspace.org/browse/VIVO-1479
2018-04-24 17:09:02 -04:00
Huda J. Khan
b8fd17ba1e Revert "integrating related term info in skos utils"
This reverts commit 8f66b10323.
2018-02-07 18:39:58 -05:00
Huda J. Khan
8f66b10323 integrating related term info in skos utils 2018-02-07 15:35:05 -05:00
Graham Triggs
e0b723354d Update project version numbers 2017-10-20 15:02:14 +01:00
Graham Triggs
38f79971d6 Move OSGi jar exclusions to the Jena parent dependency for better Maven compatibility 2017-10-04 21:20:22 +01:00
Graham Triggs
58ad89b839 Minor httpclient version 2017-09-29 08:59:22 +01:00
Graham Triggs
fd2c46f24c Move dependencies to VIVO 2017-09-29 08:43:09 +01:00
Graham Triggs
93884142b4 Minor dependency updates 2017-09-28 22:14:07 +01:00
Graham Triggs
cf702ea08c Remove semargl dependencies that were only used to get one OWL definition, which is available in owlapi 2017-09-28 16:18:08 +01:00
Graham Triggs
8e067aa6f0 Disabling "runtime" dependencies, which appear to be unused - subject to full acceptance testing
cglib and asm were used by EasyMock. Referenced in Jackson databind, but doesn't appear used there.
aterm was being used by Pellet, but that was removed a while ago
2017-09-20 14:35:21 +01:00
Graham Triggs
4543e65d08 Replace c3p0 with dbcp2, so there is only one pooling library in use 2017-09-20 14:08:36 +01:00
Graham Triggs
007c65a0ae Correct mail dependency 2017-09-19 19:39:08 +01:00
Graham Triggs
4ba2f6ed3a MySQL latest driver 2017-09-18 16:56:43 +01:00
Graham Triggs
8b26e66d3b Update mail api 2017-09-18 16:39:05 +01:00
Graham Triggs
85bcf4b67c Updated dependencies 2017-09-18 16:19:49 +01:00
Graham Triggs
5320a4f665 Updated dependencies 2017-09-18 15:58:09 +01:00
Graham Triggs
ec1feee076 Updated dependencies 2017-09-18 15:08:42 +01:00
Graham Triggs
3615ed1658 Exclude OSGi dependencies 2017-09-18 14:55:29 +01:00
Graham Triggs
e224736323 Dependency updates 2017-09-18 09:49:20 +01:00
Graham Triggs
321540ba5d Dependency updates 2017-09-18 09:16:32 +01:00
Graham Triggs
bf450aca21 [VIVO-1320] Convert some org.json usages to Jackson 2017-09-15 21:04:46 +01:00
Graham Triggs
06a9360b43 [VIVO-1320] Replace json.org code with Jackson binding 2017-09-15 12:48:02 +01:00
Graham Triggs
5e6185353d [VIVO-1317] Remove Glassfish JSON library 2017-09-15 09:33:14 +01:00
Graham Triggs
62c2a0614a Upgrade to latest Jena 3.4.0 2017-08-30 19:51:21 +01:00
Graham Triggs
0bfd909348 Update versions for beta 2 release 2017-07-27 17:40:04 +01:00
Graham Triggs
4d381ee058 Update to latest MySQL 5.1 connector 2017-07-13 14:02:11 +01:00
Graham Triggs
7a76405ef3 Reset develop to SNAPSHOT release 2017-06-12 21:54:33 +01:00
Graham Triggs
2fe4d3b3a0 Beta version 2017-06-09 15:57:28 +01:00
Graham Triggs
c39680b04a Upgrade Jena from 3.1.1 to 3.3.0 2017-05-23 15:44:11 +01:00
Jim Blake
3829f48b0b VIVO-1319 Remove dependency on sourceforge.net JSON parser. (#60)
* VIVO-1246 improve the ConfigurationBeanLoader:

Add cardinality parameters minOccurs and maxOccurs
Create README.md document in the edu.cornell.mannlib.vitro.webapp.utils.configuration package
Split large class of unit tests into separate classes by functionality

* VIVO-1247, remove duplicate code used with ConfigurationBeanLoader.

Now that the @Property annotation includes cardinality parameters, we can remove a lot of duplicate code.

* VIVO-1246 Move unit tests to the new location.

* VIVO-1246 The documentation was in the wrong place.

* Ignore all /bin/ directories under eclipse

* First set of unit tests, along with enhancements to the stubs.

* Clean up the unit tests with more expressive power.

* VIVO-1319 Full tests on the controller output formats.

* Create a Jackson-based quote(), to replace the net.sf.json-based quote()

* Eliminate the use of net.sf.json.util.JSONUtils

* Use Jackson JSON library instead of net.sf.json

JSONNode, JSONArray, JSONObject become JsonNode, ArrayNode, and ObjectNode.
No direct replacement for HSONSerializer, so create JacksonUtils

Some of the message signatures are different, so adjust accordingly.
2017-05-22 19:42:10 +01:00
Graham Triggs
ac8f02d006 Update commons collections 2017-03-29 22:16:05 +01:00
Graham Triggs
ed2b570d37 [VIVO-1313] Swap javax JSON interface to Glassfish parser 2017-02-01 14:46:19 +00:00
Graham Triggs
96b06fc9a5 Add fluent dependency 2017-01-31 21:38:53 +00:00
Graham Triggs
91d061f7f2 Add explicit dependency on commons-collections, as it is used directly in Vitro code 2016-12-24 13:48:11 +00:00
Graham Triggs
4c952d01c6 Doesn’t look like we need cxd or cos anymore, so commented out. 2016-12-24 12:49:03 +00:00
Graham Triggs
890d908a6a Allow owlapi to use transitive dependencies 2016-12-24 12:12:43 +00:00
Graham Triggs
88d4cec9cf Move jaxrpc to VIVO 2016-12-24 12:06:48 +00:00
grahamtriggs
68a462b05a [VIVO-1312] Implement Linked Data Fragment Server (#53)
* [VIVO-1312] Linked Data Fragments initial implementation

* [VIVO-1312] Use known ontologies in the prefixes config

* [VIVO-1312] Simplify SPARQL as when restricted to specific values, they don’t need ordering

* [VIVO-1312] Freemarker fixes

* [VIVO-1312] Remove blank nodes

* [VIVO-1312] Add access control header and standard prefixes for TPF

* [VIVO-1312] Render literals in form so that they will work on resubmit

* [VIVO-1312] Minor template update

* [VIVO-1312] Minor template update
2016-12-23 21:55:08 +00:00
Graham Triggs
e9cb3de52e Exclude rio dependencies so that Sesame isn’t included 2016-12-21 18:51:34 +00:00