Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add SCM section to all the poms"
[controller.git]
/
opendaylight
/
statisticsmanager
/
implementation
/
pom.xml
diff --git
a/opendaylight/statisticsmanager/implementation/pom.xml
b/opendaylight/statisticsmanager/implementation/pom.xml
index 311204b5456b9fca09568f06aabec88eb716c9ec..4d47312e023ec2e1ec39faea1e8aad611dd444c4 100644
(file)
--- a/
opendaylight/statisticsmanager/implementation/pom.xml
+++ b/
opendaylight/statisticsmanager/implementation/pom.xml
@@
-8,7
+8,12
@@
<version>1.4.0-SNAPSHOT</version>
<relativePath>../../commons/opendaylight</relativePath>
</parent>
<version>1.4.0-SNAPSHOT</version>
<relativePath>../../commons/opendaylight</relativePath>
</parent>
- <groupId>org.opendaylight.controller</groupId>
+ <scm>
+ <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+ <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+ <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
+ </scm>
+
<artifactId>statisticsmanager.implementation</artifactId>
<version>0.4.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<artifactId>statisticsmanager.implementation</artifactId>
<version>0.4.0-SNAPSHOT</version>
<packaging>bundle</packaging>
@@
-16,7
+21,7
@@
<!-- Sonar properties using jacoco to retrieve integration test results -->
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
<!-- Sonar properties using jacoco to retrieve integration test results -->
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
- <sonar.jacoco.
Reportpath>target/jacobo.exec</sonar.jacoco.R
eportpath>
+ <sonar.jacoco.
reportpath>target/jacoco.exec</sonar.jacoco.r
eportpath>
<sonar.jacoco.itReportPath>target/jacoco-it.exec</sonar.jacoco.itReportPath>
<sonar.language>java</sonar.language>
</properties>
<sonar.jacoco.itReportPath>target/jacoco-it.exec</sonar.jacoco.itReportPath>
<sonar.language>java</sonar.language>
</properties>
@@
-26,7
+31,7
@@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>
0.5.3.201107060350
</version>
+ <version>
${jacoco.version}
</version>
</plugin>
</plugins>
</pluginManagement>
</plugin>
</plugins>
</pluginManagement>
@@
-34,15
+39,21
@@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>
2.3.6
</version>
+ <version>
${bundle.plugin.version}
</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Import-Package>
<extensions>true</extensions>
<configuration>
<instructions>
<Import-Package>
+ org.opendaylight.controller.clustering.services,
org.opendaylight.controller.containermanager,
org.opendaylight.controller.sal.core,
org.opendaylight.controller.containermanager,
org.opendaylight.controller.sal.core,
- org.opendaylight.controller.sal.flowprogrammer,
org.slf4j,
+ org.opendaylight.controller.sal.flowprogrammer,
org.opendaylight.controller.sal.reader,
org.opendaylight.controller.sal.reader,
+ org.opendaylight.controller.sal.utils,
+ org.slf4j,
+ org.opendaylight.controller.sal.inventory,
+ org.opendaylight.controller.sal.match,
+ org.opendaylight.controller.switchmanager,
org.opendaylight.controller.statisticsmanager,
org.opendaylight.controller.forwardingrulesmanager,
org.apache.felix.dm
org.opendaylight.controller.statisticsmanager,
org.opendaylight.controller.forwardingrulesmanager,
org.apache.felix.dm
@@
-53,6
+64,7
@@
<Export-Package>
</Export-Package>
</instructions>
<Export-Package>
</Export-Package>
</instructions>
+ <manifestLocation>${project.basedir}/META-INF</manifestLocation>
</configuration>
</plugin>
<plugin>
</configuration>
</plugin>
<plugin>
@@
-93,7
+105,7
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>containermanager</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>containermanager</artifactId>
- <version>0.
4
.0-SNAPSHOT</version>
+ <version>0.
5
.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
@@
-106,4
+118,4
@@
<version>0.4.0-SNAPSHOT</version>
</dependency>
</dependencies>
<version>0.4.0-SNAPSHOT</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>