X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fcommons%2Fopendaylight%2Fpom.xml;h=794986a7bb7b62fd0a755da2470f53297b3f521b;hb=67a6909f1dde7ad425b3f9f08e96d863938dee64;hp=774ecd284fa4944b0eca2812bfd8bf8e7e5b5761;hpb=7cafa15a0cd2d3ce1e23e6c75e44ae824d1355c7;p=controller.git diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index 774ecd284f..794986a7bb 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -76,11 +76,15 @@ 0.6.0-SNAPSHOT 0.4.1-SNAPSHOT - 0.2.2-SNAPSHOT - 0.2.2-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.6.1-SNAPSHOT 0.1.1-SNAPSHOT 0.6.0-SNAPSHOT 0.0.2-SNAPSHOT @@ -96,6 +100,12 @@ java 0.5.0-SNAPSHOT 0.5.0-SNAPSHOT + 2.5.1 + 1.7 + 1.7 + + 1.3.1 + 0.9.2-SNAPSHOT @@ -602,6 +612,11 @@ org.openflow.openflowj 1.0.2 + + org.opendaylight.controller.thirdparty + exificient + ${exi.version} + org.opendaylight.controller.thirdparty com.sun.jersey.jersey-servlet @@ -612,6 +627,11 @@ org.apache.catalina.filters.CorsFilter 7.0.42 + + org.opendaylight.controller.thirdparty + ganymed + 1.0-SNAPSHOT + org.opendaylight.yangtools.model @@ -727,28 +747,56 @@ jolokia-osgi ${jolokia.version} + + org.opendaylight.controller + commons.logback_settings + 0.0.1-SNAPSHOT + test + + - central - maven repo1 - http://repo1.maven.org/maven2 - - - opendaylight-release - opendaylight-release - ${nexusproxy}/repositories/opendaylight.release/ + opendaylight-mirror + opendaylight-mirror + ${nexusproxy}/groups/public/ + + false + + + true + never + + opendaylight-snapshot opendaylight-snapshot ${nexusproxy}/repositories/opendaylight.snapshot/ + + true + + + false + + + IDE + + + m2e.version + + + + + target-ide + + viewbuild @@ -804,98 +852,18 @@ - - + + - ebr-bundles-release - ebr-bundles-release - ${nexusproxy}/repositories/ebr-bundles-release/ + opendaylight-mirror + opendaylight-mirror + ${nexusproxy}/groups/public/ false - never true - - - - - - ebr-bundles-external - ebr-bundles-external - ${nexusproxy}/repositories/ebr-bundles-external/ - - false - - - never - true - - - - central - central - http://repo1.maven.org/maven2 - - false - - - never - true - - - - - - ops4j-releases - ops4j-releases - ${nexusproxy}/repositories/ops4j-releases/ - - false - - - never - true - - - - - thirdparty - thirdparty - ${nexusproxy}/repositories/thirdparty/ - - false - - never - true - - - - - - jboss.releases - jboss.releases - ${nexusproxy}/repositories/jboss.releases/ - - false - - - never - true - - - - - opendaylight-release - opendaylight-release - ${nexusproxy}/repositories/opendaylight.release/ - - false - - - true @@ -999,37 +967,6 @@ - - org.codehaus.mojo - properties-maven-plugin - ${propertymavenplugin.version} - - - - set-system-properties - - - - - logback.configurationFile - ${project.parent.basedir}/logback.xml - - - - - - - - com.googlecode.maven-java-formatter-plugin - maven-java-formatter-plugin - 0.3.1 - - 1.6 - 1.6 - 1.6 - ${project.parent.basedir}/sun_coding_style.xml - - org.apache.maven.plugins maven-checkstyle-plugin @@ -1051,7 +988,7 @@ true - controller/space_and_tabs_checks.xml + controller/checkstyle.xml true true ${project.basedir} @@ -1065,6 +1002,12 @@ ${failsafe.version} ${testvm.argLine} + + + logback.configurationFile + logback.xml + + @@ -1087,6 +1030,34 @@ org.apache.maven.plugins maven-surefire-plugin ${surefire.version} + + + + logback.configurationFile + logback.xml + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + ${enforcer.version} + + + enforce-java + + enforce + + + + + 1.7.0 + + + + + @@ -1215,6 +1186,13 @@ + + + org.opendaylight.controller + commons.logback_settings + 0.0.1-SNAPSHOT + + org.apache.maven.plugins @@ -1250,10 +1228,18 @@ target/apidocs + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compile.plugin.version} + + ${java.version.source} + ${java.version.target} + ${java.version.source} + ${java.version.target} + + - - -