Merge pull request #14200 from mdogan/manifest-transformer-logging

Replace System.out logging in HazelcastManifestTransformer with Logger
hazelcast · Jan 4, 2019 · 8b0a17f · 8b0a17f
2 parents b7c4809 + d0da695
commit 8b0a17f
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/...cast-build-utils/src/main/java/com/hazelcast/buildutils/HazelcastManifestTransformer.java b/...cast-build-utils/src/main/java/com/hazelcast/buildutils/HazelcastManifestTransformer.java
@@ -17,6 +17,8 @@
 package com.hazelcast.buildutils;
 
 import aQute.lib.osgi.Instruction;
+import com.hazelcast.logging.ILogger;
+import com.hazelcast.logging.Logger;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.maven.plugins.shade.relocation.Relocator;
 import org.apache.maven.plugins.shade.resource.ManifestResourceTransformer;
@@ -48,6 +50,8 @@
  */
 public class HazelcastManifestTransformer extends ManifestResourceTransformer {
 
+    private static ILogger logger = Logger.getLogger(HazelcastManifestTransformer.class);
+
     private static final String VERSION_PREFIX = "version=";
     private static final String RESOLUTION_PREFIX = "resolution:=";
     private static final String USES_PREFIX = "uses:=";
@@ -209,7 +213,7 @@ private void precompileOverrideInstructions() {
             for (String packageInstruction : packageInstructions) {
                 PackageDefinition packageDefinition = new PackageDefinition(packageInstruction);
                 Instruction instruction = Instruction.getPattern(packageDefinition.packageName);
-                System.out.println("Compiled import instruction '" + packageInstruction + "' -> " + instruction);
+                logger.fine("Compiled import instruction '" + packageInstruction + "' -> " + instruction);
                 importOverrideInstructions.add(new InstructionDefinition(packageDefinition, instruction));
             }
         }
@@ -219,7 +223,7 @@ private void precompileOverrideInstructions() {
             for (String packageInstruction : packageInstructions) {
                 PackageDefinition packageDefinition = new PackageDefinition(packageInstruction);
                 Instruction instruction = Instruction.getPattern(packageDefinition.packageName);
-                System.out.println("Compiled export instruction '" + packageInstruction + "' -> " + instruction);
+                logger.fine("Compiled export instruction '" + packageInstruction + "' -> " + instruction);
                 exportOverrideInstructions.add(new InstructionDefinition(packageDefinition, instruction));
             }
         }
@@ -230,7 +234,7 @@ private Set<String> shadeExports() {
         for (Map.Entry<String, PackageDefinition> entry : exportedPackages.entrySet()) {
             String definition = entry.getValue().buildDefinition(false);
             exports.add(definition);
-            System.out.println("Adding shaded export -> " + definition);
+            logger.fine("Adding shaded export -> " + definition);
         }
         return exports;
     }
@@ -247,9 +251,9 @@ private Set<String> shadeImports() {
             if (overridden != null) {
                 String definition = overridden.buildDefinition(true);
                 imports.add(definition);
-                System.out.println("Adding shaded import -> " + definition);
+                logger.fine("Adding shaded import -> " + definition);
             } else {
-                System.out.println("Removing shaded import -> " + entry.getValue().packageName);
+                logger.fine("Removing shaded import -> " + entry.getValue().packageName);
             }
         }
         return imports;
@@ -261,11 +265,11 @@ private PackageDefinition overridePackageDefinitionResolution(PackageDefinition
             if (instruction.matches(packageDefinition.packageName)) {
                 // is remove instruction?
                 if (instruction.isNegated()) {
-                    System.out.println("Instruction '" + instruction + "' -> package '" + packageDefinition.packageName + "'");
+                    logger.fine("Instruction '" + instruction + "' -> package '" + packageDefinition.packageName + "'");
                     return null;
                 }
 
-                System.out.println("Instruction '" + instruction + "' -> package '" + packageDefinition.packageName + "'");
+                logger.fine("Instruction '" + instruction + "' -> package '" + packageDefinition.packageName + "'");
 
                 PackageDefinition override = instructionDefinition.packageDefinition;
                 String packageName = packageDefinition.packageName;