Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2015-10-13 05:33:12 +0000
committerEike Stepper2015-10-13 05:33:12 +0000
commitbd9f9ce08698df7f88242cb4aae6250fddf72c52 (patch)
tree098ab7440f6d916dadd4d90314370c4dcf6255f9
parent43d99a2e71aa1bd48998ab017b3e37672792ed85 (diff)
downloadcdo-bd9f9ce08698df7f88242cb4aae6250fddf72c52.tar.gz
cdo-bd9f9ce08698df7f88242cb4aae6250fddf72c52.tar.xz
cdo-bd9f9ce08698df7f88242cb4aae6250fddf72c52.zip
[Releng] Upgrade UML2 dependency to 5.1 milestones
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/CDO.setup10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/build.rmap14
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.uml/META-INF/MANIFEST.MF6
3 files changed, 15 insertions, 15 deletions
diff --git a/plugins/org.eclipse.emf.cdo.releng/CDO.setup b/plugins/org.eclipse.emf.cdo.releng/CDO.setup
index 88fc592b52..48a226db2a 100644
--- a/plugins/org.eclipse.emf.cdo.releng/CDO.setup
+++ b/plugins/org.eclipse.emf.cdo.releng/CDO.setup
@@ -168,9 +168,9 @@
<repository
url="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones"/>
<repository
- url="http://download.eclipse.org/modeling/mdt/uml2/updates/4.1milestones"/>
+ url="http://download.eclipse.org/modeling/mdt/uml2/updates/5.1milestones"/>
<repository
- url="http://download.eclipse.org/mmt/qvto/updates/milestones/3.6.0/S201509241112"/>
+ url="http://download.eclipse.org/mmt/qvto/updates/milestones/3.6.0"/>
<repository
url="http://download.eclipse.org/ecoretools/updates/1.2/201306071421"/>
<repository
@@ -188,9 +188,9 @@
<repository
url="http://download.eclipse.org/ecp/releases/preview"/>
<repository
- url="http://www.elver.org/eclipse/2.1.0/update"/>
- <repository
url="http://download.oracle.com/otn_software/oepe/12.1.3.6/mars/repository"/>
+ <repository
+ url="http://www.elver.org/eclipse/2.1.0/update"/>
</repositoryList>
<repositoryList
name="Mars">
@@ -209,7 +209,7 @@
<repository
url="http://download.eclipse.org/ecoretools/updates/1.2/201306071421"/>
<repository
- url="http://download.oracle.com/otn_software/oepe/luna"/>
+ url="http://download.oracle.com/otn_software/oepe/12.1.3.6/mars/repository"/>
<repository
url="http://www.elver.org/eclipse/2.1.0/update"/>
</repositoryList>
diff --git a/plugins/org.eclipse.emf.cdo.releng/build.rmap b/plugins/org.eclipse.emf.cdo.releng/build.rmap
index 153e1eaea1..bd20acd341 100644
--- a/plugins/org.eclipse.emf.cdo.releng/build.rmap
+++ b/plugins/org.eclipse.emf.cdo.releng/build.rmap
@@ -115,12 +115,12 @@
<!-- UML2 -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
- <rm:uri format="http://download.eclipse.org/modeling/mdt/uml2/updates/4.1milestones"/>
+ <rm:uri format="http://download.eclipse.org/modeling/mdt/uml2/updates/5.1milestones"/>
</rm:provider>
<!-- QVTO -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
- <rm:uri format="http://download.eclipse.org/mmt/qvto/updates/milestones/3.6.0/S201509241112"/>
+ <rm:uri format="http://download.eclipse.org/mmt/qvto/updates/milestones/3.6.0"/>
</rm:provider>
<!-- EcoreTools -->
@@ -166,6 +166,11 @@
<rm:uri format="http://download.eclipse.org/ecp/releases/preview"/>
</rm:provider>
+ <!-- ORACLE.COM -->
+ <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
+ <rm:uri format="http://download.oracle.com/otn_software/oepe/12.1.3.6/mars/repository"/>
+ </rm:provider>
+
<!-- EVLER.ORG -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
<!-- ############################################################### -->
@@ -174,11 +179,6 @@
<rm:uri format="http://www.elver.org/eclipse/2.1.0/update"/>
</rm:provider>
- <!-- ORACLE.COM -->
- <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
- <rm:uri format="http://download.oracle.com/otn_software/oepe/12.1.3.6/mars/repository"/>
- </rm:provider>
-
</rm:searchPath>
</rm:rmap> \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.tests.uml/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.uml/META-INF/MANIFEST.MF
index 5b15b24e5b..7f0a47401b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.uml/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.uml/META-INF/MANIFEST.MF
@@ -3,11 +3,11 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.emf.cdo.tests.uml;singleton:=true
-Bundle-Version: 4.2.200.qualifier
+Bundle-Version: 4.2.300.qualifier
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.emf.cdo.tests;bundle-version="[4.0.0,5.0.0)",
org.eclipse.emf.cdo;bundle-version="[4.2.0,5.0.0)",
- org.eclipse.uml2.uml;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.emf.cdo.tests.uml;version="4.2.200"
+ org.eclipse.uml2.uml;bundle-version="[4.0.0,6.0.0)"
+Export-Package: org.eclipse.emf.cdo.tests.uml;version="4.2.300"

Back to the top