X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fparent%2Fpom.xml;h=263fd7924315d22a42068133cdd8aea263f0dd68;hb=81a463c0394f6d4647ddadd1adfa2040fdc9b486;hp=7c62febf18c631084dfd0e0778a4e60e2442e800;hpb=e609ad90a443547fa613118274a8773fa90c839f;p=yangtools.git diff --git a/common/parent/pom.xml b/common/parent/pom.xml index 7c62febf18..263fd79243 100644 --- a/common/parent/pom.xml +++ b/common/parent/pom.xml @@ -32,11 +32,12 @@ 0.2.0 3.0.0 2.1.6 + 0.6.2-SNAPSHOT 2013.10.21.2-SNAPSHOT 2010.09.24.4-SNAPSHOT 2010.09.24.4-SNAPSHOT + 2013.07.15.1-SNAPSHOT 2013.10.19.1-SNAPSHOT - 4.10 3.0.1 http://nexus.opendaylight.org/content 2013.08.27.4-SNAPSHOT @@ -44,7 +45,12 @@ 2.9.1 2.0.1 - + + 2.4 + jacoco + target/code-coverage/jacoco.exec + target/code-coverage/jacoco-it.exec + Sonar way with Findbugs @@ -88,36 +94,12 @@ - - junit - junit - 4.10 - test - org.apache.maven.shared maven-verifier 1.5 test - - org.ops4j.pax.exam - pax-exam-container-native - 3.0.0 - test - - - org.ops4j.pax.exam - pax-exam-junit4 - 3.0.0 - test - - - org.ops4j.pax.exam - pax-exam-link-mvn - 3.0.0 - test - equinoxSDK381 org.eclipse.osgi @@ -142,25 +124,15 @@ 1.5 test - - ch.qos.logback - logback-classic - 1.0.9 - - - io.netty - netty-codec-http - 4.0.10.Final - org.opendaylight.yangtools yang-data-util - 0.6.2-SNAPSHOT + ${yangtools.version} org.opendaylight.yangtools maven-sal-api-gen-plugin - 0.6.2-SNAPSHOT + ${yangtools.version} org.opendaylight.yangtools.thirdparty @@ -177,152 +149,162 @@ org.opendaylight.yangtools concepts - 0.6.2-SNAPSHOT + ${yangtools.version} org.opendaylight.yangtools object-cache-api - 0.6.2-SNAPSHOT + ${yangtools.version} org.opendaylight.yangtools object-cache-guava - 0.6.2-SNAPSHOT + ${yangtools.version} org.opendaylight.yangtools object-cache-noop - 0.6.2-SNAPSHOT + ${yangtools.version} org.opendaylight.yangtools binding-model-api - 0.6.2-SNAPSHOT + ${yangtools.version} org.opendaylight.yangtools binding-generator-api - 0.6.2-SNAPSHOT + ${yangtools.version} org.opendaylight.yangtools binding-generator-spi - 0.6.2-SNAPSHOT + ${yangtools.version} org.opendaylight.yangtools binding-generator-util - 0.6.2-SNAPSHOT + ${yangtools.version} org.opendaylight.yangtools binding-generator-impl - 0.6.2-SNAPSHOT + ${yangtools.version} org.opendaylight.yangtools binding-java-api-generator - 0.6.2-SNAPSHOT + ${yangtools.version} org.opendaylight.yangtools yang-common - 0.6.2-SNAPSHOT + ${yangtools.version} org.opendaylight.yangtools yang-data-api - 0.6.2-SNAPSHOT + ${yangtools.version} org.opendaylight.yangtools yang-data-impl - 0.6.2-SNAPSHOT + ${yangtools.version} + + + org.opendaylight.yangtools + yang-data-codec-gson + ${yangtools.version} org.opendaylight.yangtools yang-model-api - 0.6.2-SNAPSHOT + ${yangtools.version} org.opendaylight.yangtools yang-model-util - 0.6.2-SNAPSHOT + ${yangtools.version} org.opendaylight.yangtools yang-binding - 0.6.2-SNAPSHOT + ${yangtools.version} org.opendaylight.yangtools yang-parser-api - 0.6.2-SNAPSHOT + ${yangtools.version} org.opendaylight.yangtools yang-parser-impl - 0.6.2-SNAPSHOT + ${yangtools.version} org.opendaylight.yangtools yang-maven-plugin - 0.6.2-SNAPSHOT + ${yangtools.version} org.opendaylight.yangtools yang-maven-plugin-spi - 0.6.2-SNAPSHOT + ${yangtools.version} org.opendaylight.yangtools.model ietf-inet-types - 2010.09.24.4-SNAPSHOT + ${ietf.inet.types.version} org.opendaylight.yangtools.model ietf-yang-types - 2010.09.24.4-SNAPSHOT + ${ietf.yang.types.version} + + + org.opendaylight.yangtools.model + ietf-yang-types-20130715 + ${ietf.yang.types.20130715.version} org.opendaylight.yangtools.model ietf-restconf - 2013.09.04.1-SNAPSHOT + ${ietf.restconf.version} org.opendaylight.yangtools.model ietf-ted - 2013.10.21.2-SNAPSHOT + ${ietf.topology.version} org.opendaylight.yangtools.model ietf-topology - 2013.10.21.2-SNAPSHOT + ${ietf.topology.version} org.opendaylight.yangtools.model ietf-topology-isis - 2013.10.21.2-SNAPSHOT + ${ietf.topology.version} org.opendaylight.yangtools.model ietf-topology-l3-unicast-igp - 2013.10.21.2-SNAPSHOT + ${ietf.topology.version} org.opendaylight.yangtools.model ietf-topology-ospf - 2013.10.21.2-SNAPSHOT + ${ietf.topology.version} org.opendaylight.yangtools.model ietf-topology-l3-unicast - 2013.10.21.2-SNAPSHOT + ${ietf.topology.version} org.opendaylight.yangtools yang-data-composite-node - 0.6.2-SNAPSHOT + ${yangtools.version} org.apache.maven @@ -337,102 +319,29 @@ org.javassist javassist - 3.17.1-GA - - - org.mockito - mockito-all - 1.9.5 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - org.slf4j - slf4j-simple - 1.7.2 - test - - - org.slf4j - slf4j-api - 1.7.2 - - - org.slf4j - slf4j-log4j12 - 1.7.2 - - - org.slf4j - log4j-over-slf4j - 1.7.2 + ${javassist.version} xml-apis xml-apis 2.0.2 - - ch.qos.logback - logback-core - 1.0.9 - - - com.google.guava - guava - 14.0.1 - org.eclipse.xtend org.eclipse.xtend.lib 2.4.3 - - org.apache.commons - commons-lang3 - 3.1 - org.osgi org.osgi.core 5.0.0 provided - - commons-lang - commons-lang - 2.6 - - - commons-codec - commons-codec - 1.8 - - - com.google.code.findbugs - jsr305 - 2.0.3 - - - com.sun.jersey - jersey-client - 1.17 - javax.ws.rs javax.ws.rs-api 2.0 - - javax.ws.rs - jsr311-api - 1.1.1 - org.glassfish.jersey.ext @@ -445,86 +354,75 @@ 2.0 - - commons-io - commons-io - 2.4 - - org.opendaylight.yangtools restconf-client-api - ${project.version} + ${yangtools.version} org.opendaylight.yangtools restconf-common - ${project.version} + ${yangtools.version} org.opendaylight.yangtools restconf-util - ${project.version} + ${yangtools.version} org.opendaylight.yangtools restconf-test-service - ${project.version} + ${yangtools.version} org.opendaylight.yangtools restconf-client-impl - ${project.version} + ${yangtools.version} org.opendaylight.yangtools restconf-jaxrs-api - ${project.version} + ${yangtools.version} org.opendaylight.yangtools bug527-test-model - 0.6.2-SNAPSHOT + ${yangtools.version} test org.opendaylight.yangtools bug1196-test-model - 0.6.2-SNAPSHOT + ${yangtools.version} test org.opendaylight.yangtools websocket-client - ${project.version} + ${yangtools.version} - - com.github.romix - java-concurrent-hash-trie-map - ${ctrie.version} - ${project.groupId} object-cache-api - ${project.version} + ${yangtools.version} ${project.groupId} object-cache-guava - ${project.version} + ${yangtools.version} ${project.groupId} object-cache-noop - ${project.version} + ${yangtools.version} ${project.groupId} util - ${project.version} + ${yangtools.version} org.opendaylight.yangtools.model @@ -539,16 +437,42 @@ org.opendaylight.yangtools binding-type-provider - ${project.version} + ${yangtools.version} org.opendaylight.yangtools yang-data-operations - ${project.version} + ${yangtools.version} + + + org.opendaylight.yangtools + binding-data-codec + ${yangtools.version} + + + org.opendaylight.yangtools + features-test + ${yangtools.version} + test + + + + org.codehaus.sonar-plugins.java + sonar-jacoco-listeners + ${sonar-jacoco-listeners.version} + test + + + org.slf4j + slf4j-simple + test + + + @@ -581,6 +505,38 @@ + + org.apache.maven.plugins + maven-failsafe-plugin + + + ${jacoco.agent.it.arg} + + + listener + org.sonar.java.jacoco.JUnitListener + + + + ${project.build.directory}/surefire-reports + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven.surefire.version} + + + ${jacoco.agent.ut.arg} + + + listener + org.sonar.java.jacoco.JUnitListener + + + + + org.eclipse.m2e lifecycle-mapping @@ -653,15 +609,23 @@ + + + org.jacoco + jacoco-maven-plugin + [0.6,) + + prepare-agent + + + + + + - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - org.opendaylight.yangtools yang-maven-plugin @@ -838,8 +802,32 @@ maven-javadoc-plugin - org.codehaus.mojo - build-helper-maven-plugin + org.jacoco + jacoco-maven-plugin + + + prepare-ut-agent + process-test-classes + + prepare-agent + + + ${sonar.jacoco.reportPath} + jacoco.agent.ut.arg + + + + prepare-it-agent + pre-integration-test + + prepare-agent + + + ${sonar.jacoco.itReportPath} + jacoco.agent.it.arg + + + @@ -863,6 +851,13 @@ + + +