diff options
Diffstat (limited to 'ms/blueprintsprocessor/application/pom.xml')
| -rwxr-xr-x | ms/blueprintsprocessor/application/pom.xml | 70 |
1 files changed, 34 insertions, 36 deletions
diff --git a/ms/blueprintsprocessor/application/pom.xml b/ms/blueprintsprocessor/application/pom.xml index eb4522040..7e60b3de6 100755 --- a/ms/blueprintsprocessor/application/pom.xml +++ b/ms/blueprintsprocessor/application/pom.xml @@ -23,31 +23,26 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <artifactId>blueprintsprocessor-parent</artifactId> + <version>1.1.0-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> - <artifactId>application</artifactId> + <artifactId>blueprintsprocessor-application</artifactId> <packaging>jar</packaging> - <name>Blueprints Processor Application</name> - <description>Blueprints Processor Application</description> + <name>MS Blueprints Processor Application</name> <properties> <assembly.id>maven</assembly.id> <name.space>org.onap.ccsdk.cds</name.space> <serviceArtifactName>blueprintsprocessor</serviceArtifactName> <image.name>onap/ccsdk-blueprintsprocessor</image.name> - <docker.push.phase>deploy</docker.push.phase> - <docker.verbose>true</docker.verbose> - <ccsdk.project.version>${project.version}</ccsdk.project.version> - <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> </properties> <dependencies> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>blueprint-core</artifactId> <exclusions> <exclusion> @@ -73,29 +68,29 @@ <artifactId>error-catalog-services</artifactId> </dependency> - <!-- North Bound --> + <!-- North Bound - Modules --> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>designer-api</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>resource-api</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>selfservice-api</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>configs-api</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>health-api</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>health-api-common</artifactId> </dependency> @@ -132,6 +127,8 @@ <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId> <artifactId>k8s-profile-upload</artifactId> </dependency> + + <!-- Test Dependencies --> <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> @@ -156,6 +153,7 @@ <artifactId>reactor-test</artifactId> <scope>test</scope> </dependency> + <!-- BEGIN UAT --> <dependency> <groupId>org.skyscreamer</groupId> @@ -197,7 +195,6 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> </dependency> - </dependencies> <build> @@ -230,6 +227,21 @@ </resources> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${maven-surefire-plugin.version}</version> + <configuration> + <!-- Sets the VM argument line used when unit tests are run. --> + <argLine>-Xmx1024m -XX:MaxPermSize=256m ${surefireArgLine}</argLine> + <!-- Excludes integration tests when unit tests are run. --> + <excludes> + <exclude>**/IT*.java</exclude> + </excludes> + <reuseForks>false</reuseForks> + <forkCount>1</forkCount> + </configuration> + </plugin> + <plugin> <artifactId>maven-resources-plugin</artifactId> <version>2.6</version> <executions> @@ -310,14 +322,6 @@ </executions> </plugin> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> - </plugin> - <plugin> <groupId>pl.project13.maven</groupId> <artifactId>git-commit-id-plugin</artifactId> </plugin> @@ -332,7 +336,7 @@ <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> - <version>0.26.1</version> + <version>0.34.0</version> <inherited>false</inherited> <configuration> <images> @@ -349,18 +353,12 @@ </build> </image> </images> - <verbose>true</verbose> + <verbose>${docker.verbose}</verbose> + <skipPush>${docker.skip.push}</skipPush> </configuration> <executions> <execution> - <id>generate-images</id> - <phase>package</phase> - <goals> - <goal>build</goal> - </goals> - </execution> - <execution> - <id>push-images</id> + <id>build-push-images</id> <phase>${docker.push.phase}</phase> <goals> <goal>build</goal> |