diff --git a/pom.xml b/pom.xml index b3d6781..fc044f5 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 1.8 1.8 - 2.34.0 + 2.34.1 diff --git a/src/main/java/com/overops/plugins/bamboo/TaskType.java b/src/main/java/com/overops/plugins/bamboo/TaskType.java index a60ee91..361f50a 100644 --- a/src/main/java/com/overops/plugins/bamboo/TaskType.java +++ b/src/main/java/com/overops/plugins/bamboo/TaskType.java @@ -74,22 +74,12 @@ public TaskResult execute(@NotNull TaskContext context) throws TaskException { boolean isDebug = Boolean.parseBoolean(context.getConfigurationMap().get(Const.DEBUG)); String appUrl = (String)globalSettings.get(Const.GLOBAL_APP_URL); - Properties props = Utils.getOverOpsProperties(); - PrintStream printStream = null; - if (isDebug) - { - printStream = new BambooPrintWriter(System.out, logger); - logger.addBuildLogEntry(props.get("com.overops.plugins.bamboo.task.config.apiUrl") + ": " + endPoint); - logger.addBuildLogEntry(props.get("com.overops.plugins.bamboo.task.config.appUrl") + ": " + appUrl); - logger.addBuildLogEntry(props.get("com.overops.plugins.bamboo.task.config.envId") + ": " + query.getServiceId()); - logger.addBuildLogEntry(props.get("com.overops.plugins.bamboo.task.config.applicationName") + ": " + query.getApplicationName()); - logger.addBuildLogEntry(props.get("com.overops.plugins.bamboo.task.config.deploymentName") + ": " + query.getDeploymentName()); - } + PrintStream printStream = isDebug ? new BambooPrintWriter(System.out, logger) : null; Boolean displayLink = Boolean.parseBoolean(context.getConfigurationMap().get(Const.LINK)); if (displayLink) { - HtmlParts htmlParts = new HtmlParts(overOpsService.generateReportLinkHtml(appUrl, query), ""); + HtmlParts htmlParts = new HtmlParts(overOpsService.generateReportLinkHtml(appUrl, query, printStream, isDebug), ""); context.getBuildContext().getBuildResult().getCustomBuildData().put("overOpsReport", objectMapper.writeValueAsString(htmlParts)); context.getBuildContext().getBuildResult().getCustomBuildData().put("isOverOpsStep", "true"); return resultBuilder.success().build(); diff --git a/src/main/java/com/overops/plugins/bamboo/Utils.java b/src/main/java/com/overops/plugins/bamboo/Utils.java index 9c5d4f4..e192181 100644 --- a/src/main/java/com/overops/plugins/bamboo/Utils.java +++ b/src/main/java/com/overops/plugins/bamboo/Utils.java @@ -18,13 +18,6 @@ public static String getArtifactId() throws IOException { return getProperty("artifactId"); } - public static Properties getOverOpsProperties() throws IOException - { - Properties props = new Properties(); - props.load(Utils.class.getResourceAsStream("overops.properties")); - return props; - } - private static String getProperty(String prop) throws IOException { Properties props = new Properties(); props.load(Utils.class.getResourceAsStream("/version.properties"));