bump up version to 2.4.2. moved TermUtilities to ndex-object-model.

ndexbio · Jun 5, 2019 · 1fca8f9 · 1fca8f9
1 parent 1be66b2
commit 1fca8f9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 91 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 	<groupId>org.ndexbio</groupId>
 	<artifactId>ndexbio-rest</artifactId>
 	<packaging>war</packaging>
-	<version>2.4.1</version>
+	<version>2.4.2</version>
 	<name>ndexbio-rest</name>
 	<url>http://maven.apache.org</url>
 	<inceptionYear>2013</inceptionYear>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.ndexbio</groupId>
 			<artifactId>ndex-object-model</artifactId>
-			<version>2.4.1</version>
+			<version>2.4.2</version>
 		</dependency>
 
 		<dependency>
@@ -32,12 +32,6 @@
 			<artifactId>commons-dbcp2</artifactId>
 			<version>2.1.1</version>
 		</dependency>
-
-	<!-- 	<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>2.8.1</version>
-		</dependency> -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
@@ -383,6 +377,7 @@
 		<jettyVersion>9.3.18.v20170406</jettyVersion>
 		<resteasyVersion>3.1.4.Final</resteasyVersion>
 		<log4jVersion>2.8.2</log4jVersion>
-		<jacksonVersion>2.9.4</jacksonVersion>
+		<jacksonVersion>2.9.9</jacksonVersion>
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 </project>
diff --git a/src/main/java/org/ndexbio/common/solr/NetworkGlobalIndexManager.java b/src/main/java/org/ndexbio/common/solr/NetworkGlobalIndexManager.java
@@ -55,7 +55,7 @@
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.common.util.NamedList;
 import org.ndexbio.common.NdexClasses;
-import org.ndexbio.common.util.TermUtilities;
+import org.ndexbio.model.tools.TermUtilities;
 import org.ndexbio.common.util.Util;
 import org.ndexbio.cxio.aspects.datamodels.ATTRIBUTE_DATA_TYPE;
 import org.ndexbio.cxio.aspects.datamodels.NetworkAttributesElement;

diff --git a/src/main/java/org/ndexbio/common/util/TermUtilities.java b/src/main/java/org/ndexbio/common/util/TermUtilities.java
diff --git a/src/main/java/org/ndexbio/rest/Configuration.java b/src/main/java/org/ndexbio/rest/Configuration.java
@@ -304,7 +304,7 @@ public static Configuration createInstance() throws NdexException
      * @return Instance of {@link org.ndexbio.rest.Configuration} object
      * @throws NdexException
      */
-    public static Configuration reCreateInstance(final String configFilePath) throws NdexException{
+    protected static Configuration reCreateInstance(final String configFilePath) throws NdexException{
 
     	try {
     		INSTANCE = new Configuration(configFilePath);

diff --git a/src/main/java/org/ndexbio/rest/filters/NdexDefaultResponseFilter.java b/src/main/java/org/ndexbio/rest/filters/NdexDefaultResponseFilter.java
@@ -95,8 +95,8 @@ public void filter(ContainerRequestContext arg0,
 
 		MultivaluedMap<String, Object> headers = responseContext.getHeaders();
 		headers.putSingle("Access-Control-Allow-Origin", "*");
-	/*	headers.putSingle("Access-Control-Allow-Methods", "HEAD, DELETE,GET,OPTIONS,POST,PUT");
-		headers.putSingle("Access-Control-Allow-Headers", "Accept, Content-Type, Authorization, Content-Length, X-Requested-With");*/
+		headers.putSingle("Access-Control-Allow-Methods", "HEAD, DELETE,GET,OPTIONS,POST,PUT");
+		//headers.putSingle("Access-Control-Allow-Headers", "Accept, Content-Type, Authorization, Content-Length, X-Requested-With, NDEx-application");
 		headers.putSingle("Access-Control-Allow-Credentials", Boolean.TRUE); 
 
 		final ResourceMethodInvoker methodInvoker = (ResourceMethodInvoker)arg0.getProperty("org.jboss.resteasy.core.ResourceMethodInvoker");