diff options
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 147 |
1 files changed, 60 insertions, 87 deletions
@@ -3,7 +3,8 @@ <groupId>org.openecomp.dcae</groupId> <artifactId>dcae-inventory</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0</version> + <!--internal <version>2.4.0</version>--> <properties> <dropwizard.version>0.9.2</dropwizard.version> @@ -22,18 +23,18 @@ </properties> <pluginRepositories> - <!-- Black Duck plugin dependencies --> - <pluginRepository> - <id>JCenter</id> - <name>JCenter Repository</name> - <url>http://jcenter.bintray.com</url> - </pluginRepository> + <!-- Black Duck plugin dependencies --> + <pluginRepository> + <id>JCenter</id> + <name>JCenter Repository</name> + <url>http://jcenter.bintray.com</url> + </pluginRepository> - <pluginRepository> - <id>Restlet</id> - <name>Restlet Repository</name> - <url>http://maven.restlet.com</url> - </pluginRepository> + <pluginRepository> + <id>Restlet</id> + <name>Restlet Repository</name> + <url>http://maven.restlet.com</url> + </pluginRepository> </pluginRepositories> @@ -140,30 +141,54 @@ <artifactId>jersey-media-multipart</artifactId> <version>2.22.1</version> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>2.0.2-beta</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-module-junit4</artifactId> + <version>1.6.5</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-mockito</artifactId> + <version>1.6.5</version> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> <!-- blackduck maven plugin --> - <plugin> - <groupId>com.blackducksoftware.integration</groupId> - <artifactId>hub-maven-plugin</artifactId> - <version>1.4.0</version> - <inherited>false</inherited> - <configuration> - <hubProjectName>${project.name}</hubProjectName> - <outputDirectory>${project.basedir}</outputDirectory> - </configuration> - <executions> - <execution> - <id>create-bdio-file</id> - <phase>package</phase> - <goals> - <goal>createHubOutput</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <groupId>com.blackducksoftware.integration</groupId> + <artifactId>hub-maven-plugin</artifactId> + <version>1.4.0</version> + <inherited>false</inherited> + <configuration> + <hubProjectName>${project.name}</hubProjectName> + <outputDirectory>${project.basedir}</outputDirectory> + </configuration> + <executions> + <execution> + <id>create-bdio-file</id> + <phase>package</phase> + <goals> + <goal>createHubOutput</goal> + </goals> + </execution> + </executions> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> @@ -268,7 +293,7 @@ </goals> <configuration> <image>${project.artifactId}</image> - <newName>${docker.registry}/openecomp/${project.artifactId}:${docker.version}-${maven.build.timestamp}</newName> + <newName>${docker.registry}/openecomp/${project.artifactId}:${project.version}-${maven.build.timestamp}</newName> <!--serverId>${docker.registry}</serverId--> <pushImage>false</pushImage> </configuration> @@ -302,63 +327,12 @@ <licenseName>apache_v2</licenseName> <inceptionYear>2017</inceptionYear> <organizationName>AT&T Intellectual Property. All rights reserved.</organizationName> - <projectName>PROJECT</projectName> - <canUpdateCopyright>true</canUpdateCopyright> - <canUpdateDescription>true</canUpdateDescription> - <canUpdateLicense>true</canUpdateLicense> - <emptyLineAfterHeader>true</emptyLineAfterHeader> - </configuration> - <executions> - <execution> - <id>first</id> - <goals> - <goal>update-file-header</goal> - </goals> - <phase>process-sources</phase> - </execution> - </executions> -<!-- - <groupId>org.codehaus.mojo</groupId> - <artifactId>license-maven-plugin</artifactId> - <version>1.10</version> - <configuration> - <licenseName>att_license</licenseName> - <licenseResolver>classpath://licenses</licenseResolver> - <inceptionYear>2016</inceptionYear> - <organizationName>AT&T</organizationName> - <projectName>dcae-inventory</projectName> ---> - <!-- NOTE: Once you have established the tags and delimiter, they cannot be changed --> -<!-- <processStartTag>============LICENSE_START===========</processStartTag> - <processEndTag>============LICENSE_END===========</processEndTag> - <sectionDelimiter>==================================</sectionDelimiter> + <projectName>${project.artifactId}</projectName> <canUpdateCopyright>true</canUpdateCopyright> <canUpdateDescription>true</canUpdateDescription> <canUpdateLicense>true</canUpdateLicense> <emptyLineAfterHeader>true</emptyLineAfterHeader> - - <excludes> ---> <!-- - Files which are to be excluded. The pom.xml is excluded because - the start/end tags and the delimiters are in the body of the file. - This confuses the algorithm. So, this file must be manually updated - with a license header. - --> -<!-- <exclude>*.xml</exclude> - <exclude>target/*</exclude> - <exclude>*.png</exclude> - <exclude>*.md</exclude> - <exclude>*.yml</exclude> - <exclude>*.yaml</exclude> - </excludes> </configuration> - <dependencies> - <dependency> - <groupId>org.openecomp.dcae.dcae-inventory</groupId> - <artifactId>license</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> <executions> <execution> <id>first</id> @@ -368,7 +342,6 @@ <phase>process-sources</phase> </execution> </executions> ---> </plugin> <plugin> @@ -430,12 +403,12 @@ <repository> <id>ecomp-releases</id> <name>Open eCOMP Release Repository</name> - <url>${nexusproxy}/${releases.path}</url> + <url>${nexusproxy}/${releases.path}</url> </repository> <snapshotRepository> <id>ecomp-snapshots</id> <name>Open eCOMP Snapshot Repository</name> - <url>${nexusproxy}/${snapshots.path}</url> + <url>${nexusproxy}/${snapshots.path}</url> </snapshotRepository> <site> <id>ecomp-site</id> |