Fix MANIFEST generation

[gpl/argeo-slc.git] / org.argeo.slc.repo / src / org / argeo / slc / repo / osgi / ArchiveWrapper.java

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveWrapper.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveWrapper.java
index a6551a6e4d9fbcdbc436bfbfd31be348346ef1d8..3cb1e9c8f3264034407568876ea79f5356a7cd33 100644 (file)
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveWrapper.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveWrapper.java
@@ -22,8 +22,7 @@ import javax.jcr.Session;
 
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.CategoryNameVersion;
 import org.argeo.slc.DefaultNameVersion;
@@ -34,11 +33,11 @@ import org.argeo.slc.build.Distribution;
 import org.argeo.slc.build.License;
 import org.argeo.slc.repo.OsgiFactory;
 import org.argeo.slc.repo.RepoUtils;
+import org.argeo.slc.repo.internal.springutil.AntPathMatcher;
+import org.argeo.slc.repo.internal.springutil.PathMatcher;
 import org.argeo.slc.repo.maven.ArtifactIdComparator;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
-import org.springframework.util.AntPathMatcher;
-import org.springframework.util.PathMatcher;
 
 import aQute.bnd.osgi.Jar;
 
@@ -48,7 +47,7 @@ import aQute.bnd.osgi.Jar;
  * need further modification.
  */
 public class ArchiveWrapper implements Runnable, ModuleSet, Distribution {
-       private final static Log log = LogFactory.getLog(ArchiveWrapper.class);
+       private final static CmsLog log = CmsLog.getLog(ArchiveWrapper.class);
 
        private OsgiFactory osgiFactory;
        private String version;