From f7a8d73e603ab5f0046e5e87956cc78e772a28d7 Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Fri, 3 Mar 2017 14:03:14 +0100 Subject: [PATCH] Karaf4 features and distribution + upstream-artifact split to multiple files depending on type. + Version properties moved to a parent pom separate from aggregators. + Added TODOs to remind only atrifact-artifacts should be referred to ideally. + distribution-artifact still contains all types in one file. + Karaf 4 features added, both distribution and some upstream. + features/ split to singles/ and repos/. + odl-restconf and odl-netconf-mdsal are the only upstream Karaf 4 features (compatible). + Additionaly features4-netconf-connector added (user-facing features are incompatible). + features3-distribution as artifactId for the Karaf 3 distribution feature repo. *+ Karaf 4 feature repos do not contain "integration" in artifactId. *+ So othe Karaf 3 feature repos kept their artifactId, no releng change needed. - The generated features-index descriptor lists single features (very ugly). + Karaf 3 related directories contain "3", Karaf 4 ones do not contain number. *- Except distribution-karaf to not confuse releng, it will be deleted soon anyway. + distribution:karaf is the artifact creating Karaf 4 distribution. *+ New content for org.ops4j.pax.url.mvn.cfg with minimal changes (to work offline) from default. *- Other resources duplicated without any change. *- aaa-cli-jar had to be commented out for the build to succeed. + ${project.*} used whenever possible (except in parent poms of course). + Modules named "all" listed last in aggregator (as if the order mattered). + Descriptions and comments improved. + Pom atributes in separate lines. + Some copypastas from previous Changes fixed. Change-Id: Ifed7d811e4f049e90f4a8cfa759ab2f67ae51f5b Signed-off-by: Vratko Polak --- artifacts/all/pom.xml | 8 +- artifacts/distribution/pom.xml | 55 +- artifacts/pom.xml | 6 +- artifacts/upstream/all/pom.xml | 84 +++ artifacts/upstream/artifacts/pom.xml | 53 ++ artifacts/upstream/feature-repos/pom.xml | 68 ++ artifacts/upstream/feature3-repos/pom.xml | 595 ++++++++++++++++ artifacts/upstream/other/pom.xml | 51 ++ artifacts/upstream/pom.xml | 657 +----------------- artifacts/upstream/properties/pom.xml | 115 +++ artifacts/upstream/single-features/pom.xml | 69 ++ distribution-karaf/pom.xml | 11 +- features/pom.xml | 46 ++ features/repos/distribution/pom.xml | 61 ++ features/repos/index/pom.xml | 82 +++ features/repos/pom.xml | 48 ++ features/repos/test/pom.xml | 67 ++ .../singles/odl-distribution-version/pom.xml | 72 ++ .../src/main/features/features.xml | 16 + features/singles/odl-integration-all/pom.xml | 62 ++ .../pom.xml | 76 ++ features/singles/pom.xml | 48 ++ .../pom.xml | 14 +- .../src/main/features/features.xml | 0 {features-index => features3-index}/pom.xml | 7 +- .../src/main/features/features.xml | 2 +- {features-test => features3-test}/pom.xml | 4 +- .../src/main/features/features.xml | 4 +- karaf/pom.xml | 135 ++++ .../bin/configure-cluster-ipdetect.sh | 265 +++++++ .../main/assembly/bin/configure_cluster.sh | 223 ++++++ .../main/assembly/bin/custom_shard_config.txt | 17 + .../src/main/assembly/bin/set_persistence.sh | 111 +++ .../assembly/etc/org.ops4j.pax.url.mvn.cfg | 96 +++ pom.xml | 14 +- version/pom.xml | 4 +- 36 files changed, 2573 insertions(+), 673 deletions(-) create mode 100644 artifacts/upstream/all/pom.xml create mode 100644 artifacts/upstream/artifacts/pom.xml create mode 100644 artifacts/upstream/feature-repos/pom.xml create mode 100644 artifacts/upstream/feature3-repos/pom.xml create mode 100644 artifacts/upstream/other/pom.xml create mode 100644 artifacts/upstream/properties/pom.xml create mode 100644 artifacts/upstream/single-features/pom.xml create mode 100644 features/pom.xml create mode 100644 features/repos/distribution/pom.xml create mode 100644 features/repos/index/pom.xml create mode 100644 features/repos/pom.xml create mode 100644 features/repos/test/pom.xml create mode 100644 features/singles/odl-distribution-version/pom.xml create mode 100644 features/singles/odl-distribution-version/src/main/features/features.xml create mode 100644 features/singles/odl-integration-all/pom.xml create mode 100644 features/singles/odl-integration-compatible-with-all/pom.xml create mode 100644 features/singles/pom.xml rename {features-distribution => features3-distribution}/pom.xml (83%) rename {features-distribution => features3-distribution}/src/main/features/features.xml (100%) rename {features-index => features3-index}/pom.xml (98%) rename {features-index => features3-index}/src/main/features/features.xml (98%) rename {features-test => features3-test}/pom.xml (92%) rename {features-test => features3-test}/src/main/features/features.xml (98%) create mode 100644 karaf/pom.xml create mode 100755 karaf/src/main/assembly/bin/configure-cluster-ipdetect.sh create mode 100755 karaf/src/main/assembly/bin/configure_cluster.sh create mode 100644 karaf/src/main/assembly/bin/custom_shard_config.txt create mode 100755 karaf/src/main/assembly/bin/set_persistence.sh create mode 100644 karaf/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml index e91cd84e..106dc6e8 100644 --- a/artifacts/all/pom.xml +++ b/artifacts/all/pom.xml @@ -7,7 +7,9 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent @@ -22,7 +24,6 @@ ODL :: integration :: ${project.artifactId} - POM to import with all ODL artifact versions including Distribution. https://wiki.opendaylight.org/view/Integration/Distribution @@ -39,10 +40,11 @@ HEAD + ${project.groupId} - upstream-artifacts + upstream-all-artifacts ${project.version} import pom diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml index 8771d54e..b956b824 100644 --- a/artifacts/distribution/pom.xml +++ b/artifacts/distribution/pom.xml @@ -7,7 +7,9 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent @@ -38,8 +40,9 @@ HEAD + - + ${project.groupId} version @@ -52,10 +55,10 @@ xml config - + ${project.groupId} - features-distribution + features3-distribution ${project.version} features xml @@ -74,6 +77,50 @@ features xml + + + ${project.groupId} + odl-distribution-version + ${project.version} + features + xml + + + ${project.groupId} + odl-integration-compatible-with-all + ${project.version} + features + xml + + + ${project.groupId} + odl-integration-all + ${project.version} + features + xml + + + + ${project.groupId} + features-distribution + ${project.version} + features + xml + + + ${project.groupId} + features-index + ${project.version} + features + xml + + + ${project.groupId} + features-test + ${project.version} + features + xml + diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 567c830e..19ceed3c 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -7,7 +7,9 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent @@ -38,8 +40,8 @@ HEAD - all distribution upstream + all diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml new file mode 100644 index 00000000..70271607 --- /dev/null +++ b/artifacts/upstream/all/pom.xml @@ -0,0 +1,84 @@ + + + + + 4.0.0 + + org.opendaylight.odlparent + odlparent-lite + 1.8.0-SNAPSHOT + + + org.opendaylight.integration + upstream-all-artifacts + 0.6.0-SNAPSHOT + pom + + ODL :: integration :: ${project.artifactId} + POM to import, with all relevant public upstream ODL artifact versions. + https://wiki.opendaylight.org/view/Integration/Distribution + + + Eclipse Public License v1.0 + http://www.eclipse.org/legal/epl-v10.html + + + + + scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git + scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git + https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=artifacts/upstream/all;hb=HEAD + HEAD + + + + + + + ${project.groupId} + artifact-artifacts + ${project.version} + import + pom + + + + ${project.groupId} + feature3-repo-artifacts + ${project.version} + import + pom + + + ${project.groupId} + feature-repo-artifacts + ${project.version} + import + pom + + + ${project.groupId} + single-feature-artifacts + ${project.version} + import + pom + + + ${project.groupId} + other-artifacts + ${project.version} + import + pom + + + + diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml new file mode 100644 index 00000000..3985913b --- /dev/null +++ b/artifacts/upstream/artifacts/pom.xml @@ -0,0 +1,53 @@ + + + + + 4.0.0 + + org.opendaylight.integration + properties + 0.6.0-SNAPSHOT + ../properties + + artifact-artifacts + pom + + ODL :: integration :: ${project.artifactId} + POM to import, with all upstream ODL project artifact poms with public versions. + https://wiki.opendaylight.org/view/Integration/Distribution + + + Eclipse Public License v1.0 + http://www.eclipse.org/legal/epl-v10.html + + + + + scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git + scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git + https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=artifacts/upstream/artifacts;hb=HEAD + HEAD + + + + + + + org.opendaylight.controller + config-artifacts + ${config.version} + pom + import + + + + diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml new file mode 100644 index 00000000..f2d10f2d --- /dev/null +++ b/artifacts/upstream/feature-repos/pom.xml @@ -0,0 +1,68 @@ + + + + + 4.0.0 + + org.opendaylight.integration + properties + 0.6.0-SNAPSHOT + ../properties + + feature-repo-artifacts + pom + + ODL :: integration :: ${project.artifactId} + POM to import, with all upstream ODL user-facing feature repo artifact versions. + https://wiki.opendaylight.org/view/Integration/Distribution + + + Eclipse Public License v1.0 + http://www.eclipse.org/legal/epl-v10.html + + + + + scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git + scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git + https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=artifacts/upstream/feature-repos;hb=HEAD + HEAD + + + + + + + + org.opendaylight.netconf + features4-netconf + ${netconf.version} + features + xml + + + org.opendaylight.netconf + features4-netconf-connector + ${netconf.version} + features + xml + + + org.opendaylight.netconf + features4-restconf + ${restconf.version} + features + xml + + + + diff --git a/artifacts/upstream/feature3-repos/pom.xml b/artifacts/upstream/feature3-repos/pom.xml new file mode 100644 index 00000000..c6eb8fae --- /dev/null +++ b/artifacts/upstream/feature3-repos/pom.xml @@ -0,0 +1,595 @@ + + + + + 4.0.0 + + org.opendaylight.integration + properties + 0.6.0-SNAPSHOT + ../properties + + feature3-repo-artifacts + pom + + ODL :: integration :: ${project.artifactId} + POM to import, with all user-facing upstream ODL Karaf 3 feature repository artifact versions. + https://wiki.opendaylight.org/view/Integration/Distribution + + + Eclipse Public License v1.0 + http://www.eclipse.org/legal/epl-v10.html + + + + + scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git + scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git + https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=artifacts/upstream/feature3-repos;hb=HEAD + HEAD + + + + + + + + + org.opendaylight.aaa + features-aaa + ${aaa.version} + features + xml + + + org.opendaylight.aaa + features-aaa-shiro + ${aaa.version} + features + xml + + + + org.opendaylight.alto + features-alto-release + ${alto.version} + features + xml + + + + + org.opendaylight.bgpcep + features-bgp + features + ${bgpcep.version} + xml + + + org.opendaylight.bgpcep + features-bmp + features + ${bgpcep.version} + xml + + + org.opendaylight.bgpcep + features-extras + features + ${bgpcep.version} + xml + + + org.opendaylight.bgpcep + features-pcep + features + ${bgpcep.version} + xml + + + org.opendaylight.bgpcep + features-rsvp + features + ${bgpcep.version} + xml + + + + org.opendaylight.bier + features-bier + features + ${bier.version} + xml + + + + org.opendaylight.capwap + capwap-features + ${capwap.version} + features + xml + + + + org.opendaylight.cardinal + cardinal-features + ${cardinal.version} + features + xml + + + + + org.opendaylight.controller + features-extras + ${controller.extras.version} + features + xml + + + org.opendaylight.controller + features-mdsal + ${mdsal.version} + features + xml + + + org.opendaylight.controller + features-mdsal-benchmark + ${benchmark.version} + features + xml + + + + org.opendaylight.didm + features-didm + ${didm.version} + features + xml + + + org.opendaylight.didm + features-didm-hp + ${didm.version} + features + xml + + + org.opendaylight.didm + features-didm-ovs + ${didm.version} + features + xml + + + + org.opendaylight.dlux + features-dlux + ${dlux.version} + features + xml + + + + org.opendaylight.dluxapps + features-dluxapps + ${dluxapps.version} + features + xml + + + + org.opendaylight.eman + eman-features + ${eman.version} + features + xml + + + + org.opendaylight.faas + features-faas + ${faas.version} + features + xml + + + + org.opendaylight.federation + federation-features + ${federation.version} + features + xml + + + + org.opendaylight.genius + genius-features + ${genius.version} + features + xml + + + + org.opendaylight.groupbasedpolicy + features-groupbasedpolicy + ${groupbasedpolicy.version} + features + xml + + + + org.opendaylight.honeycomb.vbd + vbd-features + ${honeycomb.vbd.version} + features + xml + + + + org.opendaylight.infrautils + infrautils-features + ${infrautils.version} + features + xml + + + + org.opendaylight.iotdm + onem2mall-features + ${iotdm.version} + features + xml + + + + org.opendaylight.l2switch + features-l2switch + ${l2switch.version} + features + xml + + + + org.opendaylight.lacp + features-lacp + ${lacp.version} + features + xml + + + + org.opendaylight.lispflowmapping + features-lispflowmapping + ${lispflowmapping.version} + features + xml + + + + org.opendaylight.natapp + natapp-features + ${natapp.version} + features + xml + + + + org.opendaylight.nemo + nemo-features + ${nemo.version} + features + xml + + + + org.opendaylight.netconf + features-netconf + ${netconf.version} + features + xml + + + org.opendaylight.netconf + features-netconf-connector + ${netconf.version} + features + xml + + + org.opendaylight.netconf + features-restconf + ${restconf.version} + features + xml + + + + org.opendaylight.netvirt + features-netvirt + ${netvirt.version} + features + xml + + + org.opendaylight.netvirt + openstack.net-virt-sfc-features + ${netvirt.version} + features + xml + + + org.opendaylight.netvirt + openstack.sfc-translator-features + ${netvirt.version} + features + xml + + + org.opendaylight.netvirt + vpnservice-features + ${vpnservice.version} + features + xml + + + + org.opendaylight.netide + netide-features + ${netide.version} + features + xml + + + + org.opendaylight.neutron + features-neutron + ${neutron.version} + features + xml + + + + org.opendaylight.nic + features-nic + ${nic.version} + features + xml + + + + org.opendaylight.ocpplugin + features-ocpplugin + ${ocpplugin.version} + features + xml + + + + org.opendaylight.odlparent + features-akka + ${odlparent.version} + features + xml + + + org.opendaylight.odlparent + features-odlparent + ${odlparent.version} + features + xml + + + + org.opendaylight.of-config + features-of-config + ${of-config.version} + features + xml + + + + org.opendaylight.openflowplugin + features-openflowplugin + ${openflowplugin.version} + features + xml + + + org.opendaylight.openflowplugin + features-openflowplugin-he + ${openflowplugin.version} + features + xml + + + org.opendaylight.openflowplugin + features-openflowplugin-extension + ${openflowplugin.version} + features + xml + + + org.opendaylight.openflowplugin + features-openflowplugin-extension-he + ${openflowplugin.version} + features + xml + + + + org.opendaylight.ovsdb + library-features + ${ovsdb.version} + features + xml + + + org.opendaylight.ovsdb + southbound-features + ${ovsdb.version} + features + xml + + + org.opendaylight.ovsdb + hwvtepsouthbound-features + ${ovsdb.version} + features + xml + + + + org.opendaylight.packetcable + features-packetcable-policy + ${packetcable.version} + features + xml + + + + org.opendaylight.sdninterfaceapp + features-sdninterfaceapp + ${sdninterfaceapp.version} + features + xml + + + + org.opendaylight.sfc + features-sfc + ${sfc.version} + features + xml + + + + org.opendaylight.snbi + features-snbi + ${snbi.version} + features + xml + + + + org.opendaylight.snmp + features-snmp + ${snmp.version} + features + xml + + + + org.opendaylight.snmp4sdn + features-snmp4sdn + ${snmp4sdn.version} + features + xml + + + + org.opendaylight.sxp + features + ${sxp.version} + features + xml + + + + org.opendaylight.topoprocessing + features-topoprocessing + ${topoprocessing.version} + features + xml + + + + org.opendaylight.tsdr + features-tsdr + ${tsdr.version} + features + xml + + + + org.opendaylight.ttp + features-ttp + ${ttp.version} + features + xml + + + + org.opendaylight.unimgr + unimgr-features + ${unimgr.version} + features + xml + + + + org.opendaylight.usc + usc-features + ${usc.version} + features + xml + + + + + org.opendaylight.vtn + features-vtn-manager + ${vtn-manager.version} + features + xml + + + + + diff --git a/artifacts/upstream/other/pom.xml b/artifacts/upstream/other/pom.xml new file mode 100644 index 00000000..d4d00c57 --- /dev/null +++ b/artifacts/upstream/other/pom.xml @@ -0,0 +1,51 @@ + + + + + 4.0.0 + + org.opendaylight.integration + properties + 0.6.0-SNAPSHOT + ../properties + + other-artifacts + pom + + ODL :: integration :: ${project.artifactId} + POM to import, with all the needed versions of upstream ODL artifacts not imported elsewhere. + https://wiki.opendaylight.org/view/Integration/Distribution + + + Eclipse Public License v1.0 + http://www.eclipse.org/legal/epl-v10.html + + + + + scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git + scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git + https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=artifacts/upstream/other;hb=HEAD + HEAD + + + + + + org.opendaylight.aaa + aaa-cli-jar + + ${aaa.version} + + + + diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml index 27f6d990..48737440 100644 --- a/artifacts/upstream/pom.xml +++ b/artifacts/upstream/pom.xml @@ -7,7 +7,9 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent @@ -16,13 +18,13 @@ org.opendaylight.integration - upstream-artifacts + upstream-aggregator 0.6.0-SNAPSHOT pom ODL :: integration :: ${project.artifactId} - POM to import with all upstream ODL artifact versions. + Aggregator for upstream artifact related modules. https://wiki.opendaylight.org/view/Integration/Distribution @@ -37,643 +39,14 @@ https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=artifacts/upstream;hb=HEAD HEAD - - UTF-8 - - - 0.5.0-SNAPSHOT - 0.4.0-SNAPSHOT - - 1.3.0-SNAPSHOT - 0.7.0-SNAPSHOT - 0.1.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.2.0-SNAPSHOT - - 0.6.0-SNAPSHOT - 1.8.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.5.0-SNAPSHOT - 1.1.0-SNAPSHOT - 1.2.0-SNAPSHOT - 0.2.0-SNAPSHOT - 1.5.0-SNAPSHOT - 0.2.0-SNAPSHOT - 0.5.0-SNAPSHOT - 1.1.0-SNAPSHOT - 1.1.0-SNAPSHOT - 0.3.0-SNAPSHOT - 0.5.0-SNAPSHOT - 1.3.0-SNAPSHOT - 1.5.0-SNAPSHOT - 1.5.0-SNAPSHOT - 0.2.0-SNAPSHOT - 1.2.0-SNAPSHOT - 1.2.0-SNAPSHOT - 0.3.0-SNAPSHOT - 1.4.0-SNAPSHOT - 1.3.0-SNAPSHOT - 0.8.0-SNAPSHOT - 0.2.0-SNAPSHOT - 1.8.0-SNAPSHOT - 1.2.0-SNAPSHOT - 0.4.0-SNAPSHOT - 1.4.0-SNAPSHOT - 1.5.0-SNAPSHOT - 1.5.0-SNAPSHOT - 1.8.0-SNAPSHOT - 0.5.0-SNAPSHOT - 1.4.0-SNAPSHOT - 1.3.0-SNAPSHOT - 0.5.0-SNAPSHOT - 1.4.0-SNAPSHOT - 0.3.0-SNAPSHOT - 1.3.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.2.0-SNAPSHOT - 1.3.0-SNAPSHOT - - 0.4.0-SNAPSHOT - 0.6.0-SNAPSHOT - - 1.1.0-SNAPSHOT - - - - - - - org.opendaylight.controller - features-config-persister - ${controller.config.version} - features - xml - - - - org.opendaylight.aaa - aaa-cli-jar - ${aaa.version} - - - - - - org.opendaylight.aaa - features-aaa - ${aaa.version} - features - xml - - - org.opendaylight.aaa - features-aaa-shiro - ${aaa.version} - features - xml - - - - org.opendaylight.alto - features-alto-release - ${alto.version} - features - xml - - - - - org.opendaylight.bgpcep - features-bgp - features - ${bgpcep.version} - xml - - - org.opendaylight.bgpcep - features-bmp - features - ${bgpcep.version} - xml - - - org.opendaylight.bgpcep - features-extras - features - ${bgpcep.version} - xml - - - org.opendaylight.bgpcep - features-pcep - features - ${bgpcep.version} - xml - - - org.opendaylight.bgpcep - features-rsvp - features - ${bgpcep.version} - xml - - - - org.opendaylight.bier - features-bier - features - ${bier.version} - xml - - - - org.opendaylight.capwap - capwap-features - ${capwap.version} - features - xml - - - - org.opendaylight.cardinal - cardinal-features - ${cardinal.version} - features - xml - - - - - org.opendaylight.controller - features-extras - ${controller.extras.version} - features - xml - - - org.opendaylight.controller - features-mdsal - ${mdsal.version} - features - xml - - - org.opendaylight.controller - features-mdsal-benchmark - ${benchmark.version} - features - xml - - - - org.opendaylight.didm - features-didm - ${didm.version} - features - xml - - - org.opendaylight.didm - features-didm-hp - ${didm.version} - features - xml - - - org.opendaylight.didm - features-didm-ovs - ${didm.version} - features - xml - - - - org.opendaylight.dlux - features-dlux - ${dlux.version} - features - xml - - - - org.opendaylight.dluxapps - features-dluxapps - ${dluxapps.version} - features - xml - - - - org.opendaylight.eman - eman-features - ${eman.version} - features - xml - - - - org.opendaylight.faas - features-faas - ${faas.version} - features - xml - - - - org.opendaylight.federation - federation-features - ${federation.version} - features - xml - - - - org.opendaylight.genius - genius-features - ${genius.version} - features - xml - - - - org.opendaylight.groupbasedpolicy - features-groupbasedpolicy - ${groupbasedpolicy.version} - features - xml - - - - org.opendaylight.honeycomb.vbd - vbd-features - ${honeycomb.vbd.version} - features - xml - - - - org.opendaylight.infrautils - infrautils-features - ${infrautils.version} - features - xml - - - - org.opendaylight.iotdm - onem2mall-features - ${iotdm.version} - features - xml - - - - org.opendaylight.l2switch - features-l2switch - ${l2switch.version} - features - xml - - - - org.opendaylight.lacp - features-lacp - ${lacp.version} - features - xml - - - - org.opendaylight.lispflowmapping - features-lispflowmapping - ${lispflowmapping.version} - features - xml - - - - org.opendaylight.natapp - natapp-features - ${natapp.version} - features - xml - - - - org.opendaylight.nemo - nemo-features - ${nemo.version} - features - xml - - - - org.opendaylight.netconf - features-netconf - ${netconf.version} - features - xml - - - org.opendaylight.netconf - features-netconf-connector - ${netconf.version} - features - xml - - - org.opendaylight.netconf - features-restconf - ${restconf.version} - features - xml - - - - org.opendaylight.netvirt - features-netvirt - ${netvirt.version} - features - xml - - - org.opendaylight.netvirt - openstack.net-virt-sfc-features - ${netvirt.version} - features - xml - - - org.opendaylight.netvirt - openstack.sfc-translator-features - ${netvirt.version} - features - xml - - - org.opendaylight.netvirt - vpnservice-features - ${vpnservice.version} - features - xml - - - - org.opendaylight.netide - netide-features - ${netide.version} - features - xml - - - - org.opendaylight.neutron - features-neutron - ${neutron.version} - features - xml - - - - org.opendaylight.nic - features-nic - ${nic.version} - features - xml - - - - org.opendaylight.ocpplugin - features-ocpplugin - ${ocpplugin.version} - features - xml - - - - org.opendaylight.odlparent - features-akka - ${odlparent.version} - features - xml - - - org.opendaylight.odlparent - features-odlparent - ${odlparent.version} - features - xml - - - - org.opendaylight.of-config - features-of-config - ${of-config.version} - features - xml - - - - org.opendaylight.openflowplugin - features-openflowplugin - ${openflowplugin.version} - features - xml - - - org.opendaylight.openflowplugin - features-openflowplugin-he - ${openflowplugin.version} - features - xml - - - org.opendaylight.openflowplugin - features-openflowplugin-extension - ${openflowplugin.version} - features - xml - - - org.opendaylight.openflowplugin - features-openflowplugin-extension-he - ${openflowplugin.version} - features - xml - - - - org.opendaylight.ovsdb - library-features - ${ovsdb.version} - features - xml - - - org.opendaylight.ovsdb - southbound-features - ${ovsdb.version} - features - xml - - - org.opendaylight.ovsdb - hwvtepsouthbound-features - ${ovsdb.version} - features - xml - - - - org.opendaylight.packetcable - features-packetcable-policy - ${packetcable.version} - features - xml - - - - org.opendaylight.sdninterfaceapp - features-sdninterfaceapp - ${sdninterfaceapp.version} - features - xml - - - - org.opendaylight.sfc - features-sfc - ${sfc.version} - features - xml - - - - org.opendaylight.snbi - features-snbi - ${snbi.version} - features - xml - - - - org.opendaylight.snmp - features-snmp - ${snmp.version} - features - xml - - - - org.opendaylight.snmp4sdn - features-snmp4sdn - ${snmp4sdn.version} - features - xml - - - - org.opendaylight.sxp - features - ${sxp.version} - features - xml - - - - org.opendaylight.topoprocessing - features-topoprocessing - ${topoprocessing.version} - features - xml - - - - org.opendaylight.tsdr - features-tsdr - ${tsdr.version} - features - xml - - - - org.opendaylight.ttp - features-ttp - ${ttp.version} - features - xml - - - - org.opendaylight.unimgr - unimgr-features - ${unimgr.version} - features - xml - - - - org.opendaylight.usc - usc-features - ${usc.version} - features - xml - - - - - org.opendaylight.vtn - features-vtn-manager - ${vtn-manager.version} - features - xml - - - - + + + properties + artifacts + feature3-repos + feature-repos + single-features + other + all + diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml new file mode 100644 index 00000000..3f240911 --- /dev/null +++ b/artifacts/upstream/properties/pom.xml @@ -0,0 +1,115 @@ + + + + + 4.0.0 + + org.opendaylight.odlparent + odlparent-lite + 1.8.0-SNAPSHOT + + + org.opendaylight.integration + properties + 0.6.0-SNAPSHOT + + pom + + ODL :: integration :: properties + + POM defining upstream public versions as properties, to be used as parent for artifact pom definitions. + https://wiki.opendaylight.org/view/Integration/Distribution + + + Eclipse Public License v1.0 + http://www.eclipse.org/legal/epl-v10.html + + + + + scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git + scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git + https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=artifacts/upstream/properties;hb=HEAD + HEAD + + + + + + 0.5.0-SNAPSHOT + 0.4.0-SNAPSHOT + + 1.3.0-SNAPSHOT + 0.7.0-SNAPSHOT + 0.1.0-SNAPSHOT + 0.4.0-SNAPSHOT + 0.2.0-SNAPSHOT + + 0.6.0-SNAPSHOT + 1.8.0-SNAPSHOT + 0.4.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 1.1.0-SNAPSHOT + 1.2.0-SNAPSHOT + 0.2.0-SNAPSHOT + 1.5.0-SNAPSHOT + 0.2.0-SNAPSHOT + 0.5.0-SNAPSHOT + 1.1.0-SNAPSHOT + 1.1.0-SNAPSHOT + 0.3.0-SNAPSHOT + 0.5.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.5.0-SNAPSHOT + 1.5.0-SNAPSHOT + 0.2.0-SNAPSHOT + 1.2.0-SNAPSHOT + 1.2.0-SNAPSHOT + 0.3.0-SNAPSHOT + 1.4.0-SNAPSHOT + 1.3.0-SNAPSHOT + 0.8.0-SNAPSHOT + 0.2.0-SNAPSHOT + 1.8.0-SNAPSHOT + 1.2.0-SNAPSHOT + 0.4.0-SNAPSHOT + 1.4.0-SNAPSHOT + 1.5.0-SNAPSHOT + 1.5.0-SNAPSHOT + 1.8.0-SNAPSHOT + 0.5.0-SNAPSHOT + 1.4.0-SNAPSHOT + 1.3.0-SNAPSHOT + 0.5.0-SNAPSHOT + 1.4.0-SNAPSHOT + 0.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 0.4.0-SNAPSHOT + 0.2.0-SNAPSHOT + 1.3.0-SNAPSHOT + + 0.4.0-SNAPSHOT + 0.6.0-SNAPSHOT + + 1.1.0-SNAPSHOT + + + diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml new file mode 100644 index 00000000..50a52d07 --- /dev/null +++ b/artifacts/upstream/single-features/pom.xml @@ -0,0 +1,69 @@ + + + + + 4.0.0 + + org.opendaylight.integration + properties + 0.6.0-SNAPSHOT + ../properties + + single-feature-artifacts + pom + + ODL :: integration :: ${project.artifactId} + POM to import, with all upstream ODL user-facing single feature artifact versions. + https://wiki.opendaylight.org/view/Integration/Distribution + + + Eclipse Public License v1.0 + http://www.eclipse.org/legal/epl-v10.html + + + + + scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git + scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git + https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=artifacts/upstream/single-features;hb=HEAD + HEAD + + + + + + org.opendaylight.controller + odl-config-persister + ${config.version} + + features + xml + + + + + org.opendaylight.netconf + odl-netconf-mdsal + ${mdsal.version} + features + xml + + + org.opendaylight.netconf + odl-restconf + ${restconf.version} + features + xml + + + + diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml index 5d65b86c..d92d7529 100644 --- a/distribution-karaf/pom.xml +++ b/distribution-karaf/pom.xml @@ -7,7 +7,9 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent @@ -16,14 +18,13 @@ org.opendaylight.integration - distribution-karaf 0.6.0-SNAPSHOT pom ODL :: integration :: ${project.artifactId} - The actual Karaf building sub-project. + The Karaf 3 archives building sub-project. https://wiki.opendaylight.org/view/Integration/Distribution @@ -58,8 +59,8 @@ + ${project.groupId} features-integration-index - org.opendaylight.integration features xml runtime @@ -76,8 +77,8 @@ + ${project.groupId} features-integration-test - org.opendaylight.integration features xml test diff --git a/features/pom.xml b/features/pom.xml new file mode 100644 index 00000000..1e2dd8e9 --- /dev/null +++ b/features/pom.xml @@ -0,0 +1,46 @@ + + + + + 4.0.0 + + org.opendaylight.odlparent + odlparent-lite + 1.8.0-SNAPSHOT + + + org.opendaylight.integration + features-aggregator + 0.6.0-SNAPSHOT + pom + + ODL :: integration :: ${project.artifactId} + Aggregator for distribution features and feature repos. + https://wiki.opendaylight.org/view/Integration/Distribution + + + Eclipse Public License v1.0 + http://www.eclipse.org/legal/epl-v10.html + + + + + scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git + scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git + https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=features;hb=HEAD + HEAD + + + singles + repos + + diff --git a/features/repos/distribution/pom.xml b/features/repos/distribution/pom.xml new file mode 100644 index 00000000..abeba8c2 --- /dev/null +++ b/features/repos/distribution/pom.xml @@ -0,0 +1,61 @@ + + + + + 4.0.0 + + org.opendaylight.odlparent + feature-repo-parent + 1.8.0-SNAPSHOT + + + org.opendaylight.integration + features-distribution + 0.6.0-SNAPSHOT + feature + + ODL :: integration :: ${project.artifactId} + Repository of features internal to distribution. + https://wiki.opendaylight.org/view/Integration/Distribution + + + Eclipse Public License v1.0 + http://www.eclipse.org/legal/epl-v10.html + + + + + scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git + scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git + https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=features/repos/distribution;hb=HEAD + HEAD + + + + + ${project.groupId} + all-artifacts + ${project.version} + import + pom + + + + + + ${project.groupId} + odl-distribution-version + features + xml + + + diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml new file mode 100644 index 00000000..89f72d8f --- /dev/null +++ b/features/repos/index/pom.xml @@ -0,0 +1,82 @@ + + + + + 4.0.0 + + org.opendaylight.odlparent + feature-repo-parent + 1.8.0-SNAPSHOT + + + org.opendaylight.integration + features-index + 0.6.0-SNAPSHOT + feature + + ODL :: integration :: ${project.artifactId} + Aggregate repository of all ODL repositories with user-facing features. + https://wiki.opendaylight.org/view/Integration/Distribution + + + Eclipse Public License v1.0 + http://www.eclipse.org/legal/epl-v10.html + + + + + scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git + scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git + https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=features/repos/index;hb=HEAD + HEAD + + + + + ${project.groupId} + all-artifacts + ${project.version} + import + pom + + + + + + + ${project.groupId} + features-distribution + features + xml + + + + diff --git a/features/repos/pom.xml b/features/repos/pom.xml new file mode 100644 index 00000000..cbc148c3 --- /dev/null +++ b/features/repos/pom.xml @@ -0,0 +1,48 @@ + + + + + 4.0.0 + + org.opendaylight.odlparent + odlparent-lite + 1.8.0-SNAPSHOT + + + org.opendaylight.integration + repos-aggregator + 0.6.0-SNAPSHOT + pom + + ODL :: integration :: ${project.artifactId} + Aggregator for distribution feature repos. + https://wiki.opendaylight.org/view/Integration/Distribution + + + Eclipse Public License v1.0 + http://www.eclipse.org/legal/epl-v10.html + + + + + scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git + scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git + https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=features/repos;hb=HEAD + HEAD + + + + distribution + index + test + + diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml new file mode 100644 index 00000000..425ba0b5 --- /dev/null +++ b/features/repos/test/pom.xml @@ -0,0 +1,67 @@ + + + + + 4.0.0 + + org.opendaylight.odlparent + feature-repo-parent + 1.8.0-SNAPSHOT + + + org.opendaylight.integration + features-test + 0.6.0-SNAPSHOT + feature + + ODL :: integration :: ${project.artifactId} + Aggregate repository of features used for integration system testsing. + https://wiki.opendaylight.org/view/Integration/Distribution + + + Eclipse Public License v1.0 + http://www.eclipse.org/legal/epl-v10.html + + + + + scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git + scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git + https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=features/repos/test;hb=HEAD + HEAD + + + + + ${project.groupId} + all-artifacts + ${project.version} + import + pom + + + + + + ${project.groupId} + odl-integration-compatible-with-all + features + xml + + + ${project.groupId} + odl-integration-all + features + xml + + + diff --git a/features/singles/odl-distribution-version/pom.xml b/features/singles/odl-distribution-version/pom.xml new file mode 100644 index 00000000..a5bb770a --- /dev/null +++ b/features/singles/odl-distribution-version/pom.xml @@ -0,0 +1,72 @@ + + + + 4.0.0 + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + org.opendaylight.integration + odl-distribution-version + 0.6.0-SNAPSHOT + feature + + ODL :: integration :: ${project.artifactId} + Single feature for Version functionality. + https://wiki.opendaylight.org/view/Integration/Distribution + + + Eclipse Public License v1.0 + http://www.eclipse.org/legal/epl-v10.html + + + + + scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git + scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git + https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=features/singles/odl-distribution-version;hb=HEAD + HEAD + + + + + ${project.groupId} + all-artifacts + ${project.version} + import + pom + + + + + + + ${project.groupId} + version + + + ${project.groupId} + version + xml + config + + + + org.opendaylight.controller + odl-config-persister + xml + features + + + diff --git a/features/singles/odl-distribution-version/src/main/features/features.xml b/features/singles/odl-distribution-version/src/main/features/features.xml new file mode 100644 index 00000000..dffe874c --- /dev/null +++ b/features/singles/odl-distribution-version/src/main/features/features.xml @@ -0,0 +1,16 @@ + + + + + + + mvn:org.opendaylight.integration/version/${project.version}/xml/config + + + diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml new file mode 100644 index 00000000..6f6b1325 --- /dev/null +++ b/features/singles/odl-integration-all/pom.xml @@ -0,0 +1,62 @@ + + + + 4.0.0 + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + org.opendaylight.integration + odl-integration-all + + 0.6.0-SNAPSHOT + feature + + ODL :: integration :: ${project.artifactId} + Single feature containing all features separately compatible with odl-integration-compatible-with-all. + https://wiki.opendaylight.org/view/Integration/Distribution + + + Eclipse Public License v1.0 + http://www.eclipse.org/legal/epl-v10.html + + + + + scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git + scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git + https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=features/singles/odl-integration-all;hb=HEAD + HEAD + + + + + ${project.groupId} + all-artifacts + ${project.version} + import + pom + + + + + + ${project.groupId} + odl-integration-compatible-with-all + xml + features + + + + diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml new file mode 100644 index 00000000..803fb4da --- /dev/null +++ b/features/singles/odl-integration-compatible-with-all/pom.xml @@ -0,0 +1,76 @@ + + + + 4.0.0 + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + org.opendaylight.integration + odl-integration-compatible-with-all + + 0.6.0-SNAPSHOT + feature + + ODL :: integration :: ${project.artifactId} + Single feature containing all features compatible together. + https://wiki.opendaylight.org/view/Integration/Distribution + + + Eclipse Public License v1.0 + http://www.eclipse.org/legal/epl-v10.html + + + + + scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git + scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git + https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=features/singles/odl-integration-compatible-with-all;hb=HEAD + HEAD + + + + + ${project.groupId} + all-artifacts + ${project.version} + import + pom + + + + + + + ${project.groupId} + odl-distribution-version + xml + features + + + + diff --git a/features/singles/pom.xml b/features/singles/pom.xml new file mode 100644 index 00000000..b0361bdf --- /dev/null +++ b/features/singles/pom.xml @@ -0,0 +1,48 @@ + + + + + 4.0.0 + + org.opendaylight.odlparent + odlparent-lite + 1.8.0-SNAPSHOT + + + org.opendaylight.integration + singles-aggregator + 0.6.0-SNAPSHOT + pom + + ODL :: integration :: ${project.artifactId} + Aggregator for distribution single features. + https://wiki.opendaylight.org/view/Integration/Distribution + + + Eclipse Public License v1.0 + http://www.eclipse.org/legal/epl-v10.html + + + + + scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git + scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git + https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=features/singles;hb=HEAD + HEAD + + + + odl-distribution-version + odl-integration-compatible-with-all + odl-integration-all + + diff --git a/features-distribution/pom.xml b/features3-distribution/pom.xml similarity index 83% rename from features-distribution/pom.xml rename to features3-distribution/pom.xml index d245d5dc..e06f59ad 100644 --- a/features-distribution/pom.xml +++ b/features3-distribution/pom.xml @@ -7,7 +7,9 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent @@ -16,7 +18,7 @@ org.opendaylight.integration - features-distribution + features3-distribution 0.6.0-SNAPSHOT jar + + ${project.groupId} version @@ -60,7 +63,8 @@ xml config - + + org.opendaylight.controller features-config-persister diff --git a/features-distribution/src/main/features/features.xml b/features3-distribution/src/main/features/features.xml similarity index 100% rename from features-distribution/src/main/features/features.xml rename to features3-distribution/src/main/features/features.xml diff --git a/features-index/pom.xml b/features3-index/pom.xml similarity index 98% rename from features-index/pom.xml rename to features3-index/pom.xml index c64683c3..628c187a 100644 --- a/features-index/pom.xml +++ b/features3-index/pom.xml @@ -7,7 +7,9 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent @@ -49,11 +51,12 @@ + ${project.groupId} - features-distribution + features3-distribution features xml diff --git a/features-index/src/main/features/features.xml b/features3-index/src/main/features/features.xml similarity index 98% rename from features-index/src/main/features/features.xml rename to features3-index/src/main/features/features.xml index 1caa6c1c..92f125d0 100644 --- a/features-index/src/main/features/features.xml +++ b/features3-index/src/main/features/features.xml @@ -62,7 +62,7 @@ mvn:org.opendaylight.groupbasedpolicy/features-groupbasedpolicy/{{VERSION}}/xml/features mvn:org.opendaylight.honeycomb.vbd/vbd-features/{{VERSION}}/xml/features mvn:org.opendaylight.infrautils/infrautils-features/{{VERSION}}/xml/features - mvn:org.opendaylight.integration/features-distribution/{{VERSION}}/xml/features + mvn:org.opendaylight.integration/features3-distribution/{{VERSION}}/xml/features mvn:org.opendaylight.iotdm/onem2mall-features/{{VERSION}}/xml/features mvn:org.opendaylight.l2switch/features-l2switch/{{VERSION}}/xml/features mvn:org.opendaylight.lacp/features-lacp/{{VERSION}}/xml/features diff --git a/features-test/pom.xml b/features3-test/pom.xml similarity index 92% rename from features-test/pom.xml rename to features3-test/pom.xml index 0a8adaff..28a20f9f 100644 --- a/features-test/pom.xml +++ b/features3-test/pom.xml @@ -7,7 +7,9 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.odlparent diff --git a/features-test/src/main/features/features.xml b/features3-test/src/main/features/features.xml similarity index 98% rename from features-test/src/main/features/features.xml rename to features3-test/src/main/features/features.xml index 108dc6cf..d309183e 100644 --- a/features-test/src/main/features/features.xml +++ b/features3-test/src/main/features/features.xml @@ -55,8 +55,8 @@ --> mvn:org.opendaylight.integration/features-integration-index/{{VERSION}}/xml/features - + odl-aaa-shiro odl-aaa-netconf-plugin odl-bgpcep-bgp-all @@ -127,8 +127,8 @@ --> - + odl-alto-release + + + 4.0.0 + + org.opendaylight.odlparent + karaf4-parent + 1.8.0-SNAPSHOT + + + org.opendaylight.integration + karaf + 0.6.0-SNAPSHOT + pom + + ODL :: integration :: ${project.artifactId} + The actual Karaf archive building sub-project. + https://wiki.opendaylight.org/view/Integration/Distribution + + + Eclipse Public License v1.0 + http://www.eclipse.org/legal/epl-v10.html + + + + + scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git + scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git + https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=karaf;hb=HEAD + HEAD + + + + + ${project.groupId} + all-artifacts + ${project.version} + import + pom + + + + + + + ${project.groupId} + features-index + features + xml + runtime + + + org.opendaylight.odlparent + opendaylight-karaf4-empty + + + org.opendaylight.controller + opendaylight-karaf-empty + + + org.opendaylight.odlparent + opendaylight-karaf-empty + + + + + + ${project.groupId} + features-test + features + xml + test + + + org.opendaylight.odlparent + opendaylight-karaf4-empty + + + org.opendaylight.controller + opendaylight-karaf-empty + + + org.opendaylight.odlparent + opendaylight-karaf-empty + + + + + + + + + + + + + + diff --git a/karaf/src/main/assembly/bin/configure-cluster-ipdetect.sh b/karaf/src/main/assembly/bin/configure-cluster-ipdetect.sh new file mode 100755 index 00000000..7b97ef96 --- /dev/null +++ b/karaf/src/main/assembly/bin/configure-cluster-ipdetect.sh @@ -0,0 +1,265 @@ +#!/bin/bash +# +# Copyright (c) 2015 Brocade Communications Systems, Inc. and others. All rights reserved. +# Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. +# +# This program and the accompanying materials are made available under the +# terms of the Eclipse Public License v1.0 which accompanies this distribution, +# and is available at http://www.eclipse.org/legal/epl-v10.html +# + + +function usage() +{ + # Print any error messages + test "$1" != "" && echo " ERROR: $1" + + # Print standard usage help + cat << EOF + This script is used to configure cluster parameters on this + controller. The user should restart controller to apply changes. + + Usage: $0 + - seed_nodes_list: List of seed nodes, separated by comma or space. + + The script checks that one (any) of the the controller's active IP + addresses is present in the seed_nodes_list. When running this script + on multiple seed nodes, keep the seed_node_list same on all nodes. + + Optionally, shards can be configured in a more granular way by + modifying the file "custom_shard_configs.txt" in the same folder + as this tool. Please see that file for more details. + +This script is currently limited to IPv4 addresses. If you have +problems running this script, please use 'configure_cluster.sh'. + +EOF + + exit 1 +} + + +function start_banner +{ +cat < ${MODULESHARDSCONF} + modules_builder > ${MODULESCONF} + cat ${MODULESCONF} + fi + + echo "Configuring replication type in module-shards.conf" + sed -i -e "/^[^#].*replicas[ ]*=/ { :loop /.*\]/ b done; N; b loop; :done s/replicas.*\]/replicas = [${MEMBER_NAME_LIST}]/}" ${MODULESHARDSCONF} +} + + +function verify_configuration_files +{ + # Constants + BIN_DIR=`dirname $0` + test ${BIN_DIR} == '.' && BIN_DIR=${PWD} + CONTROLLER_DIR=`dirname ${BIN_DIR}` + CONF_DIR=${CONTROLLER_DIR}/configuration/initial + AKKACONF=${CONF_DIR}/akka.conf + MODULESCONF=${CONF_DIR}/modules.conf + MODULESHARDSCONF=${CONF_DIR}/module-shards.conf + + # Verify configuration files are present in expected location. + if [ ! -f ${AKKACONF} -o ! -f ${MODULESHARDSCONF} ]; then + # Check if the configuration files exist in the system + # directory, then copy them over. + ORIG_CONF_DIR=${CONTROLLER_DIR}/system/org/opendaylight/controller/sal-clustering-config + version=$(sed -n -e 's/.*\(.*\)<\/version>/\1/p' ${ORIG_CONF_DIR}/maven-metadata-local.xml) + ORIG_CONF_DIR=${ORIG_CONF_DIR}/${version} + ORIG_AKKA_CONF=sal-clustering-config-${version}-akkaconf.xml + ORIG_MODULES_CONF=sal-clustering-config-${version}-moduleconf.xml + ORIG_MODULESHARDS_CONF=sal-clustering-config-${version}-moduleshardconf.xml + + if [ -f ${ORIG_CONF_DIR}/${ORIG_AKKA_CONF} -a \ + -f ${ORIG_CONF_DIR}/${ORIG_MODULES_CONF} -a \ + -f ${ORIG_CONF_DIR}/${ORIG_MODULESHARDS_CONF} ]; then + cat < + - index: Integer within 1..N, where N is the number of seed nodes. + - seed_nodes_list: List of seed nodes, separated by comma or space. + + The address at the provided index should belong this controller. + When running this script on multiple seed nodes, keep the + seed_node_list same, and vary the index from 1 through N. + + Optionally, shards can be configured in a more granular way by + modifying the file "custom_shard_configs.txt" in the same folder + as this tool. Please see that file for more details + +EOF + + exit 1 +} + + +function start_banner +{ +cat < ${MODULESHARDSCONF} + modules_builder > ${MODULESCONF} + cat ${MODULESCONF} + fi + + echo "Configuring replication type in module-shards.conf" + sed -i -e "/^[^#].*replicas[ ]*=/ { :loop /.*\]/ b done; N; b loop; :done s/replicas.*\]/replicas = [${MEMBER_NAME_LIST}]/}" ${MODULESHARDSCONF} +} + + +function verify_configuration_files +{ + # Constants + BIN_DIR=`dirname $0` + test ${BIN_DIR} == '.' && BIN_DIR=${PWD} + CONTROLLER_DIR=`dirname ${BIN_DIR}` + CONF_DIR=${CONTROLLER_DIR}/configuration/initial + AKKACONF=${CONF_DIR}/akka.conf + MODULESCONF=${CONF_DIR}/modules.conf + MODULESHARDSCONF=${CONF_DIR}/module-shards.conf + + # Verify configuration files are present in expected location. + if [ ! -f ${AKKACONF} -o ! -f ${MODULESHARDSCONF} ]; then + # Check if the configuration files exist in the system + # directory, then copy them over. + ORIG_CONF_DIR=${CONTROLLER_DIR}/system/org/opendaylight/controller/sal-clustering-config + version=$(sed -n -e 's/.*\(.*\)<\/version>/\1/p' ${ORIG_CONF_DIR}/maven-metadata-local.xml) + ORIG_CONF_DIR=${ORIG_CONF_DIR}/${version} + ORIG_AKKA_CONF=sal-clustering-config-${version}-akkaconf.xml + ORIG_MODULES_CONF=sal-clustering-config-${version}-moduleconf.xml + ORIG_MODULESHARDS_CONF=sal-clustering-config-${version}-moduleshardconf.xml + + if [ -f ${ORIG_CONF_DIR}/${ORIG_AKKA_CONF} -a \ + -f ${ORIG_CONF_DIR}/${ORIG_MODULES_CONF} -a \ + -f ${ORIG_CONF_DIR}/${ORIG_MODULESHARDS_CONF} ]; then + cat < + +EOF + + exit 1 +} + + +function end_banner +{ +cat <\(.*\)<\/version>/\1/p' ${ORIG_CONF_DIR}/maven-metadata-local.xml) + ORIG_CONF_DIR=${ORIG_CONF_DIR}/${version} + ORIG_CLUSTER_CONF=sal-clustering-config-${version}-datastore.cfg + + if [ -f ${ORIG_CONF_DIR}/${ORIG_CLUSTER_CONF} ]; then + cat < - + 4.0.0 org.opendaylight.odlparent @@ -16,7 +18,7 @@ org.opendaylight.integration - agregator + distribution-aggregator 0.6.0-SNAPSHOT pom @@ -39,10 +41,12 @@ artifacts + karaf distribution-karaf - features-distribution - features-index - features-test + features + features3-distribution + features3-index + features3-test version diff --git a/version/pom.xml b/version/pom.xml index 5b0cbbd2..683142a5 100644 --- a/version/pom.xml +++ b/version/pom.xml @@ -7,7 +7,9 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.controller -- 2.36.6