X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=odlparent%2Fpom.xml;h=639ffa94762b509767e98c8e077bb376b86e0ccd;hb=e7737d520df1561acb42ca0f255f6d2f3ec60b3d;hp=887b61a408f4bf11dd56dd03de4b171b0d21d357;hpb=ca11928e7924eec6b43bdaca3fd4fa6b015f3a75;p=odlparent.git
diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 887b61a40..639ffa947 100644
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -13,7 +13,7 @@
org.opendaylight.odlparent
odlparent-lite
- 1.8.0-SNAPSHOT
+ 1.9.0-SNAPSHOT
../odlparent-lite
@@ -48,20 +48,16 @@
${maven.compiler.target}
-
- 1.8
3.0.1
2.6.1
- 3.5.1
-
- 3.0.0
+ 3.6.1
- 2.10.3
+ 2.10.4
- 3.4
+ 3.5
2.18.1
@@ -76,7 +72,7 @@
toolkit -->
2.17
- 0.3.0-SNAPSHOT
+ 0.4.0-SNAPSHOT
${maven.compile.plugin.version}
@@ -84,24 +80,17 @@
1.31
- 4.4.0
+ 4.11.0
2.18.1
-
- 0.7.2.201409121644
+ 0.7.7.201606060606
- 3.0.7
+ 3.0.8
+ 4.0.9
+ 4.0.9
2.8.1
@@ -111,23 +100,23 @@
- 1.54
+ 1.56
5.0.0
- 2.4.7
+ 2.4.18
2.11
- 8
+ 11
0.7
2.4
jacoco
- target/code-coverage/jacoco.exec
- target/code-coverage/jacoco-it.exec
+ ${project.build.directory}/code-coverage/jacoco.exec
+ ${project.build.directory}/code-coverage/jacoco-it.exec
- **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**
+ **/gen/**,**/generated-sources/**,**/generated-test-sources/**,**/yang-gen/**,**/yang-gen-config/**,**/yang-gen-sal/**,**/yang-gen-code/**,**/pax/**
false
@@ -138,7 +127,7 @@
org.opendaylight.odlparent
odlparent-artifacts
- 1.8.0-SNAPSHOT
+ 1.9.0-SNAPSHOT
import
pom
@@ -152,7 +141,7 @@
com.puppycrawl.tools
checkstyle
- 6.16
+ 7.6.1
@@ -175,11 +164,16 @@
org.skyscreamer
jsonassert
- 1.2.3
+ 1.3.0
test
+
org.mockito
+
mockito-all
1.10.19
test
@@ -208,6 +202,12 @@
0.28
test
+
+ org.awaitility
+ awaitility
+ 2.0.0
+ test
+
org.powermock
powermock-api-mockito
@@ -238,7 +238,29 @@
1.6.4
test
-
+
+
+
+
+ org.immutables
+ value
+ 2.4.2
+
+ provided
+
+
+
+ org.kohsuke.metainf-services
+ metainf-services
+ 1.7
+ true
+
+
+
org.slf4j
jcl-over-slf4j
@@ -278,12 +300,12 @@
ch.qos.logback
logback-core
- 1.1.7
+ 1.1.9
ch.qos.logback
logback-classic
- 1.1.7
+ 1.1.9
com.google.guava
@@ -296,10 +318,24 @@
18.0
test
+
+ com.mycila.guice.extensions
+ mycila-guice-jsr250
+
+ 4.0.rc1
+ test
+
+
+ com.google.inject
+ guice
+
+ 4.1.0
+
org.apache.commons
commons-lang3
- 3.4
+ 3.5
commons-lang
@@ -390,12 +426,12 @@
org.apache.shiro
shiro-core
- 1.2.5
+ 1.3.2
org.apache.shiro
shiro-web
- 1.2.5
+ 1.3.2
@@ -464,13 +500,38 @@
com.github.romix
java-concurrent-hash-trie-map
- 0.2.23
+ 0.2.23-ODL
com.google.code.findbugs
jsr305
3.0.0
+
+ com.google.code.findbugs
+ annotations
+ 3.0.0
+
+
+
+ net.jcip
+
+ jcip-annotations
+
+
+
+
+ org.eclipse.jdt
+ org.eclipse.jdt.annotation
+ 2.0.0
+ provided
+
com.google.code.gson
gson
@@ -479,17 +540,17 @@
commons-fileupload
commons-fileupload
- 1.3.1
+ 1.3.2
commons-io
commons-io
- 2.4
+ 2.5
commons-net
commons-net
- 3.5
+ 3.6
eclipselink
@@ -625,37 +686,37 @@
io.netty
netty-all
- 4.0.37.Final
+ 4.1.8.Final
io.netty
netty-buffer
- 4.0.37.Final
+ 4.1.8.Final
io.netty
netty-codec
- 4.0.37.Final
+ 4.1.8.Final
io.netty
netty-codec-http
- 4.0.37.Final
+ 4.1.8.Final
io.netty
netty-common
- 4.0.37.Final
+ 4.1.8.Final
io.netty
netty-handler
- 4.0.37.Final
+ 4.1.8.Final
io.netty
netty-transport
- 4.0.37.Final
+ 4.1.8.Final
@@ -663,7 +724,7 @@
io.netty
netty-transport-native-epoll
linux-x86_64
- 4.0.37.Final
+ 4.1.8.Final
javax.ws.rs
@@ -811,7 +872,7 @@
com.webcohesion.enunciate
enunciate-core-annotations
- 2.1.1
+ 2.6.0
org.codehaus.jettison
@@ -870,7 +931,7 @@
org.osgi
org.osgi.compendium
- 5.0.0
+ ${osgi.core.version}
provided
@@ -879,6 +940,17 @@
${osgi.core.version}
provided
+
+ org.osgi
+
+ org.osgi.service.event
+ 1.3.1
+
+
+ org.apache.aries.quiesce
+ org.apache.aries.quiesce.api
+ 1.0.0
+
org.ow2.asm
asm-all
@@ -893,63 +965,63 @@
org.springframework
spring-aop
- 3.2.14.RELEASE
+ 3.2.17.RELEASE
org.springframework
spring-beans
- 3.2.14.RELEASE
+ 3.2.17.RELEASE
org.springframework
spring-context
- 3.2.14.RELEASE
+ 3.2.17.RELEASE
org.springframework
spring-core
- 3.2.14.RELEASE
+ 3.2.17.RELEASE
org.springframework
spring-expression
- 3.2.14.RELEASE
+ 3.2.17.RELEASE
org.springframework
spring-tx
- 3.2.14.RELEASE
+ 3.2.17.RELEASE
org.springframework
spring-web
- 3.2.14.RELEASE
+ 3.2.17.RELEASE
org.springframework
spring-webmvc
- 3.2.14.RELEASE
+ 3.2.17.RELEASE
org.springframework.security
spring-security-config
- 3.2.8.RELEASE
+ 3.2.9.RELEASE
org.springframework.security
spring-security-core
- 3.2.8.RELEASE
+ 3.2.9.RELEASE
org.springframework.security
spring-security-taglibs
- 3.2.8.RELEASE
+ 3.2.9.RELEASE
org.springframework.security
spring-security-web
- 3.2.8.RELEASE
+ 3.2.9.RELEASE
virgomirror
@@ -965,7 +1037,24 @@
1.3.0
+
+
+ org.reactivestreams
+ reactive-streams
+ 1.0.0
+
+
+
+ com.typesafe
+ ssl-config-akka_${scala.version}
+ 0.2.1
+
+
+ com.typesafe
+ ssl-config-core_${scala.version}
+ 0.2.1
+
com.typesafe.akka
akka-actor_${scala.version}
@@ -976,11 +1065,22 @@
akka-cluster_${scala.version}
${akka.version}
+
+ com.typesafe.akka
+ akka-osgi_${scala.version}
+ ${akka.version}
+
com.typesafe.akka
akka-persistence_${scala.version}
${akka.version}
+
+ com.typesafe.akka
+ akka-persistence-tck_${scala.version}
+ ${akka.version}
+ test
+
com.typesafe.akka
akka-protobuf_${scala.version}
@@ -993,24 +1093,29 @@
com.typesafe.akka
- akka-testkit_${scala.version}
+ akka-slf4j_${scala.version}
${akka.version}
- test
com.typesafe.akka
- akka-osgi_${scala.version}
+ akka-stream_${scala.version}
${akka.version}
com.typesafe.akka
- akka-slf4j_${scala.version}
+ akka-testkit_${scala.version}
${akka.version}
+ test
org.scala-lang.modules
scala-java8-compat_${scala.version}
- 0.7.0
+ 0.8.0
+
+
+ org.scala-lang.modules
+ scala-parser-combinators_${scala.version}
+ 1.0.4
org.iq80.leveldb
@@ -1033,6 +1138,23 @@
2.5.0
+
+
+ org.agrona
+ agrona
+ 0.9.5
+
+
+ io.aeron
+ aeron-client
+ 1.2.5
+
+
+ io.aeron
+ aeron-driver
+ 1.2.5
+
+
org.scala-lang
@@ -1050,7 +1172,7 @@
com.lmax
disruptor
- 3.3.4
+ 3.3.6
@@ -1084,18 +1206,31 @@
${exam.version}
test
+
+ org.ops4j.pax.exam
+ pax-exam-link-assembly
+ ${exam.version}
+ test
+
+
+ org.ops4j.pax.url
+ pax-url-link
+ 2.5.2
+ test
+
org.ops4j.pax.url
pax-url-aether
- 2.4.7
+ 2.5.2
test
org.ops4j.pax.url
pax-url-wrap
- 2.4.7
+ 2.5.2
+
org.springframework.osgi
spring-osgi-mock
@@ -1108,31 +1243,32 @@
1.6
test
+
org.eclipse.jetty
jetty-client
- 8.1.19.v20160209
+ 9.2.19.v20160908
org.eclipse.jetty
jetty-server
- 8.1.19.v20160209
+ 9.2.19.v20160908
org.eclipse.jetty
jetty-servlet-tester
- 8.1.19.v20160209
+ 9.2.19.v20160908
test
org.eclipse.jetty
jetty-servlets
- 8.1.19.v20160209
+ 9.2.19.v20160908
org.eclipse.jetty
jetty-webapp
- 8.1.19.v20160209
+ 9.2.19.v20160908
org.apache.aries.blueprint
@@ -1140,6 +1276,12 @@
1.4.2
+
+ com.h2database
+ h2
+ 1.4.191
+
+
+
+ javax.inject
+ javax.inject
+ 1
+ true
+
+
+ org.ops4j.pax.cdi
+ pax-cdi-api
+ 1.0.0.RC2
+ true
+
+
+
+
+ com.datastax.cassandra
+ cassandra-driver-core
+ 2.1.9
+
+
+
+
+ io.dropwizard.metrics
+ metrics-core
+ 3.1.2
+
+
+ io.dropwizard.metrics
+ metrics-graphite
+ 3.1.2
+
+
+
+
+ org.apache.karaf.shell
+ org.apache.karaf.shell.console
+ ${karaf.version}
@@ -1173,12 +1355,29 @@
provided
+
+ org.slf4j
+ slf4j-simple
+ test
+
+
+
+ com.google.code.findbugs
+ annotations
+ provided
+
+
com.google.code.findbugs
jsr305
provided
+
+ org.eclipse.jdt
+ org.eclipse.jdt.annotation
+ provided
+
@@ -1188,7 +1387,7 @@
We do not need to specify the groupId. -->
maven-antrun-plugin
- ${maven.antrun.plugin.version}
+ 1.8
maven-checkstyle-plugin
@@ -1198,7 +1397,7 @@
com.puppycrawl.tools
checkstyle
- 6.16
+ 7.6.1
org.opendaylight.odlparent
@@ -1208,7 +1407,7 @@
org.opendaylight.odlparent
odl-license
- 0.2.0-SNAPSHOT
+ 0.3.0-SNAPSHOT
com.github.sevntu.checkstyle
@@ -1218,12 +1417,14 @@
odl_checks.xml
+ checkstyle-suppressions.xml
${project.build.sourceDirectory}
true
true
true
+ **\/*.java, **\/*.xtend
org/opendaylight/yang/gen/**,
**/protobuff/messages/**,
@@ -1286,7 +1487,8 @@
Hence people introducing new generated sources have to include
PMD config too.
-->
- ${basedir}/target/generated-sources
+ ${project.build.directory}/generated-sources
+ ${project.build.directory}/generated-test-sources
false
@@ -1318,11 +1520,10 @@
maven-jar-plugin
- ${maven.jar.version}
+ 3.0.2
maven-dependency-plugin
- 2.10
unpack-license
@@ -1333,7 +1534,7 @@
org.opendaylight.odlparent
odl-license
- 0.2.0-SNAPSHOT
+ 0.3.0-SNAPSHOT
${project.build.outputDirectory}
@@ -1348,6 +1549,10 @@
${maven.plugin.version}
+
+ maven-remote-resources-plugin
+ 1.5
+
maven-resources-plugin
3.0.1
@@ -1358,7 +1563,7 @@
maven-source-plugin
- 3.0.0
+ 3.0.1
attach-sources
@@ -1374,15 +1579,52 @@
${maven.surefire.version}
true
+ false
+
+
+ org.apache.aries.blueprint
+ blueprint-maven-plugin
+ 1.4.0
+
+
+ org.opendaylight
+
+
+
+
+
+
+ org.apache.xbean
+ xbean-finder-shaded
+ 4.5
+
+
+
+
+
+ blueprint-generate
+
+
+
+
+
org.apache.felix
maven-bundle-plugin
${maven.bundle.version}
true
+
+
+
+ {maven-resources},target/classes/LICENSE,META-INF/git.properties=-target/classes/META-INF/git.properties
+
+
@@ -1410,11 +1652,6 @@
maven-enunciate-plugin
${enunciate.version}
-
- com.webcohesion.enunciate
- enunciate-maven-plugin
- 2.1.1
-
org.codehaus.groovy.maven
gmaven-plugin
@@ -1423,12 +1660,49 @@
org.codehaus.mojo
build-helper-maven-plugin
- 1.10
+ 1.12
org.codehaus.mojo
findbugs-maven-plugin
- 3.0.3
+ 3.0.4
+
+
+ org.opendaylight.odlparent
+ findbugs
+ 1.9.0-SNAPSHOT
+
+
+
+
+ Max
+
+ Low
+
+ false
+
+ findbugs-exclude.xml
+
+ true
+
+ ${project.build.directory}/findbugs
+
+
+
+
+ analyze-compile
+ compile
+
+ check
+
+
+
org.codehaus.mojo
@@ -1439,7 +1713,7 @@
org.eclipse.xtend
xtend-maven-plugin
- 2.9.2
+ 2.11.0
@@ -1447,8 +1721,8 @@
testCompile
- ${project.build.directory}/generated-sources/xtend/main
- ${project.build.directory}/generated-sources/xtend/test
+ ${project.build.directory}/generated-sources/xtend
+ ${project.build.directory}/generated-test-sources/xtend
@@ -1512,6 +1786,20 @@
+
+
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+ [1.8,)
+
+ run
+
+
+
+
+
+
org.apache.servicemix.tooling
@@ -1539,6 +1827,21 @@
+
+
+
+ org.ops4j.pax.exam
+ maven-paxexam-plugin
+ [1.2.4,)
+
+ generate-depends-file
+
+
+
+
+
+
+
@@ -1554,7 +1857,11 @@
**/gen/**
**/generated-sources/**
+ **/generated-test-sources/**
**/yang-gen/**
+ **/yang-gen-config/**
+ **/yang-gen-sal/**
+ **/yang-gen-code/**
**/pax/**
@@ -1587,20 +1894,21 @@
maven-enforcer-plugin
- enforce-maven
+ enforce-banned-dependencies
+
+ enforce
+
-
- 1.8.0
-
-
- [3.2.5,)
-
+
+ Please always use mockito-core instead of mockito-all (https://bugs.opendaylight.org/show_bug.cgi?id=7662)
+
+ org.mockito:mockito-all
+
+
+ true
-
- enforce
-
@@ -1699,6 +2007,86 @@
+
+
+
+
+ maven-antrun-plugin
+
+
+
+ move-autowire-test
+ process-test-classes
+
+ run
+
+
+
+
+
+
+
+ Moving autowire.xml to org/opendaylight/blueprint
+
+
+
+ NOT moving autowire.xml (to org/opendaylight/blueprint)
+
+
+
+
+
+
+ move-autowire-package
+ prepare-package
+
+ run
+
+
+
+
+
+
+
+ Moving autowire.xml to org/opendaylight/blueprint
+
+
+
+ NOT moving autowire.xml (to org/opendaylight/blueprint)
+
+
+
+
+
+
+
+
+ ant-contrib
+ ant-contrib
+ 1.0b3
+
+
+ ant
+ ant
+
+
+
+
+ org.apache.ant
+ ant-nodeps
+ 1.8.1
+
+
+
@@ -1714,15 +2102,6 @@
maven-project-info-reports-plugin
${projectinfo}
-
- org.codehaus.mojo
- findbugs-maven-plugin
-
- Max
- Low
- site
-
-
org.codehaus.mojo
jdepend-maven-plugin
@@ -1741,7 +2120,7 @@
http://doc.akka.io/japi/akka/${akka.version}/
https://google.github.io/guava/releases/18.0/api/docs/
https://google.github.io/guava/releases/19.0/api/docs/
- http://netty.io/4.0/api/
+ http://netty.io/4.1/api/