Merge "[Releng] [CDO] update target platforms for 2019-12"
diff --git a/cdo/.project b/cdo/.project
new file mode 100644
index 0000000..2022b44
--- /dev/null
+++ b/cdo/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>cdo</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.core.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.core.prefs
index f08be2b..631db84 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.core.prefs
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.core.prefs
@@ -6,6 +6,7 @@
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -13,17 +14,20 @@
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -109,11 +113,12 @@
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -144,6 +149,8 @@
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -168,13 +175,17 @@
org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -222,6 +233,8 @@
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -258,9 +271,12 @@
org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -286,6 +302,10 @@
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_on_off_tags=false
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/pom.xml b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/pom.xml
index b6a0c28..105c4e4 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/pom.xml
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/pom.xml
@@ -18,7 +18,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<configuration>
<sourceFolder>resource</sourceFolder>
<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDropAdapter.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDropAdapter.java
index 26e9d6b..c6f309b 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDropAdapter.java
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDropAdapter.java
@@ -111,12 +111,12 @@
// handle resources to move within the repositories view
if (data instanceof IStructuredSelection) {
IStructuredSelection selection = (IStructuredSelection) data;
- toMove = getResourceNodeAdaptables(selection);
+ toMove = getResourceNodeAdaptablesFromSelection((IStructuredSelection)selection);
} else if (data instanceof PluginTransferData) {
PluginTransferData ptData = (PluginTransferData) data;
if (ResourceDropActionDelegate.DROP_ACTION_ID.equals(ptData.getExtensionId())) {
CDOResourceURITransferData uris = CDOResourceURITransferData.deserialize(ptData.getData());
- toMove = getResourceNodeAdaptables(uris.getURIs());
+ toMove = getResourceNodeAdaptablesFromIterable(uris.getURIs());
}
}
@@ -332,11 +332,11 @@
return result;
}
- protected Iterable<?> getResourceNodeAdaptables(IStructuredSelection selection) {
+ protected Iterable<?> getResourceNodeAdaptablesFromSelection(IStructuredSelection selection) {
return Iterables.filter((List<?>) selection.toList(), CDOPredicates.adaptsTo(CDOResourceNode.class));
}
- protected Iterable<?> getResourceNodeAdaptables(Iterable<URI> uris) {
+ protected Iterable<?> getResourceNodeAdaptablesFromIterable(Iterable<URI> uris) {
List<Object> result = Lists.newArrayList();
for (URI next : uris) {
diff --git a/cdo/pom.xml b/cdo/pom.xml
index fb6c472..860aa9f 100755
--- a/cdo/pom.xml
+++ b/cdo/pom.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<!-- Project POM (aggregator) -->
<groupId>org.eclipse.papyrus.cdo</groupId>
<artifactId>org.eclipse.papyrus.cdo.root</artifactId>
@@ -11,39 +12,43 @@
<name>Collaborative Modeling - CDO</name>
<properties>
- <tycho-version>1.3.0</tycho-version>
- <tychoExtrasVersion>1.3.0</tychoExtrasVersion>
+ <tycho-version>1.6.0</tycho-version>
+ <tychoExtrasVersion>1.6.0</tychoExtrasVersion>
<jarSignerVersion>1.1.5</jarSignerVersion>
<findbugs.version>3.0.1</findbugs.version>
<xtext.version>2.16.0</xtext.version>
<jboss.version>1.3.0</jboss.version>
- <jacoco.version>0.8.2</jacoco.version>
+ <jacoco.version>0.8.5</jacoco.version>
<testConfig>CI_TESTS_CONFIG</testConfig>
- <test.argLine>-Xms512m -Xmx2048m -XX:SoftRefLRUPolicyMSPerMB=100</test.argLine>
+ <test.argLine>-Xms512m -Xmx2048m -XX:SoftRefLRUPolicyMSPerMB=100
+ </test.argLine>
<java.source>1.8</java.source>
<java.target>1.8</java.target>
- <mylyn.wikitext.version>2.4.0-SNAPSHOT</mylyn.wikitext.version>
+ <mylyn.wikitext.version>3.0.29</mylyn.wikitext.version>
- <targetPlatform.groupID>org.eclipse.papyrus.cdo</targetPlatform.groupID>
- <targetPlatform.artifactID>org.eclipse.papyrus.cdo.targetplatform</targetPlatform.artifactID>
+ <targetPlatform.groupID>org.eclipse.papyrus.cdo
+ </targetPlatform.groupID>
+ <targetPlatform.artifactID>org.eclipse.papyrus.cdo.targetplatform
+ </targetPlatform.artifactID>
<targetPlatform.version>1.2.0-SNAPSHOT</targetPlatform.version>
</properties>
<!-- Children modules to build -->
<modules>
- <module>benchmarks</module>
- <module>bundles</module>
- <module>features</module>
- <module>releng</module>
+ <module>benchmarks</module>
+ <module>bundles</module>
+ <module>features</module>
+ <module>releng</module>
<module>tests</module>
</modules>
-
+
<pluginRepositories>
<pluginRepository>
<id>org.eclipse.cbi.maven.plugins</id>
<name>Eclipse CBI</name>
- <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
+ <url>https://repo.eclipse.org/content/repositories/cbi-releases/
+ </url>
<releases>
<enabled>true</enabled>
</releases>
@@ -63,17 +68,52 @@
</pluginRepositories>
<repositories>
- <repository>
- <id>license-feature</id>
- <url>http://download.eclipse.org/cbi/updates/license/</url>
- <layout>p2</layout>
- </repository>
+ <repository>
+ <id>license-feature</id>
+ <url>http://download.eclipse.org/cbi/updates/license/</url>
+ <layout>p2</layout>
+ </repository>
</repositories>
-
+
<build>
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.eclipse.mylyn.docs</groupId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
+ <version>${mylyn.wikitext.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.eclipse.mylyn.docs
+ </groupId>
+ <artifactId>
+ org.eclipse.mylyn.wikitext.maven
+ </artifactId>
+ <versionRange>
+ [2.4.0-SNAPSHOT,)
+ </versionRange>
+ <goals>
+ <goal>eclipse-help</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.7</version>
@@ -226,7 +266,8 @@
<artifactId>target-platform-configuration</artifactId>
<configuration>
<includePackedArtifacts>true</includePackedArtifacts>
- <targetDefinitionIncludeSource>honor</targetDefinitionIncludeSource>
+ <targetDefinitionIncludeSource>honor
+ </targetDefinitionIncludeSource>
<environments>
<environment>
<os>win32</os>
@@ -289,14 +330,15 @@
<useUIHarness>true</useUIHarness>
<useUIThread>true</useUIThread>
<testFailureIgnore>true</testFailureIgnore>
- <!-- ${tycho.testArgLine} is populated by JaCoCo and is required to enable code coverage -->
+ <!-- ${tycho.testArgLine} is populated by JaCoCo and is required to
+ enable code coverage -->
<argLine>${tycho.testArgLine} ${test.argLine}</argLine>
<appArgLine>-testConfig=${testConfig}</appArgLine>
<product>org.eclipse.sdk.ide</product>
<skipTests>${skipInnerTests}</skipTests>
</configuration>
</plugin>
- </plugins>
+ </plugins>
</build>
<profiles>
@@ -322,7 +364,7 @@
<target.suffix>portable</target.suffix>
</properties>
</profile>
-
+
<profile>
<id>packAndSign</id> <!-- Stable release profile. Takes +30min. Eclipse servers only -->
<!-- Pack200 -->
diff --git a/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.target b/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.target
index 5f6a65b..7a93529 100755
--- a/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.target
+++ b/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.target
@@ -1,43 +1,40 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="CollaborativeModeling CDO - 2019-06" sequenceNumber="1562832247">
+<target name="CollaborativeModeling CDO - 2019-12" sequenceNumber="1584959940">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.junit.utils" version="0.0.0"/>
<unit id="org.eclipse.papyrus.junit.framework" version="0.0.0"/>
<unit id="org.eclipse.papyrus.toolsmiths.feature.feature.group" version="0.0.0"/>
- <repository id="papyrusMasterN" location="https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-06/"/>
+ <repository id="papyrusMasterN" location="https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-12/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.sdk.feature.group" version="4.12.0.v20190605-1801"/>
- <repository id="eclipse-2019-06" location="https://download.eclipse.org/releases/2019-06/"/>
+ <unit id="org.eclipse.sdk.feature.group" version="4.14.0.v20191210-0610"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="2.20.0.v20191028-0905"/>
+ <repository id="eclipse-2019-12" location="https://download.eclipse.org/releases/2019-12/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.cdo.explorer" version="4.5.200.v20180529-1130"/>
- <unit id="org.eclipse.emf.cdo.dawn" version="2.0.600.v20180530-1201"/>
- <unit id="org.eclipse.emf.cdo.dawn.gmf" version="2.1.500.v20180529-1130"/>
- <unit id="org.eclipse.emf.cdo.admin" version="4.1.600.v20180529-1130"/>
- <unit id="org.eclipse.emf.cdo.explorer.ui" version="4.4.300.v20180529-1130"/>
- <unit id="org.eclipse.emf.cdo.ui.admin" version="4.1.500.v20180529-1130"/>
- <unit id="org.eclipse.emf.cdo.server.ocl" version="4.2.300.v20180529-1130"/>
+ <unit id="org.eclipse.emf.cdo.explorer" version="4.5.300.v20191209-1916"/>
+ <unit id="org.eclipse.emf.cdo.dawn" version="2.0.700.v20191029-0845"/>
+ <unit id="org.eclipse.emf.cdo.dawn.gmf" version="2.1.500.v20191029-0845"/>
+ <unit id="org.eclipse.emf.cdo.admin" version="4.1.600.v20191029-0845"/>
+ <unit id="org.eclipse.emf.cdo.explorer.ui" version="4.4.300.v20191029-0845"/>
+ <unit id="org.eclipse.emf.cdo.ui.admin" version="4.1.600.v20191029-0845"/>
+ <unit id="org.eclipse.emf.cdo.server.ocl" version="4.2.300.v20191029-0845"/>
<unit id="org.eclipse.emf.cdo.ecore" version="0.0.0"/>
<unit id="org.eclipse.emf.cdo.gmf.notation" version="0.0.0"/>
- <unit id="org.eclipse.emf.cdo.security" version="4.3.300.v20180529-1130"/>
- <repository id="cdo" location="https://download.eclipse.org/modeling/emf/cdo/drops/I20190517-0100/"/>
+ <unit id="org.eclipse.emf.cdo.security" version="4.3.400.v20191209-1916"/>
+ <repository id="cdo" location="http://download.eclipse.org/modeling/emf/cdo/drops/R20191211-0144"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.papyrus.sysml14.feature.feature.group" version="1.3.200"/>
<repository id="Sysml" location="http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/2019-06"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.0.v20181203-1331"/>
+ <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.1.v20200302-1312"/>
<repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.5"/>
</location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.sdk.feature.group" version="2.18.0.v20190528-0845"/>
- <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/release/2.18"/>
- </location>
</locations>
</target>
diff --git a/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.tpd b/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.tpd
index f04ad28..9e377a0 100755
--- a/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.tpd
+++ b/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.tpd
@@ -1,19 +1,20 @@
-target "CollaborativeModeling CDO - 2019-06" with source requirements
+target "CollaborativeModeling CDO - 2019-12" with source requirements
/** Manual dependencies */
//manualUpdate
-location papyrusMasterN "https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-06/" {
+location papyrusMasterN "https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-12/" {
org.eclipse.papyrus.sdk.feature.feature.group lazy
org.eclipse.papyrus.junit.utils lazy
org.eclipse.papyrus.junit.framework lazy
org.eclipse.papyrus.toolsmiths.feature.feature.group lazy
}
-location "https://download.eclipse.org/releases/2019-06/" eclipse-2019-06 {
- org.eclipse.sdk.feature.group
+location "https://download.eclipse.org/releases/2019-12/" eclipse-2019-12 {
+ org.eclipse.sdk.feature.group
+ org.eclipse.emf.sdk.feature.group
}
@@ -21,7 +22,7 @@
//manual update
-location cdo "https://download.eclipse.org/modeling/emf/cdo/drops/I20190517-0100/" {
+location cdo "http://download.eclipse.org/modeling/emf/cdo/drops/R20191211-0144" {
org.eclipse.emf.cdo.explorer
org.eclipse.emf.cdo.dawn
org.eclipse.emf.cdo.dawn.gmf
@@ -45,8 +46,3 @@
org.eclipse.uml2.sdk.feature.group
}
-//updateFrom("EMF (Core)",0)
-
-location emf "http://download.eclipse.org/modeling/emf/emf/builds/release/2.18" {
- org.eclipse.emf.sdk.feature.group
-}
\ No newline at end of file
