Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Resolve Bug:445 Remove freemarker from config code generator.
[controller.git]
/
opendaylight
/
statisticsmanager
/
implementation
/
pom.xml
diff --git
a/opendaylight/statisticsmanager/implementation/pom.xml
b/opendaylight/statisticsmanager/implementation/pom.xml
index 311204b5456b9fca09568f06aabec88eb716c9ec..46368b07622b7b9d8bd4da7992e5c785513ad09f 100644
(file)
--- a/
opendaylight/statisticsmanager/implementation/pom.xml
+++ b/
opendaylight/statisticsmanager/implementation/pom.xml
@@
-1,24
+1,27
@@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
- <version>1.4.
0
-SNAPSHOT</version>
+ <version>1.4.
2
-SNAPSHOT</version>
<relativePath>../../commons/opendaylight</relativePath>
</parent>
<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>
+ <tag>HEAD</tag>
+ </scm>
+
<artifactId>statisticsmanager.implementation</artifactId>
<artifactId>statisticsmanager.implementation</artifactId>
- <version>0.4.
0
-SNAPSHOT</version>
+ <version>0.4.
2
-SNAPSHOT</version>
<packaging>bundle</packaging>
<properties>
<!-- Sonar properties using jacoco to retrieve integration test results -->
<packaging>bundle</packaging>
<properties>
<!-- Sonar properties using jacoco to retrieve integration test results -->
- <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
<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.jacoco.itReportPath>target/jacoco-it.exec</sonar.jacoco.itReportPath>
- <sonar.language>java</sonar.language>
</properties>
<build>
<pluginManagement>
</properties>
<build>
<pluginManagement>
@@
-26,7
+29,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,17
+37,24
@@
<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.c
ontainermanager
,
+ org.opendaylight.controller.c
lustering.services
,
org.opendaylight.controller.sal.core,
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.sal.connection,
+ org.opendaylight.controller.switchmanager,
org.opendaylight.controller.statisticsmanager,
org.opendaylight.controller.forwardingrulesmanager,
org.opendaylight.controller.statisticsmanager,
org.opendaylight.controller.forwardingrulesmanager,
+ org.opendaylight.controller.connectionmanager,
org.apache.felix.dm
</Import-Package>
<Bundle-Activator>
org.apache.felix.dm
</Import-Package>
<Bundle-Activator>
@@
-53,6
+63,7
@@
<Export-Package>
</Export-Package>
</instructions>
<Export-Package>
</Export-Package>
</instructions>
+ <manifestLocation>${project.basedir}/META-INF</manifestLocation>
</configuration>
</plugin>
<plugin>
</configuration>
</plugin>
<plugin>
@@
-83,27
+94,34
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>statisticsmanager</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>statisticsmanager</artifactId>
- <version>0.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal</artifactId>
- <version>0.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>containermanager</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <artifactId>sal.connection</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>switchmanager</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>forwardingrulesmanager</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>forwardingrulesmanager</artifactId>
- <version>0.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>clustering.services</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>clustering.services</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>connectionmanager</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
</dependency>
</dependencies>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>