X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.repo%2Fsrc%2Forg%2Fargeo%2Fslc%2Frepo%2Fmaven%2FGenerateBinaries.java;h=063b408c74b4894b2b58e44e31b9bc6f3d4768e3;hb=f59056d0b805cb91f524671a28b8780338509ba4;hp=cd5283db4e1b568ff61d4bd1cff6a753df814cf4;hpb=b9505fef5ba8186433e903e9de3c73c17bdf6562;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/GenerateBinaries.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/GenerateBinaries.java
index cd5283db4..063b408c7 100644
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/GenerateBinaries.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/GenerateBinaries.java
@@ -30,18 +30,18 @@ import javax.jcr.Session;
 
 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.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.DefaultArtifact;
 import org.osgi.framework.Version;
-import org.sonatype.aether.artifact.Artifact;
-import org.sonatype.aether.util.artifact.DefaultArtifact;
 
 /**
  * Generates binaries-, sources- and sdk-version.pom artifacts for a given
@@ -101,7 +101,7 @@ public class GenerateBinaries implements Runnable, SlcNames {
 	 * indexed.
 	 */
 	public static void processGroupNode(Node groupNode, String version,
-			ArgeoMonitor monitor) throws RepositoryException {
+			JcrMonitor monitor) throws RepositoryException {
 		// TODO set artifactsBase based on group node
 		GenerateBinaries gb = new GenerateBinaries();
 		String groupId = groupNode.getProperty(SlcNames.SLC_GROUP_BASE_ID)
@@ -115,7 +115,7 @@ public class GenerateBinaries implements Runnable, SlcNames {
 
 	/** Only builds local indexes. Does not change anything in the local Session */
 	public static GenerateBinaries preProcessGroupNode(Node groupNode,
-			ArgeoMonitor monitor) throws RepositoryException {
+			JcrMonitor monitor) throws RepositoryException {
 		// TODO set artifactsBase based on group node
 		GenerateBinaries gb = new GenerateBinaries();
 		String groupId = groupNode.getProperty(SlcNames.SLC_GROUP_BASE_ID)
@@ -148,7 +148,7 @@ public class GenerateBinaries implements Runnable, SlcNames {
 	 * methods build the binaries {@code Set<Artifact>} and other indexes. It
 	 * does not impact the
 	 */
-	protected void internalPreProcessing(Node groupNode, ArgeoMonitor monitor)
+	protected void internalPreProcessing(Node groupNode, JcrMonitor monitor)
 			throws RepositoryException {
 		if (monitor != null)
 			monitor.subTask("Pre processing group " + groupId);
@@ -187,7 +187,7 @@ public class GenerateBinaries implements Runnable, SlcNames {
 	}
 
 	/** Does the real job : writes JCR META-DATA and generates binaries */
-	protected void internalProcessing(Node groupNode, ArgeoMonitor monitor)
+	protected void internalProcessing(Node groupNode, JcrMonitor monitor)
 			throws RepositoryException {
 		if (monitor != null)
 			monitor.subTask("Processing group " + groupId);