X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fcommons%2Fopendaylight%2Fpom.xml;h=fb548d4acdd9cf1b63439c8f52fc3a2a92b4ed51;hb=6932c15f119da55b17ce4ad39236566bfed96ab3;hp=53d8e52c8b93bd27892e61c1187664f94e42ae2d;hpb=dd5c16523714ca4ae2b0c715b8af525ed010aaa5;p=controller.git diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index 53d8e52c8b..d5d7e8e5c4 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -1,18 +1,16 @@ - + 4.0.0 3.0 - org.opendaylight.controller commons.opendaylight - 1.4.1-SNAPSHOT + 1.4.2-SNAPSHOT pom org.opendaylight.controller commons.parent - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT ../parent @@ -58,11 +56,11 @@ -Xmx1024m -XX:MaxPermSize=256m 14.0.1 5.0.0 - 2010.09.24.3 - 2010.09.24.3 - 2013.10.21.1 - 2013.08.27.3 - 2013.09.07.3 + 2010.09.24.4-SNAPSHOT + 2010.09.24.4-SNAPSHOT + 2013.10.21.2-SNAPSHOT + 2013.08.27.4-SNAPSHOT + 2013.09.07.4-SNAPSHOT 3.17.1-GA 2.3.2 3.1 @@ -70,40 +68,41 @@ 1.3.1 2.3.7 4.8.1 - 0.6.1 + 0.6.2-SNAPSHOT - 0.4.1-SNAPSHOT - 0.5.1-SNAPSHOT - 0.4.1-SNAPSHOT - 0.5.1-SNAPSHOT - 0.5.1-SNAPSHOT - 0.5.1-SNAPSHOT - 0.5.1-SNAPSHOT - 0.2.3-SNAPSHOT - 0.2.3-SNAPSHOT - 1.0-SNAPSHOT - 0.5.1-SNAPSHOT - 0.5.1-SNAPSHOT - 0.7.0-SNAPSHOT - 0.1.1-SNAPSHOT - 0.7.0-SNAPSHOT - 0.0.2-SNAPSHOT - 0.1.1-SNAPSHOT - 0.0.2-SNAPSHOT - 0.1.1-SNAPSHOT - 0.5.1-SNAPSHOT - 0.4.0-SNAPSHOT - 4.0.10.Final + 0.4.2-SNAPSHOT + 0.5.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.5.2-SNAPSHOT + 0.5.2-SNAPSHOT + 0.5.2-SNAPSHOT + 0.5.2-SNAPSHOT + 0.2.5-SNAPSHOT + 0.2.5-SNAPSHOT + 1.1-SNAPSHOT + 0.5.2-SNAPSHOT + 0.5.2-SNAPSHOT + 0.7.1-SNAPSHOT + 0.1.2-SNAPSHOT + 0.8.1-SNAPSHOT + 0.0.3-SNAPSHOT + 0.1.2-SNAPSHOT + 0.0.3-SNAPSHOT + 0.1.2-SNAPSHOT + 0.5.2-SNAPSHOT + 0.5.0-SNAPSHOT + 4.0.17.Final 2.4 - 0.4.1-SNAPSHOT - 0.4.1-SNAPSHOT - 0.5.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.4.1-SNAPSHOT - 0.4.1-SNAPSHOT - 0.4.1-SNAPSHOT - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.6.0-SNAPSHOT + 0.5.1-SNAPSHOT + 0.5.1-SNAPSHOT + 0.4.3-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.3-SNAPSHOT 1.17 7.0.42 @@ -115,6 +114,10 @@ 1.7 1.3.1 + 2.4.3 + src/main/xtend-gen + src/main/yang-gen-config + src/main/yang-gen-sal @@ -646,7 +649,7 @@ org.opendaylight.controller.thirdparty ganymed - 1.0-SNAPSHOT + 1.1-SNAPSHOT com.google.code.findbugs @@ -675,6 +678,11 @@ ietf-topology ${ietf-topology.version} + + org.opendaylight.yangtools.model + ietf-topology-l3-unicast-igp + ${ietf-topology.version} + org.opendaylight.yangtools.model opendaylight-l2-types @@ -696,6 +704,16 @@ concepts ${yangtools.version} + + org.opendaylight.yangtools + restconf-client-api + ${yangtools.version} + + + org.opendaylight.yangtools + restconf-client-impl + ${yangtools.version} + @@ -723,6 +741,11 @@ netty-common ${netty.version} + + io.netty + netty-codec-http + ${netty.version} + @@ -755,6 +778,12 @@ yang-model-api ${yangtools.version} + + org.opendaylight.yangtools + yang-model-util + ${yangtools.version} + + org.opendaylight.controller hosttracker @@ -783,18 +812,13 @@ org.opendaylight.controller clustering.services-implementation - ${controller.version} + ${clustering.services_implementation.version} org.opendaylight.controller clustering.stub ${clustering.stub.version} - - org.opendaylight.controller - configuration - ${controller.version} - org.opendaylight.controller configuration.implementation @@ -954,7 +978,7 @@ org.opendaylight.controller osgi-brandfragment.web - 0.0.1-SNAPSHOT + 0.0.2-SNAPSHOT @@ -1038,12 +1062,12 @@ org.opendaylight.controller httpservice-bridge - 0.0.1-SNAPSHOT + 0.0.2-SNAPSHOT org.opendaylight.controller jolokia-bridge - 0.0.1-SNAPSHOT + 0.0.2-SNAPSHOT org.opendaylight.controller @@ -1053,12 +1077,12 @@ org.opendaylight.controller usermanager.northbound - 0.0.1-SNAPSHOT + 0.0.2-SNAPSHOT org.opendaylight.controller controllermanager.northbound - 0.0.1-SNAPSHOT + 0.0.2-SNAPSHOT @@ -1135,7 +1159,7 @@ org.opendaylight.controller commons.logback_settings - 0.0.1-SNAPSHOT + 0.0.2-SNAPSHOT test @@ -1145,6 +1169,11 @@ + + org.eclipse.xtend + org.eclipse.xtend.lib + ${xtend.version} + org.opendaylight.controller sal-common @@ -1200,6 +1229,13 @@ sal-binding-broker-impl ${mdsal.version} + + org.opendaylight.controller + sal-binding-broker-impl + ${mdsal.version} + test-jar + test + org.opendaylight.controller sal-compatibility @@ -1267,60 +1303,60 @@ org.opendaylight.controller - concepts - ${concepts.version} + sal-remote + ${mdsal.version} - - - org.opendaylight.controller - config-api - ${config.version} + sal-restconf-broker + ${mdsal.version} org.opendaylight.controller - config-manager - ${config.version} + sal-binding-util + ${mdsal.version} org.opendaylight.controller - yang-jmx-generator - ${config.version} + concepts + ${concepts.version} - org.opendaylight.controller - yang-store-api - ${config.version} + org.opendaylight.controller + sal-remoterpc-connector + ${mdsal.version} + + + org.opendaylight.controller - yang-store-impl + config-api ${config.version} org.opendaylight.controller - logback-config + config-manager ${config.version} org.opendaylight.controller - config-persister-api + yang-jmx-generator ${config.version} org.opendaylight.controller - config-persister-file-adapter + logback-config ${config.version} org.opendaylight.controller - config-persister-file-xml-adapter + config-persister-api ${config.version} org.opendaylight.controller - config-persister-directory-adapter + config-persister-file-xml-adapter ${config.version} @@ -1328,11 +1364,6 @@ config-persister-directory-xml-adapter ${config.version} - - org.opendaylight.controller - config-persister-directory-autodetect-adapter - ${config.version} - org.opendaylight.controller @@ -1433,13 +1464,21 @@ netty-timer-config ${config.version} - org.opendaylight.controller configuration ${configuration.version} - + + org.bouncycastle + bcprov-jdk15on + 1.50 + + + org.bouncycastle + bcpkix-jdk15on + 1.50 + @@ -1461,7 +1500,7 @@ opendaylight-snapshot opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ + ${nexusproxy}/repositories/${nexus.repository.snapshot}/ true @@ -1557,7 +1596,7 @@ opendaylight-snapshot opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ + ${nexusproxy}/repositories/${nexus.repository.snapshot}/ true @@ -1570,12 +1609,12 @@ opendaylight-release - ${nexusproxy}/repositories/opendaylight.release/ + ${nexusproxy}/repositories/${nexus.repository.release}/ opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ + ${nexusproxy}/repositories/${nexus.repository.snapshot}/ @@ -1662,7 +1701,7 @@ org.opendaylight.controller checkstyle - 0.0.2-SNAPSHOT + 0.0.3-SNAPSHOT @@ -1680,7 +1719,7 @@ true ${project.basedir} **\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat - **\/target\/,**\/bin\/,**\/target-ide\/ + **\/target\/,**\/bin\/,**\/target-ide\/,**\/${jmxGeneratorPath}\/,**\/${salGeneratorPath}\/ @@ -1718,6 +1757,7 @@ maven-surefire-plugin ${surefire.version} + ${testvm.argLine} logback.configurationFile @@ -1746,6 +1786,10 @@ + + org.codehaus.mojo + build-helper-maven-plugin + @@ -1754,6 +1798,17 @@ maven-release-plugin ${releaseplugin.version} + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + org.opendaylight.yangtools + yang-maven-plugin + ${yangtools.version} + + org.eclipse.m2e @@ -1841,7 +1896,7 @@ - + @@ -1854,7 +1909,20 @@ - + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + ${enforcer.version} + + enforce + + + + @@ -1879,7 +1947,7 @@ org.opendaylight.controller commons.logback_settings - 0.0.1-SNAPSHOT + 0.0.2-SNAPSHOT @@ -1928,6 +1996,67 @@ ${java.version.target} + + org.eclipse.xtend + xtend-maven-plugin + ${xtend.version} + + + + compile + + + ${xtend.dstdir} + + + + + + maven-clean-plugin + + + + ${xtend.dstdir} + + ** + + + + ${jmxGeneratorPath} + + ** + + + + ${salGeneratorPath} + + ** + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.8 + + + add-source + generate-sources + + add-source + + + + ${jmxGeneratorPath} + ${salGeneratorPath} + ${xtend.dstdir} + + + + +