Merge pull request #13587 from gradle/vv/use-optional-credentials

Mark credentials as Optional in ivy and maven repositories
gradle · Jun 25, 2020 · c105ee5 · c105ee5
2 parents 72e8893 + d31fc7e
commit c105ee5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/tasks/PublishToIvyRepository.java b/subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/tasks/PublishToIvyRepository.java
@@ -30,6 +30,7 @@
 import org.gradle.api.publish.ivy.internal.publisher.IvyPublisher;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.Internal;
+import org.gradle.api.tasks.Optional;
 import org.gradle.api.tasks.PathSensitivity;
 import org.gradle.api.tasks.TaskAction;
 import org.gradle.internal.artifacts.repositories.AuthenticationSupportedInternal;
@@ -44,12 +45,9 @@
  */
 public class PublishToIvyRepository extends DefaultTask {
 
-    private static final Credentials NO_CREDENTIALS = new Credentials() {
-    };
-
     private IvyPublicationInternal publication;
     private IvyArtifactRepository repository;
-    private final Property<Credentials> credentials = getProject().getObjects().property(Credentials.class).convention(NO_CREDENTIALS);
+    private final Property<Credentials> credentials = getProject().getObjects().property(Credentials.class);
 
     public PublishToIvyRepository() {
 
@@ -118,6 +116,7 @@ public IvyArtifactRepository getRepository() {
     }
 
     @Input
+    @Optional
     Property<Credentials> getCredentials() {
         return credentials;
     }
@@ -129,7 +128,7 @@ Property<Credentials> getCredentials() {
      */
     public void setRepository(IvyArtifactRepository repository) {
         this.repository = repository;
-        this.credentials.set(((AuthenticationSupportedInternal) repository).getConfiguredCredentials().orElse(NO_CREDENTIALS));
+        this.credentials.set(((AuthenticationSupportedInternal) repository).getConfiguredCredentials());
     }
 
     @TaskAction

diff --git a/...ects/maven/src/main/java/org/gradle/api/publish/maven/tasks/PublishToMavenRepository.java b/...ects/maven/src/main/java/org/gradle/api/publish/maven/tasks/PublishToMavenRepository.java
@@ -28,6 +28,7 @@
 import org.gradle.api.publish.maven.internal.publisher.ValidatingMavenPublisher;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.Internal;
+import org.gradle.api.tasks.Optional;
 import org.gradle.api.tasks.TaskAction;
 import org.gradle.internal.artifacts.repositories.AuthenticationSupportedInternal;
 import org.gradle.internal.serialization.Cached;
@@ -48,10 +49,7 @@ public class PublishToMavenRepository extends AbstractPublishToMaven {
     private final Transient.Var<MavenArtifactRepository> repository = varOf();
     private final Cached<PublishSpec> spec = Cached.of(this::computeSpec);
 
-    private static final Credentials NO_CREDENTIALS = new Credentials() {
-    };
-
-    private final Property<Credentials> credentials = getProject().getObjects().property(Credentials.class).convention(NO_CREDENTIALS);
+    private final Property<Credentials> credentials = getProject().getObjects().property(Credentials.class);
 
     /**
      * The repository to publish to.
@@ -65,6 +63,7 @@ public MavenArtifactRepository getRepository() {
     }
 
     @Input
+    @Optional
     Property<Credentials> getCredentials() {
         return credentials;
     }
@@ -76,7 +75,7 @@ Property<Credentials> getCredentials() {
      */
     public void setRepository(MavenArtifactRepository repository) {
         this.repository.set(repository);
-        this.credentials.set(((AuthenticationSupportedInternal) repository).getConfiguredCredentials().orElse(NO_CREDENTIALS));
+        this.credentials.set(((AuthenticationSupportedInternal) repository).getConfiguredCredentials());
     }
 
     @TaskAction