Relocated FatJarDetector Utility to generator/java-exec pacakge

fabric8io · Feb 5, 2020 · 02dc4e2 · 02dc4e2
1 parent 8212c1c
commit 02dc4e2
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 25 deletions.
diff --git a/core/src/main/java/io/fabric8/maven/core/util/JibServiceUtil.java b/core/src/main/java/io/fabric8/maven/core/util/JibServiceUtil.java
@@ -273,7 +273,7 @@ public static JibBuildService.JibBuildConfiguration getJibBuildConfiguration(Bui
         Credential pullCredential = getRegistryCredentials(pullRegistry, config.getDockerBuildContext().getRegistryConfig());
 
         RegistryImage baseRegistryImage = RegistryImage.named(baseImage);
-        if (pullCredential != null) {
+        if (pullCredential!= null && !pullCredential.getUsername().isEmpty() && !pullCredential.getPassword().isEmpty()) {
             baseRegistryImage.addCredential(pullCredential.getUsername(), pullCredential.getPassword());
 
         }
@@ -331,8 +331,6 @@ public static void pushImage(TarImage baseImage, String targetImageName, Credent
         }
     }
 
-
-
     private static Set<Port> getPortSet(List<String> ports) {
         Set<Port> portSet = new HashSet<>();
         for(String port : ports) {
@@ -342,21 +340,6 @@ private static Set<Port> getPortSet(List<String> ports) {
         return portSet;
     }
 
-    public static Path getFatJar(String buildDir, Logger log) {
-        FatJarDetector fatJarDetector = new FatJarDetector(buildDir);
-        try {
-            FatJarDetector.Result result = fatJarDetector.scan();
-            if(result != null) {
-                return result.getArchiveFile().toPath();
-            }
-
-        } catch (MojoExecutionException e) {
-            log.error("MOJO Execution exception occurred: %s", e);
-            throw new UnsupportedOperationException();
-        }
-        return null;
-    }
-
     public static Credential getRegistryCredentials(String registry, RegistryService.RegistryConfig registryConfig) throws MojoExecutionException {
         if (registry == null) {
             registry = DOCKER_REGISTRY; // Let's assume docker is default registry.

diff --git a/generator/java-exec/src/main/java/FatJarDetector.java b/generator/java-exec/src/main/java/FatJarDetector.java
@@ -13,7 +13,6 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package io.fabric8.maven.core.util;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/generator/java-exec/src/main/java/io/fabric8/maven/generator/javaexec/JavaExecGenerator.java b/generator/java-exec/src/main/java/io/fabric8/maven/generator/javaexec/JavaExecGenerator.java
@@ -22,7 +22,7 @@
 import java.util.Map;
 
 import io.fabric8.maven.core.util.Configs;
-import io.fabric8.maven.core.util.FatJarDetector;
+import FatJarDetector;
 import io.fabric8.maven.core.util.MainClassDetector;
 import io.fabric8.maven.core.util.MavenUtil;
 import io.fabric8.maven.docker.config.AssemblyConfiguration;

diff --git a/generator/java-exec/src/test/java/FatJarDetectorTest.java b/generator/java-exec/src/test/java/FatJarDetectorTest.java
@@ -13,7 +13,6 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package io.fabric8.maven.core.util;
 
 import java.io.File;
 import java.net.URL;

diff --git a/...java/io/fabric8/maven/generator/javaexec/JavaExecGeneratorMainClassDeterminationTest.java b/...java/io/fabric8/maven/generator/javaexec/JavaExecGeneratorMainClassDeterminationTest.java
@@ -25,7 +25,7 @@
 import io.fabric8.maven.core.config.OpenShiftBuildStrategy;
 import io.fabric8.maven.core.config.ProcessorConfig;
 import io.fabric8.maven.core.util.ClassUtil;
-import io.fabric8.maven.core.util.FatJarDetector;
+import FatJarDetector;
 import io.fabric8.maven.docker.config.AssemblyConfiguration;
 import io.fabric8.maven.docker.config.ImageConfiguration;
 import io.fabric8.maven.docker.util.Logger;

diff --git a/...ator/openliberty/src/main/java/io/fabric8/generator/openliberty/OpenLibertyGenerator.java b/...ator/openliberty/src/main/java/io/fabric8/generator/openliberty/OpenLibertyGenerator.java
@@ -28,7 +28,7 @@
 import org.apache.maven.plugins.assembly.model.FileSet;
 import org.apache.maven.project.MavenProject;
 
-import io.fabric8.maven.core.util.FatJarDetector;
+import FatJarDetector;
 import io.fabric8.maven.core.util.MavenUtil;
 import io.fabric8.maven.docker.config.AssemblyConfiguration;
 import io.fabric8.maven.docker.config.ImageConfiguration;

diff --git a/.../openliberty/src/test/java/io/fabric8/generator/openliberty/OpenLibertyGeneratorTest.java b/.../openliberty/src/test/java/io/fabric8/generator/openliberty/OpenLibertyGeneratorTest.java
@@ -29,7 +29,7 @@
 import org.apache.maven.project.MavenProject;
 import org.junit.Test;
 
-import io.fabric8.maven.core.util.FatJarDetector;
+import FatJarDetector;
 import io.fabric8.maven.docker.config.AssemblyConfiguration;
 import io.fabric8.maven.docker.util.Logger;
 import io.fabric8.maven.generator.api.GeneratorContext;

diff --git a/.../spring-boot/src/main/java/io/fabric8/maven/generator/springboot/SpringBootGenerator.java b/.../spring-boot/src/main/java/io/fabric8/maven/generator/springboot/SpringBootGenerator.java
@@ -41,7 +41,7 @@
 import io.fabric8.maven.docker.util.Logger;
 import io.fabric8.maven.generator.api.GeneratorContext;
 import io.fabric8.maven.generator.api.GeneratorMode;
-import io.fabric8.maven.core.util.FatJarDetector;
+import FatJarDetector;
 import io.fabric8.maven.generator.javaexec.JavaExecGenerator;
 import org.apache.commons.io.FileUtils;
 import org.apache.maven.model.Plugin;