diff options
Diffstat (limited to 'bpmn')
| -rw-r--r-- | bpmn/MSOCommonBPMN/pom.xml | 19 | ||||
| -rw-r--r-- | bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java | 14 | ||||
| -rw-r--r-- | bpmn/MSOInfrastructureBPMN/pom.xml | 12 |
3 files changed, 9 insertions, 36 deletions
diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml index b0ec0c01bc..669a3cb353 100644 --- a/bpmn/MSOCommonBPMN/pom.xml +++ b/bpmn/MSOCommonBPMN/pom.xml @@ -351,24 +351,9 @@ <version>4.3.14.RELEASE</version> </dependency> <dependency> - <!-- This version should be upgraded in Beijing --> - <groupId>org.openecomp.sdc.sdc-tosca</groupId> + <groupId>org.onap.sdc.sdc-tosca</groupId> <artifactId>sdc-tosca</artifactId> - <version>1.2.3</version> - <exclusions> - <exclusion> - <groupId>org.openecomp.sdc.jtosca</groupId> - <artifactId>jtosca</artifactId> - <!-- <version>1.2.2-SNAPSHOT</version> --> - </exclusion> - </exclusions> - </dependency> - <dependency> - <!-- When the sdc-tosca version is upgraded from 1.2.3, - this dependency should be removed entirely --> - <groupId>org.openecomp.sdc.jtosca</groupId> - <artifactId>jtosca</artifactId> - <version>1.2.1</version> + <version>1.3.3</version> </dependency> <dependency> <groupId>org.camunda.bpm</groupId> diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java index 7547c3ac11..36585717fa 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java @@ -37,13 +37,13 @@ import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget; import org.openecomp.mso.bpmn.core.json.JsonUtils; import org.openecomp.mso.logger.MessageEnum; import org.openecomp.mso.logger.MsoLogger; -import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper; -import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException; -import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory; -import org.openecomp.sdc.toscaparser.api.NodeTemplate; -import org.openecomp.sdc.toscaparser.api.Property; -import org.openecomp.sdc.toscaparser.api.functions.GetInput; -import org.openecomp.sdc.toscaparser.api.parameters.Input; +import org.onap.sdc.tosca.parser.api.ISdcCsarHelper; +import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException; +import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory; +import org.onap.sdc.toscaparser.api.NodeTemplate; +import org.onap.sdc.toscaparser.api.Property; +import org.onap.sdc.toscaparser.api.functions.GetInput; +import org.onap.sdc.toscaparser.api.parameters.Input; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/bpmn/MSOInfrastructureBPMN/pom.xml b/bpmn/MSOInfrastructureBPMN/pom.xml index 0329f2883e..11253869d7 100644 --- a/bpmn/MSOInfrastructureBPMN/pom.xml +++ b/bpmn/MSOInfrastructureBPMN/pom.xml @@ -367,17 +367,5 @@ <version>8.9.1</version> </dependency> - <!--for yang tools--> -<!-- <dependency> - <groupId>org.onap.so</groupId> - <artifactId>common</artifactId> - <version>1.1.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.onap.sdnc.northbound</groupId> - <artifactId>generic-resource-api.model</artifactId> - <version>1.2.0</version> - </dependency>--> </dependencies> </project> |