You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sc...@apache.org on 2016/12/12 22:53:33 UTC
[1/2] maven-resolver git commit: [MRESOLVER-2] Add repository id to
TransferResource.
Repository: maven-resolver
Updated Branches:
refs/heads/master 98531efd5 -> d2f5aa54b
[MRESOLVER-2] Add repository id to TransferResource.
o Updated to restore binary compatibility by re-adding methods removed
from the public API marking them @Deprecated.
Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/077281a8
Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/077281a8
Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/077281a8
Branch: refs/heads/master
Commit: 077281a887a47c3aa889e84a8a7a7e9f9585a1b7
Parents: 98531ef
Author: Christian Schulte <sc...@apache.org>
Authored: Mon Dec 12 23:26:22 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Mon Dec 12 23:52:53 2016 +0100
----------------------------------------------------------------------
.../aether/transfer/TransferResource.java | 23 ++++++++++++++++++++
1 file changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/077281a8/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferResource.java
----------------------------------------------------------------------
diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferResource.java b/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferResource.java
index f2e2135..d304199 100644
--- a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferResource.java
+++ b/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferResource.java
@@ -48,6 +48,25 @@ public final class TransferResource
/**
* Creates a new transfer resource with the specified properties.
*
+ * @param repositoryUrl The base URL of the repository, may be {@code null} or empty if unknown. If not empty, a
+ * trailing slash will automatically be added if missing.
+ * @param resourceName The relative path to the resource within the repository, may be {@code null}. A leading slash
+ * (if any) will be automatically removed.
+ * @param file The source/target file involved in the transfer, may be {@code null}.
+ * @param trace The trace information, may be {@code null}.
+ *
+ * @deprecated As of 1.2.0, replaced by {@link #TransferResource(java.lang.String, java.lang.String,
+ * java.lang.String, java.io.File, org.eclipse.aether.RequestTrace)}
+ */
+ @Deprecated
+ public TransferResource( String repositoryUrl, String resourceName, File file, RequestTrace trace )
+ {
+ this( null, repositoryUrl, resourceName, file, trace );
+ }
+
+ /**
+ * Creates a new transfer resource with the specified properties.
+ *
* @param repositoryId The ID of the repository used to transfer the resource, may be {@code null} or empty if unknown.
* @param repositoryUrl The base URL of the repository, may be {@code null} or empty if unknown. If not empty, a
* trailing slash will automatically be added if missing.
@@ -55,6 +74,8 @@ public final class TransferResource
* (if any) will be automatically removed.
* @param file The source/target file involved in the transfer, may be {@code null}.
* @param trace The trace information, may be {@code null}.
+ *
+ * @since 1.2.0
*/
public TransferResource( String repositoryId, String repositoryUrl, String resourceName,
File file, RequestTrace trace )
@@ -105,6 +126,8 @@ public final class TransferResource
* The ID of the repository, e.g., "central".
*
* @return The ID of the repository or an empty string if unknown, never {@code null}.
+ *
+ * @since 1.2.0
*/
public String getRepositoryId()
{
[2/2] maven-resolver git commit: [MRESOLVER-4] Use
java.util.Objects#requireNonNull to intercept invalid input
Posted by sc...@apache.org.
[MRESOLVER-4] Use java.util.Objects#requireNonNull to intercept invalid input
o Updated to re-add missing validation.
Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/d2f5aa54
Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/d2f5aa54
Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/d2f5aa54
Branch: refs/heads/master
Commit: d2f5aa54b14107eeffe230a331d472ae46d7ff5b
Parents: 077281a
Author: Christian Schulte <sc...@apache.org>
Authored: Mon Dec 12 23:33:20 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Mon Dec 12 23:52:59 2016 +0100
----------------------------------------------------------------------
.../org/eclipse/aether/internal/impl/DefaultRepositorySystem.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/d2f5aa54/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
----------------------------------------------------------------------
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
index 7555812..5787a61 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
@@ -431,11 +431,13 @@ public class DefaultRepositorySystem
requireNonNull( session, "repository system session cannot be null" );
invalidSession( session.getLocalRepositoryManager(), "local repository manager" );
invalidSession( session.getSystemProperties(), "system properties" );
+ invalidSession( session.getUserProperties(), "user properties" );
invalidSession( session.getConfigProperties(), "config properties" );
invalidSession( session.getMirrorSelector(), "mirror selector" );
invalidSession( session.getProxySelector(), "proxy selector" );
invalidSession( session.getAuthenticationSelector(), "authentication selector" );
invalidSession( session.getArtifactTypeRegistry(), "artifact type registry" );
+ invalidSession( session.getData(), "data" );
}
private void invalidSession( Object obj, String name )