Skip to content
Snippets Groups Projects
Commit 871a4867 authored by srosse's avatar srosse
Browse files

OO-283: remove gnuregexp and jazzlib

parent 6d4e43d2
No related branches found
No related tags found
No related merge requests found
......@@ -1103,7 +1103,7 @@
<artifactId>javassist</artifactId>
<version>3.8.0.GA</version>
</dependency>
<dependency>
<dependency><!-- Velocity dependency -->
<groupId>oro</groupId>
<artifactId>oro</artifactId>
<version>2.0.8</version>
......@@ -1237,11 +1237,6 @@
<classifier>patched</classifier><!-- patched version of scorm adapter:
contact: matthai.kurian@gmail.com -->
</dependency>
<dependency>
<groupId>gnu-regexp</groupId>
<artifactId>gnu-regexp</artifactId>
<version>1.1.4</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
......@@ -1441,12 +1436,6 @@
<!-- <exclusions> <exclusion> <groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId> </exclusion> </exclusions> -->
</dependency>
<dependency>
<groupId>jazzlib</groupId>
<artifactId>jazzlib</artifactId>
<version>0.0.6</version> <!-- do not replace with 0.0.7 as this version is highly patched. -->
<classifier>patched</classifier>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
......
......@@ -30,6 +30,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.zip.ZipInputStream;
import org.olat.core.commons.modules.bc.FolderConfig;
import org.olat.core.commons.modules.bc.meta.MetaInfo;
......@@ -165,7 +166,7 @@ public class VersionsFileManager extends VersionsManager implements Initializabl
VFSLeaf currentFile = (VFSLeaf) currentVersion;
if (addToRevisions(currentVersion, identity, comment)) {
// copy the content of the new file to the old
boolean closeInputStream = !(newFile instanceof net.sf.jazzlib.ZipInputStream || newFile instanceof java.util.zip.ZipInputStream);
boolean closeInputStream = !(newFile instanceof ZipInputStream);
if (VFSManager.copyContent(newFile, currentFile, closeInputStream)) { return true; }
} else {
log.error("Cannot create a version of this file: " + currentVersion);
......
......@@ -27,10 +27,9 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import net.sf.jazzlib.ZipEntry;
import net.sf.jazzlib.ZipInputStream;
import net.sf.jazzlib.ZipOutputStream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import java.util.zip.ZipOutputStream;
import org.hibernate.collection.PersistentList;
import org.olat.core.CoreSpringFactory;
......
......@@ -22,9 +22,8 @@ package org.olat.search.service.document.file;
import java.io.IOException;
import java.io.InputStream;
import net.sf.jazzlib.ZipEntry;
import net.sf.jazzlib.ZipInputStream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import org.apache.lucene.document.Document;
import org.olat.core.logging.OLog;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment