X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.repo%2Fsrc%2Forg%2Fargeo%2Fslc%2Frepo%2Fosgi%2FNormalizeGroup.java;h=1d250379970540ba02a5c4a7b8409fc6e1c31ba9;hb=305ecfa036fac8562fbb3af875c6ecf5822b6dcb;hp=99f31bb0414ae047c913ed7c6641ae1e09f60bee;hpb=b9505fef5ba8186433e903e9de3c73c17bdf6562;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/NormalizeGroup.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/NormalizeGroup.java
index 99f31bb04..1d2503799 100644
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/NormalizeGroup.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/NormalizeGroup.java
@@ -32,20 +32,20 @@ import javax.jcr.Session;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.ArgeoMonitor;
+import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
-import org.argeo.slc.aether.ArtifactIdComparator;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.repo.ArtifactIndexer;
 import org.argeo.slc.repo.RepoConstants;
 import org.argeo.slc.repo.RepoUtils;
+import org.argeo.slc.repo.maven.ArtifactIdComparator;
 import org.argeo.slc.repo.maven.MavenConventionsUtils;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.DefaultArtifact;
 import org.osgi.framework.Constants;
 import org.osgi.framework.Version;
-import org.sonatype.aether.artifact.Artifact;
-import org.sonatype.aether.util.artifact.DefaultArtifact;
 
 /**
  * Make sure that all JCR metadata and Maven metadata are consistent for this
@@ -100,7 +100,7 @@ public class NormalizeGroup implements Runnable, SlcNames {
 	}
 
 	public static void processGroupNode(Node groupNode, String version,
-			Boolean overridePoms, ArgeoMonitor monitor)
+			Boolean overridePoms, JcrMonitor monitor)
 			throws RepositoryException {
 		// TODO set artifactsBase based on group node
 		NormalizeGroup ng = new NormalizeGroup();
@@ -112,7 +112,7 @@ public class NormalizeGroup implements Runnable, SlcNames {
 		ng.processGroupNode(groupNode, monitor);
 	}
 
-	protected void processGroupNode(Node groupNode, ArgeoMonitor monitor)
+	protected void processGroupNode(Node groupNode, JcrMonitor monitor)
 			throws RepositoryException {
 		if (monitor != null)
 			monitor.subTask("Group " + groupId);