(385314) Consolidate git repos - extensions and test-stubs
diff --git a/scripts/releaselor/releaselor.rb b/scripts/releaselor/releaselor.rb
index 073c0e3..b3f2016 100755
--- a/scripts/releaselor/releaselor.rb
+++ b/scripts/releaselor/releaselor.rb
@@ -27,8 +27,6 @@
else
paths = {
'eclipse-mirror' => 'eclipse-mirror',
- 'osgi-test-stubs' => 'osgi-test-stubs',
- 'osgi-extensions' => 'osgi-extensions',
'util' => 'util',
'test' => 'test',
'medic' => 'medic',
@@ -55,8 +53,6 @@
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),
@@ -76,14 +72,12 @@
elsif args[:product_release] == 'kernel'
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, 'eclipse-mirror', paths['eclipse-mirror'], 'org.eclipse.virgo.eclipse-mirror', bundle_version, release_from_branch, 'clean'),
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, '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)
]
@@ -91,7 +85,7 @@
elsif args[:product_release] == 'web-server'
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, 'eclipse-mirror', paths['eclipse-mirror'], 'org.eclipse.virgo.eclipse-mirror', bundle_version, release_from_branch, 'clean'),
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),
@@ -104,13 +98,11 @@
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, '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(virgo_eclipse_repo_root, 'web', paths['web'], 'org.eclipse.virgo.web', bundle_version, release_from_branch, default_targets),
@@ -124,22 +116,20 @@
else
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(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, '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(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')
]
end
diff --git a/scripts/ripplor/ripplor.rb b/scripts/ripplor/ripplor.rb
index f94d746..38f52b9 100755
--- a/scripts/ripplor/ripplor.rb
+++ b/scripts/ripplor/ripplor.rb
@@ -20,8 +20,6 @@
else
paths = {
'eclipse-mirror' => 'eclipse-mirror',
- 'osgi-test-stubs' => 'osgi-test-stubs',
- 'osgi-extensions' => 'osgi-extensions',
'util' => 'util',
'test' => 'test',
'medic' => 'medic',
@@ -43,8 +41,6 @@
ALL_REPOS = [
Repository.new(eclipse_repo_root, 'eclipse-mirror', paths['eclipse-mirror'], 'org.eclipse.virgo.eclipse-mirror', nil, ripple_branch, 'clean'),
- Repository.new(eclipse_repo_root, 'osgi-test-stubs', paths['osgi-test-stubs'], 'org.eclipse.virgo.teststubs', nil, ripple_branch),
- Repository.new(eclipse_repo_root, 'osgi-extensions', paths['osgi-extensions'], 'org.eclipse.virgo.osgi', nil, ripple_branch),
Repository.new(eclipse_repo_root, 'util', paths['util'], 'org.eclipse.virgo.util', nil, ripple_branch),
Repository.new(eclipse_repo_root, 'test', paths['test'], 'org.eclipse.virgo.test', nil, ripple_branch),
Repository.new(eclipse_repo_root, 'medic', paths['medic'], 'org.eclipse.virgo.medic', nil, ripple_branch),
diff --git a/scripts/virgo-build-updatlor/update-virgo-build-all.rb b/scripts/virgo-build-updatlor/update-virgo-build-all.rb
index 4c2c172..fac8f21 100755
--- a/scripts/virgo-build-updatlor/update-virgo-build-all.rb
+++ b/scripts/virgo-build-updatlor/update-virgo-build-all.rb
@@ -18,8 +18,6 @@
else
paths = {
'eclipse-mirror' => 'eclipse-mirror',
- 'osgi-test-stubs' => 'osgi-test-stubs',
- 'osgi-extensions' => 'osgi-extensions',
'util' => 'util',
'test' => 'test',
'medic' => 'medic',
@@ -50,28 +48,26 @@
gemini_web_repo_root = 'ssh://' + args[:remote_user] + '@git.eclipse.org/gitroot/gemini.web/org.eclipse.gemini.web.'
VIRGO_PERMISSION_REPOS = [
- Repository.new(virgo_repo_root, 'sample-greenpages', paths['sample-greenpages'], nil, nil, update_branch),
- Repository.new(virgo_repo_root, 'sample-configuration-properties', paths['sample-configuration-properties'], nil, nil, update_branch),
- Repository.new(virgo_repo_root, 'sample-formtags', paths['sample-formtags'], nil, nil, update_branch),
- Repository.new(virgo_repo_root, 'sample-osgi-examples', paths['sample-osgi-examples'], nil, nil, update_branch),
- Repository.new(virgo_repo_root, 'web-server', paths['web-server'], nil, nil, update_branch),
- Repository.new(virgo_repo_root, 'jetty-server', paths['jetty-server'], nil, nil, update_branch),
- Repository.new(virgo_repo_root, 'documentation', paths['documentation'], nil, nil, update_branch),
- Repository.new(virgo_repo_root, 'apps', paths['apps'], nil, nil, update_branch),
- Repository.new(virgo_repo_root, 'snaps', paths['snaps'], nil, nil, update_branch),
- Repository.new(virgo_repo_root, 'web', paths['web'], nil, nil, update_branch),
- Repository.new(virgo_repo_root, 'kernel', paths['kernel'], nil, nil, update_branch),
- Repository.new(virgo_repo_root, 'artifact-repository', paths['artifact-repository'], nil, nil, update_branch),
- Repository.new(virgo_repo_root, 'medic', paths['medic'], nil, nil, update_branch),
- Repository.new(virgo_repo_root, 'test', paths['test'], nil, nil, update_branch),
- Repository.new(virgo_repo_root, 'util', paths['util'], nil, nil, update_branch),
- Repository.new(virgo_repo_root, 'osgi-extensions', paths['osgi-extensions'], nil, nil, update_branch),
- Repository.new(virgo_repo_root, 'osgi-test-stubs', paths['osgi-test-stubs'], nil, nil, update_branch),
- Repository.new(virgo_repo_root, 'eclipse-mirror', paths['eclipse-mirror'], nil, nil, update_branch),
- Repository.new(virgo_repo_root, 'performance-test', paths['performance-test'], nil, nil, update_branch),
- Repository.new(virgo_repo_root, 'system-verification-tests', paths['system-verification-tests'], nil, nil, update_branch),
- Repository.new(virgo_repo_root, 'kernel-system-verification-tests', paths['kernel-system-verification-tests'], nil, nil, update_branch),
- Repository.new(virgo_repo_root, 'kernel-tools', paths['kernel-tools'], nil, nil, update_branch)
+ Repository.new(virgo_repo_root, 'sample-greenpages', paths['sample-greenpages'], nil, nil, update_branch),
+ Repository.new(virgo_repo_root, 'sample-configuration-properties', paths['sample-configuration-properties'], nil, nil, update_branch),
+ Repository.new(virgo_repo_root, 'sample-formtags', paths['sample-formtags'], nil, nil, update_branch),
+ Repository.new(virgo_repo_root, 'sample-osgi-examples', paths['sample-osgi-examples'], nil, nil, update_branch),
+ Repository.new(virgo_repo_root, 'web-server', paths['web-server'], nil, nil, update_branch),
+ Repository.new(virgo_repo_root, 'jetty-server', paths['jetty-server'], nil, nil, update_branch),
+ Repository.new(virgo_repo_root, 'documentation', paths['documentation'], nil, nil, update_branch),
+ Repository.new(virgo_repo_root, 'apps', paths['apps'], nil, nil, update_branch),
+ Repository.new(virgo_repo_root, 'snaps', paths['snaps'], nil, nil, update_branch),
+ Repository.new(virgo_repo_root, 'web', paths['web'], nil, nil, update_branch),
+ Repository.new(virgo_repo_root, 'kernel', paths['kernel'], nil, nil, update_branch),
+ Repository.new(virgo_repo_root, 'artifact-repository', paths['artifact-repository'], nil, nil, update_branch),
+ Repository.new(virgo_repo_root, 'medic', paths['medic'], nil, nil, update_branch),
+ Repository.new(virgo_repo_root, 'test', paths['test'], nil, nil, update_branch),
+ Repository.new(virgo_repo_root, 'util', paths['util'], nil, nil, update_branch),
+ Repository.new(virgo_repo_root, 'eclipse-mirror', paths['eclipse-mirror'], nil, nil, update_branch),
+ Repository.new(virgo_repo_root, 'performance-test', paths['performance-test'], nil, nil, update_branch),
+ Repository.new(virgo_repo_root, 'system-verification-tests', paths['system-verification-tests'], nil, nil, update_branch),
+ Repository.new(virgo_repo_root, 'kernel-system-verification-tests', paths['kernel-system-verification-tests'], nil, nil, update_branch),
+ Repository.new(virgo_repo_root, 'kernel-tools', paths['kernel-tools'], nil, nil, update_branch)
]
