From 3efc13f943058c2679db322ec4e38dad20f98cc5 Mon Sep 17 00:00:00 2001 From: Rob Daugherty Date: Wed, 19 Jul 2017 16:38:36 -0400 Subject: Fix artifact group IDs (org.openecomp.so) Since the repositories were renamed from "mso" to "so" the artifact group IDs in the poms must be updated to match. Issue: SO-39 Change-Id: I617fe738a77d0f6c1d1cc0ac9474fb753f4e234c Signed-off-by: Rob Daugherty --- bpmn/MSOCockpit/pom.xml | 10 ++++----- bpmn/MSOCommonBPMN/pom.xml | 10 ++++----- bpmn/MSOCoreBPMN/pom.xml | 8 +++---- .../mso/bpmn/core/PropertyConfigurationTest.java | 26 ---------------------- bpmn/MSOInfrastructureBPMN/pom.xml | 14 ++++++------ bpmn/MSOMockServer/pom.xml | 4 ++-- bpmn/MSORESTClient/pom.xml | 4 ++-- bpmn/MSOURN-plugin/pom.xml | 6 ++--- bpmn/pom.xml | 4 ++-- 9 files changed, 30 insertions(+), 56 deletions(-) (limited to 'bpmn') diff --git a/bpmn/MSOCockpit/pom.xml b/bpmn/MSOCockpit/pom.xml index 165c528812..5fa9e7e2f1 100644 --- a/bpmn/MSOCockpit/pom.xml +++ b/bpmn/MSOCockpit/pom.xml @@ -1,13 +1,13 @@ - org.openecomp.mso + org.openecomp.so bpmn 1.1.0-SNAPSHOT 4.0.0 - org.openecomp.mso + org.openecomp.so MSOCockpit pom MSOCockpit @@ -47,17 +47,17 @@ - org.openecomp.mso + org.openecomp.so common ${project.version} - org.openecomp.mso + org.openecomp.so cockpit-urnmap-plugin ${project.version} - org.openecomp.mso + org.openecomp.so MSOCoreBPMN ${project.version} diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml index e35c874a4e..3452fe3fdd 100644 --- a/bpmn/MSOCommonBPMN/pom.xml +++ b/bpmn/MSOCommonBPMN/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.openecomp.mso + org.openecomp.so bpmn 1.1.0-SNAPSHOT @@ -296,13 +296,13 @@ 3.4 - org.openecomp.mso + org.openecomp.so MSOCoreBPMN ${project.version} - org.openecomp.mso + org.openecomp.so MSOCoreBPMN ${project.version} tests @@ -320,14 +320,14 @@ 4.3.2.RELEASE - org.openecomp.mso + org.openecomp.so MSOMockServer ${project.version} classes test - org.openecomp.mso + org.openecomp.so MSORESTClient ${project.version} diff --git a/bpmn/MSOCoreBPMN/pom.xml b/bpmn/MSOCoreBPMN/pom.xml index bdc26713e9..29ea1b6e01 100644 --- a/bpmn/MSOCoreBPMN/pom.xml +++ b/bpmn/MSOCoreBPMN/pom.xml @@ -2,12 +2,12 @@ - org.openecomp.mso + org.openecomp.so bpmn 1.1.0-SNAPSHOT 4.0.0 - org.openecomp.mso + org.openecomp.so MSOCoreBPMN jar @@ -134,7 +134,7 @@ Saxon-HE - org.openecomp.mso + org.openecomp.so common ${project.version} @@ -169,7 +169,7 @@ 1.6 - org.openecomp.mso + org.openecomp.so status-control ${project.version} diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/PropertyConfigurationTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/PropertyConfigurationTest.java index fa0f8d8dd8..50b9a53f04 100644 --- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/PropertyConfigurationTest.java +++ b/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/PropertyConfigurationTest.java @@ -105,30 +105,4 @@ public class PropertyConfigurationTest { Assert.assertEquals("testValue", props.get("testKey")); props.put("newKey", "newvalue"); } - - @Test - public void testNotAllowedPropertyReloading() throws IOException { - Path msoConfigPath = Paths.get(System.getProperty("mso.config.path")); - Path backupPropFilePath = msoConfigPath.resolve("backup-" + PropertyConfiguration.MSO_BPMN_PROPERTIES); - - try { - // Create a new file... a backup file - Files.createFile(backupPropFilePath); - - // Load properties - PropertyConfiguration propertyConfiguration = PropertyConfiguration.getInstance(); - Map props = propertyConfiguration.getProperties(PropertyConfiguration.MSO_BPMN_PROPERTIES); - Assert.assertNotNull(props); - Assert.assertEquals("testValue", props.get("testKey")); - - // Update the backup file - Path bpmnPropertiesSourcePath = Paths.get("src", "test", "resources", "mso.bpmn.properties"); - Files.copy(bpmnPropertiesSourcePath, backupPropFilePath, StandardCopyOption.REPLACE_EXISTING); - - // Cache size should remain the same - Assert.assertEquals(1, PropertyConfiguration.getInstance().cacheSize()); - } finally { - backupPropFilePath.toFile().delete(); - } - } } diff --git a/bpmn/MSOInfrastructureBPMN/pom.xml b/bpmn/MSOInfrastructureBPMN/pom.xml index ca9ce57912..5c0eff96bb 100644 --- a/bpmn/MSOInfrastructureBPMN/pom.xml +++ b/bpmn/MSOInfrastructureBPMN/pom.xml @@ -1,7 +1,7 @@ - org.openecomp.mso + org.openecomp.so bpmn 1.1.0-SNAPSHOT @@ -282,17 +282,17 @@ 3.4 - org.openecomp.mso + org.openecomp.so MSOCoreBPMN ${project.version} - org.openecomp.mso + org.openecomp.so MSOCommonBPMN ${project.version} - org.openecomp.mso + org.openecomp.so MSOCommonBPMN ${project.version} tests @@ -300,7 +300,7 @@ - org.openecomp.mso + org.openecomp.so MSOCoreBPMN ${project.version} tests @@ -318,14 +318,14 @@ 4.3.2.RELEASE - org.openecomp.mso + org.openecomp.so MSOMockServer ${project.version} test classes - org.openecomp.mso + org.openecomp.so MSORESTClient ${project.version} diff --git a/bpmn/MSOMockServer/pom.xml b/bpmn/MSOMockServer/pom.xml index 268f392977..34f7a2331d 100644 --- a/bpmn/MSOMockServer/pom.xml +++ b/bpmn/MSOMockServer/pom.xml @@ -1,12 +1,12 @@ - org.openecomp.mso + org.openecomp.so bpmn 1.1.0-SNAPSHOT 4.0.0 - org.openecomp.mso + org.openecomp.so MSOMockServer war diff --git a/bpmn/MSORESTClient/pom.xml b/bpmn/MSORESTClient/pom.xml index 2c899084f8..e17a58f488 100644 --- a/bpmn/MSORESTClient/pom.xml +++ b/bpmn/MSORESTClient/pom.xml @@ -4,12 +4,12 @@ 4.0.0 - org.openecomp.mso + org.openecomp.so bpmn 1.1.0-SNAPSHOT - org.openecomp.mso + org.openecomp.so MSORESTClient jar diff --git a/bpmn/MSOURN-plugin/pom.xml b/bpmn/MSOURN-plugin/pom.xml index ac75b53c08..a8b198de58 100644 --- a/bpmn/MSOURN-plugin/pom.xml +++ b/bpmn/MSOURN-plugin/pom.xml @@ -3,12 +3,12 @@ 4.0.0 - org.openecomp.mso + org.openecomp.so bpmn 1.1.0-SNAPSHOT - org.openecomp.mso + org.openecomp.so cockpit-urnmap-plugin jar @@ -56,7 +56,7 @@ provided - org.openecomp.mso + org.openecomp.so common ${project.version} compile diff --git a/bpmn/pom.xml b/bpmn/pom.xml index ed062ba1c3..c7b914a276 100644 --- a/bpmn/pom.xml +++ b/bpmn/pom.xml @@ -4,11 +4,11 @@ org.openecomp - mso + so 1.1.0-SNAPSHOT - org.openecomp.mso + org.openecomp.so bpmn BPMN Subsystem BPMN Subsystem for MSO -- cgit 1.2.3-korg