karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject [5/8] karaf git commit: tooling.karaf-maven-plugin: Dependency30Helper removed
Date Mon, 03 Jul 2017 16:00:44 GMT
tooling.karaf-maven-plugin: Dependency30Helper removed

Updated MavenUtilTest


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d114b1d2
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d114b1d2
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d114b1d2

Branch: refs/heads/master
Commit: d114b1d28597dd4b0e767b6435f7016948e63a09
Parents: 1f38978
Author: Paul Campbell <pcampbell@kemitix.net>
Authored: Wed Apr 12 19:36:54 2017 +0100
Committer: Paul Campbell <pcampbell@kemitix.net>
Committed: Tue Jun 6 14:29:09 2017 +0100

----------------------------------------------------------------------
 .../karaf/tooling/utils/Dependency30Helper.java | 406 -------------------
 .../karaf/tooling/utils/Dependency31Helper.java |   3 -
 .../karaf/tooling/features/MavenUtilTest.java   |  36 --
 3 files changed, 445 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/d114b1d2/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency30Helper.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency30Helper.java
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency30Helper.java
deleted file mode 100644
index 29e1464..0000000
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency30Helper.java
+++ /dev/null
@@ -1,406 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.karaf.tooling.utils;
-
-import static java.lang.String.format;
-import static org.apache.commons.lang.reflect.MethodUtils.invokeMethod;
-import static org.apache.karaf.deployer.kar.KarArtifactInstaller.FEATURE_CLASSIFIER;
-
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.maven.RepositoryUtils;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectBuildingRequest;
-import org.sonatype.aether.RepositorySystem;
-import org.sonatype.aether.RepositorySystemSession;
-import org.sonatype.aether.artifact.Artifact;
-import org.sonatype.aether.collection.CollectRequest;
-import org.sonatype.aether.collection.CollectResult;
-import org.sonatype.aether.collection.DependencyCollectionContext;
-import org.sonatype.aether.collection.DependencyCollectionException;
-import org.sonatype.aether.collection.DependencyGraphTransformer;
-import org.sonatype.aether.collection.DependencySelector;
-import org.sonatype.aether.graph.Dependency;
-import org.sonatype.aether.graph.DependencyNode;
-import org.sonatype.aether.repository.RemoteRepository;
-import org.sonatype.aether.resolution.ArtifactRequest;
-import org.sonatype.aether.resolution.ArtifactResolutionException;
-import org.sonatype.aether.resolution.ArtifactResult;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
-import org.sonatype.aether.util.artifact.DefaultArtifact;
-import org.sonatype.aether.util.graph.selector.AndDependencySelector;
-import org.sonatype.aether.util.graph.selector.ExclusionDependencySelector;
-import org.sonatype.aether.util.graph.selector.OptionalDependencySelector;
-import org.sonatype.aether.util.graph.transformer.ChainedDependencyGraphTransformer;
-import org.sonatype.aether.util.graph.transformer.ConflictMarker;
-import org.sonatype.aether.util.graph.transformer.JavaDependencyContextRefiner;
-import org.sonatype.aether.util.graph.transformer.JavaEffectiveScopeCalculator;
-
-/**
- * This is a dependency helper compliant with Maven 3.0 (using Aether Sonatype lib)
- */
-public class Dependency30Helper implements DependencyHelper {
-
-    /**
-     * The entry point to Aether, i.e. the component doing all the work.
-     */
-    private final RepositorySystem repositorySystem;
-
-    /**
-     * The current repository/network configuration of Maven.
-     */
-    private final RepositorySystemSession repositorySystemSession;
-
-    /**
-     * The project's defined repositories to use for the resolution of project dependencies.
-     */
-    private final List<RemoteRepository> projectRepositories;
-
-    // dependencies we are interested in
-    protected Set<LocalDependency> localDependencies;
-    // log of what happened during search
-    protected String treeListing;
-
-    public Dependency30Helper(List<RemoteRepository> projectRepositories, RepositorySystemSession
repositorySystemSession, RepositorySystem repositorySystem) {
-        this.projectRepositories = projectRepositories;
-        this.repositorySystemSession = repositorySystemSession;
-        this.repositorySystem = repositorySystem;
-    }
-    
-	public void setRepositorySession(final ProjectBuildingRequest request) throws MojoExecutionException
{
-		try {
-			invokeMethod(request, "setRepositorySession", repositorySystemSession);
-		} catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e)
{
-			throw new MojoExecutionException("Cannot set repository session on project building request",
e);
-		}
-	}
-
-    @Override
-    public Set<LocalDependency> getLocalDependencies() {
-        return this.localDependencies;
-    }
-
-    @Override
-    public String getTreeListing() {
-        return this.treeListing;
-    }
-
-    @Override
-    public void getDependencies(MavenProject project, boolean useTransitiveDependencies)
throws MojoExecutionException {
-        DependencyNode rootNode = getDependencyTree(RepositoryUtils.toArtifact(project.getArtifact()));
-        Scanner scanner = new Scanner();
-        scanner.scan(rootNode, useTransitiveDependencies);
-        localDependencies = scanner.localDependencies;
-        treeListing = scanner.getLog();
-    }
-
-    private DependencyNode getDependencyTree(Artifact artifact) throws MojoExecutionException
{
-        try {
-            CollectRequest collectRequest = new CollectRequest(new Dependency(artifact, "compile"),
null, projectRepositories);
-            DefaultRepositorySystemSession session = new DefaultRepositorySystemSession(repositorySystemSession);
-            session.setDependencySelector(new AndDependencySelector(new OptionalDependencySelector(),
-                    new ScopeDependencySelector1(),
-                    new ExclusionDependencySelector()));
-            DependencyGraphTransformer transformer = new ChainedDependencyGraphTransformer(new
ConflictMarker(),
-                    new JavaEffectiveScopeCalculator(),
-                    new JavaDependencyContextRefiner());
-            session.setDependencyGraphTransformer(transformer);
-            CollectResult result = repositorySystem.collectDependencies(session, collectRequest);
-            return result.getRoot();
-        } catch (DependencyCollectionException e) {
-            throw new MojoExecutionException("Cannot build project dependency tree", e);
-        }
-    }
-
-    /**
-     * Aether's ScopeDependencySelector appears to always exclude the configured scopes (test
and provided) and there is no way to configure it to
-     * accept the top level provided scope dependencies. We need this 3 layers cake since
Aether never actually uses the top level selector you give it,
-     * it always starts by getting the child to apply to the project's dependencies.
-     */
-    private static class ScopeDependencySelector1 implements DependencySelector {
-
-        private DependencySelector child = new ScopeDependencySelector2();
-
-        public boolean selectDependency(Dependency dependency) {
-            throw new IllegalStateException("This does not appear to be called");
-        }
-
-        public DependencySelector deriveChildSelector(DependencyCollectionContext context)
{
-            return child;
-        }
-
-    }
-
-    private static class ScopeDependencySelector2 implements DependencySelector {
-
-        private DependencySelector child = new ScopeDependencySelector3();
-
-        public boolean selectDependency(Dependency dependency) {
-            String scope = dependency.getScope();
-            return !"test".equals(scope) && !"runtime".equals(scope);
-        }
-
-        public DependencySelector deriveChildSelector(DependencyCollectionContext context)
{
-            return child;
-        }
-
-    }
-
-    private static class ScopeDependencySelector3 implements DependencySelector {
-
-        public boolean selectDependency(Dependency dependency) {
-            String scope = dependency.getScope();
-            return !"test".equals(scope) && !"provided".equals(scope) &&
!"runtime".equals(scope);
-        }
-
-        public DependencySelector deriveChildSelector(DependencyCollectionContext context)
{
-            return this;
-        }
-
-    }
-
-    private static class Scanner {
-
-        private enum Accept {
-            ACCEPT(true, true),
-            PROVIDED(true, false),
-            STOP(false, false);
-
-            private final boolean more;
-            private final boolean local;
-
-            Accept(boolean more, boolean local) {
-                this.more = more;
-                this.local = local;
-            }
-
-            public boolean isContinue() {
-                return more;
-            }
-
-            public boolean isLocal() {
-                return local;
-            }
-
-        }
-
-        // all the dependencies needed, with provided dependencies removed
-        private final Set<LocalDependency> localDependencies = new LinkedHashSet<>();
-
-        // dependencies from ancestor, to be removed from localDependencies
-        private final Set<Artifact> dependencies = new LinkedHashSet<>();
-
-        private final StringBuilder log = new StringBuilder();
-
-        public void scan(DependencyNode rootNode, boolean useTransitiveDependencies) throws
MojoExecutionException {
-            for (DependencyNode child : rootNode.getChildren()) {
-                scan(rootNode, child, Accept.ACCEPT, useTransitiveDependencies, false, "");
-            }
-            if (useTransitiveDependencies) {
-                localDependencies.removeAll(dependencies);
-            }
-        }
-
-        private void scan(DependencyNode parentNode, DependencyNode dependencyNode, Accept
parentAccept, boolean useTransitiveDependencies, boolean isFromFeature, String indent) throws
MojoExecutionException {
-            Accept accept = accept(dependencyNode, parentAccept);
-            if (accept.isLocal()) {
-                if (isFromFeature) {
-                    if (!isFeature(dependencyNode)) {
-                        log.append(indent).append("from feature:").append(dependencyNode).append("\n");
-                        dependencies.add(dependencyNode.getDependency().getArtifact());
-                    } else {
-                        log.append(indent).append("is feature:").append(dependencyNode).append("\n");
-                    }
-                } else {
-                    log.append(indent).append("local:").append(dependencyNode).append("\n");
-                    if (localDependencies.contains(dependencyNode.getDependency().getArtifact()))
{
-                        log.append(indent).append("already in feature, returning:").append(dependencyNode).append("\n");
-                        return;
-                    }
-                    // TODO resolve scope conflicts
-                    localDependencies.add(new LocalDependency(dependencyNode.getDependency().getScope(),
dependencyNode.getDependency().getArtifact(), parentNode.getDependency().getArtifact()));
-                    if (isFeature(dependencyNode) || !useTransitiveDependencies) {
-                        isFromFeature = true;
-                    }
-                }
-                if (useTransitiveDependencies && accept.isContinue()) {
-                    List<DependencyNode> children = dependencyNode.getChildren();
-                    for (DependencyNode child : children) {
-                        scan(dependencyNode, child, accept, useTransitiveDependencies, isFromFeature,
indent + " ");
-                    }
-                }
-            }
-        }
-
-        public String getLog() {
-            return log.toString();
-        }
-
-        private Accept accept(DependencyNode dependency, Accept previous) {
-            String scope = dependency.getDependency().getScope();
-            if (scope == null || "runtime".equalsIgnoreCase(scope) || "compile".equalsIgnoreCase(scope))
{
-                return previous;
-            }
-            if ("provided".equalsIgnoreCase(scope)) {
-                return Accept.PROVIDED;
-            }
-            return Accept.STOP;
-        }
-
-    }
-
-    public static boolean isFeature(DependencyNode dependencyNode) {
-        return isFeature(dependencyNode.getDependency().getArtifact());
-    }
-
-    public static boolean isFeature(Artifact artifact) {
-        return artifact.getExtension().equals("kar") || FEATURE_CLASSIFIER.equals(artifact.getClassifier());
-    }
-
-    @Override
-    public boolean isArtifactAFeature(Object artifact) {
-        return Dependency30Helper.isFeature((Artifact) artifact);
-    }
-    
-	@Override
-	public String getBaseVersion(Object artifact) {
-		return ((Artifact) artifact).getBaseVersion();
-	}
-
-	@Override
-	public String getGroupId(Object artifact) {
-		return ((Artifact) artifact).getGroupId();
-	}
-
-    @Override
-    public String getArtifactId(Object artifact) {
-        return ((Artifact) artifact).getArtifactId();
-    }
-
-    @Override
-    public String getClassifier(Object artifact) {
-        return ((Artifact) artifact).getClassifier();
-    }
-
-    @Override
-    public File resolve(Object artifact, Log log) {
-        ArtifactRequest request = new ArtifactRequest();
-        request.setArtifact((Artifact) artifact);
-        request.setRepositories(projectRepositories);
-
-        log.debug("Resolving artifact " + artifact + " from " + projectRepositories);
-
-        ArtifactResult result;
-        try {
-            result = repositorySystem.resolveArtifact(repositorySystemSession, request);
-        } catch (ArtifactResolutionException e) {
-            log.warn("Could not resolve " + artifact, e);
-            return null;
-        }
-
-        log.debug("Resolved artifact " + artifact + " to " + result.getArtifact().getFile()
+ " from " + result.getRepository());
-
-        return result.getArtifact().getFile();
-    }
-
-    @Override
-    public File resolveById(String id, Log log) throws MojoFailureException {
-        if (id.startsWith("mvn:")) {
-            if (id.contains("!")) {
-                id = id.substring(0, "mvn:".length()) + id.substring(id.indexOf("!") + 1);
-            }
-            if (id.endsWith("/")) {
-                id = id.substring(0, id.length() - 1);
-            }
-        }
-        id = MavenUtil.mvnToAether(id);
-        ArtifactRequest request = new ArtifactRequest();
-        request.setArtifact(new DefaultArtifact(id));
-        request.setRepositories(projectRepositories);
-
-        log.debug("Resolving artifact " + id + " from " + projectRepositories);
-
-        ArtifactResult result;
-        try {
-            result = repositorySystem.resolveArtifact(repositorySystemSession, request);
-        } catch (ArtifactResolutionException e) {
-            log.warn("Could not resolve " + id, e);
-            throw new MojoFailureException(format("Couldn't resolve artifact %s", id), e);
-        }
-
-        log.debug("Resolved artifact " + id + " to " + result.getArtifact().getFile() + "
from " + result.getRepository());
-
-        return result.getArtifact().getFile();
-    }
-
-    @Override
-    public String artifactToMvn(org.apache.maven.artifact.Artifact artifact, String versionOrRange)
{
-        return this.artifactToMvn(RepositoryUtils.toArtifact(artifact), versionOrRange);
-    }
-
-    @Override
-    public String artifactToMvn(Object _artifact, String versionOrRange) {
-        Artifact artifact = (Artifact) _artifact;
-        String bundleName;
-        if (artifact.getExtension().equals("jar") && MavenUtil.isEmpty(artifact.getClassifier()))
{
-            bundleName = String.format("mvn:%s/%s/%s", artifact.getGroupId(), artifact.getArtifactId(),
versionOrRange);
-        } else {
-            if (MavenUtil.isEmpty(artifact.getClassifier())) {
-                bundleName = String.format("mvn:%s/%s/%s/%s", artifact.getGroupId(), artifact.getArtifactId(),
versionOrRange, artifact.getExtension());
-            } else {
-                bundleName = String.format("mvn:%s/%s/%s/%s/%s", artifact.getGroupId(), artifact.getArtifactId(),
versionOrRange, artifact.getExtension(), artifact.getClassifier());
-            }
-        }
-        return bundleName;
-    }
-
-    @Override
-    public org.apache.maven.artifact.Artifact mvnToArtifact(String name) {
-        name = MavenUtil.mvnToAether(name);
-        DefaultArtifact artifact = new DefaultArtifact(name);
-        org.apache.maven.artifact.Artifact mavenArtifact = RepositoryUtils.toArtifact(artifact);
-        return mavenArtifact;
-    }
-
-    @Override
-    public String pathFromMaven(String name) {
-        if (name.indexOf(':') == -1) {
-            return name;
-        }
-        if (name.endsWith("/")) {
-            name = name.substring(0, name.length() - 1);
-        }
-        name = MavenUtil.mvnToAether(name);
-        return pathFromAether(name);
-    }
-
-    @Override
-    public String pathFromAether(String name) {
-        DefaultArtifact artifact = new DefaultArtifact(name);
-        org.apache.maven.artifact.Artifact mavenArtifact = RepositoryUtils.toArtifact(artifact);
-        return MavenUtil.layout.pathOf(mavenArtifact);
-    }
-}

http://git-wip-us.apache.org/repos/asf/karaf/blob/d114b1d2/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency31Helper.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency31Helper.java
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency31Helper.java
index 232f680..2878c72 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency31Helper.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency31Helper.java
@@ -53,9 +53,6 @@ import static org.apache.karaf.deployer.kar.KarArtifactInstaller.FEATURE_CLASSIF
 /**
  * <p>{@link DependencyHelper} for accessing Eclipse Aether system used in Maven 3.1+.
It uses reflection to access
  * these methods of {@code maven-core} APIs which directly references Eclipse Aether classes.</p>
- *
- * <p>When {@code karaf-maven-plugin} switches to {@code maven-core:3.1.0+}, reflection
should be use for Sonatype
- * Aether in {@link Dependency30Helper} and this class will use Maven API directly.</p>
  */
 public class Dependency31Helper implements DependencyHelper {
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/d114b1d2/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/MavenUtilTest.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/MavenUtilTest.java
b/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/MavenUtilTest.java
index 0623566..2d07377 100644
--- a/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/MavenUtilTest.java
+++ b/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/MavenUtilTest.java
@@ -18,9 +18,7 @@
  */
 package org.apache.karaf.tooling.features;
 
-import org.apache.karaf.tooling.utils.Dependency30Helper;
 import org.apache.karaf.tooling.utils.Dependency31Helper;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.apache.karaf.tooling.utils.MavenUtil.aetherToMvn;
@@ -47,15 +45,6 @@ public class MavenUtilTest {
     }
 
     @Test
-    public void testPathFromMvnSonatype() throws Exception {
-        Dependency30Helper helper = new Dependency30Helper(null, null, null);
-        assertEquals("org/foo/org.foo.bar/1.0-SNAPSHOT/org.foo.bar-1.0-SNAPSHOT.jar", helper.pathFromMaven("mvn:org.foo/org.foo.bar/1.0-SNAPSHOT"));
-        assertEquals("org/foo/org.foo.bar/1.0-SNAPSHOT/org.foo.bar-1.0-SNAPSHOT.kar", helper.pathFromMaven("mvn:org.foo/org.foo.bar/1.0-SNAPSHOT/kar"));
-        assertEquals("org/foo/org.foo.bar/1.0-SNAPSHOT/org.foo.bar-1.0-SNAPSHOT-features.xml",
helper.pathFromMaven("mvn:org.foo/org.foo.bar/1.0-SNAPSHOT/xml/features"));
-    }
-
-    @Test
-    @Ignore("Will work with org.apache.maven:maven-core:3.1.0+")
     public void testPathFromMvnEclipse() throws Exception {
         Dependency31Helper helper = new Dependency31Helper(null, null, null);
         assertEquals("org/foo/org.foo.bar/1.0-SNAPSHOT/org.foo.bar-1.0-SNAPSHOT.jar", helper.pathFromMaven("mvn:org.foo/org.foo.bar/1.0-SNAPSHOT"));
@@ -64,15 +53,6 @@ public class MavenUtilTest {
     }
 
     @Test
-    public void testPathFromAetherSonatype() throws Exception {
-        Dependency30Helper helper = new Dependency30Helper(null, null, null);
-        assertEquals("org/foo/org.foo.bar/1.0-SNAPSHOT/org.foo.bar-1.0-SNAPSHOT.jar", helper.pathFromAether("org.foo:org.foo.bar:1.0-SNAPSHOT"));
-        assertEquals("org/foo/org.foo.bar/1.0-SNAPSHOT/org.foo.bar-1.0-SNAPSHOT.kar", helper.pathFromAether("org.foo:org.foo.bar:kar:1.0-SNAPSHOT"));
-        assertEquals("org/foo/org.foo.bar/1.0-SNAPSHOT/org.foo.bar-1.0-SNAPSHOT-features.xml",
helper.pathFromAether("org.foo:org.foo.bar:xml:features:1.0-SNAPSHOT"));
-    }
-
-    @Test
-    @Ignore("Will work with org.apache.maven:maven-core:3.1.0+")
     public void testPathFromAetherEclipse() throws Exception {
         Dependency31Helper helper = new Dependency31Helper(null, null, null);
         assertEquals("org/foo/org.foo.bar/1.0-SNAPSHOT/org.foo.bar-1.0-SNAPSHOT.jar", helper.pathFromAether("org.foo:org.foo.bar:1.0-SNAPSHOT"));
@@ -81,14 +61,6 @@ public class MavenUtilTest {
     }
 
     @Test
-    public void testSonatypeArtifactToMvn() throws Exception {
-        Dependency30Helper helper = new Dependency30Helper(null, null, null);
-        assertEquals("mvn:org.foo/org.foo.bar/1.0-SNAPSHOT", helper.artifactToMvn(new org.sonatype.aether.util.artifact.DefaultArtifact("org.foo:org.foo.bar:1.0-SNAPSHOT"),
"1.0-SNAPSHOT"));
-        assertEquals("mvn:org.foo/org.foo.bar/1.0-SNAPSHOT/kar", helper.artifactToMvn(new
org.sonatype.aether.util.artifact.DefaultArtifact("org.foo:org.foo.bar:kar:1.0-SNAPSHOT"),
"1.0-SNAPSHOT"));
-        assertEquals("mvn:org.foo/org.foo.bar/1.0-SNAPSHOT/xml/features", helper.artifactToMvn(new
org.sonatype.aether.util.artifact.DefaultArtifact("org.foo:org.foo.bar:xml:features:1.0-SNAPSHOT"),
"1.0-SNAPSHOT"));
-    }
-
-    @Test
     public void testEclipseArtifactToMvn() throws Exception {
         Dependency31Helper helper = new Dependency31Helper(null, null, null);
         assertEquals("mvn:org.foo/org.foo.bar/1.0-SNAPSHOT", helper.artifactToMvn(new org.eclipse.aether.artifact.DefaultArtifact("org.foo:org.foo.bar:1.0-SNAPSHOT"),
"1.0-SNAPSHOT"));
@@ -97,14 +69,6 @@ public class MavenUtilTest {
     }
 
     @Test
-    public void testSonatypeArtifactToMvnWithRange() throws Exception {
-        Dependency30Helper helper = new Dependency30Helper(null, null, null);
-        assertEquals("mvn:org.foo/org.foo.bar/[1.0,2.0)", helper.artifactToMvn(new org.sonatype.aether.util.artifact.DefaultArtifact("org.foo:org.foo.bar:1.0-SNAPSHOT"),
"[1.0,2.0)"));
-        assertEquals("mvn:org.foo/org.foo.bar/[1.0,2.0)/kar", helper.artifactToMvn(new org.sonatype.aether.util.artifact.DefaultArtifact("org.foo:org.foo.bar:kar:1.0-SNAPSHOT"),
"[1.0,2.0)"));
-        assertEquals("mvn:org.foo/org.foo.bar/[1.0,2.0)/xml/features", helper.artifactToMvn(new
org.sonatype.aether.util.artifact.DefaultArtifact("org.foo:org.foo.bar:xml:features:1.0-SNAPSHOT"),
"[1.0,2.0)"));
-    }
-
-    @Test
     public void testEclipseArtifactToMvnWithRange() throws Exception {
         Dependency31Helper helper = new Dependency31Helper(null, null, null);
         assertEquals("mvn:org.foo/org.foo.bar/[1.0,2.0)", helper.artifactToMvn(new org.eclipse.aether.artifact.DefaultArtifact("org.foo:org.foo.bar:1.0-SNAPSHOT"),
"[1.0,2.0)"));


Mime
View raw message