summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--appc-config/appc-config-params/features/onap-appc-config-params/pom.xml4
-rw-r--r--appc-config/appc-config-params/features/src/main/resources/features.xml2
-rw-r--r--appc-config/appc-config-params/provider/pom.xml4
-rw-r--r--appc-config/appc-config-params/provider/src/main/java/org/onap/sdnc/config/params/transformer/tosca/ArtifactProcessorImpl.java20
-rw-r--r--appc-config/pom.xml2
-rw-r--r--appc-directed-graph/pom.xml1
-rw-r--r--appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/pom.xml4
-rwxr-xr-xappc-inbound/pom.xml1
-rw-r--r--appc-sdc-listener/appc-yang-generator/pom.xml4
-rw-r--r--appc-sdc-listener/appc-yang-generator/src/main/java/org/onap/appc/yang/impl/YANGGeneratorImpl.java8
10 files changed, 23 insertions, 27 deletions
diff --git a/appc-config/appc-config-params/features/onap-appc-config-params/pom.xml b/appc-config/appc-config-params/features/onap-appc-config-params/pom.xml
index 6a441f02b..114eae8b3 100644
--- a/appc-config/appc-config-params/features/onap-appc-config-params/pom.xml
+++ b/appc-config/appc-config-params/features/onap-appc-config-params/pom.xml
@@ -60,8 +60,8 @@ limitations under the License.
<version>${commons.collections.version}</version>
</dependency>
<dependency>
- <groupId>org.openecomp.sdc.common</groupId>
- <artifactId>openecomp-tosca-datatype</artifactId>
+ <groupId>org.onap.sdc.common</groupId>
+ <artifactId>onap-tosca-datatype</artifactId>
<version>${tosca.datatype.version}</version>
</dependency>
<dependency>
diff --git a/appc-config/appc-config-params/features/src/main/resources/features.xml b/appc-config/appc-config-params/features/src/main/resources/features.xml
index 757a1fc99..083fb5cf4 100644
--- a/appc-config/appc-config-params/features/src/main/resources/features.xml
+++ b/appc-config/appc-config-params/features/src/main/resources/features.xml
@@ -39,7 +39,7 @@
<bundle>mvn:commons-collections/commons-collections/3.2.2</bundle>
<!-- <bundle>wrap:mvn:org.onap.appc/appc-yang-generator/${project.version}</bundle> -->
- <bundle>wrap:mvn:org.openecomp.sdc.common/openecomp-tosca-datatype/${tosca.datatype.version}</bundle>
+ <bundle>wrap:mvn:org.onap.sdc.common/onap-tosca-datatype/${tosca.datatype.version}</bundle>
<bundle>mvn:org.yaml/snakeyaml/${snakeyaml.version}</bundle>
<bundle>mvn:org.onap.appc/appc-config-params-provider/${project.version}</bundle>
</feature>
diff --git a/appc-config/appc-config-params/provider/pom.xml b/appc-config/appc-config-params/provider/pom.xml
index 5812a4bf0..50cb878a5 100644
--- a/appc-config/appc-config-params/provider/pom.xml
+++ b/appc-config/appc-config-params/provider/pom.xml
@@ -45,8 +45,8 @@
</dependency>
<dependency>
- <groupId>org.openecomp.sdc.common</groupId>
- <artifactId>openecomp-tosca-datatype</artifactId>
+ <groupId>org.onap.sdc.common</groupId>
+ <artifactId>onap-tosca-datatype</artifactId>
<version>${tosca.datatype.version}</version>
<exclusions>
<exclusion>
diff --git a/appc-config/appc-config-params/provider/src/main/java/org/onap/sdnc/config/params/transformer/tosca/ArtifactProcessorImpl.java b/appc-config/appc-config-params/provider/src/main/java/org/onap/sdnc/config/params/transformer/tosca/ArtifactProcessorImpl.java
index ad9daf5eb..d990bbdc3 100644
--- a/appc-config/appc-config-params/provider/src/main/java/org/onap/sdnc/config/params/transformer/tosca/ArtifactProcessorImpl.java
+++ b/appc-config/appc-config-params/provider/src/main/java/org/onap/sdnc/config/params/transformer/tosca/ArtifactProcessorImpl.java
@@ -41,11 +41,11 @@ import org.onap.sdnc.config.params.data.PropertyDefinition;
import org.onap.sdnc.config.params.data.RequestKey;
import org.onap.sdnc.config.params.data.ResponseKey;
import org.onap.sdnc.config.params.transformer.tosca.exceptions.ArtifactProcessorException;
-import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate;
-import org.openecomp.sdc.tosca.datatypes.model.NodeType;
-import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate;
-import org.openecomp.sdc.tosca.datatypes.model.TopologyTemplate;
-import org.openecomp.sdc.tosca.services.YamlUtil;
+import org.onap.sdc.tosca.datatypes.model.NodeTemplate;
+import org.onap.sdc.tosca.datatypes.model.NodeType;
+import org.onap.sdc.tosca.datatypes.model.ServiceTemplate;
+import org.onap.sdc.tosca.datatypes.model.TopologyTemplate;
+import org.onap.sdc.tosca.services.YamlUtil;
import org.slf4j.MDC;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
@@ -141,11 +141,11 @@ public class ArtifactProcessorImpl implements ArtifactProcessor {
List<Parameter> parameterList = new LinkedList<>();
- Map<String, org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition> propertyDefinitionFromTOSCA =
+ Map<String, org.onap.sdc.tosca.datatypes.model.PropertyDefinition> propertyDefinitionFromTOSCA =
nodeType.getProperties();
if (null != propertyDefinitionFromTOSCA) {
for (String propertyName : propertyDefinitionFromTOSCA.keySet()) {
- org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition propertyDefinition =
+ org.onap.sdc.tosca.datatypes.model.PropertyDefinition propertyDefinition =
propertyDefinitionFromTOSCA.get(propertyName);
Parameter parameter = new Parameter();
@@ -284,7 +284,7 @@ public class ArtifactProcessorImpl implements ArtifactProcessor {
toscaNodeType.setVersion(artifact.getVersion());
toscaNodeType.setDescription("");
if (artifact.getParameters() != null) {
- Map<String, org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition> toscaPropertyMap =
+ Map<String, org.onap.sdc.tosca.datatypes.model.PropertyDefinition> toscaPropertyMap =
new HashMap<>();
toscaNodeType.setProperties(toscaPropertyMap);
@@ -305,8 +305,8 @@ public class ArtifactProcessorImpl implements ArtifactProcessor {
if (!StringUtils.isBlank(pdParameter.getName())
&& !pdParameter.getName().matches(".*\\s+.*")) {
Log.info("Adding parameter " + pdParameter.getName() + " in node type");
- org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition toscaProperty =
- new org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition();
+ org.onap.sdc.tosca.datatypes.model.PropertyDefinition toscaProperty =
+ new org.onap.sdc.tosca.datatypes.model.PropertyDefinition();
toscaProperty.setType(
StringUtils.isBlank(pdParameter.getType()) ? "string" : pdParameter.getType());
diff --git a/appc-config/pom.xml b/appc-config/pom.xml
index a57b7719f..193dacd09 100644
--- a/appc-config/pom.xml
+++ b/appc-config/pom.xml
@@ -40,8 +40,6 @@
<jettison.version>1.3.7</jettison.version>
<common.collections.version>3.2.2</common.collections.version>
<common.io.version>2.5</common.io.version>
-
- <tosca.datatype.version>1.1.0</tosca.datatype.version>
</properties>
<dependencyManagement>
diff --git a/appc-directed-graph/pom.xml b/appc-directed-graph/pom.xml
index cc623e3c7..17d499437 100644
--- a/appc-directed-graph/pom.xml
+++ b/appc-directed-graph/pom.xml
@@ -43,7 +43,6 @@
<jettison.version>1.3.7</jettison.version>
<commons.collections.version>3.2.2</commons.collections.version>
<common.io.version>2.5</common.io.version>
- <tosca.datatype.version>1.1.0</tosca.datatype.version>
<licenseDir>${project.parent.basedir}</licenseDir>
</properties>
diff --git a/appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/pom.xml b/appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/pom.xml
index f0da8fa19..acb1a8f2d 100644
--- a/appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/pom.xml
+++ b/appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/pom.xml
@@ -50,8 +50,8 @@ limitations under the License.
<classifier>features</classifier>
</dependency>
<dependency>
- <groupId>org.openecomp.sdc.common</groupId>
- <artifactId>openecomp-tosca-datatype</artifactId>
+ <groupId>org.onap.sdc.common</groupId>
+ <artifactId>onap-tosca-datatype</artifactId>
<version>${tosca.datatype.version}</version>
</dependency>
<dependency>
diff --git a/appc-inbound/pom.xml b/appc-inbound/pom.xml
index 486c2ea3b..fa222f01c 100755
--- a/appc-inbound/pom.xml
+++ b/appc-inbound/pom.xml
@@ -38,7 +38,6 @@
<jettison.version>1.3.7</jettison.version>
<commons.collections.version>3.2.2</commons.collections.version>
<common.io.version>2.5</common.io.version>
- <tosca.datatype.version>1.1.0</tosca.datatype.version>
</properties>
<modules>
<module>appc-artifact-handler</module>
diff --git a/appc-sdc-listener/appc-yang-generator/pom.xml b/appc-sdc-listener/appc-yang-generator/pom.xml
index de3fbb2b7..f316eaec6 100644
--- a/appc-sdc-listener/appc-yang-generator/pom.xml
+++ b/appc-sdc-listener/appc-yang-generator/pom.xml
@@ -75,8 +75,8 @@ limitations under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.openecomp.sdc.common</groupId>
- <artifactId>openecomp-tosca-datatype</artifactId>
+ <groupId>org.onap.sdc.common</groupId>
+ <artifactId>onap-tosca-datatype</artifactId>
<version>${tosca.datatype.version}</version>
<exclusions>
<exclusion>
diff --git a/appc-sdc-listener/appc-yang-generator/src/main/java/org/onap/appc/yang/impl/YANGGeneratorImpl.java b/appc-sdc-listener/appc-yang-generator/src/main/java/org/onap/appc/yang/impl/YANGGeneratorImpl.java
index 94e9df2b6..f53b4c51b 100644
--- a/appc-sdc-listener/appc-yang-generator/src/main/java/org/onap/appc/yang/impl/YANGGeneratorImpl.java
+++ b/appc-sdc-listener/appc-yang-generator/src/main/java/org/onap/appc/yang/impl/YANGGeneratorImpl.java
@@ -38,10 +38,10 @@ import org.onap.appc.yang.YANGGenerator;
import org.onap.appc.yang.exception.YANGGenerationException;
import org.onap.appc.yang.objects.Leaf;
import org.onap.appc.yang.type.YangTypes;
-import org.openecomp.sdc.tosca.datatypes.model.NodeType;
-import org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition;
-import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate;
-import org.openecomp.sdc.tosca.services.YamlUtil;
+import org.onap.sdc.tosca.datatypes.model.NodeType;
+import org.onap.sdc.tosca.datatypes.model.PropertyDefinition;
+import org.onap.sdc.tosca.datatypes.model.ServiceTemplate;
+import org.onap.sdc.tosca.services.YamlUtil;
import java.io.*;
import java.util.HashMap;