Bug 6278: Copy karaf-parent from controller to odlparent 49/42649/5
authorRyan Goulding <ryandgoulding@gmail.com>
Fri, 22 Jul 2016 07:52:08 +0000 (03:52 -0400)
committerTom Pantelis <tpanteli@brocade.com>
Wed, 3 Aug 2016 15:44:23 +0000 (15:44 +0000)
commit678b2e0c2cf9f7b149bad013bcce5845fd521ebf
treee7145bb4da8305228bf07a44daaa1f74f1f703c3
parent0c60b58f901657a17dc2b2ad487e05c19a57298b
Bug 6278: Copy karaf-parent from controller to odlparent

As discussed in the MD-SAL call, there is an architectural need to move
karaf-parent from the controller project to the odlparent project.  This
is particularly useful for karaf upgrades, since right now a bump in karaf
version within odlparent requires a rebuild of controller to reflect the
change in karaf-parent, and our build jobs are not set up to support such
a process.

The move process will be handled in multiple steps:

1) Copy karaf-parent, karaf-branding and opendaylight-karaf-resources to
odlparent.  All three of these should belong in odlparent.  All three must
be moved since karaf-parent depends on the latter two artifacts.  Since
controller depends on odlparent (and not the other way around), they must
be moved upstream to odlparent.

2) Have controller's karaf-parent derive from odlparent's karaf-parent.
This preserves the ability for downstream consumers to derive from the
controller karaf-parent in the interim, while allowing changes to odlparent's
karaf-parent to be recognized since controller does not need to be rebuilt.
[THIS PATCH]

This also involves removing karaf-branding and opendaylight-karaf-resources
from the controller project, since they are no longer needed.  There are two
consumers that need to be patched:
lispflowmapping: https://git.opendaylight.org/gerrit/42647
vtn: https://git.opendaylight.org/gerrit/42648

3) Change all downstream projects to utilize odlparent's karaf-parent.  This
is future work and will be done in several patches.

4) Remove controller's karaf-parent once we feel all downstream consumers
are using the odlparent's karaf-parent.

Change-Id: Ib42ff5212bbfb93883346a19855544df4fb06d61
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
24 files changed:
karaf/karaf-branding/.gitignore [deleted file]
karaf/karaf-branding/pom.xml [deleted file]
karaf/karaf-branding/src/main/resources/org/apache/karaf/branding/branding.properties [deleted file]
karaf/karaf-parent/pom.xml
karaf/opendaylight-karaf-resources/pom.xml [deleted file]
karaf/opendaylight-karaf-resources/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg [deleted file]
karaf/opendaylight-karaf-resources/src/main/resources/bin/instance [deleted file]
karaf/opendaylight-karaf-resources/src/main/resources/bin/instance.bat [deleted file]
karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf [deleted file]
karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf.bat [deleted file]
karaf/opendaylight-karaf-resources/src/main/resources/bin/setenv [deleted file]
karaf/opendaylight-karaf-resources/src/main/resources/bin/setenv.bat [deleted file]
karaf/opendaylight-karaf-resources/src/main/resources/configuration/context.xml [deleted file]
karaf/opendaylight-karaf-resources/src/main/resources/configuration/logback.xml [deleted file]
karaf/opendaylight-karaf-resources/src/main/resources/configuration/tomcat-logging.properties [deleted file]
karaf/opendaylight-karaf-resources/src/main/resources/configuration/tomcat-server.xml [deleted file]
karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties [deleted file]
karaf/opendaylight-karaf-resources/src/main/resources/etc/jetty.xml [deleted file]
karaf/opendaylight-karaf-resources/src/main/resources/etc/jre.properties [deleted file]
karaf/opendaylight-karaf-resources/src/main/resources/etc/odl.java.security [deleted file]
karaf/opendaylight-karaf-resources/src/main/resources/etc/org.ops4j.pax.logging.cfg [deleted file]
karaf/opendaylight-karaf-resources/src/main/resources/version.properties [deleted file]
karaf/pom.xml
opendaylight/commons/opendaylight/pom.xml

©2013 OpenDaylight, A Linux Foundation Collaborative Project. All Rights Reserved.
OpenDaylight is a registered trademark of The OpenDaylight Project, Inc.
Linux Foundation and OpenDaylight are registered trademarks of the Linux Foundation.
Linux is a registered trademark of Linus Torvalds.