X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=applications%2Freconciliation-framework%2Fpom.xml;h=1ef4016643d1c0e33468642d5f708b75c4f61060;hb=c9fb5748beda27ab17867f687c252c149928edfc;hp=000f66f6b6b5b2e0db45c05b15f092ce177634a3;hpb=6916d4f22823d56b391d0d45cb8544260def3431;p=openflowplugin.git diff --git a/applications/reconciliation-framework/pom.xml b/applications/reconciliation-framework/pom.xml index 000f66f6b6..1ef4016643 100644 --- a/applications/reconciliation-framework/pom.xml +++ b/applications/reconciliation-framework/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 org.opendaylight.openflowplugin applications - 0.6.0-SNAPSHOT + 0.10.0-SNAPSHOT org.opendaylight.openflowplugin.applications reconciliation-framework @@ -13,12 +12,12 @@ - junit - junit + org.osgi + org.osgi.core - org.opendaylight.controller - sal-binding-api + org.opendaylight.mdsal + mdsal-binding-api org.opendaylight.openflowplugin @@ -32,10 +31,6 @@ org.opendaylight.yangtools yang-common - - org.opendaylight.controller - sal-common-util - org.opendaylight.mdsal mdsal-singleton-common-api @@ -45,18 +40,13 @@ model-flow-service - org.mockito - mockito-core - test - - - org.opendaylight.controller - sal-binding-broker-impl + org.opendaylight.mdsal + mdsal-binding-dom-adapter test - org.opendaylight.controller - sal-binding-broker-impl + org.opendaylight.mdsal + mdsal-binding-dom-adapter test test-jar @@ -65,34 +55,35 @@ org.apache.karaf.shell.console provided + + javax.inject + javax.inject + true + + + javax.annotation + javax.annotation-api + true + + + org.apache.aries.blueprint + blueprint-maven-plugin-annotation + true + - org.apache.maven.plugins - maven-checkstyle-plugin - - checkstyle.violationSeverity=error - - - - org.apache.felix - maven-bundle-plugin - - - org.opendaylight.yangtools - yang-maven-plugin + org.apache.aries.blueprint + blueprint-maven-plugin - - scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git https://wiki.opendaylight.org/view/OpenDaylight_OpenFlow_Plugin:Main HEAD -