From: Tony Tkacik Date: Tue, 15 Sep 2015 09:18:56 +0000 (+0200) Subject: Removed unnecessary commons.parent. X-Git-Tag: release/beryllium~265 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=refs%2Fchanges%2F69%2F26969%2F4 Removed unnecessary commons.parent. Change-Id: Idc3dcdf859bd11edb53a5faa641206a8d9fac1c0 Signed-off-by: Tony Tkacik --- diff --git a/karaf/pom.xml b/karaf/pom.xml index 86ae052fdc..914ad57c2f 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -10,13 +10,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 4.0.0 - org.opendaylight.controller - commons.parent - 1.2.0-SNAPSHOT - ../opendaylight/commons/parent + org.opendaylight.odlparent + odlparent + 1.6.0-SNAPSHOT + - + org.opendaylight.controller karaf-aggregator + 1.2.0-SNAPSHOT pom karaf-branding diff --git a/opendaylight/commons/logback_settings/pom.xml b/opendaylight/commons/logback_settings/pom.xml index 71ae449ca6..805c7136e8 100644 --- a/opendaylight/commons/logback_settings/pom.xml +++ b/opendaylight/commons/logback_settings/pom.xml @@ -2,11 +2,12 @@ 4.0.0 - org.opendaylight.controller - commons.parent - 1.2.0-SNAPSHOT - ../parent + org.opendaylight.odlparent + odlparent + 1.6.0-SNAPSHOT + + org.opendaylight.controller commons.logback_settings 0.2.0-SNAPSHOT diff --git a/opendaylight/commons/parent/README b/opendaylight/commons/parent/README deleted file mode 100644 index 4560dd4b79..0000000000 --- a/opendaylight/commons/parent/README +++ /dev/null @@ -1,10 +0,0 @@ -This contains a dummy parent project. The use case of this is for -example the maven-checkstyle plugin call in commons/opendaylight in -there the plugin references the spaces_tabs_checks.xml from the -parent, it works well for all the childs of commons/opendaylight -artifact but when trying to deploy that one itself it breaks because -the plugin section will still refer to the parent when there is no -parent. -This fake parents allow to still set a parent for the -commons/opendaylight even if pretty much empty or limited to the bare -minimum and yet allow the commons/opendaylight to reference a parent. diff --git a/opendaylight/commons/parent/pom.xml b/opendaylight/commons/parent/pom.xml deleted file mode 100644 index 5a31af3b30..0000000000 --- a/opendaylight/commons/parent/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - 4.0.0 - org.opendaylight.controller - commons.parent - 1.2.0-SNAPSHOT - pom - - - opendaylight.release - opendaylight.snapshot - http://nexus.opendaylight.org/content - 2.3.2 - dav:http://nexus.opendaylight.org/content/sites/site - - - - - com.google.code.sortpom - maven-sortpom-plugin - 2.2.1 - - false - ${project.build.sourceEncoding} - true - \n - 2 - custom_1 - scope,groupId,artifactId - groupId,artifactId - true - - - - - sort - - verify - - - - - org.apache.maven.plugins - maven-release-plugin - ${releaseplugin.version} - - - - - scm:git:http://git.opendaylight.org/gerrit/controller.git - scm:git:ssh://git.opendaylight.org:29418/controller.git - HEAD - https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main - - - - - opendaylight-release - ${nexusproxy}/repositories/${nexus.repository.release}/ - - - - opendaylight-snapshot - ${nexusproxy}/repositories/${nexus.repository.snapshot}/ - - - - website - ${sitedeploy} - - - diff --git a/opendaylight/commons/parent/sun_coding_style.xml b/opendaylight/commons/parent/sun_coding_style.xml deleted file mode 100644 index f4516b913d..0000000000 --- a/opendaylight/commons/parent/sun_coding_style.xml +++ /dev/null @@ -1,291 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index 21bae79df2..822d29ac46 100644 --- a/pom.xml +++ b/pom.xml @@ -2,12 +2,12 @@ 4.0.0 - org.opendaylight.controller - commons.parent - 1.2.0-SNAPSHOT - opendaylight/commons/parent + org.opendaylight.odlparent + odlparent + 1.6.0-SNAPSHOT + - + org.opendaylight.controller releasepom 0.3.0-SNAPSHOT pom @@ -28,7 +28,6 @@ opendaylight/commons/protocol-framework opendaylight/commons/checkstyle opendaylight/commons/opendaylight - opendaylight/commons/parent opendaylight/commons/logback_settings opendaylight/commons/filter-valve opendaylight/commons/liblldp