reverted changes from object_storage branch by creating a diff and ap…

…plying reverse; then fixing conflicts in datasets.java
TIK-NFL · Apr 21, 2020 · 179433b · 179433b
1 parent 6c29c1f
commit 179433b
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 818 deletions.
diff --git a/pom.xml b/pom.xml
@@ -608,11 +608,6 @@
             <artifactId>opennlp-tools</artifactId>
             <version>1.9.1</version>
         </dependency>
-        <dependency>
-            <groupId>org.quartz-scheduler</groupId>
-            <artifactId>quartz</artifactId>
-            <version>2.3.1</version>
-        </dependency>
     </dependencies>
     <build>
         <!--        <testResources>

diff --git a/src/main/java/edu/harvard/iq/dataverse/DeleteOneTimeUrlTask.java b/src/main/java/edu/harvard/iq/dataverse/DeleteOneTimeUrlTask.java
diff --git a/src/main/java/edu/harvard/iq/dataverse/S3BigDataUpload.java b/src/main/java/edu/harvard/iq/dataverse/S3BigDataUpload.java
diff --git a/src/main/java/edu/harvard/iq/dataverse/S3BigDataUploadServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/S3BigDataUploadServiceBean.java