aboutsummaryrefslogtreecommitdiffstats
path: root/bpmn
diff options
context:
space:
mode:
authorRob Daugherty <rd472p@att.com>2017-07-19 16:38:36 -0400
committerRob Daugherty <rd472p@att.com>2017-07-19 16:39:10 -0400
commit3efc13f943058c2679db322ec4e38dad20f98cc5 (patch)
tree732de32358dbd683c3e6aca13f5a16d68a5e6d4b /bpmn
parent62a625db852194e0afb6063cb982b4b71a833a2c (diff)
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 <rd472p@att.com>
Diffstat (limited to 'bpmn')
-rw-r--r--bpmn/MSOCockpit/pom.xml10
-rw-r--r--bpmn/MSOCommonBPMN/pom.xml10
-rw-r--r--bpmn/MSOCoreBPMN/pom.xml8
-rw-r--r--bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/PropertyConfigurationTest.java26
-rw-r--r--bpmn/MSOInfrastructureBPMN/pom.xml14
-rw-r--r--bpmn/MSOMockServer/pom.xml4
-rw-r--r--bpmn/MSORESTClient/pom.xml4
-rw-r--r--bpmn/MSOURN-plugin/pom.xml6
-rw-r--r--bpmn/pom.xml4
9 files changed, 30 insertions, 56 deletions
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 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>bpmn</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>MSOCockpit</artifactId>
<packaging>pom</packaging>
<name>MSOCockpit</name>
@@ -47,17 +47,17 @@
</dependency>
<dependency>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>cockpit-urnmap-plugin</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>MSOCoreBPMN</artifactId>
<version>${project.version}</version>
</dependency>
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">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>bpmn</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
@@ -296,13 +296,13 @@
<version>3.4</version>
</dependency>
<dependency>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>MSOCoreBPMN</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<!-- unit test utilities -->
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>MSOCoreBPMN</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -320,14 +320,14 @@
<version>4.3.2.RELEASE</version>
</dependency>
<dependency>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>MSOMockServer</artifactId>
<version>${project.version}</version>
<classifier>classes</classifier>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>MSORESTClient</artifactId>
<version>${project.version}</version>
</dependency>
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 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>bpmn</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>MSOCoreBPMN</artifactId>
<packaging>jar</packaging>
@@ -134,7 +134,7 @@
<artifactId>Saxon-HE</artifactId>
</dependency>
<dependency>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
</dependency>
@@ -169,7 +169,7 @@
<version>1.6</version>
</dependency>
<dependency>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>status-control</artifactId>
<version>${project.version}</version>
</dependency>
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<String,String> 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 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>bpmn</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
@@ -282,17 +282,17 @@
<version>3.4</version>
</dependency>
<dependency>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>MSOCoreBPMN</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>MSOCommonBPMN</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>MSOCommonBPMN</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -300,7 +300,7 @@
</dependency>
<dependency>
<!-- unit test utilities -->
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>MSOCoreBPMN</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -318,14 +318,14 @@
<version>4.3.2.RELEASE</version>
</dependency>
<dependency>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>MSOMockServer</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<classifier>classes</classifier>
</dependency>
<dependency>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>MSORESTClient</artifactId>
<version>${project.version}</version>
</dependency>
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 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>bpmn</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>MSOMockServer</artifactId>
<packaging>war</packaging>
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 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>bpmn</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>MSORESTClient</artifactId>
<packaging>jar</packaging>
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 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>bpmn</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>cockpit-urnmap-plugin</artifactId>
<packaging>jar</packaging>
@@ -56,7 +56,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
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 @@
<parent>
<groupId>org.openecomp</groupId>
- <artifactId>mso</artifactId>
+ <artifactId>so</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.openecomp.so</groupId>
<artifactId>bpmn</artifactId>
<name>BPMN Subsystem</name>
<description>BPMN Subsystem for MSO</description>