diff options
| author |   Patrick Brady <pb071s@att.com> | 2017-09-04 21:37:25 -0700 |
|---|---|---|
| committer | Patrick Brady <pb071s@att.com> | 2017-09-07 00:45:01 -0700 |
| commit | 76706005ee07da01fc3e00ed44ada720e29855b1 (patch) | |
| tree | 8327ef6892b0f7ba21034bfb467c8c664a3a14e4 /appc-metric | |
| parent | 3e0d86059e4926a0a5197f75f201284075811d98 (diff) | |
Change to CCSDK and ODL Carbon
Change-Id: I49a0f436e366ff4a1b99705fb6bb5e7ba82e6ecc
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-Id: [APPC-91]
Issue-Id: [APPC-158]
Diffstat (limited to 'appc-metric')
| -rw-r--r-- | appc-metric/appc-metric-bundle/pom.xml | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/appc-metric/appc-metric-bundle/pom.xml b/appc-metric/appc-metric-bundle/pom.xml index c3673e327..84baddffd 100644 --- a/appc-metric/appc-metric-bundle/pom.xml +++ b/appc-metric/appc-metric-bundle/pom.xml @@ -57,8 +57,7 @@ </dependency> <dependency> <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - <version>1.6.2</version> + <artifactId>powermock-api-mockito</artifactId> <scope>test</scope> </dependency> <dependency> @@ -72,15 +71,9 @@ <version>2.2</version> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.8.4</version> - </dependency> - - <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-module-junit4</artifactId> - <version>1.6.2</version> + <version>1.6.4</version> <scope>test</scope> </dependency> </dependencies> @@ -90,7 +83,6 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>2.3.7</version> <extensions>true</extensions> <configuration> <instructions> @@ -100,8 +92,8 @@ <Embed-Dependency>appc-common,eelf-core,logback-core,logback-classic,appc-data-lib;scope=compile|runtime;inline=false</Embed-Dependency> <Embed-Transitive>true</Embed-Transitive> <Export-Service>org.openecomp.appc.metricservice.impl.MetricServiceImpl,org.openecomp.appc.metricservice.MetricService,org.openecomp.appc.metricservice.policy.*,org.openecomp.appc.metricservice.metric.*</Export-Service> - <Export-Package>org.openecomp.appc.metricservice,org.openecomp.appc.metricservice.impl,org.openecomp.appc.metricservice.policy,org.openecomp.appc.metricservice.publisher,org.openecomp.appc.metricservice.metric</Export-Package> - <Import-Package>!groovy.lang,!javax.*,!org.apache.log,!org.apache.log4j.*,!org.codehaus.jackson.*,!org.codehaus.jackson.map.*,!org.codehaus.commons.compiler,!org.codehaus.groovy.*,!org.apache.commons.lang3,!org.codehaus.janino,!org.jasypt.*,!com.ibm.icu.*,!com.sun.faces.*,*</Import-Package> + <Export-Package>org.openecomp.appc.metricservice,org.openecomp.appc.metricservice.impl,org.openecomp.appc.metricservice.policy,org.openecomp.appc.metricservice.publisher,org.openecomp.appc.metricservice.metric,org.apache.http</Export-Package> + <Import-Package>!groovy.lang,!javax.*,!org.apache.log,!org.apache.log4j.*,!org.codehaus.jackson.*,!org.codehaus.jackson.map.*,!org.codehaus.commons.compiler,!org.codehaus.groovy.*,!org.apache.commons.lang3,!org.codehaus.janino,!org.jasypt.*,!com.ibm.icu.*,!com.sun.faces.*,*;resolution:=optional</Import-Package> </instructions> </configuration> </plugin> |