[drat] branch master updated: Upgrade to Apache OODT 1.9 release.

[mattmann]

This is an automated email from the ASF dual-hosted git repository.

mattmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drat.git


The following commit(s) were added to refs/heads/master by this push:
     new 5acdbc6  Upgrade to Apache OODT 1.9 release.
5acdbc6 is described below

commit 5acdbc6733dc8b5c0dc4f2c9677ada52c41314e9
Author: Chris Mattmann <chris.a.mattm...@jpl.nasa.gov>
AuthorDate: Sat Oct 5 16:02:05 2019 -0700

    Upgrade to Apache OODT 1.9 release.
---
 .../org/apache/oodt/cas/pge/staging/HashingOrigFileStager.java   | 9 +++++----
 pom.xml                                                          | 2 +-
 .../java/drat/proteus/workflow/rest/WorkflowRestResource.java    | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git 
a/extensions/src/main/java/org/apache/oodt/cas/pge/staging/HashingOrigFileStager.java
 
b/extensions/src/main/java/org/apache/oodt/cas/pge/staging/HashingOrigFileStager.java
index 688c1b1..bf4bad5 100644
--- 
a/extensions/src/main/java/org/apache/oodt/cas/pge/staging/HashingOrigFileStager.java
+++ 
b/extensions/src/main/java/org/apache/oodt/cas/pge/staging/HashingOrigFileStager.java
@@ -20,7 +20,8 @@ package org.apache.oodt.cas.pge.staging;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.oodt.cas.filemgr.structs.exceptions.DataTransferException;
 import org.apache.oodt.cas.pge.metadata.PgeMetadata;
@@ -29,8 +30,8 @@ import com.google.common.io.Files;
 
 public class HashingOrigFileStager extends FileManagerFileStager {
 
-  private static final Logger LOG = Logger
-      .getLogger(HashingOrigFileStager.class.getName());
+    private static final Logger LOG = 
+       LoggerFactory.getLogger(HashingOrigFileStager.class);
 
   /*
    * (non-Javadoc)
@@ -40,7 +41,7 @@ public class HashingOrigFileStager extends 
FileManagerFileStager {
    * URI, java.io.File, org.apache.oodt.cas.pge.metadata.PgeMetadata,
    * java.util.logging.Logger)
    */
-  @Override
+
   public void stageFile(URI stageFile, File destDir, PgeMetadata pgeMetadata,
       Logger logger)
       throws IOException, DataTransferException, InstantiationException {
diff --git a/pom.xml b/pom.xml
index 922e74c..aa051cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <oodt.version>1.2.5</oodt.version>
+    <oodt.version>1.9</oodt.version>
     <junit.version>4.12</junit.version>
   </properties>
 
diff --git 
a/proteus/src/main/java/drat/proteus/workflow/rest/WorkflowRestResource.java 
b/proteus/src/main/java/drat/proteus/workflow/rest/WorkflowRestResource.java
index 21be1bf..18ee093 100644
--- a/proteus/src/main/java/drat/proteus/workflow/rest/WorkflowRestResource.java
+++ b/proteus/src/main/java/drat/proteus/workflow/rest/WorkflowRestResource.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 
 import org.apache.oodt.cas.metadata.Metadata;
 import org.apache.oodt.cas.metadata.util.PathUtils;
-import org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient;
+import org.apache.oodt.cas.workflow.system.WorkflowManagerClient;
 import org.apache.oodt.pcs.util.WorkflowManagerUtils;
 import org.wicketstuff.rest.annotations.MethodMapping;
 import org.wicketstuff.rest.annotations.parameters.RequestBody;
@@ -41,7 +41,7 @@ public class WorkflowRestResource extends 
AbstractRestResource<GsonWebSerialDese
     
     
     private static final long serialVersionUID = -5885885059043262485L;
-    XmlRpcWorkflowManagerClient wm;
+    WorkflowManagerClient wm;