From 8f66b10323ffb14bc5d622502d7dd12b8b6f3934 Mon Sep 17 00:00:00 2001
From: "Huda J. Khan" <hjk54@cornell.edu>
Date: Wed, 7 Feb 2018 15:35:05 -0500
Subject: [PATCH] integrating related term info in skos utils

---
 .../mannlib/semservices/util/SKOSUtils.java   |  21 ++-
 dependencies/pom.xml                          | 164 ++++++++++++------
 2 files changed, 129 insertions(+), 56 deletions(-)

diff --git a/api/src/main/java/edu/cornell/mannlib/semservices/util/SKOSUtils.java b/api/src/main/java/edu/cornell/mannlib/semservices/util/SKOSUtils.java
index 5b8955a87..fb29b3f0b 100644
--- a/api/src/main/java/edu/cornell/mannlib/semservices/util/SKOSUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/semservices/util/SKOSUtils.java
@@ -1,4 +1,4 @@
-/* $This file is distributed under the terms of the license in LICENSE$ */
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
 /* We are no longer using the SKOS API since Vitro has moved to V 4.0 of OWL API which does not appear to be compatible.
  This file will contain methods used for reading SKOS as XML and parsing it for the properties
@@ -160,13 +160,19 @@ public class SKOSUtils {
 			// conceptURI);
 			concept.setCloseMatchURIList(closeMatchURIList);
 
+		 
 			// Notes may exist, in which case they should be employed
 			if (addNotes) {
-				List<String> notes = getNotesFromModel(conceptURI, model,
-						langTagValue);
+				List<String> notes = getNotesFromModel(conceptURI, model, langTagValue);
 				if (notes.size() > 0) {
 					concept.setDefinition(notes.get(0));
 				}
+			} else { // get definitions from skos:definition
+
+				List<String> definitions = getDefinitionFromModel(conceptURI, model, langTagValue);
+				if (definitions.size() > 0) {
+					concept.setDefinition(definitions.get(0));
+				}
 			}
 
 		} catch (Exception e) {
@@ -219,12 +225,17 @@ public class SKOSUtils {
 		String propertyURI = "http://www.w3.org/2004/02/skos/core#note";
 		return getLabelsFromModel(conceptURI, propertyURI, model, langTagValue);
 	}
+	
+	private static List<String> getDefinitionFromModel(String conceptURI,
+			Model model, String langTagValue) {
+		String propertyURI = "http://www.w3.org/2004/02/skos/core#definition";
+		return getLabelsFromModel(conceptURI, propertyURI, model, langTagValue);
+	}
 
 	private static List<String> getCloseMatchURIsFromModel(String conceptURI,
 			Model model) {
 		String propertyURI = "http://www.w3.org/2004/02/skos/core#closeMatch";
-		return getRelatedURIsFromModel(conceptURI, propertyURI, model);
-
+		return getRelatedURIsFromModel(conceptURI, propertyURI, model); 
 	}
 
 	private static List<String> getExactMatchURIsFromModel(String conceptURI,
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 77bc41c76..eb18519c1 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -7,37 +7,37 @@
 
     <groupId>org.vivoweb</groupId>
     <artifactId>vitro-dependencies</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>1.10.0-beta2</version>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>org.vivoweb</groupId>
         <artifactId>vitro-project</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>1.10.0-beta2</version>
         <relativePath>..</relativePath>
     </parent>
 
     <name>Vitro Dependencies</name>
 
     <dependencies>
-        <!-- Added for runtime, or just EasyMock -->
-        <!-- dependency>
+        <dependency>
+            <!-- Added for runtime -->
             <groupId>asm</groupId>
             <artifactId>asm</artifactId>
             <version>3.1</version>
-        </dependency -->
-        <!-- Added for runtime, was 1.6 - was used by Pellet, still needed? -->
-        <!-- dependency>
+        </dependency>
+        <dependency>
+            <!-- Added for runtime, was 1.6 -->
             <groupId>com.github.ansell.aterms</groupId>
             <artifactId>aterm-java</artifactId>
             <version>1.8.2</version>
-        </dependency -->
-        <!-- Added for runtime, used by Jackson databind, was used by EasyMock -->
-        <!-- dependency>
+        </dependency>
+        <dependency>
+            <!-- Added for runtime -->
             <groupId>cglib</groupId>
             <artifactId>cglib</artifactId>
             <version>2.2</version>
-        </dependency -->
+        </dependency>
             <!-- Added for runtime -->
         <!-- dependency>
             <groupId>com.servlets</groupId>
@@ -68,32 +68,37 @@
         <dependency>
             <groupId>com.ibm.icu</groupId>
             <artifactId>icu4j</artifactId>
-            <version>59.1</version>
+            <version>3.4.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.mchange</groupId>
+            <artifactId>c3p0</artifactId>
+            <version>0.9.5.2</version>
         </dependency>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-jpeg</artifactId>
-            <version>3.3.2</version>
+            <version>3.3.1</version>
         </dependency>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-tiff</artifactId>
-            <version>3.3.2</version>
+            <version>3.3.1</version>
         </dependency>
         <dependency>
             <groupId>com.twelvemonkeys.servlet</groupId>
             <artifactId>servlet</artifactId>
-            <version>3.3.2</version>
+            <version>3.3.1</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-dbcp2</artifactId>
-            <version>2.1.1</version>
+            <groupId>commons-dbcp</groupId>
+            <artifactId>commons-dbcp</artifactId>
+            <version>1.4</version>
         </dependency>
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
-            <version>1.3.3</version>
+            <version>1.3.2</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
@@ -106,15 +111,30 @@
             <artifactId>commons-lang3</artifactId>
             <version>3.4</version>
         </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.2.2</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-            <version>4.1</version>
+            <artifactId>commons-csv</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>1.4</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>6.0.6</version>
+            <version>5.1.42</version>
         </dependency>
         <dependency>
             <groupId>net.sf.jga</groupId>
@@ -130,7 +150,7 @@
         <dependency>
             <groupId>net.sf.saxon</groupId>
             <artifactId>Saxon-HE</artifactId>
-            <version>9.8.0-4</version>
+            <version>9.6.0-7</version>
         </dependency>
         <dependency>
             <groupId>net.sourceforge.owlapi</groupId>
@@ -144,17 +164,16 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <!-- OWLAPI should match the version used by JFact -->
         <!-- Include all OWALPI JARs that are in the OSGi bundle -->
         <dependency>
             <groupId>net.sourceforge.owlapi</groupId>
             <artifactId>owlapi-api</artifactId>
-            <version>5.1.1</version>
+            <version>5.0.4</version>
         </dependency>
         <dependency>
             <groupId>net.sourceforge.owlapi</groupId>
             <artifactId>owlapi-apibinding</artifactId>
-            <version>5.1.1</version>
+            <version>5.0.4</version>
             <!-- Exclude rio binding as we don't use Sesame -->
             <exclusions>
                 <exclusion>
@@ -163,51 +182,67 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.semarglproject</groupId>
+            <artifactId>semargl-core</artifactId>
+            <version>0.6.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.semarglproject</groupId>
+            <artifactId>semargl-rdfa</artifactId>
+            <version>0.6.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jsonld-java</groupId>
+            <artifactId>jsonld-java</artifactId>
+            <version>0.8.3</version>
+        </dependency>
+        <!-- Force updated Jackson core used by dependencies, otherwise we get an incompatible version -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.7.4</version>
+        </dependency>
+        <!-- Needed for ORCID? -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>fluent-hc</artifactId>
+            <version>4.5.2</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.3</version>
+            <version>4.5.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpmime</artifactId>
-            <version>4.5.3</version>
+            <version>4.5.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jena</groupId>
             <artifactId>jena-arq</artifactId>
-            <version>3.4.0</version>
-            <exclusions>
-                <!-- Exclude OSGi bundles from jsonld-java -->
-                <exclusion>
-                    <groupId>org.apache.httpcomponents</groupId>
-                    <artifactId>httpclient-osgi</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.httpcomponents</groupId>
-                    <artifactId>httpcore-osgi</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>3.3.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jena</groupId>
             <artifactId>jena-core</artifactId>
-            <version>3.4.0</version>
+            <version>3.3.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jena</groupId>
             <artifactId>jena-sdb</artifactId>
-            <version>3.4.0</version>
+            <version>3.3.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jena</groupId>
             <artifactId>jena-tdb</artifactId>
-            <version>3.4.0</version>
+            <version>3.3.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.solr</groupId>
             <artifactId>solr-solrj</artifactId>
-            <version>4.10.4</version>
+            <version>4.7.2</version>
         </dependency>
         <dependency>
             <groupId>org.directwebremoting</groupId>
@@ -219,15 +254,30 @@
             <artifactId>freemarker</artifactId>
             <version>2.3.23</version>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>javax.json</artifactId>
+            <version>1.0.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>jtidy</artifactId>
+            <version>r8-20060801</version>
+        </dependency>
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
-            <version>1.10.3</version>
+            <version>1.10.1</version>
         </dependency>
         <dependency>
             <groupId>org.owasp.antisamy</groupId>
             <artifactId>antisamy</artifactId>
-            <version>1.5.6</version>
+            <version>1.5.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.5</version>
         </dependency>
 
         <!-- Used for JSP runtime -->
@@ -239,18 +289,30 @@
         <dependency>
             <groupId>org.apache.taglibs</groupId>
             <artifactId>taglibs-standard-spec</artifactId>
-            <version>1.2.5</version>
+            <version>1.2.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.taglibs</groupId>
             <artifactId>taglibs-standard-impl</artifactId>
-            <version>1.2.5</version>
+            <version>1.2.1</version>
         </dependency>
 
+        <!-- dependency>
+            <groupId>javax.json</groupId>
+            <artifactId>javax.json-api</artifactId>
+            <version>1.0</version>
+        </dependency -->
         <dependency>
-            <groupId>com.sun.mail</groupId>
-            <artifactId>javax.mail</artifactId>
-            <version>1.6.0</version>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <!-- Data Distribution API -->
+        <dependency>
+          <groupId>edu.cornell.library.scholars</groupId>
+          <artifactId>DataDistributionAPI_VIVO_1.10.0</artifactId>
+          <version>1.0</version>
+          <type>jar</type>
         </dependency>
     </dependencies>
 </project>