From: Brinda Santh Date: Thu, 12 Sep 2019 02:07:33 +0000 (-0400) Subject: Fix proto cyclic dependency. X-Git-Tag: 0.7.0~236^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7003208140fb18782052cb23dfc5e8373b40a12f;p=ccsdk%2Fcds.git Fix proto cyclic dependency. Change-Id: I84e0ba25b78e8212eff6b4c91fca2d4457dbf7eb Issue-ID: CCSDK-1682 Signed-off-by: Brinda Santh --- diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_cli/pom.xml b/components/model-catalog/blueprint-model/test-blueprint/capability_cli/pom.xml index 791c161d4..46ce3a04a 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_cli/pom.xml +++ b/components/model-catalog/blueprint-model/test-blueprint/capability_cli/pom.xml @@ -19,11 +19,10 @@ org.onap.ccsdk.cds.blueprintsprocessor cba-parent - 0.6.0-SNAPSHOT + 0.7.0-SNAPSHOT org.onap.ccsdk.cds.components.cba capability_cli - 0.6.0-SNAPSHOT CBA Capability CLI CBA Capability CLI diff --git a/components/model-catalog/blueprint-model/test-blueprint/resource-audit/pom.xml b/components/model-catalog/blueprint-model/test-blueprint/resource-audit/pom.xml index b38c27c41..527e2b62b 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/resource-audit/pom.xml +++ b/components/model-catalog/blueprint-model/test-blueprint/resource-audit/pom.xml @@ -19,11 +19,10 @@ org.onap.ccsdk.cds.blueprintsprocessor cba-parent - 0.6.0-SNAPSHOT + 0.7.0-SNAPSHOT org.onap.ccsdk.cds.components.cba resource-audit - 0.6.0-SNAPSHOT CBA Resource Audit CBA Resource Audit diff --git a/components/model-catalog/proto-definition/pom.xml b/components/model-catalog/proto-definition/pom.xml index 9c6d802a0..8e378f1a3 100644 --- a/components/model-catalog/proto-definition/pom.xml +++ b/components/model-catalog/proto-definition/pom.xml @@ -17,13 +17,6 @@ --> 4.0.0 - - org.onap.ccsdk.cds - parent - 0.7.0-SNAPSHOT - ../../../ - - org.onap.ccsdk.cds.components proto-definition 0.7.0-SNAPSHOT diff --git a/components/parent/pom.xml b/components/parent/pom.xml deleted file mode 100644 index 6f33118c1..000000000 --- a/components/parent/pom.xml +++ /dev/null @@ -1,390 +0,0 @@ - - - - 4.0.0 - - org.onap.ccsdk.cds - components - 0.7.0-SNAPSHOT - - org.onap.ccsdk.cds.components - parent - Components Parent - pom - - 1.0.0 - 27.0.1-jre - 2.9.2 - 1.4.197 - 1.2.2 - 1.7 - 2.5.1 - - - - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - - - io.springfox - springfox-swagger2 - ${springfox.swagger2.version} - - - org.slf4j - slf4j-api - - - - - io.springfox - springfox-swagger-ui - ${springfox.swagger2.version} - - - - - org.apache.commons - commons-lang3 - 3.2.1 - - - commons-collections - commons-collections - 3.2.2 - - - commons-io - commons-io - 2.6 - - - org.apache.velocity - velocity - ${velocity.version} - - - com.google.guava - guava - ${guava.version} - - - com.hubspot.jinjava - jinjava - ${jinja.version} - - - - - org.jetbrains.kotlin - kotlin-stdlib - ${kotlin.version} - - - org.jetbrains.kotlin - kotlin-stdlib-common - ${kotlin.version} - - - org.jetbrains.kotlin - kotlin-scripting-jvm-host - ${kotlin.version} - - - org.jetbrains.kotlin - kotlin-compiler-embeddable - ${kotlin.version} - - - org.jetbrains.kotlin - kotlin-script-util - ${kotlin.version} - - - org.jetbrains.kotlin - kotlin-script-runtime - ${kotlin.version} - - - org.jetbrains.kotlinx - kotlinx-coroutines-core - ${kotlin.couroutines.version} - - - org.jetbrains.kotlinx - kotlinx-coroutines-reactor - ${kotlin.couroutines.version} - - - org.jetbrains.kotlin - kotlin-reflect - ${kotlin.version} - - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - ${kotlin.version} - - - org.jetbrains.kotlin - kotlin-stdlib-jdk7 - ${kotlin.version} - - - - - io.grpc - grpc-core - ${grpc.version} - - - io.grpc - grpc-netty - ${grpc.version} - - - io.grpc - grpc-protobuf - ${grpc.version} - - - io.grpc - grpc-stub - ${grpc.version} - - - com.google.protobuf - protobuf-java-util - ${protobuff.java.utils.version} - - - - - - com.h2database - h2 - ${h2database.version} - - - - - - io.mockk - mockk - ${mockk.version} - test - - - org.jetbrains.kotlin - kotlin-test-junit - ${kotlin.version} - test - - - org.jetbrains.kotlinx - kotlinx-coroutines-test - ${kotlin.couroutines.version} - test - - - io.grpc - grpc-testing - ${grpc.version} - test - - - - - - - org.apache.commons - commons-lang3 - - - commons-collections - commons-collections - - - commons-io - commons-io - - - com.jayway.jsonpath - json-path - - - org.slf4j - slf4j-api - - - - - com.google.guava - guava - - - io.springfox - springfox-swagger2 - - - org.slf4j - slf4j-api - - - - - io.springfox - springfox-swagger-ui - - - org.jetbrains.kotlin - kotlin-stdlib - - - org.jetbrains.kotlin - kotlin-script-util - - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - - - org.jetbrains.kotlinx - kotlinx-coroutines-core - - - org.jetbrains.kotlinx - kotlinx-coroutines-reactor - - - com.fasterxml.jackson.module - jackson-module-kotlin - - - - io.grpc - grpc-netty - - - io.grpc - grpc-protobuf - - - io.grpc - grpc-stub - - - com.google.protobuf - protobuf-java-util - - - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - - attach-sources - - jar - - - - - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${kotlin.maven.version} - - - compile - - compile - - - - ${project.basedir}/src/main/kotlin - ${project.basedir}/src/main/java - - - - - test-compile - - test-compile - - - - ${project.basedir}/src/test/kotlin - ${project.basedir}/src/test/java - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.5.1 - - ${maven.compiler.source} - ${maven.compiler.target} - - - - - default-compile - none - - - - default-testCompile - none - - - java-compile - compile - - compile - - - - java-test-compile - test-compile - - testCompile - - - - - - - diff --git a/components/pom.xml b/components/pom.xml index 060cf4ec6..2febac501 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -35,7 +35,7 @@ 1.8 - parent + model-catalog/proto-definition diff --git a/ms/blueprintsprocessor/modules/commons/grpc-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/grpc-lib/pom.xml index e5214e139..5cc29a65e 100644 --- a/ms/blueprintsprocessor/modules/commons/grpc-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/grpc-lib/pom.xml @@ -28,6 +28,10 @@ Blueprints Processor GRPC Lib + + org.onap.ccsdk.cds.controllerblueprints + blueprint-proto + org.onap.ccsdk.cds.controllerblueprints blueprint-core @@ -36,10 +40,6 @@ org.onap.ccsdk.cds.blueprintsprocessor processor-core - - org.onap.ccsdk.cds.components - proto-definition - diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml index 7c53e1c04..b5cac581a 100755 --- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml @@ -33,10 +33,9 @@ - org.onap.ccsdk.cds.components - proto-definition + org.onap.ccsdk.cds.controllerblueprints + blueprint-proto - org.onap.ccsdk.cds.controllerblueprints blueprint-core diff --git a/ms/blueprintsprocessor/modules/services/execution-service/pom.xml b/ms/blueprintsprocessor/modules/services/execution-service/pom.xml index 4acc22433..784906b4e 100644 --- a/ms/blueprintsprocessor/modules/services/execution-service/pom.xml +++ b/ms/blueprintsprocessor/modules/services/execution-service/pom.xml @@ -57,10 +57,6 @@ org.onap.ccsdk.cds.controllerblueprints resource-dict - - org.onap.ccsdk.cds.components - proto-definition - org.onap.ccsdk.sli.core diff --git a/ms/blueprintsprocessor/parent/pom.xml b/ms/blueprintsprocessor/parent/pom.xml index 5a54a7717..ded4ea1ad 100755 --- a/ms/blueprintsprocessor/parent/pom.xml +++ b/ms/blueprintsprocessor/parent/pom.xml @@ -248,11 +248,7 @@ protobuf-java-util ${protobuff.java.utils.version} - - org.onap.ccsdk.cds.components - proto-definition - ${project.version} - + @@ -458,6 +454,11 @@ blueprint-core ${project.version} + + org.onap.ccsdk.cds.controllerblueprints + blueprint-proto + ${project.version} + org.onap.ccsdk.cds.controllerblueprints blueprint-validation diff --git a/ms/controllerblueprints/modules/blueprint-proto/krotoPlusConfig.asciipb b/ms/controllerblueprints/modules/blueprint-proto/krotoPlusConfig.asciipb new file mode 100644 index 000000000..30255b96d --- /dev/null +++ b/ms/controllerblueprints/modules/blueprint-proto/krotoPlusConfig.asciipb @@ -0,0 +1,6 @@ +grpc_coroutines { + filter { exclude_path: "google/*" } +} +grpc_stub_exts { + support_coroutines: true +} \ No newline at end of file diff --git a/ms/controllerblueprints/modules/blueprint-proto/pom.xml b/ms/controllerblueprints/modules/blueprint-proto/pom.xml new file mode 100644 index 000000000..7d4d60028 --- /dev/null +++ b/ms/controllerblueprints/modules/blueprint-proto/pom.xml @@ -0,0 +1,113 @@ + + + + + + org.onap.ccsdk.cds.controllerblueprints + modules + 0.7.0-SNAPSHOT + + 4.0.0 + + blueprint-proto + Controller Blueprints Proto + Controller Blueprints Proto + + + + com.github.marcoferrer.krotoplus + kroto-plus-coroutines + + + + + + + kr.motd.maven + os-maven-plugin + 1.6.2 + + + + + org.xolstice.maven.plugins + protobuf-maven-plugin + 0.6.1 + + + com.google.protobuf:protoc:3.6.1:exe:${os.detected.classifier} + + ${project.basedir}/../../../../components/model-catalog/proto-definition/proto + + + + + + compile + + + + grpc-java + + compile-custom + + + grpc-java + io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier} + + + + + + + + + + + + + + + + + + + + kotlin-maven-plugin + org.jetbrains.kotlin + ${kotlin.maven.version} + + + compile + + compile + + + + ${project.basedir}/target/generated-sources/protobuf/java + ${project.basedir}/target/generated-sources/protobuf/grpc-java + + + + + + + + + diff --git a/ms/controllerblueprints/modules/pom.xml b/ms/controllerblueprints/modules/pom.xml index 73b231316..6cb4ea80a 100644 --- a/ms/controllerblueprints/modules/pom.xml +++ b/ms/controllerblueprints/modules/pom.xml @@ -31,6 +31,7 @@ blueprint-core resource-dict blueprint-validation + blueprint-proto diff --git a/ms/controllerblueprints/parent/pom.xml b/ms/controllerblueprints/parent/pom.xml index 925b1678a..86a721149 100644 --- a/ms/controllerblueprints/parent/pom.xml +++ b/ms/controllerblueprints/parent/pom.xml @@ -30,6 +30,7 @@ 1.0.0 27.0.1-jre + 0.5.0 2.9.2 1.4.197 1.2.2 @@ -200,6 +201,11 @@ protobuf-java-util ${protobuff.java.utils.version} + + com.github.marcoferrer.krotoplus + kroto-plus-coroutines + ${kroto-plus.version} + diff --git a/ms/sdclistener/application/pom.xml b/ms/sdclistener/application/pom.xml index da24e97bc..7b12e14ea 100644 --- a/ms/sdclistener/application/pom.xml +++ b/ms/sdclistener/application/pom.xml @@ -90,8 +90,8 @@ test - org.onap.ccsdk.cds.components - proto-definition + org.onap.ccsdk.cds.controllerblueprints + blueprint-proto diff --git a/ms/sdclistener/parent/pom.xml b/ms/sdclistener/parent/pom.xml index cfdfc9b24..05bfdeff4 100755 --- a/ms/sdclistener/parent/pom.xml +++ b/ms/sdclistener/parent/pom.xml @@ -16,7 +16,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.onap.ccsdk.cds @@ -110,9 +111,15 @@ ${protobuff.java.utils.version} - org.onap.ccsdk.cds.components - proto-definition - ${project.version} + org.onap.ccsdk.cds.controllerblueprints + blueprint-proto + ${project.version} + + + * + * + + io.projectreactor