upgrade gradle and handle empty git credentails

Geekoosh · Jan 2, 2021 · 39d75c8 · 39d75c8
1 parent 2d68dc7
commit 39d75c8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 group 'com.geekoosh'
-version '0.0.2'
+version '0.0.3'
 
 apply plugin: 'java'
 
@@ -22,14 +22,18 @@ buildscript {
     }
     dependencies {
         classpath "io.spring.gradle:dependency-management-plugin:1.0.3.RELEASE"
-        classpath "com.github.jengelman.gradle.plugins:shadow:2.0.1"
+        classpath "com.github.jengelman.gradle.plugins:shadow:6.1.0"
         classpath 'ca.cutterslade.gradle:gradle-dependency-analyze:1.3.3'
     }
 }
 
 apply plugin: "io.spring.dependency-management"
 apply plugin: 'com.github.johnrengelman.shadow'
 
+shadowJar {
+    archiveFileName = "flyway-all.jar"
+}
+
 dependencyManagement {
     imports {
         mavenBom 'com.amazonaws:aws-java-sdk-bom:1.11.623'

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-rc-2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/src/main/java/com/geekoosh/lambda/git/GitService.java b/src/main/java/com/geekoosh/lambda/git/GitService.java
@@ -60,10 +60,12 @@ public void cloneRepo() throws MigrationFilesException {
         logger.info("Fetching from branch " + branchRef());
 
         CloneCommand cloneCmd = Git.cloneRepository();
+        if(gitRequest.getUsername() != null && gitRequest.getPassword() != null) {
+            cloneCmd = cloneCmd.setCredentialsProvider(new UsernamePasswordCredentialsProvider(
+                    gitRequest.getUsername(), gitRequest.getPassword()
+            ));
+        }
         cloneCmd
-                .setCredentialsProvider(new UsernamePasswordCredentialsProvider(
-                        gitRequest.getUsername(), gitRequest.getPassword()
-                ))
                 .setURI(gitRequest.getGitRepository())
                 .setBranchesToClone(Collections.singletonList(branchRef()))
                 .setBranch(branchRef())