From 8edec22767a6fdb055af92ef815e374987ed8d22 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Tue, 7 Apr 2020 11:51:20 -0400 Subject: Roll to next Guilin snapshot Roll to next Guilin snapshot release Issue-ID: CCSDK-2152 Signed-off-by: Dan Timoney Change-Id: I1a5ea68da8821ffe28ac84e60177af05e26b3585 --- .../modules/blueprints/blueprint-core/pom.xml | 3 +- .../modules/blueprints/blueprint-core/pom.xml-n | 115 ++++++++++++++++++++ .../modules/blueprints/blueprint-proto/pom.xml | 3 +- .../modules/blueprints/blueprint-proto/pom.xml-n | 118 +++++++++++++++++++++ .../blueprints/blueprint-validation/pom.xml | 3 +- .../blueprints/blueprint-validation/pom.xml-n | 64 +++++++++++ ms/blueprintsprocessor/modules/blueprints/pom.xml | 3 +- .../modules/blueprints/pom.xml-n | 38 +++++++ .../modules/blueprints/resource-dict/pom.xml | 3 +- .../modules/blueprints/resource-dict/pom.xml-n | 43 ++++++++ 10 files changed, 388 insertions(+), 5 deletions(-) create mode 100644 ms/blueprintsprocessor/modules/blueprints/blueprint-core/pom.xml-n create mode 100644 ms/blueprintsprocessor/modules/blueprints/blueprint-proto/pom.xml-n create mode 100644 ms/blueprintsprocessor/modules/blueprints/blueprint-validation/pom.xml-n create mode 100644 ms/blueprintsprocessor/modules/blueprints/pom.xml-n create mode 100644 ms/blueprintsprocessor/modules/blueprints/resource-dict/pom.xml-n (limited to 'ms/blueprintsprocessor/modules/blueprints') diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/pom.xml b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/pom.xml index def1ed0b3..6f0791c4e 100644 --- a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/pom.xml +++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/pom.xml @@ -15,13 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> + 4.0.0 org.onap.ccsdk.cds.blueprintsprocessor blueprints - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT blueprint-core diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/pom.xml-n b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/pom.xml-n new file mode 100644 index 000000000..f16bbdde2 --- /dev/null +++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/pom.xml-n @@ -0,0 +1,115 @@ + + + + 4.0.0 + + + org.onap.ccsdk.cds.blueprintsprocessor + blueprints + 1.0.0-SNAPSHOT + + + blueprint-core + + Controller Blueprints Core + + + + + org.jetbrains.kotlin + kotlin-compiler-embeddable + + + org.jetbrains.kotlin + kotlin-scripting-jvm-host + + + org.jetbrains.kotlin + kotlin-compiler + + + + + org.jetbrains.kotlin + kotlin-script-util + + + org.jetbrains.kotlin + kotlin-script-runtime + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + + + com.fasterxml.jackson.module + jackson-module-jsonSchema + + + io.projectreactor + reactor-core + + + org.yaml + snakeyaml + + + org.apache.velocity + velocity + + + org.slf4j + slf4j-api + + + + + com.hubspot.jinjava + jinjava + + + org.springframework.boot + spring-boot-starter-logging + + + org.apache.commons + commons-compress + + + + org.jetbrains.kotlin + kotlin-test-junit + test + + + io.mockk + mockk + test + + + org.jetbrains.kotlinx + kotlinx-coroutines-test + test + + + diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-proto/pom.xml b/ms/blueprintsprocessor/modules/blueprints/blueprint-proto/pom.xml index 11ce0e27c..b71085f3d 100644 --- a/ms/blueprintsprocessor/modules/blueprints/blueprint-proto/pom.xml +++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-proto/pom.xml @@ -14,13 +14,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> + 4.0.0 org.onap.ccsdk.cds.blueprintsprocessor blueprints - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT blueprint-proto diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-proto/pom.xml-n b/ms/blueprintsprocessor/modules/blueprints/blueprint-proto/pom.xml-n new file mode 100644 index 000000000..6a6562082 --- /dev/null +++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-proto/pom.xml-n @@ -0,0 +1,118 @@ + + + + 4.0.0 + + + org.onap.ccsdk.cds.blueprintsprocessor + blueprints + 1.0.0-SNAPSHOT + + + blueprint-proto + + Controller Blueprints Proto + Controller Blueprints Proto + + + true + + + + + com.github.marcoferrer.krotoplus + kroto-plus-coroutines + + + + + + + org.xolstice.maven.plugins + protobuf-maven-plugin + 0.6.1 + + + com.google.protobuf:protoc:3.10.0: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} + + + + + + + + org.jetbrains.kotlin + kotlin-maven-plugin + ${kotlin.maven.version} + + + compile + + compile + + + + ${project.basedir}/target/generated-sources/protobuf/java + ${project.basedir}/target/generated-sources/protobuf/grpc-java + + + + + + + + + + kr.motd.maven + os-maven-plugin + 1.6.2 + + + + diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-validation/pom.xml b/ms/blueprintsprocessor/modules/blueprints/blueprint-validation/pom.xml index 0a5818ecd..d87f25a3c 100644 --- a/ms/blueprintsprocessor/modules/blueprints/blueprint-validation/pom.xml +++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-validation/pom.xml @@ -16,13 +16,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> + 4.0.0 org.onap.ccsdk.cds.blueprintsprocessor blueprints - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT blueprint-validation diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-validation/pom.xml-n b/ms/blueprintsprocessor/modules/blueprints/blueprint-validation/pom.xml-n new file mode 100644 index 000000000..3d572d6f2 --- /dev/null +++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-validation/pom.xml-n @@ -0,0 +1,64 @@ + + + + 4.0.0 + + + org.onap.ccsdk.cds.blueprintsprocessor + blueprints + 1.0.0-SNAPSHOT + + + blueprint-validation + + Controller Blueprints Validation Service + + + + org.springframework + spring-core + + + org.springframework + spring-context + + + org.onap.ccsdk.cds.blueprintsprocessor + blueprint-core + + + org.onap.ccsdk.cds.blueprintsprocessor + resource-dict + + + + + org.jetbrains.kotlin + kotlin-test-junit + + + io.mockk + mockk + + + org.jetbrains.kotlinx + kotlinx-coroutines-test + + + diff --git a/ms/blueprintsprocessor/modules/blueprints/pom.xml b/ms/blueprintsprocessor/modules/blueprints/pom.xml index 0ea6a1eee..a2b19ccec 100644 --- a/ms/blueprintsprocessor/modules/blueprints/pom.xml +++ b/ms/blueprintsprocessor/modules/blueprints/pom.xml @@ -14,13 +14,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> + 4.0.0 org.onap.ccsdk.cds.blueprintsprocessor modules - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT blueprints diff --git a/ms/blueprintsprocessor/modules/blueprints/pom.xml-n b/ms/blueprintsprocessor/modules/blueprints/pom.xml-n new file mode 100644 index 000000000..8146f2cd6 --- /dev/null +++ b/ms/blueprintsprocessor/modules/blueprints/pom.xml-n @@ -0,0 +1,38 @@ + + + + 4.0.0 + + + org.onap.ccsdk.cds.blueprintsprocessor + modules + 1.0.0-SNAPSHOT + + + blueprints + pom + + Blueprints POM + Blueprints POM + + + blueprint-core + resource-dict + blueprint-validation + blueprint-proto + + diff --git a/ms/blueprintsprocessor/modules/blueprints/resource-dict/pom.xml b/ms/blueprintsprocessor/modules/blueprints/resource-dict/pom.xml index c26301a5a..6fa99c0fb 100644 --- a/ms/blueprintsprocessor/modules/blueprints/resource-dict/pom.xml +++ b/ms/blueprintsprocessor/modules/blueprints/resource-dict/pom.xml @@ -16,13 +16,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> + 4.0.0 org.onap.ccsdk.cds.blueprintsprocessor blueprints - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT resource-dict diff --git a/ms/blueprintsprocessor/modules/blueprints/resource-dict/pom.xml-n b/ms/blueprintsprocessor/modules/blueprints/resource-dict/pom.xml-n new file mode 100644 index 000000000..945c0a52c --- /dev/null +++ b/ms/blueprintsprocessor/modules/blueprints/resource-dict/pom.xml-n @@ -0,0 +1,43 @@ + + + + 4.0.0 + + + org.onap.ccsdk.cds.blueprintsprocessor + blueprints + 1.0.0-SNAPSHOT + + + resource-dict + + Controller Blueprints Resource Dictionary + + + + org.onap.ccsdk.cds.blueprintsprocessor + blueprint-core + + + org.jetbrains.kotlin + kotlin-test-junit + test + + + -- cgit 1.2.3-korg