Merge branch 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.web-server
Conflicts:
scripts/releaselor/releaselor.rb
diff --git a/scripts/releaselor/releaselor.rb b/scripts/releaselor/releaselor.rb
index 1455663..073c0e3 100755
--- a/scripts/releaselor/releaselor.rb
+++ b/scripts/releaselor/releaselor.rb
@@ -54,23 +54,23 @@
if args[:product_release] == 'full-product'
ALL_REPOS = [
- Repository.new(virgo_eclipse_repo_root, 'eclipse-mirror', paths['eclipse-mirror'], 'org.eclipse.virgo.eclipse-mirror', bundle_version, release_from_branch, 'clean'),
- Repository.new(virgo_eclipse_repo_root, 'osgi-test-stubs', paths['osgi-test-stubs'], 'org.eclipse.virgo.teststubs', bundle_version, release_from_branch, default_targets),
- Repository.new(virgo_eclipse_repo_root, 'osgi-extensions', paths['osgi-extensions'], 'org.eclipse.virgo.osgi', bundle_version, release_from_branch, default_targets),
- Repository.new(virgo_eclipse_repo_root, 'util', paths['util'], 'org.eclipse.virgo.util', bundle_version, release_from_branch, default_targets),
- Repository.new(virgo_eclipse_repo_root, 'test', paths['test'], 'org.eclipse.virgo.test', bundle_version, release_from_branch, default_targets),
- Repository.new(virgo_eclipse_repo_root, 'medic', paths['medic'], 'org.eclipse.virgo.medic', bundle_version, release_from_branch, default_targets),
- Repository.new(virgo_eclipse_repo_root, 'artifact-repository', paths['artifact-repository'], 'org.eclipse.virgo.repository', bundle_version, release_from_branch, default_targets),
- Repository.new(virgo_eclipse_repo_root, 'nano', paths['nano'], 'org.eclipse.virgo.nano', bundle_version, release_from_branch, 'clean clean-integration test package publish-ivy publish-maven publish-multiple-nano-packages-build publish-updatesite-build publish-multiple-nano-packages-download'),
- Repository.new(virgo_eclipse_repo_root, 'kernel', paths['kernel'], 'org.eclipse.virgo.kernel', bundle_version, release_from_branch, 'clean clean-integration test package smoke-test publish-ivy publish-maven publish-package-build publish-updatesite-build publish-package-download'),
- Repository.new(virgo_eclipse_repo_root, 'kernel-tools', paths['kernel-tools'], 'org.eclipse.virgo.kernel-tools', bundle_version, release_from_branch, default_targets),
- Repository.new(gemini_eclipse_repo_root, 'gemini-web-container', paths['gemini-web'], 'org.eclipse.gemini.web', gemini_version, gemini_release_from_branch, 'clean clean-integration test doc package publish-ivy publish-maven'),
- Repository.new(virgo_eclipse_repo_root, 'web', paths['web'], 'org.eclipse.virgo.web', bundle_version, release_from_branch, default_targets),
- Repository.new(virgo_eclipse_repo_root, 'snaps', paths['snaps'], 'org.eclipse.virgo.snaps', bundle_version, release_from_branch, 'clean clean-integration test package publish-ivy publish-maven publish-package-build publish-package-download'),
- Repository.new(virgo_eclipse_repo_root, 'apps', paths['apps'], 'org.eclipse.virgo.apps', bundle_version, release_from_branch, default_targets),
- Repository.new(virgo_eclipse_repo_root, 'documentation', paths['documentation'], 'org.eclipse.virgo.documentation', bundle_version, release_from_branch, 'clean clean-integration doc-html package publish-ivy publish-package-download'),
- Repository.new(virgo_eclipse_repo_root, 'web-server', paths['web-server'], 'org.eclipse.virgo.web-server', bundle_version, release_from_branch, 'clean clean-integration test package smoke-test publish-ivy publish-maven publish-package-build publish-updatesite-build publish-package-download'),
- Repository.new(virgo_eclipse_repo_root, 'jetty-server', paths['jetty-server'], 'org.eclipse.virgo.jetty-server', bundle_version, release_from_branch, 'clean clean-integration test package smoke-test publish-ivy publish-package-build publish-updatesite-build publish-package-download publish-updatesite-download')
+ Repository.new(virgo_eclipse_repo_root, 'eclipse-mirror', paths['eclipse-mirror'], 'org.eclipse.virgo.eclipse-mirror', bundle_version, release_from_branch, 'clean'),
+ Repository.new(virgo_eclipse_repo_root, 'osgi-test-stubs', paths['osgi-test-stubs'], 'org.eclipse.virgo.teststubs', bundle_version, release_from_branch, default_targets),
+ Repository.new(virgo_eclipse_repo_root, 'osgi-extensions', paths['osgi-extensions'], 'org.eclipse.virgo.osgi', bundle_version, release_from_branch, default_targets),
+ Repository.new(virgo_eclipse_repo_root, 'util', paths['util'], 'org.eclipse.virgo.util', bundle_version, release_from_branch, default_targets),
+ Repository.new(virgo_eclipse_repo_root, 'test', paths['test'], 'org.eclipse.virgo.test', bundle_version, release_from_branch, default_targets),
+ Repository.new(virgo_eclipse_repo_root, 'medic', paths['medic'], 'org.eclipse.virgo.medic', bundle_version, release_from_branch, default_targets),
+ Repository.new(virgo_eclipse_repo_root, 'artifact-repository', paths['artifact-repository'], 'org.eclipse.virgo.repository', bundle_version, release_from_branch, default_targets),
+ Repository.new(virgo_eclipse_repo_root, 'nano', paths['nano'], 'org.eclipse.virgo.nano', bundle_version, release_from_branch, 'clean clean-integration test package publish-ivy publish-maven publish-multiple-nano-packages-build publish-updatesite-build publish-multiple-nano-packages-download'),
+ Repository.new(virgo_eclipse_repo_root, 'kernel', paths['kernel'], 'org.eclipse.virgo.kernel', bundle_version, release_from_branch, 'clean clean-integration test package smoke-test publish-ivy publish-maven publish-package-build publish-updatesite-build publish-package-download'),
+ Repository.new(virgo_eclipse_repo_root, 'kernel-tools', paths['kernel-tools'], 'org.eclipse.virgo.kernel-tools', bundle_version, release_from_branch, default_targets),
+ Repository.new(gemini_eclipse_repo_root, 'gemini-web-container', paths['gemini-web'], 'org.eclipse.gemini.web', gemini_version, gemini_release_from_branch, 'clean clean-integration test doc package publish-ivy publish-maven'),
+ Repository.new(virgo_eclipse_repo_root, 'web', paths['web'], 'org.eclipse.virgo.web', bundle_version, release_from_branch, default_targets),
+ Repository.new(virgo_eclipse_repo_root, 'snaps', paths['snaps'], 'org.eclipse.virgo.snaps', bundle_version, release_from_branch, 'clean clean-integration test package publish-ivy publish-maven publish-package-build publish-package-download'),
+ Repository.new(virgo_eclipse_repo_root, 'apps', paths['apps'], 'org.eclipse.virgo.apps', bundle_version, release_from_branch, default_targets),
+ Repository.new(virgo_eclipse_repo_root, 'documentation', paths['documentation'], 'org.eclipse.virgo.documentation', bundle_version, release_from_branch, 'clean clean-integration doc-html package publish-ivy publish-package-download'),
+ Repository.new(virgo_eclipse_repo_root, 'web-server', paths['web-server'], 'org.eclipse.virgo.web-server', bundle_version, release_from_branch, 'clean clean-integration test package smoke-test publish-ivy publish-maven publish-package-build publish-updatesite-build publish-package-download'),
+ Repository.new(virgo_eclipse_repo_root, 'jetty-server', paths['jetty-server'], 'org.eclipse.virgo.jetty-server', bundle_version, release_from_branch, 'clean clean-integration test package smoke-test publish-ivy publish-package-build publish-updatesite-build publish-package-download publish-updatesite-download')
]
elsif args[:product_release] == 'kernel'
