X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=odlparent%2Fpom.xml;h=1061e40ccb8e9dc90c572aa68b5173b0710b8bb8;hb=1a20d2f8af7bdf04430030ab2ccb3a7a2192b685;hp=5123f35fa60103255f3b21127533747da9a26545;hpb=6370cd1f581151aab17d7ef27c2930043a86b99e;p=odlparent.git diff --git a/odlparent/pom.xml b/odlparent/pom.xml index 5123f35fa..1061e40cc 100644 --- a/odlparent/pom.xml +++ b/odlparent/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 4.0.0-SNAPSHOT + 4.0.2-SNAPSHOT ../odlparent-lite @@ -47,63 +47,36 @@ ${maven.compiler.source} ${maven.compiler.target} - - - 3.3.0 - - 3.7.0 - - 3.0.0 - - 3.5 - - - 2.18.1 - - - - ${maven.bundle.version} - - 3.0.0-SNAPSHOT - - 3.0.0-M1 - - 1.31 - - 4.11.0 - - 2.20.1 - - 0.8.1 - - 4.2.0 - - 4.2.0 - + + 3.0.0-M2 + + 4.2.1 + 2.8.1 - - 1.0.0 - 1.59 + 1.60 - - 5.0.0 + + ${project.build.directory}/code-coverage/jacoco.exec 3.8 jacoco - ${project.build.directory}/code-coverage/jacoco.exec + ${jacoco.destFile} ${project.build.directory}/code-coverage/jacoco-it.exec + **/gen/**,**/generated-sources/**,**/generated-test-sources/**,**/yang-gen/**,**/yang-gen-config/**,**/yang-gen-sal/**,**/yang-gen-code/**,**/pax/** false true + + + true @@ -112,7 +85,7 @@ org.opendaylight.odlparent odlparent-artifacts - 4.0.0-SNAPSHOT + 4.0.2-SNAPSHOT import pom @@ -126,7 +99,7 @@ com.puppycrawl.tools checkstyle - 8.10 + 8.12 @@ -137,12 +110,7 @@ junit junit - 4.11 - test - - - junit - junit-dep + 4.11 test @@ -155,12 +123,19 @@ org.mockito mockito-core - 1.10.19 + 2.20.1 + test + + + org.mockito + mockito-inline + 2.20.1 test org.hamcrest hamcrest-core + 1.3 test @@ -173,13 +148,14 @@ com.google.truth truth - 0.40 + + 0.42 test com.google.truth.extensions truth-java8-extension - 0.40 + 0.42 test @@ -197,31 +173,31 @@ org.powermock powermock-api-mockito - 1.6.4 + 1.7.4 test org.powermock powermock-api-support - 1.6.4 + 1.7.4 test org.powermock powermock-core - 1.6.4 + 1.7.4 test org.powermock powermock-module-junit4 - 1.6.4 + 1.7.4 test org.powermock powermock-reflect - 1.6.4 + 1.7.4 test @@ -232,7 +208,7 @@ org.immutables value - 2.6.1 + 2.7.1 provided @@ -240,7 +216,7 @@ org.kohsuke.metainf-services metainf-services - 1.7 + 1.8 true provided @@ -284,10 +260,21 @@ logback-classic 1.2.3 + + + + org.apache.logging.log4j + log4j-bom + 2.11.1 + import + pom + + com.google.guava guava - 23.6.1-jre + + 25.1-jre com.google.code.findbugs @@ -299,7 +286,7 @@ com.google.guava guava-testlib - 23.6.1-jre + 25.1-jre test @@ -325,16 +312,18 @@ org.apache.commons commons-lang3 - 3.7 + + 3.8 org.apache.commons commons-text - 1.1 + 1.4 commons-lang commons-lang + 2.6 @@ -450,7 +439,7 @@ com.fasterxml.jackson jackson-bom - 2.8.9 + 2.9.6 import pom @@ -484,7 +473,7 @@ org.eclipse.jdt org.eclipse.jdt.annotation - 2.1.150 + 2.2.0 provided @@ -513,37 +502,38 @@ io.netty netty-all - 4.1.24.Final + + 4.1.28.Final io.netty netty-buffer - 4.1.24.Final + 4.1.28.Final io.netty netty-codec - 4.1.24.Final + 4.1.28.Final io.netty netty-codec-http - 4.1.24.Final + 4.1.28.Final io.netty netty-common - 4.1.24.Final + 4.1.28.Final io.netty netty-handler - 4.1.24.Final + 4.1.28.Final io.netty netty-transport - 4.1.24.Final + 4.1.28.Final @@ -551,7 +541,7 @@ io.netty netty-transport-native-epoll linux-x86_64 - 4.1.24.Final + 4.1.28.Final javax.ws.rs @@ -576,7 +566,7 @@ org.apache.felix org.apache.felix.metatype - 1.1.6 + 1.2.0 org.bouncycastle @@ -596,7 +586,8 @@ org.codehaus.enunciate enunciate-core-annotations - ${enunciate.version} + + 1.31 @@ -623,7 +614,7 @@ org.codehaus.jettison jettison - 1.3.8 + 1.4.0 @@ -716,58 +707,59 @@ com.typesafe ssl-config-core_2.12 - 0.2.2 + 0.2.4 com.typesafe.akka akka-actor_2.12 - 2.5.11 + + 2.5.14 com.typesafe.akka akka-cluster_2.12 - 2.5.11 + 2.5.14 com.typesafe.akka akka-osgi_2.12 - 2.5.11 + 2.5.14 com.typesafe.akka akka-persistence_2.12 - 2.5.11 + 2.5.14 com.typesafe.akka akka-persistence-tck_2.12 - 2.5.11 + 2.5.14 test com.typesafe.akka akka-protobuf_2.12 - 2.5.11 + 2.5.14 com.typesafe.akka akka-remote_2.12 - 2.5.11 + 2.5.14 com.typesafe.akka akka-slf4j_2.12 - 2.5.11 + 2.5.14 com.typesafe.akka akka-stream_2.12 - 2.5.11 + 2.5.14 com.typesafe.akka akka-testkit_2.12 - 2.5.11 + 2.5.14 test @@ -778,44 +770,29 @@ org.scala-lang.modules scala-parser-combinators_2.12 - 1.0.6 - - - org.iq80.leveldb - leveldb - 0.7 - - - org.fusesource.leveldbjni - leveldbjni-all - 1.8-odl + 1.1.1 org.uncommons.maths uncommons-maths 1.2.2a - - com.google.protobuf - protobuf-java - 2.5.0 - org.agrona agrona - 0.9.12 + 0.9.21 io.aeron aeron-client - 1.7.0 + 1.9.3 io.aeron aeron-driver - 1.7.0 + 1.9.3 @@ -841,87 +818,94 @@ org.ops4j.pax.exam pax-exam - ${exam.version} + 4.12.0 test org.ops4j.pax.exam pax-exam-container-forked - ${exam.version} + 4.12.0 test org.ops4j.pax.exam pax-exam-container-karaf - ${exam.version} + 4.12.0 test org.ops4j.pax.exam pax-exam-container-native - ${exam.version} + 4.12.0 test org.ops4j.pax.exam pax-exam-extender-service - ${exam.version} + 4.12.0 test org.ops4j.pax.exam pax-exam-inject - ${exam.version} + 4.12.0 test org.ops4j.pax.exam pax-exam-invoker-junit - ${exam.version} + 4.12.0 test org.ops4j.pax.exam pax-exam-features - ${exam.version} + 4.12.0 xml test org.ops4j.pax.exam pax-exam-junit4 - ${exam.version} + 4.12.0 test org.ops4j.pax.exam pax-exam-link-mvn - ${exam.version} + 4.12.0 test org.ops4j.pax.exam pax-exam-link-assembly - ${exam.version} + 4.12.0 test org.ops4j.pax.url pax-url-link - 2.5.3 + 2.5.4 test org.ops4j.pax.url pax-url-aether - 2.5.3 + 2.5.4 test org.ops4j.pax.url pax-url-wrap - 2.5.3 + 2.5.4 + + + + org.ops4j.pax.web + pax-web-api + + 7.2.3 @@ -930,32 +914,46 @@ 1.2.1 test + + + org.xmlunit + xmlunit-core + 2.6.2 + test + + + org.xmlunit + xmlunit-matchers + 2.6.2 + test + + - xmlunit - xmlunit - 1.6 + org.xmlunit + xmlunit-legacy + 2.6.2 test org.eclipse.jetty jetty-client - 9.3.21.v20170918 + 9.4.11.v20180605 org.eclipse.jetty jetty-server - 9.3.21.v20170918 + 9.4.11.v20180605 org.eclipse.jetty jetty-servlets - 9.3.21.v20170918 + 9.4.11.v20180605 org.eclipse.jetty jetty-webapp - 9.3.21.v20170918 + 9.4.11.v20180605 @@ -993,12 +991,6 @@ 1 true - - org.ops4j.pax.cdi - pax-cdi-api - 1.0.0.RC2 - true - @@ -1040,7 +1032,7 @@ org.threeten threeten-extra - 1.3.2 + 1.4 @@ -1057,25 +1049,47 @@ org.apache.aries.blueprint.core 1.9.0 + + org.apache.aries.blueprint + blueprint-maven-plugin-annotation + 1.3.0 + true + + + + org.apache.sshd + sshd-core + 2.0.0 + + + org.apache.sshd + sshd-netty + 2.0.0 + + + net.i2p.crypto + eddsa + 0.3.0 + - + org.slf4j slf4j-api provided - - org.slf4j - slf4j-simple - test - - - + com.google.code.findbugs annotations @@ -1086,6 +1100,29 @@ org.eclipse.jdt.annotation provided + + + + org.slf4j + slf4j-simple + test + + + + + junit + junit + test + + + org.mockito + mockito-core + test + @@ -1105,22 +1142,22 @@ com.puppycrawl.tools checkstyle - 8.10.1 + 8.12 org.opendaylight.odlparent checkstyle - 4.0.0-SNAPSHOT + 4.0.2-SNAPSHOT org.opendaylight.odlparent odl-license - 4.0.0-SNAPSHOT + 4.0.2-SNAPSHOT com.github.sevntu-checkstyle sevntu-checkstyle-maven-plugin - 1.27.0 + 1.32.0 @@ -1179,7 +1216,7 @@ org.apache.maven.plugins maven-pmd-plugin - 3.9.0 + 3.10.0 cpd @@ -1209,7 +1246,7 @@ maven-compiler-plugin - ${maven.compile.plugin.version} + 3.8.0 1.8 1.8 @@ -1217,6 +1254,7 @@ -parameters -Xlint:deprecation + -Xlint:unchecked @@ -1226,15 +1264,15 @@ maven-failsafe-plugin - ${failsafe.version} + 2.22.0 maven-invoker-plugin - 2.0.0 + 3.1.0 maven-jar-plugin - 3.0.2 + 3.1.0 maven-dependency-plugin @@ -1248,7 +1286,7 @@ org.opendaylight.odlparent odl-license - 4.0.0-SNAPSHOT + 4.0.2-SNAPSHOT ${project.build.outputDirectory} @@ -1260,7 +1298,7 @@ maven-plugin-plugin - ${maven.plugin.version} + 3.5 @@ -1269,11 +1307,11 @@ maven-resources-plugin - 3.0.1 + 3.1.0 maven-shade-plugin - 3.1.0 + 3.2.0 maven-source-plugin @@ -1290,9 +1328,9 @@ maven-surefire-plugin - ${maven.surefire.version} + 2.22.0 - true + ${maven.test.redirectTestOutputToFile} false @@ -1302,21 +1340,21 @@ org.apache.aries.blueprint blueprint-maven-plugin - 1.4.0 - - - org.opendaylight - - + 1.10.0 + - - org.apache.xbean xbean-finder-shaded - 4.5 + 4.9 + + + org.opendaylight + + @@ -1329,7 +1367,7 @@ org.apache.felix maven-bundle-plugin - ${maven.bundle.version} + 4.0.0 true @@ -1337,6 +1375,10 @@ so that the build doesn't fail if there is no .../.git/ - so git.properties is effectively optional; and so the '-' there is needed to make the maven-bundle-plugin if that resource is not present. --> {maven-resources},${project.build.directory}/classes/LICENSE,META-INF/git.properties=-${project.build.directory}/classes/META-INF/git.properties + + + <_removeheaders>Import-Service,Export-Service @@ -1364,7 +1406,8 @@ org.codehaus.enunciate maven-enunciate-plugin - ${enunciate.version} + + 1.31 org.codehaus.groovy.maven @@ -1384,7 +1427,7 @@ org.opendaylight.odlparent findbugs - 4.0.0-SNAPSHOT + 4.0.2-SNAPSHOT @@ -1392,7 +1435,8 @@ jp.skypencil.findbugs.slf4j bug-pattern - + 1.4.0 @@ -1429,17 +1473,17 @@ com.github.spotbugs spotbugs-maven-plugin - 3.1.3.1 + 3.1.6 com.github.spotbugs spotbugs - 3.1.3 + 3.1.7 org.opendaylight.odlparent spotbugs - 4.0.0-SNAPSHOT + 4.0.2-SNAPSHOT @@ -1447,8 +1491,8 @@ jp.skypencil.findbugs.slf4j bug-pattern - - 1.4.0 + + 1.4.1 + + + org.eclipse.platform + org.eclipse.equinox.common + 3.10.0 + + org.eclipse.m2e @@ -1597,7 +1651,6 @@ [0.7.0,) prepare-agent - report @@ -1642,7 +1695,6 @@ org.jacoco jacoco-maven-plugin - ${jacoco.version} @@ -1722,7 +1774,7 @@ org.basepom.maven duplicate-finder-maven-plugin - 1.2.1 + 1.3.0 find-duplicate-classpath-entries @@ -1790,16 +1842,7 @@ prepare-agent - ${sonar.jacoco.reportPath} - - - - post-unit-test - - report - - - ${sonar.jacoco.reportPath} + ${jacoco.destFile} @@ -1858,86 +1901,6 @@ - - - - - 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 - - - @@ -1967,21 +1930,27 @@ - - ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ - - - - opendaylight-site - ${nexus.site.url}/${project.artifactId}/ - - + + + + jdk9-findbugs + + [9,) + + + + + + org.codehaus.mojo + findbugs-maven-plugin + + true + + + + + +