From 871a48677b78dc62370e72e53d1b3ee41564867c Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Mon, 18 Jun 2012 13:28:48 +0200
Subject: [PATCH] OO-283: remove gnuregexp and jazzlib
---
pom.xml | 13 +------------
.../core/util/vfs/version/VersionsFileManager.java | 3 ++-
.../olat/repository/handlers/PortfolioHandler.java | 7 +++----
.../search/service/document/file/OpenDocument.java | 5 ++---
4 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7bb10d9986b..8baea752321 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/src/main/java/org/olat/core/util/vfs/version/VersionsFileManager.java b/src/main/java/org/olat/core/util/vfs/version/VersionsFileManager.java
index d3f6919debf..67ee407c908 100644
--- a/src/main/java/org/olat/core/util/vfs/version/VersionsFileManager.java
+++ b/src/main/java/org/olat/core/util/vfs/version/VersionsFileManager.java
@@ -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);
diff --git a/src/main/java/org/olat/repository/handlers/PortfolioHandler.java b/src/main/java/org/olat/repository/handlers/PortfolioHandler.java
index 9bba8bfdaa0..de24686e505 100644
--- a/src/main/java/org/olat/repository/handlers/PortfolioHandler.java
+++ b/src/main/java/org/olat/repository/handlers/PortfolioHandler.java
@@ -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;
diff --git a/src/main/java/org/olat/search/service/document/file/OpenDocument.java b/src/main/java/org/olat/search/service/document/file/OpenDocument.java
index fe4b2453818..3ec87a09acb 100644
--- a/src/main/java/org/olat/search/service/document/file/OpenDocument.java
+++ b/src/main/java/org/olat/search/service/document/file/OpenDocument.java
@@ -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;
--
GitLab