aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdolfo SBH2011-09-22 16:56:08 (EDT)
committerEd.Willink2011-09-24 12:05:54 (EDT)
commitafa49ded5a0ddb6abeb57b043043f5ce1b2c5697 (patch)
treecd50e12752f23ba345486319a287db8e82572533
parent62949406d0b55aa4f3e99589c5776d6948657ec5 (diff)
downloadorg.eclipse.ocl-afa49ded5a0ddb6abeb57b043043f5ce1b2c5697.zip
org.eclipse.ocl-afa49ded5a0ddb6abeb57b043043f5ce1b2c5697.tar.gz
org.eclipse.ocl-afa49ded5a0ddb6abeb57b043043f5ce1b2c5697.tar.bz2
[Bug 358558] [project] Major version change to 4.0
- o.e.uml2.uml.resources bundle did increase version !!! (Sources in GIT now >.<) - updating ocl.rmap to try to fetch that bundle
-rw-r--r--releng/org.eclipse.ocl.releng.buckminster/releng/ocl.rmap11
-rw-r--r--tests/org.eclipse.ocl.uml.tests/META-INF/MANIFEST.MF2
2 files changed, 11 insertions, 2 deletions
diff --git a/releng/org.eclipse.ocl.releng.buckminster/releng/ocl.rmap b/releng/org.eclipse.ocl.releng.buckminster/releng/ocl.rmap
index 02a3907..9251076 100644
--- a/releng/org.eclipse.ocl.releng.buckminster/releng/ocl.rmap
+++ b/releng/org.eclipse.ocl.releng.buckminster/releng/ocl.rmap
@@ -6,7 +6,7 @@
<rm:locator pattern="^lpg\.runtime\.java.*$" searchPathRef="p2_orbit" failOnError="false"/>
<rm:locator pattern="^org\.eclipse\.ocl.*$" searchPathRef="local_ocl"/>
<rm:locator pattern="^org\.eclipse\.emf\.examples\.library.*" searchPathRef="cvs_emf_examples"/>
- <rm:locator pattern="^org\.eclipse\.uml2\.uml\.resources$" searchPathRef="cvs_uml"/>
+ <rm:locator pattern="^org\.eclipse\.uml2\.uml\.resources$" searchPathRef="git_uml"/>
<rm:locator pattern="^org\.eclipse\.test$" searchPathRef="cvs_eclipse"/>
<rm:locator pattern="^org\.eclipse\.ant\.optional\.junit$" searchPathRef="cvs_eclipse"/>
<rm:searchPath name="cvs_ocl">
@@ -158,6 +158,15 @@
</rm:uri>
</rm:provider>
</rm:searchPath>
+ <rm:searchPath name="git_uml">
+ <rm:provider componentTypes="osgi.bundle" readerType="git" mutable="false">
+ <rm:property key="buckminster.mutable" value="false"/>
+ <rm:property key="git.remote.uri" value="git://git.eclipse.org/gitroot/uml2/org.eclipse.uml2.git"/>
+ <rm:uri format="${workspace.root}/org.eclipse.uml2.git,plugins/{0}">
+ <bc:propertyRef key="buckminster.component"/>
+ </rm:uri>
+ </rm:provider>
+ </rm:searchPath>
<rm:searchPath name="cvs_eclipse">
<rm:provider componentTypes="osgi.bundle" readerType="cvs" mutable="false">
<rm:property key="buckminster.mutable" value="false"/>
diff --git a/tests/org.eclipse.ocl.uml.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.ocl.uml.tests/META-INF/MANIFEST.MF
index a6a86e9..3253804 100644
--- a/tests/org.eclipse.ocl.uml.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.ocl.uml.tests/META-INF/MANIFEST.MF
@@ -11,5 +11,5 @@ Export-Package: org.eclipse.ocl.uml.helper.tests,
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ocl.uml;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.ocl.tests;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
- org.eclipse.uml2.uml.resources;bundle-version="[3.0.0,4.0.0)"
+ org.eclipse.uml2.uml.resources;bundle-version="[4.0.0,5.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5