X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fcommons%2Fopendaylight%2Fpom.xml;h=8feb1600b5f9c84e444f3a060d84ae418e1015f9;hb=cf4834ff659cecdeb08a247679dfbf6b10f4ea73;hp=96c5166c2f7e20ea46d46f8577701b4ac88dd002;hpb=9d39b9af1e440da03b8943b1a60f09ca2a080fff;p=controller.git diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index 96c5166c2f..8feb1600b5 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -76,11 +76,11 @@ 0.6.0-SNAPSHOT 0.4.1-SNAPSHOT - 0.2.2-SNAPSHOT - 0.2.2-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 +96,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 +608,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 +623,11 @@ org.apache.catalina.filters.CorsFilter 7.0.42 + + org.opendaylight.controller.thirdparty + ganymed + 1.0-SNAPSHOT + org.opendaylight.yangtools.model @@ -727,28 +743,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,86 +848,18 @@ - - - - ebr-bundles-release - ebr-bundles-release - ${nexusproxy}/repositories/ebr-bundles-release/ - - - - - ebr-bundles-external - ebr-bundles-external - ${nexusproxy}/repositories/ebr-bundles-external/ - - false - - - true - - - - central - central - http://repo1.maven.org/maven2 - - false - - - true - - - - - - ops4j-releases - ops4j-releases - ${nexusproxy}/repositories/ops4j-releases/ - - false - - - true - - - - - thirdparty - thirdparty - ${nexusproxy}/repositories/thirdparty/ - - false - - - true - - - - - - jboss.releases - jboss.releases - ${nexusproxy}/repositories/jboss.releases/ - - false - - - true - - - + + - opendaylight-release - opendaylight-release - ${nexusproxy}/repositories/opendaylight.release/ + opendaylight-mirror + opendaylight-mirror + ${nexusproxy}/groups/public/ false true + never @@ -987,37 +963,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 @@ -1039,7 +984,7 @@ true - controller/space_and_tabs_checks.xml + controller/checkstyle.xml true true ${project.basedir} @@ -1053,6 +998,12 @@ ${failsafe.version} ${testvm.argLine} + + + logback.configurationFile + logback.xml + + @@ -1075,6 +1026,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 + + + + + @@ -1203,6 +1182,13 @@ + + + org.opendaylight.controller + commons.logback_settings + 0.0.1-SNAPSHOT + + org.apache.maven.plugins @@ -1238,10 +1224,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} + + - - -