diff options
Diffstat (limited to 'ms/blueprintsprocessor/parent/pom.xml')
-rwxr-xr-x | ms/blueprintsprocessor/parent/pom.xml | 106 |
1 files changed, 50 insertions, 56 deletions
diff --git a/ms/blueprintsprocessor/parent/pom.xml b/ms/blueprintsprocessor/parent/pom.xml index 1fdd58224..eb4f4ded5 100755 --- a/ms/blueprintsprocessor/parent/pom.xml +++ b/ms/blueprintsprocessor/parent/pom.xml @@ -25,17 +25,14 @@ </parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>parent</artifactId> + <artifactId>blueprintsprocessor-parent</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> - <name>Blueprints Processor Parent</name> - <description>Blueprints Processor Parent</description> + <name>MS Blueprints Processor Parent</name> <properties> - <sli.version>${ccsdk.sli.core.version}</sli.version> <!-- Override CDS version from parent to be project.version --> - <ccsdk.cds.version>${project.version}</ccsdk.cds.version> <error.catalog.version>${project.version}</error.catalog.version> <dmaap.client.version>1.1.5</dmaap.client.version> <!-- Should be using released artifact as soon as available: --> @@ -76,7 +73,6 @@ <type>pom</type> <scope>import</scope> </dependency> - <dependency> <groupId>org.springframework.kafka</groupId> <artifactId>spring-kafka</artifactId> @@ -224,17 +220,6 @@ <version>${kotlin.version}</version> </dependency> <dependency> - <groupId>org.jetbrains.kotlin</groupId> - <artifactId>kotlin-stdlib-jdk8</artifactId> - <version>${kotlin.version}</version> - </dependency> - <dependency> - <groupId>org.jetbrains.kotlin</groupId> - <artifactId>kotlin-stdlib-jdk7</artifactId> - <version>${kotlin.version}</version> - </dependency> - - <dependency> <groupId>com.github.marcoferrer.krotoplus</groupId> <artifactId>kroto-plus-coroutines</artifactId> <version>${kroto-plus.version}</version> @@ -281,7 +266,6 @@ <artifactId>jsch</artifactId> <version>${jsch.version}</version> </dependency> - <dependency> <groupId>org.apache.kafka</groupId> <artifactId>kafka-clients</artifactId> @@ -321,7 +305,7 @@ <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-provider</artifactId> - <version>${sli.version}</version> + <version>${ccsdk.sli.core.version}</version> <exclusions> <exclusion> <groupId>commons-lang</groupId> @@ -364,82 +348,82 @@ <!-- Blueprint Processor Application Module Dependencies --> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>processor-core</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>db-lib</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>rest-lib</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>nats-lib</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>ssh-lib</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <!-- message-lib dependency --> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>message-lib</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>dmaap-lib</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>grpc-lib</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>execution-service</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>workflow-service</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <!-- North Bound --> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>configs-api</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>designer-api</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>resource-api</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>selfservice-api</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>application</artifactId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> + <artifactId>blueprintsprocessor-application</artifactId> <version>${ccsdk.cds.version}</version> </dependency> @@ -495,12 +479,12 @@ <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>health-api</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>health-api-common</artifactId> <version>${ccsdk.cds.version}</version> </dependency> @@ -518,22 +502,22 @@ <!-- Controller Blueprints Application Dependency --> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>resource-dict</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>blueprint-core</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>blueprint-proto</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>blueprint-validation</artifactId> <version>${ccsdk.cds.version}</version> </dependency> @@ -655,10 +639,6 @@ <artifactId>kotlin-script-util</artifactId> </dependency> <dependency> - <groupId>org.jetbrains.kotlin</groupId> - <artifactId>kotlin-stdlib-jdk8</artifactId> - </dependency> - <dependency> <groupId>org.jetbrains.kotlinx</groupId> <artifactId>kotlinx-coroutines-core</artifactId> </dependency> @@ -719,11 +699,35 @@ <groupId>io.netty</groupId> <artifactId>netty-tcnative-boringssl-static</artifactId> </dependency> - + <!-- javax.annotations Needed for Java 11 migration--> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + <version>${javax-annotation.version}</version> + </dependency> <dependency> <groupId>org.onap.ccsdk.cds.error.catalog</groupId> <artifactId>error-catalog-core</artifactId> </dependency> + <!-- required for java 11 --> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + <version>2.3.0</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>2.3.0</version> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-validation</artifactId> + </dependency> </dependencies> <repositories> @@ -756,7 +760,6 @@ <plugin> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-maven-plugin</artifactId> - <version>${kotlin.maven.version}</version> <executions> <execution> <id>compile</id> @@ -784,15 +787,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.5.1</version> - <configuration> - <source>${maven.compiler.source}</source> - <target>${maven.compiler.target}</target> - </configuration> - </plugin> </plugins> </build> </project> |