From 271a15d2c98e4bd95963ca4733b469833bbc7905 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Fri, 15 Mar 2019 16:19:33 -0400 Subject: [PATCH] Remove -SNAPSHOT from test Jenkins staging plugin strips the string '-SNAPSHOT' from all xml files. Updated test case not to use a snapshot version in test data. Change-Id: I225b9a731bea2f21233327e4063ad841f0893f82 Issue-ID: CCSDK-1156 Signed-off-by: Timoney, Dan (dt5972) --- .../jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java | 8 ++++---- properties-node/provider/src/test/resources/test.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java b/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java index aa3f89d1..f1e0ab62 100644 --- a/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java +++ b/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java @@ -293,7 +293,7 @@ public class TestPropertiesNode { assertEquals(ctx.getAttribute("test-xml.project.dependencies.dependency.scope"),"provided"); assertEquals(ctx.getAttribute("test-xml.project.build.pluginManagement.plugins.plugin.configuration" + ".lifecycleMappingMetadata.pluginExecutions.pluginExecution." + - "pluginExecutionFilter.versionRange"),"[1.2.0.100-SNAPSHOT,)"); + "pluginExecutionFilter.versionRange"),"[1.2.0.100,)"); assertEquals(ctx.getAttribute("test-xml.project.build.plugins.plugin.configuration." + "instructions.Import-Package"),"*"); } @@ -314,7 +314,7 @@ public class TestPropertiesNode { assertEquals(ctx.getAttribute("project.dependencies.dependency.scope"),"provided"); assertEquals(ctx.getAttribute("project.build.pluginManagement.plugins.plugin.configuration" + ".lifecycleMappingMetadata.pluginExecutions.pluginExecution." + - "pluginExecutionFilter.versionRange"),"[1.2.0.100-SNAPSHOT,)"); + "pluginExecutionFilter.versionRange"),"[1.2.0.100,)"); assertEquals(ctx.getAttribute("project.build.plugins.plugin.configuration." + "instructions.Import-Package"),"*"); } @@ -334,7 +334,7 @@ public class TestPropertiesNode { assertEquals(ctx.getAttribute("project.dependencies.dependency.scope"),"provided"); assertEquals(ctx.getAttribute("project.build.pluginManagement.plugins.plugin.configuration" + ".lifecycleMappingMetadata.pluginExecutions.pluginExecution." + - "pluginExecutionFilter.versionRange"),"[1.2.0.100-SNAPSHOT,)"); + "pluginExecutionFilter.versionRange"),"[1.2.0.100,)"); assertEquals(ctx.getAttribute("project.build.plugins.plugin.configuration." + "instructions.Import-Package"),"*"); } @@ -355,7 +355,7 @@ public class TestPropertiesNode { assertEquals(ctx.getAttribute("project.dependencies.dependency.scope"),"provided"); assertEquals(ctx.getAttribute("project.build.pluginManagement.plugins.plugin.configuration" + ".lifecycleMappingMetadata.pluginExecutions.pluginExecution." + - "pluginExecutionFilter.versionRange"),"[1.2.0.100-SNAPSHOT,)"); + "pluginExecutionFilter.versionRange"),"[1.2.0.100,)"); assertEquals(ctx.getAttribute("project.build.plugins.plugin.configuration." + "instructions.Import-Package"),"*"); assertEquals(ctx.getAttribute("tmp.sdn-circuit-req-row_length"),"1"); diff --git a/properties-node/provider/src/test/resources/test.xml b/properties-node/provider/src/test/resources/test.xml index 1974f688..19e3b713 100644 --- a/properties-node/provider/src/test/resources/test.xml +++ b/properties-node/provider/src/test/resources/test.xml @@ -162,7 +162,7 @@ providermodule-plugin - [1.2.0.100-SNAPSHOT,) + [1.2.0.100,) process -- 2.16.6