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 "Validate user input in FlowSepc Configuration"
[controller.git]
/
opendaylight
/
clustering
/
services_implementation
/
pom.xml
diff --git
a/opendaylight/clustering/services_implementation/pom.xml
b/opendaylight/clustering/services_implementation/pom.xml
index d6ff7ca6d1804fd249eca46700381864db5cb66c..d6bd287434a499c19b1aa1576b0aa11ee303344d 100644
(file)
--- a/
opendaylight/clustering/services_implementation/pom.xml
+++ b/
opendaylight/clustering/services_implementation/pom.xml
@@
-7,6
+7,11
@@
<version>1.4.0-SNAPSHOT</version>
<relativePath>../../commons/opendaylight</relativePath>
</parent>
<version>1.4.0-SNAPSHOT</version>
<relativePath>../../commons/opendaylight</relativePath>
</parent>
+ <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>clustering.services-implementation</artifactId>
<version>0.4.0-SNAPSHOT</version>
<artifactId>clustering.services-implementation</artifactId>
<version>0.4.0-SNAPSHOT</version>
@@
-25,7
+30,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>
@@
-39,9
+44,12
@@
<instructions>
<Import-Package>
org.slf4j,
<instructions>
<Import-Package>
org.slf4j,
- !org.
jboss
.*,
+ !org.
apache.logging.log4j
.*,
!bsh*,
!net.jcip.*,
!bsh*,
!net.jcip.*,
+ !javax.swing,
+ !org.hornetq.*,
+ !org.jboss.*,
javax.transaction,
*,
org.opendaylight.controller.clustering.services,
javax.transaction,
*,
org.opendaylight.controller.clustering.services,
@@
-61,7
+69,7
@@
*
</DynamicImport-Package>
<Embed-Dependency>
*
</DynamicImport-Package>
<Embed-Dependency>
- infinispan-core,jgroups,jboss-marshalling-river,jboss-marshalling,jboss-logging,staxmapper;type=!pom;inline=false
+ infinispan-core,jgroups,jboss-marshalling-river,jboss-marshalling,jboss-logging,staxmapper
,narayana-jta
;type=!pom;inline=false
</Embed-Dependency>
<Embed-Transitive>
true
</Embed-Dependency>
<Embed-Transitive>
true
@@
-98,7
+106,7
@@
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId>
- <version>5.
2.3
.Final</version>
+ <version>5.
3.0
.Final</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
@@
-108,7
+116,12
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.5.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossts.jta</groupId>
+ <artifactId>narayana-jta</artifactId>
+ <version>4.17.7.Final</version>
</dependency>
</dependencies>
</project>
</dependency>
</dependencies>
</project>