X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=odlparent%2Fpom.xml;h=ee37a401a57ff7326c43c95d5c9532575cb47c34;hb=910697d62b57b55ed9efb30e5410e86ff6b28f90;hp=795ee7d6a34d27a1bb69d8ec9c58e5a9901be28f;hpb=a92025556a8e6546972df2de857e9bfe3e09f10c;p=odlparent.git diff --git a/odlparent/pom.xml b/odlparent/pom.xml index 795ee7d6a..ee37a401a 100644 --- a/odlparent/pom.xml +++ b/odlparent/pom.xml @@ -13,13 +13,14 @@ org.opendaylight.odlparent odlparent-lite - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT ../odlparent-lite org.opendaylight.odlparent odlparent pom + ODL :: odlparent :: ${project.artifactId} scm:git:ssh://git.opendaylight.org:29418/odlparent.git @@ -28,17 +29,11 @@ https://wiki.opendaylight.org/view/ODL_Root_Parent:Main - - - 3.0.5 - - + a variable. Duplication within odlparent doesn't count if it can be + managed using maven-versions-plugin. --> opendaylight.release opendaylight.snapshot @@ -48,8 +43,8 @@ - 1.7 - 1.7 + 1.8 + 1.8 ${maven.compiler.source} ${maven.compiler.target} @@ -68,8 +63,8 @@ ${maven.bundle.version} 2.16 ${maven.compile.plugin.version} - 1.4 - 1.30.1 + 1.4.1 + 1.31 4.4.0 2.18.1 1.0 @@ -85,73 +80,50 @@ 0.7.2.201409121644 ${maven.jar.version} 3.0.3 - 2.6 + 2.8.1 1.0-alpha-2 ${maven.release.version} - 0.1.0-SNAPSHOT + 0.2.0-SNAPSHOT - - 1.52 - - 1.10 - - 3.4 - - 2.6 - - 3.3 - - - 2.5.2 - - 3.1.0 - - 2.3.1 - + + 1.54 + 18.0 - - 1.3 - + 2.3.2 - + 3.20.0-GA - + 1.17 - - 1.17 - - - + 20131018 - + 1.3.7 3.0.0 - + 4.11 - + 1.1.3 - - 1.9.5 - - 4.0.30.Final - + + 1.10.19 + 5.0.0 - + 1.7.12 - - 3.2.14.RELEASE - - 1.5.0 + + 2.4.3 + 2.11 + 8 + 0.7 2.4 @@ -164,13 +136,29 @@ + + + org.opendaylight.odlparent + odlparent-artifacts + 1.7.0-SNAPSHOT + import + pom + + + junit junit ${junit.version} test + + junit + junit-dep + ${junit.version} + test + org.skyscreamer jsonassert @@ -192,7 +180,7 @@ org.hamcrest hamcrest-core - ${hamcrest.version} + 1.3 test @@ -201,6 +189,36 @@ ${slf4j.version} test + + org.powermock + powermock-api-mockito + 1.6.4 + test + + + org.powermock + powermock-api-support + 1.6.4 + test + + + org.powermock + powermock-core + 1.6.4 + test + + + org.powermock + powermock-module-junit4 + 1.6.4 + test + + + org.powermock + powermock-reflect + 1.6.4 + test + org.slf4j @@ -242,25 +260,20 @@ guava ${guava.version} - - commons-collections - commons-collections - 3.2.1 - org.apache.commons commons-lang3 - ${commons.lang3.version} + 3.4 commons-lang commons-lang - ${commons.lang.version} + 2.6 commons-codec commons-codec - ${commons.codec.version} + 1.10 @@ -296,23 +309,54 @@ jersey-core ${jersey.version} + + com.sun.jersey + jersey-json + ${jersey.version} + com.sun.jersey jersey-server ${jersey.version} + + com.sun.jersey + jersey-servlet + ${jersey.version} + + + com.sun.jersey.jersey-test-framework + jersey-test-framework-grizzly2 + ${jersey.version} + test + com.sun.jersey jersey-client - ${jersey.client.version} + ${jersey.version} org.opendaylight.controller.thirdparty com.sun.jersey.jersey-servlet 1.17 + + org.apache.shiro + shiro-core + 1.2.4 + + + org.apache.shiro + shiro-web + 1.2.4 + + + net.java.dev.stax-utils + stax-utils + 20070216 + org.sonatype.plexus plexus-build-api @@ -383,7 +427,7 @@ com.google.code.gson gson - ${gson.version} + 2.3.1 commons-fileupload @@ -398,7 +442,7 @@ commons-net commons-net - ${commons.net.version} + 3.4 eclipselink @@ -462,14 +506,22 @@ equinoxSDK381 + org.eclipse.osgi.services + 3.3.100.v20120522-1822 + + + + org.eclipse.tycho org.eclipse.osgi - 3.8.1.v20120830-144521 + 3.9.1.v20130814-1242 + equinoxSDK381 - org.eclipse.osgi.services - 3.3.100.v20120522-1822 + org.eclipse.osgi + 3.8.1.v20120830-144521 + geminiweb @@ -521,41 +573,50 @@ org.eclipse.virgo.util.parser.manifest 3.6.0.RELEASE + io.netty netty-all - ${netty.version} + + 4.0.36.Final io.netty netty-buffer - ${netty.version} + 4.0.36.Final io.netty netty-codec - ${netty.version} + 4.0.36.Final io.netty netty-codec-http - ${netty.version} + 4.0.36.Final io.netty netty-common - ${netty.version} + 4.0.36.Final - io.netty netty-handler - ${netty.version} + 4.0.36.Final io.netty netty-transport - ${netty.version} + 4.0.36.Final + + + + io.netty + netty-transport-native-epoll + linux-x86_64 + 4.0.36.Final javax.ws.rs @@ -660,7 +721,7 @@ org.apache.felix org.apache.felix.dependencymanager - ${felix.dependencymanager.version} + 3.1.0 org.apache.felix @@ -711,20 +772,23 @@ servlet 1.0.0-v20070606 + org.eclipse.persistence org.eclipse.persistence.antlr - ${eclipse.persistence.version} + 2.5.2 org.eclipse.persistence org.eclipse.persistence.core - ${eclipse.persistence.version} + 2.5.2 org.eclipse.persistence org.eclipse.persistence.moxy - ${eclipse.persistence.version} + 2.5.2 javax.validation @@ -744,7 +808,7 @@ org.jolokia jolokia-osgi - 1.3.1 + 1.3.3 org.json @@ -777,37 +841,42 @@ org.springframework spring-aop - ${spring.version} + 3.2.14.RELEASE org.springframework spring-beans - ${spring.version} + 3.2.14.RELEASE org.springframework spring-context - ${spring.version} + 3.2.14.RELEASE org.springframework spring-core - ${spring.version} + 3.2.14.RELEASE org.springframework spring-expression - ${spring.version} + 3.2.14.RELEASE org.springframework spring-tx - ${spring.version} + 3.2.14.RELEASE org.springframework spring-web - ${spring.version} + 3.2.14.RELEASE + + + org.springframework + spring-webmvc + 3.2.14.RELEASE @@ -836,6 +905,101 @@ 3.8.0.I20120518-2145 + + + + com.typesafe + config + 1.3.0 + + + + + com.typesafe.akka + akka-actor_${scala.version} + ${akka.version} + + + com.typesafe.akka + akka-cluster_${scala.version} + ${akka.version} + + + com.typesafe.akka + akka-persistence_${scala.version} + ${akka.version} + + + com.typesafe.akka + akka-protobuf_${scala.version} + ${akka.version} + + + com.typesafe.akka + akka-remote_${scala.version} + ${akka.version} + + + com.typesafe.akka + akka-testkit_${scala.version} + ${akka.version} + + + com.typesafe.akka + akka-osgi_${scala.version} + ${akka.version} + + + com.typesafe.akka + akka-slf4j_${scala.version} + ${akka.version} + + + org.scala-lang.modules + scala-java8-compat_${scala.version} + 0.7.0 + + + org.iq80.leveldb + leveldb + ${leveldb.version} + + + org.fusesource.leveldbjni + leveldbjni-all + 1.8-odl + + + org.uncommons.maths + uncommons-maths + 1.2.2a + + + com.google.protobuf + protobuf-java + 2.5.0 + + + + + org.scala-lang + scala-library + ${scala.version}.${scala.micro.version} + + + org.scala-lang + scala-reflect + ${scala.version}.${scala.micro.version} + + + + + com.lmax + disruptor + + 3.3.2 + + org.ops4j.pax.exam @@ -871,9 +1035,14 @@ org.ops4j.pax.url pax-url-aether - ${url.version} + 1.5.0 test + + org.ops4j.pax.url + pax-url-wrap + 1.5.0 + org.springframework.osgi spring-osgi-mock @@ -891,6 +1060,11 @@ jetty-servlets 8.1.14.v20131031 + + org.apache.aries.blueprint + org.apache.aries.blueprint.core + 1.4.2 + @@ -915,7 +1089,7 @@ org.opendaylight.odlparent odl-license - 0.0.1-SNAPSHOT + 0.1.0-SNAPSHOT @@ -925,7 +1099,6 @@ ${project.build.sourceDirectory} org/opendaylight/yang/gen/**, - **/config/yang/**, **/protobuff/messages/**, **/thrift/gen/*.java @@ -946,7 +1119,6 @@ ${project.build.sourceDirectory} org/opendaylight/yang/gen/**, - **/config/yang/**, **/protobuff/messages/**, **/thrift/gen/*.java @@ -962,21 +1134,13 @@ - - maven-clean-plugin - ${maven.clean.plugin.version} - - - maven-install-plugin - 2.5.2 - - - maven-deploy-plugin - 2.8.2 - maven-compiler-plugin ${maven.compile.plugin.version} + + 1.8 + 1.8 + maven-enforcer-plugin @@ -987,36 +1151,18 @@ ${failsafe.version} - org.apache.maven.plugins maven-invoker-plugin 2.0.0 maven-jar-plugin - ${jar.plugin.version} - - - maven-javadoc-plugin - ${maven.javadoc.version} - - - true - - - - attach-javadocs - - jar - - - + ${maven.jar.version} maven-release-plugin ${maven.release.version} - org.apache.maven.plugins maven-dependency-plugin 2.10 @@ -1029,7 +1175,7 @@ org.opendaylight.odlparent odl-license - 0.0.1-SNAPSHOT + 0.1.0-SNAPSHOT ${project.build.outputDirectory} @@ -1040,7 +1186,6 @@ - org.apache.maven.plugins maven-plugin-plugin ${maven.plugin.version} @@ -1072,6 +1217,9 @@ maven-surefire-plugin ${maven.surefire.version} + + true + @@ -1091,7 +1239,7 @@ org.apache.servicemix.tooling depends-maven-plugin - 1.2 + 1.3.1 generate-depends-file @@ -1122,6 +1270,11 @@ build-helper-maven-plugin 1.9.1 + + org.codehaus.mojo + findbugs-maven-plugin + 3.0.3 + org.codehaus.mojo properties-maven-plugin @@ -1200,6 +1353,20 @@ + + + org.jacoco + jacoco-maven-plugin + [0.7.0,) + + prepare-agent + report + + + + + + @@ -1226,12 +1393,25 @@ maven-paxexam-plugin 1.2.4 + + + org.codehaus.mojo + jdepend-maven-plugin + 2.0 + + + site + + generate-no-fork + + + + - org.apache.maven.plugins maven-enforcer-plugin @@ -1250,19 +1430,15 @@ - org.apache.maven.plugins maven-dependency-plugin - org.apache.maven.plugins maven-checkstyle-plugin - org.apache.maven.plugins maven-source-plugin - org.apache.maven.plugins maven-javadoc-plugin @@ -1309,7 +1485,6 @@ org.codehaus.mojo findbugs-maven-plugin - 3.0.1 Max Low @@ -1319,7 +1494,23 @@ org.codehaus.mojo jdepend-maven-plugin - 2.0 + + + + generate-no-fork + + + + + + maven-javadoc-plugin + + + http://doc.akka.io/japi/akka/${akka.version}/ + https://google.github.io/guava/releases/${guava.version}/api/docs/ + http://netty.io/4.0/api/ + +