You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2016/06/13 21:01:20 UTC
svn commit: r1748310 - in
/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve:
./ internal/
Author: rfscholte
Date: Mon Jun 13 21:01:20 2016
New Revision: 1748310
URL: http://svn.apache.org/viewvc?rev=1748310&view=rev
Log:
Improve exceptionhandling for the dependency resolvers
Added:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResult.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolverException.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolverException.java
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResolverException.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30ArtifactResult.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolver.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31ArtifactResult.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolver.java
Modified: maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResolverException.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResolverException.java?rev=1748310&r1=1748309&r2=1748310&view=diff
==============================================================================
--- maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResolverException.java (original)
+++ maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResolverException.java Mon Jun 13 21:01:20 2016
@@ -25,19 +25,18 @@ package org.apache.maven.shared.dependen
public class DependencyResolverException
extends Exception
{
+ protected DependencyResolverException( Exception cause )
+ {
+ super( cause );
+ }
- /**
- *
- */
- private static final long serialVersionUID = 8971449574933775007L;
-
- /**
- * @param message The message for the exception.
- * @param e The exception itself.
- */
public DependencyResolverException( String message, Exception e )
{
super( message, e );
}
-
+
+ public DependencyResult getResult()
+ {
+ return null;
+ }
}
Added: maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResult.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResult.java?rev=1748310&view=auto
==============================================================================
--- maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResult.java (added)
+++ maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResult.java Mon Jun 13 21:01:20 2016
@@ -0,0 +1,37 @@
+package org.apache.maven.shared.dependencies.resolve;
+
+/*
+ * 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.
+ */
+
+import java.util.List;
+
+/**
+ *
+ * @author Robert Scholte
+ *
+ */
+public interface DependencyResult
+{
+ /**
+ * Gets the exceptions that occurred while building the dependency graph.
+ *
+ * @return
+ */
+ List<Exception> getCollectorExceptions();
+}
Modified: maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30ArtifactResult.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30ArtifactResult.java?rev=1748310&r1=1748309&r2=1748310&view=diff
==============================================================================
--- maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30ArtifactResult.java (original)
+++ maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30ArtifactResult.java Mon Jun 13 21:01:20 2016
@@ -30,7 +30,7 @@ import org.sonatype.aether.resolution.Ar
* @author Robert Scholte
* @since 3.0
*/
-public class Maven30ArtifactResult
+class Maven30ArtifactResult
implements org.apache.maven.shared.artifact.resolve.ArtifactResult
{
private final ArtifactResult artifactResult;
Modified: maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolver.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolver.java?rev=1748310&r1=1748309&r2=1748310&view=diff
==============================================================================
--- maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolver.java (original)
+++ maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolver.java Mon Jun 13 21:01:20 2016
@@ -222,11 +222,11 @@ public class Maven30DependencyResolver
}
catch ( ArtifactResolutionException e )
{
- throw new DependencyResolverException( e.getMessage(), e );
+ throw new Maven30DependencyResolverException( e );
}
catch ( DependencyCollectionException e )
{
- throw new DependencyResolverException( e.getMessage(), e );
+ throw new Maven30DependencyResolverException( e );
}
}
Added: maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolverException.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolverException.java?rev=1748310&view=auto
==============================================================================
--- maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolverException.java (added)
+++ maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolverException.java Mon Jun 13 21:01:20 2016
@@ -0,0 +1,64 @@
+package org.apache.maven.shared.dependencies.resolve.internal;
+
+/*
+ * 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.
+ */
+
+import java.util.List;
+
+import org.apache.maven.shared.dependencies.resolve.DependencyResolverException;
+import org.apache.maven.shared.dependencies.resolve.DependencyResult;
+import org.sonatype.aether.collection.DependencyCollectionException;
+import org.sonatype.aether.resolution.ArtifactResolutionException;
+
+/**
+ *
+ * @author Robert Scholte
+ *
+ */
+class Maven30DependencyResolverException extends DependencyResolverException
+{
+ private DependencyCollectionException dce;
+
+ private ArtifactResolutionException are;
+
+ protected Maven30DependencyResolverException( DependencyCollectionException e )
+ {
+ super( e );
+ this.dce = e;
+ }
+
+ public Maven30DependencyResolverException( ArtifactResolutionException e )
+ {
+ super( e );
+ this.are = e;
+ }
+
+ @Override
+ public DependencyResult getResult()
+ {
+ return new DependencyResult()
+ {
+ @Override
+ public List<Exception> getCollectorExceptions()
+ {
+ return dce.getResult().getExceptions();
+ }
+ };
+ }
+}
Modified: maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31ArtifactResult.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31ArtifactResult.java?rev=1748310&r1=1748309&r2=1748310&view=diff
==============================================================================
--- maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31ArtifactResult.java (original)
+++ maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31ArtifactResult.java Mon Jun 13 21:01:20 2016
@@ -30,7 +30,7 @@ import org.eclipse.aether.artifact.Artif
* @author Robert Scholte
* @since 3.0
*/
-public class Maven31ArtifactResult
+class Maven31ArtifactResult
implements org.apache.maven.shared.artifact.resolve.ArtifactResult
{
private final ArtifactResult artifactResult;
Modified: maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolver.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolver.java?rev=1748310&r1=1748309&r2=1748310&view=diff
==============================================================================
--- maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolver.java (original)
+++ maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolver.java Mon Jun 13 21:01:20 2016
@@ -222,7 +222,7 @@ public class Maven31DependencyResolver
}
catch ( DependencyResolutionException e )
{
- throw new DependencyResolverException( e.getMessage(), e );
+ throw new Maven31DependencyResolverException( e );
}
}
Added: maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolverException.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolverException.java?rev=1748310&view=auto
==============================================================================
--- maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolverException.java (added)
+++ maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolverException.java Mon Jun 13 21:01:20 2016
@@ -0,0 +1,55 @@
+package org.apache.maven.shared.dependencies.resolve.internal;
+
+/*
+ * 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.
+ */
+
+import java.util.List;
+
+import org.apache.maven.shared.dependencies.resolve.DependencyResolverException;
+import org.apache.maven.shared.dependencies.resolve.DependencyResult;
+import org.eclipse.aether.resolution.DependencyResolutionException;
+
+/**
+ *
+ * @author Robert Scholte
+ *
+ */
+class Maven31DependencyResolverException extends DependencyResolverException
+{
+ private DependencyResolutionException e;
+
+ public Maven31DependencyResolverException( DependencyResolutionException e )
+ {
+ super( e );
+ this.e = e;
+ }
+
+ @Override
+ public DependencyResult getResult()
+ {
+ return new DependencyResult()
+ {
+ @Override
+ public List<Exception> getCollectorExceptions()
+ {
+ return e.getResult().getCollectExceptions();
+ }
+ };
+ }
+}