Code Review
/
odlparent.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump akka to 2.4.20
[odlparent.git]
/
odlparent
/
pom.xml
diff --git
a/odlparent/pom.xml
b/odlparent/pom.xml
index 5a416aadb2c02e1543dcec32609f22c8568d1474..5f12309bd51459d29b498a4c80cd4d5d082f684d 100644
(file)
--- a/
odlparent/pom.xml
+++ b/
odlparent/pom.xml
@@
-13,7
+13,7
@@
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.0.
5
-SNAPSHOT</version>
+ <version>2.0.
6
-SNAPSHOT</version>
<relativePath>../odlparent-lite</relativePath>
</parent>
<relativePath>../odlparent-lite</relativePath>
</parent>
@@
-104,9
+104,9
@@
<!-- Used by controller, snbi; see also centinel, dlux, toolkit -->
<osgi.core.version>5.0.0</osgi.core.version>
<!-- Used by controller, snbi; see also centinel, dlux, toolkit -->
<osgi.core.version>5.0.0</osgi.core.version>
- <akka.version>2.4.
18
</akka.version>
+ <akka.version>2.4.
20
</akka.version>
<scala.version>2.11</scala.version>
<scala.version>2.11</scala.version>
- <scala.micro.version>1
1
</scala.micro.version>
+ <scala.micro.version>1
2
</scala.micro.version>
<leveldb.version>0.7</leveldb.version>
<!-- Default Sonar configuration -->
<leveldb.version>0.7</leveldb.version>
<!-- Default Sonar configuration -->
@@
-126,7
+126,7
@@
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-artifacts</artifactId>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-artifacts</artifactId>
- <version>2.0.
5
-SNAPSHOT</version>
+ <version>2.0.
6
-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<scope>import</scope>
<type>pom</type>
</dependency>
@@
-771,7
+771,7
@@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.
0.1
</version>
+ <version>3.
1.0
</version>
</dependency>
<dependency>
<groupId>orbit</groupId>
</dependency>
<dependency>
<groupId>orbit</groupId>
@@
-876,6
+876,11
@@
<artifactId>bcprov-jdk15on</artifactId>
<version>${bouncycastle.version}</version>
</dependency>
<artifactId>bcprov-jdk15on</artifactId>
<version>${bouncycastle.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-ext-jdk15on</artifactId>
+ <version>${bouncycastle.version}</version>
+ </dependency>
<dependency>
<groupId>org.codehaus.enunciate</groupId>
<artifactId>enunciate-core-annotations</artifactId>
<dependency>
<groupId>org.codehaus.enunciate</groupId>
<artifactId>enunciate-core-annotations</artifactId>
@@
-1259,19
+1264,19
@@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-link</artifactId>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-link</artifactId>
- <version>2.5.
2
</version>
+ <version>2.5.
3
</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
- <version>2.5.
2
</version>
+ <version>2.5.
3
</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-wrap</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-wrap</artifactId>
- <version>2.5.
2
</version>
+ <version>2.5.
3
</version>
</dependency>
<dependency>
</dependency>
<dependency>
@@
-1460,12
+1465,12
@@
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>checkstyle</artifactId>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.0.
5
-SNAPSHOT</version>
+ <version>2.0.
6
-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odl-license</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odl-license</artifactId>
- <version>2.0.
5
-SNAPSHOT</version>
+ <version>2.0.
6
-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.sevntu.checkstyle</groupId>
</dependency>
<dependency>
<groupId>com.github.sevntu.checkstyle</groupId>
@@
-1592,7
+1597,7
@@
<artifactItem>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odl-license</artifactId>
<artifactItem>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odl-license</artifactId>
- <version>2.0.
5
-SNAPSHOT</version>
+ <version>2.0.
6
-SNAPSHOT</version>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
@@
-1728,7
+1733,7
@@
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>findbugs</artifactId>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>findbugs</artifactId>
- <version>2.0.
5
-SNAPSHOT</version>
+ <version>2.0.
6
-SNAPSHOT</version>
</dependency>
</dependencies>
<configuration>
</dependency>
</dependencies>
<configuration>