diff options
| author | Vincent LORENZO | 2024-04-30 08:41:39 +0000 |
|---|---|---|
| committer | Vincent LORENZO | 2024-04-30 15:39:46 +0000 |
| commit | 1479c686db1b69cecd7e6245a266cb9fe4181ae8 (patch) | |
| tree | 4bc536473abc5ea18723531aa65650f0e747a507 | |
| parent | 6f92930ce4b2b81b245b084112e400c411056a54 (diff) | |
| download | org.eclipse.papyrus-1479c686db1b69cecd7e6245a266cb9fe4181ae8.tar.gz org.eclipse.papyrus-1479c686db1b69cecd7e6245a266cb9fe4181ae8.tar.xz org.eclipse.papyrus-1479c686db1b69cecd7e6245a266cb9fe4181ae8.zip | |
[Releng] Updates for Eclipse 2024-06
- update target platforms
- update guava version
- adapt code to new GEF version
Signed-off-by: Vincent LORENZO <vincent.lorenzo@cea.fr>
Change-Id: I3899df96fed3f4b7d5e13c6b986326bb90ac9423
133 files changed, 553 insertions, 840 deletions
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml index 753adb878f5..60f41ce0a97 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.papyrus.infra.feature" label="Papyrus infra" - version="3.3.0.qualifier" + version="3.3.100.qualifier" provider-name="Eclipse Modeling Project" license-feature="org.eclipse.license" license-feature-version="2.0.2"> @@ -69,141 +69,82 @@ <plugin id="org.eclipse.papyrus.infra.onefile" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.constraints" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.constraints.edit" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.constraints.editor" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.hyperlink" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.doc" - download-size="0" - install-size="0" version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.psf" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.newchild" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.newchild.edit" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.sync" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.guava" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.types" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.types.core" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.types.edit" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.types.rulebased" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.filters" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.filters.edit" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.properties" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.properties.edit" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.properties.editor" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> </feature> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/pom.xml index 2a52e26a219..b49f81e39ff 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.feature</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.3.100-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
\ No newline at end of file diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/feature.xml index 4f811ac231a..13eabba49b5 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.papyrus.infra.gmfdiag.feature" label="%featureName" - version="3.0.200.qualifier" + version="3.0.300.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="2.0.2"> @@ -25,219 +25,130 @@ <plugin id="org.eclipse.papyrus.infra.gmfdiag.commands" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.navigation" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.outline" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.preferences" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.properties" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.widgets" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.common" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.expansion" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.gef" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.modelexplorer" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.extensionpoints.editors" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.dnd" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.hyperlink" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.viewersearcher" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.controlmode" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.menu" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.export" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.assistant" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.assistant.edit" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.assistant.editor" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.assistant.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.canonical" - download-size="0" - install-size="0" version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.welcome" - download-size="0" - install-size="0" version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.tooling.runtime" - download-size="0" - install-size="0" version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.representation" - download-size="0" - install-size="0" version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.representation.edit" - download-size="0" - install-size="0" version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.style" - download-size="0" - install-size="0" version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.style.edit" - download-size="0" - install-size="0" version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> </feature> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/pom.xml index a952f2fe6fa..038e6b6b70b 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.gmfdiag.feature</artifactId> - <version>3.0.200-SNAPSHOT</version> + <version>3.0.300-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
\ No newline at end of file diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/feature.xml index f75498e9275..a645cc93869 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.papyrus.uml.diagram.feature" label="%featureName" - version="4.1.0.qualifier" + version="4.1.100.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="2.0.2"> @@ -21,177 +21,102 @@ <plugin id="org.eclipse.papyrus.uml.diagram.clazz" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.diagram.common" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.diagram.common.groups" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.diagram.component" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.diagram.deployment" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.diagram.icons" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.diagram.menu" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.diagram.modelexplorer" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.diagram.navigation" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.diagram.profile" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.diagram.statemachine" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.diagram.usecase" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.diagram.wizards" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.diagram.communication" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.diagram.sequence" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.diagram.activity" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.diagram.composite" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.diagram.dnd" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.diagram.stereotype.edition" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.diagram.timing" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.diagram.interactionoverview" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.diagram.symbols" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.diagram.symbols.properties" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.diagram.linklf" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.diagram.sequence.restrictions" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> </feature> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/pom.xml index 605e9b4cb4b..a9477b91123 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/pom.xml @@ -8,6 +8,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.diagram.feature</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.100-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
\ No newline at end of file diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml index dea62de4c57..fab2600c0ea 100755 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.papyrus.uml.feature" label="%featureName" - version="5.1.0.qualifier" + version="5.1.100.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="2.0.2"> @@ -85,163 +85,94 @@ <plugin id="org.eclipse.papyrus.uml.commands" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.controlmode.profile" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.export" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.extensionpoints" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.icons" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.import" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.perspective" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.profile" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.profile.drafter" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.resourceloading.profile" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.service.types" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.service.types.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.templaterepository" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.documentation.profile" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.appearance" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.oclconstraintevaluation" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.navigation" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.service.validation" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.services.decoration" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.modelrepair" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.filters" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.filters.edit" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> <plugin id="org.eclipse.papyrus.uml.types.core" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + version="0.0.0"/> </feature> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/pom.xml index 6c19a7b7b6f..72988a553f5 100755 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.feature</artifactId> - <version>5.1.0-SNAPSHOT</version> + <version>5.1.100-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF index adf24d85314..8f41f1fe1b6 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF @@ -40,8 +40,8 @@ Bundle-Activator: org.eclipse.papyrus.infra.core.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.core;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)", - com.google.common.io;version="[32.0.0, 33.0.0)", - com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", + com.google.common.io;version="[33.1.0,33.2.0)", + com.google.common.util.concurrent;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.core diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF index d5417afb0d1..5e3f686284c 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Bundle-Activator: org.eclipse.papyrus.infra.tools.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.tools;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)", - com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", + com.google.common.util.concurrent;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.tools diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF index 49b8f280803..470b3e3c33f 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF @@ -14,5 +14,5 @@ Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.gmf;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: plugin -Import-Package: com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.emf.gmf diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF index dce8f679a27..6fe29f2ccc1 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF @@ -21,6 +21,6 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.emf.readonly.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.readonly;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.emf.readonly diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF index 8b4d8ba6e3d..3aa62320518 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF @@ -31,7 +31,7 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.emf;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)", - com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", + com.google.common.util.concurrent;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.emf diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/META-INF/MANIFEST.MF index 4a2aefd1195..316a185d12d 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/META-INF/MANIFEST.MF @@ -42,6 +42,6 @@ Bundle-Activator: org.eclipse.papyrus.infra.ui.internal.emf.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.emf;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.ui.emf diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/META-INF/MANIFEST.MF index a3233967324..d2e2342446c 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/META-INF/MANIFEST.MF @@ -19,5 +19,5 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant.ui;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.assistant.ui diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/META-INF/MANIFEST.MF index 55b26c3d0a6..4b5b77232d4 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/META-INF/MANIFEST.MF @@ -33,6 +33,6 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.assistant diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF index 115e9bd0e2a..7d1e37e41da 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF @@ -32,6 +32,6 @@ Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.properties.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.properties;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.css.properties diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF index 71ae01eb5b0..ee5adbae0ec 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF @@ -50,5 +50,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.collect;version="[32.0.0,33.0.0)" +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.css diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/META-INF/MANIFEST.MF index 9041f1ccfab..f389529d08e 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.canonical;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)", - com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", + com.google.common.util.concurrent;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.canonical diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF index ff876f501ca..15a3877dc33 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF @@ -101,14 +101,14 @@ Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.common.Activator Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Bundle-Version: 4.3.200.qualifier +Bundle-Version: 4.3.300.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.common;singleton:=true -Import-Package: com.google.common.base;version="[32.0.0,33.0.0)", - com.google.common.collect;version="[32.0.0,33.0.0)", - com.google.common.util.concurrent;version="[32.0.0,33.0.0)", +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", + com.google.common.util.concurrent;version="[33.1.0,33.2.0)", org.osgi.service.component.annotations;version="1.3.0";resolution:=optional Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.common Service-Component: OSGI-INF/org.eclipse.papyrus.infra.gmfdiag.common.internal.service.EditPolicyProviderServiceImpl.xml, diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml index c2ba82bb608..f852adb88e7 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.gmfdiag.common</artifactId> - <version>4.3.200-SNAPSHOT</version> + <version>4.3.300-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PaletteUtil.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PaletteUtil.java index f8a494da2e3..004a22d0c5f 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PaletteUtil.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PaletteUtil.java @@ -127,7 +127,7 @@ public class PaletteUtil { @SuppressWarnings("unchecked") public static List<PaletteContainer> getDirectChildContainers(PaletteContainer container) { List<PaletteContainer> containers = new ArrayList<>(); - Iterator<PaletteEntry> it = container.getChildren().iterator(); + Iterator<PaletteEntry> it = container.getChildren().stream().filter(PaletteEntry.class::isInstance).map(PaletteEntry.class::cast).toList().iterator(); while (it.hasNext()) { PaletteEntry entry = it.next(); if (entry instanceof PaletteContainer) { @@ -183,7 +183,7 @@ public class PaletteUtil { */ public static List<ToolEntry> getAllToolEntries(PaletteContainer container) { final List<ToolEntry> entries = new ArrayList<>(); - Iterator<PaletteEntry> it = container.getChildren().iterator(); + Iterator<PaletteEntry> it = container.getChildren().stream().filter(PaletteEntry.class::isInstance).map(PaletteEntry.class::cast).toList().iterator(); while (it.hasNext()) { PaletteEntry entry = it.next(); if (entry instanceof ToolEntry) { diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF index 2b052956c50..c5ee37dec36 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" Bundle-Vendor: Eclipse Modeling Project Bundle-ActivationPolicy: lazy -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.100.qualifier Bundle-Name: Customizable Drag and Drop Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.dnd.Activator Bundle-ManifestVersion: 2 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/pom.xml index 6b01a37952f..28a6e3ef998 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/pom.xml +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.gmfdiag.dnd</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/AbstractDropStrategy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/AbstractDropStrategy.java index 2c857c9f952..59706e9a5d9 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/AbstractDropStrategy.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/AbstractDropStrategy.java @@ -127,7 +127,7 @@ public abstract class AbstractDropStrategy implements DropStrategy { // Adapted from org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy#castToDropObjectsRequest if (request instanceof ChangeBoundsRequest) { ChangeBoundsRequest changeBoundsRequest = (ChangeBoundsRequest) request; - Iterator<EditPart> editParts = ToolUtilities.getSelectionWithoutDependants(changeBoundsRequest.getEditParts()).iterator(); + Iterator<EditPart> editParts = ToolUtilities.getSelectionWithoutDependants(changeBoundsRequest.getEditParts()).stream().filter(EditPart.class::isInstance).map(EditPart.class::cast).toList().iterator(); List<EObject> elements = new LinkedList<>(); while (editParts.hasNext()) { diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF index 52c20eefddf..4d7d8ed153e 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF @@ -24,5 +24,5 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.menu;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.menu diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF index 5bd44abd7c6..323674d087e 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF @@ -38,5 +38,5 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.properties;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.properties diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/META-INF/MANIFEST.MF index 4dc6905756b..d9aca41fd77 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/META-INF/MANIFEST.MF @@ -29,5 +29,5 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.ui.ide;bundle-version="[3.17.0,4.0.0)", org.eclipse.uml2.uml.edit;bundle-version="[5.5.0,6.0.0)" Bundle-ActivationPolicy: lazy -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/META-INF/MANIFEST.MF b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/META-INF/MANIFEST.MF index 247e0c9562c..a7812234de5 100644 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/META-INF/MANIFEST.MF +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/META-INF/MANIFEST.MF @@ -12,5 +12,5 @@ Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0 org.eclipse.papyrus.infra.internationalization;bundle-version="[2.0.0,3.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" Bundle-ActivationPolicy: lazy -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.internationalization.readonly diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/META-INF/MANIFEST.MF b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/META-INF/MANIFEST.MF index 08a67bc6efe..cbaaee0db79 100644 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/META-INF/MANIFEST.MF +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/META-INF/MANIFEST.MF @@ -28,6 +28,6 @@ Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0 org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.papyrus.infra.internationalization.Activator -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.internationalization diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.guava/META-INF/MANIFEST.MF b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/META-INF/MANIFEST.MF index cf90db476e8..334fcb784da 100755 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.guava/META-INF/MANIFEST.MF +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ Manifest-Version: 1.0 -Require-Bundle: com.google.guava;bundle-version="[32.1.3,33.0.0)", +Require-Bundle: com.google.guava;bundle-version="[33.1.0,33.2.0)", org.eclipse.osgi;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)", org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)" @@ -13,8 +13,8 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.guava.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.guava;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)", - com.google.common.reflect;version="[32.0.0, 33.0.0)", - com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", + com.google.common.reflect;version="[33.1.0,33.2.0)", + com.google.common.util.concurrent;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.guava diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/META-INF/MANIFEST.MF b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/META-INF/MANIFEST.MF index 06705f772d8..14c22b8ba95 100755 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/META-INF/MANIFEST.MF +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/META-INF/MANIFEST.MF @@ -20,8 +20,8 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.sync.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.sync;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)", - com.google.common.reflect;version="[32.0.0, 33.0.0)", - com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", + com.google.common.reflect;version="[33.1.0,33.2.0)", + com.google.common.util.concurrent;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.sync diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF index bdb21b28a91..2a3acb1cb78 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF @@ -51,5 +51,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.nattable.common.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.common;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.nattable.common diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF index 38df2914c3e..32a5f79320f 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF @@ -22,6 +22,6 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.controlmode;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.nattable.controlmode diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF index d276721c725..f1ddb451e90 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF @@ -98,5 +98,5 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.nattable diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF index 155def6883a..8fd503dcb0d 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF @@ -36,7 +36,7 @@ Bundle-Activator: org.eclipse.papyrus.infra.services.controlmode.ControlModePlug Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)", - com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", + com.google.common.util.concurrent;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.services.controlmode diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF index 721c6017e30..0a6e9fe0706 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF @@ -27,5 +27,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.services.edit.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.edit;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.services.edit diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/META-INF/MANIFEST.MF index c8b2a31fe3a..10fc8c0bf11 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/META-INF/MANIFEST.MF @@ -17,5 +17,5 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.services.localizer.internal.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.services.localizer;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.services.localizer diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF index 9eec571f15d..ac687f82c21 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF @@ -28,5 +28,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.services.validation.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.validation;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.services.validation diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF index b8e5670202b..f53cead5ecc 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF @@ -25,5 +25,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.types.core.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.types.core;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.types.core diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF index 72dabf84c67..2f014324d44 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF @@ -20,5 +20,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.ui.resources.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.resources;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.ui.resources diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF index 8d6e2a08b10..bff53dc8fc6 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF @@ -54,8 +54,8 @@ Bundle-Activator: org.eclipse.papyrus.infra.ui.Activator Bundle-Description: Plugin dedicated to manage generic menus and actions, linked to EMF but not to UML nor GMF technologies. Bundle-SymbolicName: org.eclipse.papyrus.infra.ui;singleton:=true -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.cache;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)", - com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.cache;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", + com.google.common.util.concurrent;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.ui diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF index 3e40c0ed198..f1ff93164f2 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF @@ -41,5 +41,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.widgets.Activator Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.widgets;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.widgets diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/META-INF/MANIFEST.MF b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/META-INF/MANIFEST.MF index 8fe356fac6d..8fa6c7227c3 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/META-INF/MANIFEST.MF @@ -28,5 +28,5 @@ Bundle-Activator: org.eclipse.papyrus.uml.profile.types.generator.ui.internal.Ac Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.types.generator.ui;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.util.concurrent;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.profile.types.generator.ui diff --git a/plugins/toolsmiths/builder/org.eclipse.papyrus.toolsmiths.plugin.builder/META-INF/MANIFEST.MF b/plugins/toolsmiths/builder/org.eclipse.papyrus.toolsmiths.plugin.builder/META-INF/MANIFEST.MF index 25c45146c83..aff4f20514e 100755 --- a/plugins/toolsmiths/builder/org.eclipse.papyrus.toolsmiths.plugin.builder/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/builder/org.eclipse.papyrus.toolsmiths.plugin.builder/META-INF/MANIFEST.MF @@ -35,8 +35,8 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)", org.eclipse.papyrus.infra.tools;bundle-version="[4.0.0,5.0.0)", org.eclipse.pde.ui;bundle-version="[3.11.0,4.0.0)", org.eclipse.papyrus.infra.core.architecture;bundle-version="[3.0.0,4.0.0)" -Import-Package: com.google.common.base;version="[32.0.0,33.0.0)", - com.google.common.collect;version="[32.0.0,33.0.0)", +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional Export-Package: org.eclipse.papyrus.toolsmiths.plugin.builder, org.eclipse.papyrus.toolsmiths.plugin.builder.helper, diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/META-INF/MANIFEST.MF b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/META-INF/MANIFEST.MF index 7fe726d792c..d87ad90d8d8 100644 --- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)", org.eclipse.xtext.builder;bundle-version="[2.24.0,3.0.0)", org.eclipse.xtend.lib;bundle-version="[2.24.0,3.0.0)", org.eclipse.ocl.ecore;bundle-version="[3.15.0,4.0.0)", - com.google.guava;bundle-version="[32.1.3,33.0.0)", + com.google.guava;bundle-version="[33.1.0,33.2.0)", org.eclipse.xtext.xbase.lib;bundle-version="[2.24.0,3.0.0)", org.eclipse.gmf.runtime.notation;bundle-version="[1.9.0,2.0.0)", org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)", diff --git a/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF index 27ad0f4df69..68b51747e49 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.cbi.p2repo.aggregator;bundle-version="[1.1.0,2.0.0)" org.eclipse.oomph.setup.workingsets;bundle-version="[1.12.0,2.0.0)", org.eclipse.ui;bundle-version="[3.117.0,4.0.0)", org.eclipse.xtext;bundle-version="[2.22.0,3.0.0)", - com.google.guava;bundle-version="[32.1.3,33.0.0)" + com.google.guava;bundle-version="[33.1.0,33.2.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Version: 3.2.0.qualifier diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/META-INF/MANIFEST.MF index f2035ea53c1..01b3e7ed432 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)", org.eclipse.ui.ide;bundle-version="[3.17.0,4.0.0)", org.eclipse.ui.views.properties.tabbed;bundle-version="[3.8.0,4.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)", - com.google.guava;bundle-version="[32.1.3,33.0.0)" + com.google.guava;bundle-version="[33.1.0,33.2.0)" Export-Package: org.eclipse.papyrus.toolsmiths.factory, org.eclipse.papyrus.toolsmiths.generator, org.eclipse.papyrus.toolsmiths.model.customizationplugin, diff --git a/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/META-INF/MANIFEST.MF index 4c2d86c612b..2c12d97482b 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.papyrus.uml.m2m.qvto.tests.tools;singleton:=tru Bundle-Version: 2.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: com.google.guava;bundle-version="[32.1.3,33.0.0)", +Require-Bundle: com.google.guava;bundle-version="[33.1.0,33.2.0)", org.eclipse.emf.compare;bundle-version="[3.5.0,4.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.emf.edit.ui;bundle-version="[2.18.0,3.0.0)", diff --git a/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration/META-INF/MANIFEST.MF b/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration/META-INF/MANIFEST.MF index e2f4b8922dc..a83850785b3 100644 --- a/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths.profilemigration;singleton:=true Bundle-Version: 1.1.0.qualifier Bundle-ClassPath: . -Require-Bundle: com.google.guava;bundle-version="[32.1.3,33.0.0)", +Require-Bundle: com.google.guava;bundle-version="[33.1.0,33.2.0)", org.eclipse.emf.compare;bundle-version="[3.5.0,4.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", diff --git a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.architecture/META-INF/MANIFEST.MF b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.architecture/META-INF/MANIFEST.MF index 4e94bffac65..ce82e9900a6 100644 --- a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.architecture/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.architecture/META-INF/MANIFEST.MF @@ -37,6 +37,6 @@ Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths.validation.architecture;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.validation.architecture -Import-Package: com.google.common.collect;version="[32.0.0,33.0.0)", +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)", org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional Service-Component: OSGI-INF/org.eclipse.papyrus.toolsmiths.validation.architecture.internal.checkers.ArchitectureBuilderProvider.xml diff --git a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.common/META-INF/MANIFEST.MF b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.common/META-INF/MANIFEST.MF index 6c5aaaced25..f42f2ac4a13 100644 --- a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.common/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.common/META-INF/MANIFEST.MF @@ -46,5 +46,5 @@ Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths.validation.common;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.validation.common -Import-Package: com.google.common.base;version="[32.0.0,33.0.0)", - com.google.common.collect;version="[32.0.0,33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" diff --git a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.elementtypes/META-INF/MANIFEST.MF b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.elementtypes/META-INF/MANIFEST.MF index f681499ffdf..95bd48b294b 100644 --- a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.elementtypes/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.elementtypes/META-INF/MANIFEST.MF @@ -37,6 +37,6 @@ Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths.validation.elementtypes;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.validation.elementtypes -Import-Package: com.google.common.collect;version="[32.0.0,33.0.0)", +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)", org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional Service-Component: OSGI-INF/org.eclipse.papyrus.toolsmiths.validation.elementtypes.internal.checkers.ElementTypesBuilderProvider.xml diff --git a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.newchild/META-INF/MANIFEST.MF b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.newchild/META-INF/MANIFEST.MF index 167e3a6078f..6997c54f904 100644 --- a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.newchild/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.newchild/META-INF/MANIFEST.MF @@ -31,5 +31,5 @@ Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths.validation.newchild;singleto Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.validation.newchild Service-Component: OSGI-INF/org.eclipse.papyrus.toolsmiths.validation.newchild.internal.checkers.NewChildMenuBuilderProvider.xml -Import-Package: com.google.common.collect;version="[32.0.0,33.0.0)", +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)", org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional diff --git a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.profile/META-INF/MANIFEST.MF b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.profile/META-INF/MANIFEST.MF index eb3417f30f8..bedf326d2d7 100644 --- a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.profile/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.profile/META-INF/MANIFEST.MF @@ -33,6 +33,6 @@ Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths.validation.profile;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.validation.profile -Import-Package: com.google.common.collect;version="[32.0.0,33.0.0)", +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)", org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional Service-Component: OSGI-INF/org.eclipse.papyrus.toolsmiths.validation.profile.internal.checkers.ProfileBuilderProvider.xml diff --git a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.properties/META-INF/MANIFEST.MF b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.properties/META-INF/MANIFEST.MF index 348df260ca9..57e12f330f9 100644 --- a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.properties/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.properties/META-INF/MANIFEST.MF @@ -46,8 +46,8 @@ Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths.validation.properties;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.validation.properties -Import-Package: com.google.common.base;version="[32.0.0,33.0.0)", - com.google.common.collect;version="[32.0.0,33.0.0)", +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional Service-Component: OSGI-INF/org.eclipse.papyrus.toolsmiths.validation.properties.internal.checkers.PropertiesContextBuilderProvider.xml, OSGI-INF/org.eclipse.papyrus.toolsmiths.validation.properties.internal.checkers.PropertiesEnvironmentBuilderProvider.xml, diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/META-INF/MANIFEST.MF b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/META-INF/MANIFEST.MF index 8d58224252f..5bd6d6102ec 100644 --- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/META-INF/MANIFEST.MF +++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/META-INF/MANIFEST.MF @@ -27,6 +27,6 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.controlmode;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.decoratormodel.controlmode diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF index 935d9579971..163f9bc1e9e 100644 --- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF +++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF @@ -29,7 +29,7 @@ Bundle-Activator: org.eclipse.papyrus.uml.decoratormodel.properties.Activator Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.properties;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)", - com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", + com.google.common.util.concurrent;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.decoratormodel.properties diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF index 48b2893a90a..ae8475aff6f 100644 --- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF @@ -36,8 +36,8 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.ui;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)", - com.google.common.eventbus;version="[32.0.0, 33.0.0)", - com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", + com.google.common.eventbus;version="[33.1.0,33.2.0)", + com.google.common.util.concurrent;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.decoratormodel.ui diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/META-INF/MANIFEST.MF b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/META-INF/MANIFEST.MF index aa077277741..917f3ecb841 100755 --- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/META-INF/MANIFEST.MF +++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/META-INF/MANIFEST.MF @@ -37,7 +37,7 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)", - com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", + com.google.common.util.concurrent;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.decoratormodel diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF index 3cd3dc7d1b5..d6275762de4 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF @@ -34,7 +34,7 @@ Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: com.google.guava;bundle-version="[32.1.3,33.0.0)", +Require-Bundle: com.google.guava;bundle-version="[33.1.0,33.2.0)", org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.e4.ui.css.core;bundle-version="[0.12.0,1.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", @@ -90,6 +90,6 @@ Bundle-Version: 5.0.100.qualifier Bundle-Activator: org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.activity; singleton:=true -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.activity diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF index 9792f3edabc..8433cf07b66 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF @@ -31,7 +31,7 @@ Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: com.google.guava;bundle-version="[32.1.3,33.0.0)", +Require-Bundle: com.google.guava;bundle-version="[33.1.0,33.2.0)", org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", @@ -76,6 +76,6 @@ Bundle-Activator: org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlu Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.clazz; singleton:=true -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.clazz diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF index 08c002eae75..5c46bb10c61 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF @@ -109,11 +109,11 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.papyrus.uml.tools.utils;bundle-version="[4.0.0,5.0.0)", org.eclipse.uml2.uml.editor;bundle-version="[5.5.0,6.0.0)" Bundle-Vendor: %providerName -Bundle-Version: 5.1.100.qualifier +Bundle-Version: 5.1.200.qualifier Eclipse-BuddyPolicy: dependent Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common;singleton:=true -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.common diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/pom.xml index 52ce9ef8af1..54087aa4914 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/pom.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.diagram.common</artifactId> - <version>5.1.100-SNAPSHOT</version> + <version>5.1.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/PaletteUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/PaletteUtil.java index c1075293698..a9b4b696c3a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/PaletteUtil.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/PaletteUtil.java @@ -140,7 +140,7 @@ public class PaletteUtil { @SuppressWarnings("unchecked") public static List<PaletteContainer> getDirectChildContainers(PaletteContainer container) { List<PaletteContainer> containers = new ArrayList<>(); - Iterator<PaletteEntry> it = container.getChildren().iterator(); + Iterator<PaletteEntry> it = container.getChildren().stream().filter(PaletteEntry.class::isInstance).map(PaletteEntry.class::cast).toList().iterator(); while (it.hasNext()) { PaletteEntry entry = it.next(); if (entry instanceof PaletteContainer) { @@ -196,7 +196,7 @@ public class PaletteUtil { */ public static List<ToolEntry> getAllToolEntries(PaletteContainer container) { final List<ToolEntry> entries = new ArrayList<>(); - Iterator<PaletteEntry> it = container.getChildren().iterator(); + Iterator<PaletteEntry> it = container.getChildren().stream().filter(PaletteEntry.class::isInstance).map(PaletteEntry.class::cast).toList().iterator(); while (it.hasNext()) { PaletteEntry entry = it.next(); if (entry instanceof ToolEntry) { @@ -261,7 +261,7 @@ public class PaletteUtil { // retrieve all provider for the given editor ID PaletteRoot root = new PaletteRoot(); List<? extends PapyrusPaletteService.ProviderDescriptor> providers = (List<? extends ProviderDescriptor>) PapyrusPaletteService.getInstance().getProviders(); - ContributeToPaletteOperation operation = new ContributeToPaletteOperation(part, part.getEditorInput(), root, new HashMap<Object, Object>()); + ContributeToPaletteOperation operation = new ContributeToPaletteOperation(part, part.getEditorInput(), root, new HashMap<>()); // generate for each provider, according to priority @SuppressWarnings("unchecked") @@ -270,7 +270,7 @@ public class PaletteUtil { int compare = descriptor.getPriority().compareTo(priority); if (compare < 0) { if (descriptor.providesWithVisibility(operation)) { - ((IPaletteProvider) descriptor.getProvider()).contributeToPalette(part, part.getEditorInput(), root, new HashMap<Object, Object>()); + ((IPaletteProvider) descriptor.getProvider()).contributeToPalette(part, part.getEditorInput(), root, new HashMap<>()); } } } @@ -317,7 +317,7 @@ public class PaletteUtil { */ public static List<String> getStereotypeListFromString(String serializedForm) { StringTokenizer tokenizer = new StringTokenizer(serializedForm, ","); //$NON-NLS-1$ - List<String> list = new ArrayList<String>(); + List<String> list = new ArrayList<>(); while (tokenizer.hasMoreElements()) { list.add(tokenizer.nextToken().trim()); } @@ -414,7 +414,7 @@ public class PaletteUtil { if (element instanceof Element) { org.eclipse.uml2.uml.Package package_ = ((Element) element).getNearestPackage(); List<Profile> appliedProfiles = package_.getAllAppliedProfiles(); - List<String> appliedProfilesNames = new ArrayList<String>(); + List<String> appliedProfilesNames = new ArrayList<>(); for (Profile profile : appliedProfiles) { appliedProfilesNames.add(profile.getQualifiedName()); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF index b0c95b46c04..6b6131922fa 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF @@ -26,7 +26,7 @@ Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: com.google.guava;bundle-version="[32.1.3,33.0.0)", +Require-Bundle: com.google.guava;bundle-version="[33.1.0,33.2.0)", org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", @@ -71,5 +71,5 @@ Bundle-Version: 6.0.0.qualifier Bundle-Activator: org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramEditorPlugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.communication; singleton:=true -Import-Package: com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.communication diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF index cc9c7109d96..e60bef14e77 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF @@ -33,7 +33,7 @@ Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: com.google.guava;bundle-version="[32.1.3,33.0.0)", +Require-Bundle: com.google.guava;bundle-version="[33.1.0,33.2.0)", org.eclipse.core.expressions;bundle-version="[3.7.0,4.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF index d8da8121a20..69e1bcb61fd 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF @@ -33,7 +33,7 @@ Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: com.google.guava;bundle-version="[32.1.3,33.0.0)", +Require-Bundle: com.google.guava;bundle-version="[33.1.0,33.2.0)", org.eclipse.core.expressions;bundle-version="[3.7.0,4.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF index 7291b33afac..5b7a2998bc0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF @@ -25,7 +25,7 @@ Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: com.google.guava;bundle-version="[32.1.3,33.0.0)", +Require-Bundle: com.google.guava;bundle-version="[33.1.0,33.2.0)", org.eclipse.core.expressions;bundle-version="[3.7.0,4.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF index 5886421ddd5..2cedd4c641d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF @@ -59,5 +59,5 @@ Bundle-Activator: org.eclipse.papyrus.uml.diagram.interactionoverview.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.interactionoverview;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.interactionoverview diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF index 6e32d750c31..efee026a5c1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF @@ -25,7 +25,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.uml2.uml.editor;bundle-version="[5.5.0,6.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 3.0.100.qualifier +Bundle-Version: 3.0.200.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.uml.diagram.menu.Activator diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/pom.xml index 287d17915b8..9e128ec96e1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/pom.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/pom.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project> +<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> <parent> <groupId>org.eclipse.papyrus</groupId> @@ -7,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.diagram.menu</artifactId> - <version>3.0.100-SNAPSHOT</version> + <version>3.0.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/ArrangeAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/ArrangeAction.java index 9d7250022df..a1deda081af 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/ArrangeAction.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/ArrangeAction.java @@ -235,7 +235,10 @@ public class ArrangeAction extends AbstractGraphicalParametricAction { return Collections.EMPTY_LIST; } - selection = ToolUtilities.getSelectionWithoutDependants(selection); + selection = ToolUtilities.getSelectionWithoutDependants(selection) + .stream() + .filter(IGraphicalEditPart.class::isInstance) + .map(IGraphicalEditPart.class::cast).toList(); return selection; } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF index 6e7a2ed3eb7..8127cb3fede 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF @@ -26,7 +26,7 @@ Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: com.google.guava;bundle-version="[32.1.3,33.0.0)", +Require-Bundle: com.google.guava;bundle-version="[33.1.0,33.2.0)", org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", @@ -78,5 +78,5 @@ Bundle-Activator: org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorP Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.profile; singleton:=true -Import-Package: com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.profile diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF index 4dab9503678..ce5cc33097e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: com.google.guava;bundle-version="[32.1.3,33.0.0)", +Require-Bundle: com.google.guava;bundle-version="[33.1.0,33.2.0)", org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", @@ -68,9 +68,9 @@ Require-Bundle: com.google.guava;bundle-version="[32.1.3,33.0.0)", org.eclipse.ui.navigator;bundle-version="[3.10.0,4.0.0)", org.eclipse.ui.navigator.resources;bundle-version="[3.8.0,4.0.0)" Bundle-Vendor: %providerName -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.100.qualifier Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.sequence; singleton:=true -Import-Package: com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.collect;version="[32.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.sequence diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceUtil.java index f00d40d9558..a10c1b97da4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceUtil.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceUtil.java @@ -684,11 +684,11 @@ public class SequenceUtil { Rectangle bounds = getAbsoluteBounds((GraphicalEditPart) child); if (!occurrences.containsKey(bounds.getTop())) { // there should be at most 2 occurrences (with starting message) - occurrences.put(bounds.getTop(), new ArrayList<OccurrenceSpecification>(2)); + occurrences.put(bounds.getTop(), new ArrayList<>(2)); } occurrences.get(bounds.getTop()).add(((ExecutionSpecification) element).getStart()); if (!occurrences.containsKey(bounds.getBottom())) { - occurrences.put(bounds.getBottom(), new ArrayList<OccurrenceSpecification>(1)); + occurrences.put(bounds.getBottom(), new ArrayList<>(1)); } occurrences.get(bounds.getBottom()).add(((ExecutionSpecification) element).getFinish()); // messages to and from the execution @@ -706,7 +706,7 @@ public class SequenceUtil { if (destructionOccurence.equals(currentOccurence)) { Rectangle bounds = getAbsoluteBounds((GraphicalEditPart) child); if (!occurrences.containsKey(bounds.getCenter())) { - occurrences.put(bounds.getCenter(), new ArrayList<OccurrenceSpecification>(2)); + occurrences.put(bounds.getCenter(), new ArrayList<>(2)); } occurrences.get(bounds.getCenter()).add((OccurrenceSpecification) occurence); break; @@ -758,7 +758,7 @@ public class SequenceUtil { if (figure instanceof AbstractPointListShape) { Point end = getAbsoluteEdgeExtremity((ConnectionNodeEditPart) conn, false); if (!occurrencesMap.containsKey(end)) { - occurrencesMap.put(end, new ArrayList<OccurrenceSpecification>(1)); + occurrencesMap.put(end, new ArrayList<>(1)); } occurrencesMap.get(end).add((MessageOccurrenceSpecification) ((Message) element).getReceiveEvent()); } @@ -776,7 +776,7 @@ public class SequenceUtil { if (figure instanceof AbstractPointListShape) { Point start = getAbsoluteEdgeExtremity((ConnectionNodeEditPart) conn, true); if (!occurrencesMap.containsKey(start)) { - occurrencesMap.put(start, new ArrayList<OccurrenceSpecification>(1)); + occurrencesMap.put(start, new ArrayList<>(1)); } occurrencesMap.get(start).add((MessageOccurrenceSpecification) ((Message) element).getSendEvent()); } @@ -1352,7 +1352,7 @@ public class SequenceUtil { iftToCheckForUpdate.put(es, absoluteNewBounds); iftToCheckForUpdate.put(es.getStart(), top); iftToCheckForUpdate.put(es.getFinish(), bottom); - List<ConnectionEditPart> sourceConnectionEPs = executionSpecificationEP.getSourceConnections(); + List<ConnectionEditPart> sourceConnectionEPs = executionSpecificationEP.getSourceConnections().stream().filter(ConnectionEditPart.class::isInstance).map(ConnectionEditPart.class::cast).toList(); // find possible ifts associated with messages connected to the moved es for (ConnectionEditPart sourceConnectionEP : sourceConnectionEPs) { EObject elem = sourceConnectionEP.getNotationView().getElement(); @@ -1368,7 +1368,7 @@ public class SequenceUtil { } } } - List<ConnectionEditPart> targetConnectionEPs = executionSpecificationEP.getTargetConnections(); + List<ConnectionEditPart> targetConnectionEPs = executionSpecificationEP.getTargetConnections().stream().filter(ConnectionEditPart.class::isInstance).map(ConnectionEditPart.class::cast).toList(); for (ConnectionEditPart targetConnectionEP : targetConnectionEPs) { EObject elem = targetConnectionEP.getNotationView().getElement(); if (elem instanceof Message) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/pom.xml index 31efb972338..ebea158b78f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/pom.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.diagram.sequence</artifactId> - <version>7.2.0-SNAPSHOT</version> + <version>7.2.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF index b12d646d2ce..ca39d6f25c9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF @@ -32,7 +32,7 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Created-By: 1.5.0_06-b05 (Sun Microsystems Inc.) Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: com.google.guava;bundle-version="[32.1.3,33.0.0)", +Require-Bundle: com.google.guava;bundle-version="[33.1.0,33.2.0)", org.eclipse.core.expressions;bundle-version="[3.7.0,4.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.emf.validation.ocl;bundle-version="[1.4.0,2.0.0)", diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF index c05faae31b4..a02dc8921f7 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF @@ -28,7 +28,7 @@ Bundle-ClassPath: . Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: com.google.guava;bundle-version="[32.1.3,33.0.0)", +Require-Bundle: com.google.guava;bundle-version="[33.1.0,33.2.0)", org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF index ef24cbf7a72..d0f8d2dfe6a 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: com.google.guava;bundle-version="[32.1.3,33.0.0)", +Require-Bundle: com.google.guava;bundle-version="[33.1.0,33.2.0)", org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", diff --git a/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/META-INF/MANIFEST.MF b/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/META-INF/MANIFEST.MF index 13250914c92..154447f9430 100644 --- a/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/META-INF/MANIFEST.MF +++ b/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/META-INF/MANIFEST.MF @@ -37,6 +37,6 @@ Export-Package: org.eclipse.papyrus.uml.m2m.qvto.common, org.eclipse.papyrus.uml.m2m.qvto.common.MigrationParameters, org.eclipse.papyrus.uml.m2m.qvto.common.MigrationParameters.impl, org.eclipse.papyrus.uml.m2m.qvto.common.MigrationParameters.util -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.m2m.qvto.common diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF index 141829b6ce1..f1049c3e644 100644 --- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF +++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF @@ -42,5 +42,5 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.modelexplorer.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.modelexplorer;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.modelexplorer diff --git a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF index b0f9bf3aa64..c5b0d67912c 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF @@ -20,6 +20,6 @@ Bundle-Activator: org.eclipse.papyrus.uml.controlmode.profile.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.controlmode.profile;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.controlmode.profile diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF index 90c2dff010d..2af1acbafc9 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF @@ -19,5 +19,5 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.filters;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.filters diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF index 6a789a6e9f4..6a8046cd6b4 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF @@ -37,8 +37,8 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.modelrepair;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)", - com.google.common.eventbus;version="[32.0.0, 33.0.0)", - com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", + com.google.common.eventbus;version="[33.1.0,33.2.0)", + com.google.common.util.concurrent;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.modelrepair diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF index 85379c7a371..217d27f8834 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF @@ -45,6 +45,6 @@ Bundle-Activator: org.eclipse.papyrus.uml.profile.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.profile;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.util.concurrent;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.profile diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF index bd0a99da444..608c2b9e22a 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF @@ -36,5 +36,5 @@ Bundle-Activator: org.eclipse.papyrus.uml.service.types.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.service.types;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.service.types diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/META-INF/MANIFEST.MF b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/META-INF/MANIFEST.MF index 162c8c01f02..5fedb4166ec 100644 --- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/META-INF/MANIFEST.MF +++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/META-INF/MANIFEST.MF @@ -33,6 +33,6 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.profile.drafter.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.drafter;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.profile.drafter diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/META-INF/MANIFEST.MF b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/META-INF/MANIFEST.MF index 7fa5a2b446f..10162ce7e7e 100644 --- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/META-INF/MANIFEST.MF +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/META-INF/MANIFEST.MF @@ -25,7 +25,7 @@ Bundle-Activator: org.eclipse.papyrus.uml.tools.utils.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.tools.utils;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Bundle-Description: %Bundle-Description Automatic-Module-Name: org.eclipse.papyrus.uml.tools.utils diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF index 295d1fda648..42e9d8704ab 100644 --- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF @@ -53,6 +53,6 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.tools;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.collect;version="[32.0.0, 33.0.0)", - com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)", + com.google.common.util.concurrent;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.tools diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF index 156844e2fdd..9cf7058300b 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF @@ -60,6 +60,6 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.views.modelexplorer;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.views.modelexplorer diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/META-INF/MANIFEST.MF b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/META-INF/MANIFEST.MF index 10c891d9e90..b5fa6d49f2c 100755 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/META-INF/MANIFEST.MF +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/META-INF/MANIFEST.MF @@ -41,5 +41,5 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.views.properties.toolsmiths;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.views.properties.toolsmiths diff --git a/plugins/views/validation/org.eclipse.papyrus.views.validation/META-INF/MANIFEST.MF b/plugins/views/validation/org.eclipse.papyrus.views.validation/META-INF/MANIFEST.MF index cac8186c690..646798a416c 100644 --- a/plugins/views/validation/org.eclipse.papyrus.views.validation/META-INF/MANIFEST.MF +++ b/plugins/views/validation/org.eclipse.papyrus.views.validation/META-INF/MANIFEST.MF @@ -23,6 +23,6 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.views.validation.internal.Activator Bundle-SymbolicName: org.eclipse.papyrus.views.validation;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.views.validation diff --git a/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.target b/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.target index 8e0480eb5fd..61563767538 100755 --- a/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.target +++ b/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="Papyrus Main" sequenceNumber="1704448694"> +<target name="Papyrus Main" sequenceNumber="1714466372"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/> @@ -23,17 +23,17 @@ <repository id="orbit2" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="com.google.guava" version="32.1.3.jre"/> - <unit id="com.google.guava.source" version="32.1.3.jre"/> + <unit id="com.google.guava" version="33.1.0.jre"/> + <unit id="com.google.guava.source" version="33.1.0.jre"/> <unit id="com.google.gson" version="2.10.1"/> <unit id="com.google.gson.source" version="2.10.1"/> - <unit id="org.apache.batik.anim" version="1.17.0.v20231009-1000"/> - <unit id="org.apache.batik.dom" version="1.17.0.v20231009-1000"/> - <unit id="org.apache.batik.dom.svg" version="1.17.0.v20231009-1000"/> - <unit id="org.apache.batik.xml" version="1.17.0.v20231009-1000"/> + <unit id="org.apache.batik.anim" version="1.17.0.v20231215-1130"/> + <unit id="org.apache.batik.dom" version="1.17.0.v20231215-1130"/> + <unit id="org.apache.batik.dom.svg" version="1.17.0.v20231215-1130"/> + <unit id="org.apache.batik.xml" version="1.17.0.v20231215-1130"/> <unit id="com.google.inject" version="7.0.0"/> <unit id="org.eclipse.orbit.xml-apis-ext" version="1.0.0.v20230923-0644"/> - <repository id="orbit" location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/"/> + <repository id="orbit" location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> @@ -48,42 +48,42 @@ <repository id="uml" location="https://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.sdk.feature.group" version="4.30.0.v20231201-0512"/> - <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110"/> + <unit id="org.eclipse.sdk.feature.group" version="4.32.0.v20240428-1800"/> + <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.32-I-builds/I20240428-1800"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.19.0.v20231129-1236"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.19.0.v20231129-1236"/> - <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.19.0"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.20.0.v20240305-1416"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.20.0.v20240305-1416"/> + <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/builds/release/6.20.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtext.xtext.generator" version="2.33.0.v20231121-0955"/> - <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtext.xtext.generator" version="2.35.0.v20240408-1330"/> + <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/2.35.0.M0/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.16.0.v20231117-0522"/> - <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.16.0/"/> + <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.18.0.v20240405-0451"/> + <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202404050451/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/> - <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.32.0/S-3.32M3a-20231114230950/repository/"/> + <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.34.0/S-3.34M2-20240429084926/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.16.2.202311130907"/> - <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202311130907/"/> + <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.16.3.202403010913"/> + <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202403010913/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.13.1.202211151334"/> <repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.36.0.v20231107-0612"/> - <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.36.0"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.38.0.v20240314-1003"/> + <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202404020819"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.1.202208101410"/> @@ -98,8 +98,8 @@ <repository id="emfTransaction" location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R202208110935"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gef.feature.group" version="3.18.0.202311222042"/> - <repository id="gef" location="https://download.eclipse.org/tools/gef/classic/releases/3.18.0"/> + <unit id="org.eclipse.gef.feature.group" version="3.20.0.202404101913"/> + <repository id="gef" location="https://download.eclipse.org/tools/gef/classic/milestone/S202404101913"/> </location> </locations> </target> diff --git a/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.tpd b/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.tpd index 0d48a46d590..23ddb18b277 100755 --- a/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.tpd +++ b/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.tpd @@ -26,9 +26,9 @@ location orbit2 "https://download.eclipse.org/tools/orbit/downloads/drops/R20230 } // manualUpdate -location orbit "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/" { - com.google.guava [32.1.3,32.2.0) - com.google.guava.source [32.1.3,32.2.0) +location orbit "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06/" { + com.google.guava [33.1.0,33.2.0) + com.google.guava.source [33.1.0,33.2.0) // This disappeared from the baseline, need to look at simrel messages //org.apache.commons.io // update dependencies to be in adequation with latest gmf runtime @@ -49,7 +49,7 @@ location xwt "https://download.eclipse.org/xwt/release-1.9.100/" { /*** Updates from the Simrel repository ***/ -// updateFrom("QVT Operational for 2023-12",0) +// updateFrom("QVT Operational for 2024-03",0) location qvto "https://download.eclipse.org/mmt/qvto/updates/releases/3.10.8" { org.eclipse.m2m.qvt.oml.sdk.feature.group } @@ -60,18 +60,18 @@ location uml "https://download.eclipse.org/modeling/mdt/uml2/updates/5.5" { } // updateFrom("Eclipse",0) -location platform "https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110" { +location platform "https://download.eclipse.org/eclipse/updates/4.32-I-builds/I20240428-1800" { org.eclipse.sdk.feature.group } -// updateFrom("OCL for 2023-12",0) -location ocl "https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.19.0" { +// updateFrom("OCL for 2024-03",0) +location ocl "https://download.eclipse.org/modeling/mdt/ocl/builds/release/6.20.0" { org.eclipse.ocl.examples.classic.feature.group org.eclipse.ocl.examples.feature.group } // updateFrom("Xtext, Xtend",0) -location xtext "https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0" { +location xtext "https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/2.35.0.M0/" { org.eclipse.xtext.sdk.feature.group org.eclipse.xtend.sdk.feature.group org.eclipse.xtext.redist.feature.group @@ -81,17 +81,17 @@ location xtext "https://download.eclipse.org/modeling/tmf/xtext/updates/releases } // updateFrom("EMFT MWE for 2023-12",0) -location mwe "https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.16.0/" { +location mwe "https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202404050451/" { org.eclipse.emf.mwe2.language.sdk.feature.group } // updateFrom("Web Tools Platform",0) -location webtools "https://download.eclipse.org/webtools/downloads/drops/R3.32.0/S-3.32M3a-20231114230950/repository/" { +location webtools "https://download.eclipse.org/webtools/downloads/drops/R3.34.0/S-3.34M2-20240429084926/repository/" { org.eclipse.wst.xml_ui.feature.feature.group lazy } //updateFrom("GMF Runtime",0) -location gmfRuntime "https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202311130907/" { +location gmfRuntime "https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202403010913/" { org.eclipse.gmf.runtime.sdk.feature.group } @@ -101,7 +101,7 @@ location gmfNotation "https://download.eclipse.org/modeling/gmp/gmf-notation/upd } // updateFrom("EMF (Core)",0) -location emf "https://download.eclipse.org/modeling/emf/emf/builds/release/2.36.0" { +location emf "https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202404020819" { org.eclipse.emf.sdk.feature.group } @@ -121,7 +121,7 @@ location emfTransaction "https://download.eclipse.org/modeling/emf/transaction/u } // updateFrom("GEF",0) -location gef "https://download.eclipse.org/tools/gef/classic/releases/3.18.0" { +location gef "https://download.eclipse.org/tools/gef/classic/milestone/S202404101913" { org.eclipse.gef.feature.group } diff --git a/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.target b/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.target index 96b4baa4759..1d7fad8761f 100755 --- a/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.target +++ b/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="Papyrus RCP" sequenceNumber="1704448694"> +<target name="Papyrus RCP" sequenceNumber="1714466372"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/> @@ -23,17 +23,17 @@ <repository id="orbit2" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="com.google.guava" version="32.1.3.jre"/> - <unit id="com.google.guava.source" version="32.1.3.jre"/> + <unit id="com.google.guava" version="33.1.0.jre"/> + <unit id="com.google.guava.source" version="33.1.0.jre"/> <unit id="com.google.gson" version="2.10.1"/> <unit id="com.google.gson.source" version="2.10.1"/> - <unit id="org.apache.batik.anim" version="1.17.0.v20231009-1000"/> - <unit id="org.apache.batik.dom" version="1.17.0.v20231009-1000"/> - <unit id="org.apache.batik.dom.svg" version="1.17.0.v20231009-1000"/> - <unit id="org.apache.batik.xml" version="1.17.0.v20231009-1000"/> + <unit id="org.apache.batik.anim" version="1.17.0.v20231215-1130"/> + <unit id="org.apache.batik.dom" version="1.17.0.v20231215-1130"/> + <unit id="org.apache.batik.dom.svg" version="1.17.0.v20231215-1130"/> + <unit id="org.apache.batik.xml" version="1.17.0.v20231215-1130"/> <unit id="com.google.inject" version="7.0.0"/> <unit id="org.eclipse.orbit.xml-apis-ext" version="1.0.0.v20230923-0644"/> - <repository id="orbit" location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/"/> + <repository id="orbit" location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> @@ -48,30 +48,30 @@ <repository id="uml" location="https://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.ocl.examples.classic.feature.group" version="5.19.0.v20231129-1236"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.19.0.v20231129-1236"/> - <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.19.0"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.20.0.v20240305-1416"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.20.0.v20240305-1416"/> + <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/builds/release/6.20.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtext.xtext.generator" version="2.33.0.v20231121-0955"/> - <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtext.xtext.generator" version="2.35.0.v20240408-1330"/> + <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/2.35.0.M0/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.16.0.v20231117-0522"/> - <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.16.0/"/> + <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.18.0.v20240405-0451"/> + <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202404050451/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/> - <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.32.0/S-3.32M3a-20231114230950/repository/"/> + <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.34.0/S-3.34M2-20240429084926/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.16.2.202311130907"/> - <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202311130907/"/> + <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.16.3.202403010913"/> + <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202403010913/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.13.1.202211151334"/> @@ -90,8 +90,8 @@ <repository id="emfTransaction" location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R202208110935"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gef.feature.group" version="3.18.0.202311222042"/> - <repository id="gef" location="https://download.eclipse.org/tools/gef/classic/releases/3.18.0"/> + <unit id="org.eclipse.gef.feature.group" version="3.20.0.202404101913"/> + <repository id="gef" location="https://download.eclipse.org/tools/gef/classic/milestone/S202404101913"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.justj.openjdk.hotspot.jre.full.feature.group" version="0.0.0"/> @@ -107,29 +107,29 @@ <repository id="mylyn" location="https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.egit.feature.group" version="6.8.0.202311291450-r"/> - <repository id="egit" location="https://download.eclipse.org/egit/updates-6.8"/> + <unit id="org.eclipse.egit.feature.group" version="6.9.0.202403050737-r"/> + <repository id="egit" location="https://download.eclipse.org/egit/updates-6.9"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.30.0.v20231106-1600"/> - <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.2100.v20231004-0459"/> - <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.2300.v20231106-1826"/> - <unit id="org.eclipse.sdk.feature.group" version="4.30.0.v20231201-0512"/> - <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110"/> + <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.30.200.v20240417-0631"/> + <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.2300.v20240307-1558"/> + <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.2500.v20240426-1701"/> + <unit id="org.eclipse.sdk.feature.group" version="4.32.0.v20240428-1800"/> + <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.32-I-builds/I20240428-1800"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.23.202311200811"/> - <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.23.202311200811"/> - <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202311200811/"/> + <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.24.202401051648"/> + <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.24.202401051648"/> + <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R202401051648"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xsd.sdk.feature.group" version="2.36.0.v20230916-0637"/> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.36.0.v20231107-0612"/> - <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.36.0"/> + <unit id="org.eclipse.xsd.sdk.feature.group" version="2.36.0.v20231205-1420"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.38.0.v20240314-1003"/> + <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202404020819"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.epp.mpc.feature.group" version="1.10.2.v20231116-1812"/> - <repository id="marketPlace" location="https://download.eclipse.org/mpc/drops/1.10.2/v20231116-1812/"/> + <unit id="org.eclipse.epp.mpc.feature.group" version="1.10.3.v20240228-1000"/> + <repository id="marketPlace" location="https://download.eclipse.org/mpc/drops/1.10.3/v20240228-1000"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.userstorage.feature.group" version="1.2.0.v20210517-0327"/> diff --git a/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.tpd b/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.tpd index ca085c6ad01..4ffd01560c7 100644 --- a/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.tpd +++ b/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.tpd @@ -19,30 +19,30 @@ location mylyn "https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956" /*** Updates from the Simrel repository ***/ // updateFrom("EGit",0) -location egit "https://download.eclipse.org/egit/updates-6.8" { +location egit "https://download.eclipse.org/egit/updates-6.9" { org.eclipse.egit.feature.group } // updateFrom("Eclipse",0) -location platform "https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110" { +location platform "https://download.eclipse.org/eclipse/updates/4.32-I-builds/I20240428-1800" { org.eclipse.e4.core.tools.feature.feature.group org.eclipse.rcp.configuration.feature.group org.eclipse.equinox.executable.feature.group } // updateFrom("EMF Compare",0) -location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202311200811/" { +location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R202401051648" { org.eclipse.emf.compare.source.feature.group org.eclipse.emf.compare.ide.ui.source.feature.group } // updateFrom("EMF (Core)",0) -location emf "https://download.eclipse.org/modeling/emf/emf/builds/release/2.36.0" { +location emf "https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202404020819" { org.eclipse.xsd.sdk.feature.group } // updateFrom("EPP Marketplace Client",0) -location marketPlace "https://download.eclipse.org/mpc/drops/1.10.2/v20231116-1812/" { +location marketPlace "https://download.eclipse.org/mpc/drops/1.10.3/v20240228-1000" { org.eclipse.epp.mpc.feature.group } diff --git a/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.target b/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.target index fe8ee0bac66..d1e907d0ce9 100755 --- a/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.target +++ b/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="Papyrus CDO Tests" sequenceNumber="1704448694"> +<target name="Papyrus CDO Tests" sequenceNumber="1714466372"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/> @@ -23,17 +23,17 @@ <repository id="orbit2" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="com.google.guava" version="32.1.3.jre"/> - <unit id="com.google.guava.source" version="32.1.3.jre"/> + <unit id="com.google.guava" version="33.1.0.jre"/> + <unit id="com.google.guava.source" version="33.1.0.jre"/> <unit id="com.google.gson" version="2.10.1"/> <unit id="com.google.gson.source" version="2.10.1"/> - <unit id="org.apache.batik.anim" version="1.17.0.v20231009-1000"/> - <unit id="org.apache.batik.dom" version="1.17.0.v20231009-1000"/> - <unit id="org.apache.batik.dom.svg" version="1.17.0.v20231009-1000"/> - <unit id="org.apache.batik.xml" version="1.17.0.v20231009-1000"/> + <unit id="org.apache.batik.anim" version="1.17.0.v20231215-1130"/> + <unit id="org.apache.batik.dom" version="1.17.0.v20231215-1130"/> + <unit id="org.apache.batik.dom.svg" version="1.17.0.v20231215-1130"/> + <unit id="org.apache.batik.xml" version="1.17.0.v20231215-1130"/> <unit id="com.google.inject" version="7.0.0"/> <unit id="org.eclipse.orbit.xml-apis-ext" version="1.0.0.v20230923-0644"/> - <repository id="orbit" location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/"/> + <repository id="orbit" location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> @@ -48,42 +48,42 @@ <repository id="uml" location="https://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.sdk.feature.group" version="4.30.0.v20231201-0512"/> - <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110"/> + <unit id="org.eclipse.sdk.feature.group" version="4.32.0.v20240428-1800"/> + <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.32-I-builds/I20240428-1800"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.19.0.v20231129-1236"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.19.0.v20231129-1236"/> - <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.19.0"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.20.0.v20240305-1416"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.20.0.v20240305-1416"/> + <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/builds/release/6.20.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtext.xtext.generator" version="2.33.0.v20231121-0955"/> - <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtext.xtext.generator" version="2.35.0.v20240408-1330"/> + <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/2.35.0.M0/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.16.0.v20231117-0522"/> - <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.16.0/"/> + <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.18.0.v20240405-0451"/> + <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202404050451/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/> - <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.32.0/S-3.32M3a-20231114230950/repository/"/> + <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.34.0/S-3.34M2-20240429084926/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.16.2.202311130907"/> - <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202311130907/"/> + <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.16.3.202403010913"/> + <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202403010913/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.13.1.202211151334"/> <repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.36.0.v20231107-0612"/> - <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.36.0"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.38.0.v20240314-1003"/> + <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202404020819"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.1.202208101410"/> @@ -98,12 +98,12 @@ <repository id="emfTransaction" location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R202208110935"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gef.feature.group" version="3.18.0.202311222042"/> - <repository id="gef" location="https://download.eclipse.org/tools/gef/classic/releases/3.18.0"/> + <unit id="org.eclipse.gef.feature.group" version="3.20.0.202404101913"/> + <repository id="gef" location="https://download.eclipse.org/tools/gef/classic/milestone/S202404101913"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.23.202311200811"/> - <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202311200811/"/> + <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.24.202401051648"/> + <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R202401051648"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.cdo.admin" version="0.0.0"/> @@ -115,7 +115,7 @@ <unit id="org.eclipse.emf.cdo.gmf.notation" version="0.0.0"/> <unit id="org.eclipse.emf.cdo.server.ocl" version="0.0.0"/> <unit id="org.eclipse.emf.cdo.ui.admin" version="0.0.0"/> - <repository id="cdo" location="https://download.eclipse.org/modeling/emf/cdo/drops/R20231129-0739"/> + <repository id="cdo" location="https://download.eclipse.org/modeling/emf/cdo/drops/S20240410-1137"/> </location> </locations> </target> diff --git a/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.tpd b/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.tpd index 0f666722928..b82d787383f 100755 --- a/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.tpd +++ b/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.tpd @@ -4,7 +4,7 @@ include "../../main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetpl /*** Updates from the Simrel repository ***/ // updateFrom("EMF CDO",0) -location cdo "https://download.eclipse.org/modeling/emf/cdo/drops/R20231129-0739" { +location cdo "https://download.eclipse.org/modeling/emf/cdo/drops/S20240410-1137" { org.eclipse.emf.cdo.admin lazy org.eclipse.emf.cdo.dawn lazy org.eclipse.emf.cdo.dawn.gmf lazy diff --git a/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.target b/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.target index 87d4116a901..27b173150b4 100755 --- a/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.target +++ b/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="Papyrus Tests" sequenceNumber="1704448694"> +<target name="Papyrus Tests" sequenceNumber="1714466372"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/> @@ -23,17 +23,17 @@ <repository id="orbit2" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="com.google.guava" version="32.1.3.jre"/> - <unit id="com.google.guava.source" version="32.1.3.jre"/> + <unit id="com.google.guava" version="33.1.0.jre"/> + <unit id="com.google.guava.source" version="33.1.0.jre"/> <unit id="com.google.gson" version="2.10.1"/> <unit id="com.google.gson.source" version="2.10.1"/> - <unit id="org.apache.batik.anim" version="1.17.0.v20231009-1000"/> - <unit id="org.apache.batik.dom" version="1.17.0.v20231009-1000"/> - <unit id="org.apache.batik.dom.svg" version="1.17.0.v20231009-1000"/> - <unit id="org.apache.batik.xml" version="1.17.0.v20231009-1000"/> + <unit id="org.apache.batik.anim" version="1.17.0.v20231215-1130"/> + <unit id="org.apache.batik.dom" version="1.17.0.v20231215-1130"/> + <unit id="org.apache.batik.dom.svg" version="1.17.0.v20231215-1130"/> + <unit id="org.apache.batik.xml" version="1.17.0.v20231215-1130"/> <unit id="com.google.inject" version="7.0.0"/> <unit id="org.eclipse.orbit.xml-apis-ext" version="1.0.0.v20230923-0644"/> - <repository id="orbit" location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/"/> + <repository id="orbit" location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> @@ -48,42 +48,42 @@ <repository id="uml" location="https://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.sdk.feature.group" version="4.30.0.v20231201-0512"/> - <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110"/> + <unit id="org.eclipse.sdk.feature.group" version="4.32.0.v20240428-1800"/> + <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.32-I-builds/I20240428-1800"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.19.0.v20231129-1236"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.19.0.v20231129-1236"/> - <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.19.0"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.20.0.v20240305-1416"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.20.0.v20240305-1416"/> + <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/builds/release/6.20.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtext.xtext.generator" version="2.33.0.v20231121-0955"/> - <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtext.xtext.generator" version="2.35.0.v20240408-1330"/> + <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/2.35.0.M0/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.16.0.v20231117-0522"/> - <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.16.0/"/> + <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.18.0.v20240405-0451"/> + <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202404050451/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/> - <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.32.0/S-3.32M3a-20231114230950/repository/"/> + <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.34.0/S-3.34M2-20240429084926/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.16.2.202311130907"/> - <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202311130907/"/> + <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.16.3.202403010913"/> + <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202403010913/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.13.1.202211151334"/> <repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.36.0.v20231107-0612"/> - <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.36.0"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.38.0.v20240314-1003"/> + <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202404020819"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.1.202208101410"/> @@ -98,12 +98,12 @@ <repository id="emfTransaction" location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R202208110935"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gef.feature.group" version="3.18.0.202311222042"/> - <repository id="gef" location="https://download.eclipse.org/tools/gef/classic/releases/3.18.0"/> + <unit id="org.eclipse.gef.feature.group" version="3.20.0.202404101913"/> + <repository id="gef" location="https://download.eclipse.org/tools/gef/classic/milestone/S202404101913"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.23.202311200811"/> - <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202311200811/"/> + <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.24.202401051648"/> + <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R202401051648"/> </location> </locations> </target> diff --git a/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.tpd b/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.tpd index 37bc8d133d5..935d0971c68 100644 --- a/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.tpd +++ b/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.tpd @@ -3,6 +3,6 @@ target "Papyrus Tests" with source requirements include "../../../main/targetPlatform/org.eclipse.papyrus.main.targetplatform.tpd" // updateFrom("EMF Compare",0) -location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202311200811/" { +location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R202401051648" { org.eclipse.emf.compare.source.feature.group }
\ No newline at end of file diff --git a/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target b/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target index 02ffc2d7ee2..1171c913763 100755 --- a/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target +++ b/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="Papyrus Releng" sequenceNumber="1704448696"> +<target name="Papyrus Releng" sequenceNumber="1714466372"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/> @@ -23,17 +23,17 @@ <repository id="orbit2" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="com.google.guava" version="32.1.3.jre"/> - <unit id="com.google.guava.source" version="32.1.3.jre"/> + <unit id="com.google.guava" version="33.1.0.jre"/> + <unit id="com.google.guava.source" version="33.1.0.jre"/> <unit id="com.google.gson" version="2.10.1"/> <unit id="com.google.gson.source" version="2.10.1"/> - <unit id="org.apache.batik.anim" version="1.17.0.v20231009-1000"/> - <unit id="org.apache.batik.dom" version="1.17.0.v20231009-1000"/> - <unit id="org.apache.batik.dom.svg" version="1.17.0.v20231009-1000"/> - <unit id="org.apache.batik.xml" version="1.17.0.v20231009-1000"/> + <unit id="org.apache.batik.anim" version="1.17.0.v20231215-1130"/> + <unit id="org.apache.batik.dom" version="1.17.0.v20231215-1130"/> + <unit id="org.apache.batik.dom.svg" version="1.17.0.v20231215-1130"/> + <unit id="org.apache.batik.xml" version="1.17.0.v20231215-1130"/> <unit id="com.google.inject" version="7.0.0"/> <unit id="org.eclipse.orbit.xml-apis-ext" version="1.0.0.v20230923-0644"/> - <repository id="orbit" location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/"/> + <repository id="orbit" location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> @@ -48,42 +48,42 @@ <repository id="uml" location="https://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.sdk.feature.group" version="4.30.0.v20231201-0512"/> - <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110"/> + <unit id="org.eclipse.sdk.feature.group" version="4.32.0.v20240428-1800"/> + <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.32-I-builds/I20240428-1800"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.19.0.v20231129-1236"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.19.0.v20231129-1236"/> - <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.19.0"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.20.0.v20240305-1416"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.20.0.v20240305-1416"/> + <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/builds/release/6.20.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtext.xtext.generator" version="2.33.0.v20231121-0955"/> - <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtext.xtext.generator" version="2.35.0.v20240408-1330"/> + <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/2.35.0.M0/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.16.0.v20231117-0522"/> - <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.16.0/"/> + <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.18.0.v20240405-0451"/> + <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202404050451/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/> - <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.32.0/S-3.32M3a-20231114230950/repository/"/> + <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.34.0/S-3.34M2-20240429084926/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.16.2.202311130907"/> - <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202311130907/"/> + <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.16.3.202403010913"/> + <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202403010913/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.13.1.202211151334"/> <repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.36.0.v20231107-0612"/> - <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.36.0"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.38.0.v20240314-1003"/> + <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202404020819"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.1.202208101410"/> @@ -98,8 +98,8 @@ <repository id="emfTransaction" location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R202208110935"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gef.feature.group" version="3.18.0.202311222042"/> - <repository id="gef" location="https://download.eclipse.org/tools/gef/classic/releases/3.18.0"/> + <unit id="org.eclipse.gef.feature.group" version="3.20.0.202404101913"/> + <repository id="gef" location="https://download.eclipse.org/tools/gef/classic/milestone/S202404101913"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.cbi.targetplatform.feature.feature.group" version="0.0.0"/> @@ -112,7 +112,7 @@ <repository id="cbiAggregator" location="https://download.eclipse.org/cbi/updates/p2-aggregator/tools/milestone/S202311221637/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.oomph.version.feature.group" version="1.19.0.v20231106-0758"/> + <unit id="org.eclipse.oomph.version.feature.group" version="1.20.0.v20240211-0940"/> <unit id="org.eclipse.oomph.setup.workingsets.feature.group" version="1.19.0.v20230617-1322"/> <unit id="org.eclipse.oomph.projectconfig.feature.group" version="1.17.0.v20230828-1517"/> <unit id="org.eclipse.oomph.setup.targlets.feature.group" version="1.19.0.v20230617-1322"/> @@ -123,26 +123,26 @@ <unit id="org.eclipse.oomph.targlets.feature.group" version="1.25.0.v20231120-1324"/> <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.23.0.v20231119-1528"/> <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.18.0.v20230617-1322"/> - <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.24.0.v20231119-1528"/> - <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.20.0.v20230617-1322"/> - <unit id="org.eclipse.oomph.p2.feature.group" version="1.28.0.v20231120-1324"/> - <unit id="org.eclipse.oomph.setup.feature.group" version="1.30.0.v20231122-0734"/> + <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.25.0.v20240305-1525"/> + <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.21.0.v20240130-1324"/> + <unit id="org.eclipse.oomph.p2.feature.group" version="1.30.0.v20240315-0921"/> + <unit id="org.eclipse.oomph.setup.feature.group" version="1.32.0.v20240317-0755"/> <unit id="org.eclipse.oomph.preferences.feature.group" version="1.17.0.v20230828-1517"/> - <repository id="oomph" location="https://download.eclipse.org/oomph/drops/release/1.31.0"/> + <repository id="oomph" location="https://download.eclipse.org/oomph/drops/milestone/S20240408-091352-1.33.0-M1"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <repository id="egit" location="https://download.eclipse.org/egit/updates-6.8"/> + <repository id="egit" location="https://download.eclipse.org/egit/updates-6.9"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <repository id="m2e" location="https://download.eclipse.org/technology/m2e/releases/2.5.0/"/> + <repository id="m2e" location="https://download.eclipse.org/technology/m2e/snapshots/2.6.1-M1"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <repository id="mylyn" location="https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.23.202311200811"/> + <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.24.202401051648"/> <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/> - <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202311200811/"/> + <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R202401051648"/> </location> </locations> </target> diff --git a/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.target b/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.target index f14f8d3a0fd..bcfde95a531 100755 --- a/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.target +++ b/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="Papyrus Toolsmiths" sequenceNumber="1704448696"> +<target name="Papyrus Toolsmiths" sequenceNumber="1714466372"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/> @@ -23,17 +23,17 @@ <repository id="orbit2" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="com.google.guava" version="32.1.3.jre"/> - <unit id="com.google.guava.source" version="32.1.3.jre"/> + <unit id="com.google.guava" version="33.1.0.jre"/> + <unit id="com.google.guava.source" version="33.1.0.jre"/> <unit id="com.google.gson" version="2.10.1"/> <unit id="com.google.gson.source" version="2.10.1"/> - <unit id="org.apache.batik.anim" version="1.17.0.v20231009-1000"/> - <unit id="org.apache.batik.dom" version="1.17.0.v20231009-1000"/> - <unit id="org.apache.batik.dom.svg" version="1.17.0.v20231009-1000"/> - <unit id="org.apache.batik.xml" version="1.17.0.v20231009-1000"/> + <unit id="org.apache.batik.anim" version="1.17.0.v20231215-1130"/> + <unit id="org.apache.batik.dom" version="1.17.0.v20231215-1130"/> + <unit id="org.apache.batik.dom.svg" version="1.17.0.v20231215-1130"/> + <unit id="org.apache.batik.xml" version="1.17.0.v20231215-1130"/> <unit id="com.google.inject" version="7.0.0"/> <unit id="org.eclipse.orbit.xml-apis-ext" version="1.0.0.v20230923-0644"/> - <repository id="orbit" location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/"/> + <repository id="orbit" location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> @@ -48,42 +48,42 @@ <repository id="uml" location="https://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.sdk.feature.group" version="4.30.0.v20231201-0512"/> - <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110"/> + <unit id="org.eclipse.sdk.feature.group" version="4.32.0.v20240428-1800"/> + <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.32-I-builds/I20240428-1800"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.19.0.v20231129-1236"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.19.0.v20231129-1236"/> - <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.19.0"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.20.0.v20240305-1416"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.20.0.v20240305-1416"/> + <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/builds/release/6.20.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.33.0.v20231121-0955"/> - <unit id="org.eclipse.xtext.xtext.generator" version="2.33.0.v20231121-0955"/> - <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.35.0.v20240408-1330"/> + <unit id="org.eclipse.xtext.xtext.generator" version="2.35.0.v20240408-1330"/> + <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/2.35.0.M0/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.16.0.v20231117-0522"/> - <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.16.0/"/> + <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.18.0.v20240405-0451"/> + <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202404050451/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/> - <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.32.0/S-3.32M3a-20231114230950/repository/"/> + <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.34.0/S-3.34M2-20240429084926/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.16.2.202311130907"/> - <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202311130907/"/> + <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.16.3.202403010913"/> + <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202403010913/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.13.1.202211151334"/> <repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.36.0.v20231107-0612"/> - <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.36.0"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.38.0.v20240314-1003"/> + <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202404020819"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.1.202208101410"/> @@ -98,8 +98,8 @@ <repository id="emfTransaction" location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R202208110935"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gef.feature.group" version="3.18.0.202311222042"/> - <repository id="gef" location="https://download.eclipse.org/tools/gef/classic/releases/3.18.0"/> + <unit id="org.eclipse.gef.feature.group" version="3.20.0.202404101913"/> + <repository id="gef" location="https://download.eclipse.org/tools/gef/classic/milestone/S202404101913"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.cbi.targetplatform.feature.feature.group" version="0.0.0"/> @@ -112,7 +112,7 @@ <repository id="cbiAggregator" location="https://download.eclipse.org/cbi/updates/p2-aggregator/tools/milestone/S202311221637/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.oomph.version.feature.group" version="1.19.0.v20231106-0758"/> + <unit id="org.eclipse.oomph.version.feature.group" version="1.20.0.v20240211-0940"/> <unit id="org.eclipse.oomph.setup.workingsets.feature.group" version="1.19.0.v20230617-1322"/> <unit id="org.eclipse.oomph.projectconfig.feature.group" version="1.17.0.v20230828-1517"/> <unit id="org.eclipse.oomph.setup.targlets.feature.group" version="1.19.0.v20230617-1322"/> @@ -123,26 +123,26 @@ <unit id="org.eclipse.oomph.targlets.feature.group" version="1.25.0.v20231120-1324"/> <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.23.0.v20231119-1528"/> <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.18.0.v20230617-1322"/> - <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.24.0.v20231119-1528"/> - <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.20.0.v20230617-1322"/> - <unit id="org.eclipse.oomph.p2.feature.group" version="1.28.0.v20231120-1324"/> - <unit id="org.eclipse.oomph.setup.feature.group" version="1.30.0.v20231122-0734"/> + <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.25.0.v20240305-1525"/> + <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.21.0.v20240130-1324"/> + <unit id="org.eclipse.oomph.p2.feature.group" version="1.30.0.v20240315-0921"/> + <unit id="org.eclipse.oomph.setup.feature.group" version="1.32.0.v20240317-0755"/> <unit id="org.eclipse.oomph.preferences.feature.group" version="1.17.0.v20230828-1517"/> - <repository id="oomph" location="https://download.eclipse.org/oomph/drops/release/1.31.0"/> + <repository id="oomph" location="https://download.eclipse.org/oomph/drops/milestone/S20240408-091352-1.33.0-M1"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <repository id="egit" location="https://download.eclipse.org/egit/updates-6.8"/> + <repository id="egit" location="https://download.eclipse.org/egit/updates-6.9"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <repository id="m2e" location="https://download.eclipse.org/technology/m2e/releases/2.5.0/"/> + <repository id="m2e" location="https://download.eclipse.org/technology/m2e/snapshots/2.6.1-M1"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <repository id="mylyn" location="https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/> - <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.23.202311200811"/> - <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202311200811/"/> + <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.24.202401051648"/> + <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R202401051648"/> </location> </locations> </target> diff --git a/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.tpd b/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.tpd index 435369c6a41..d8983c00410 100644 --- a/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.tpd +++ b/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.tpd @@ -19,7 +19,7 @@ location cbiAggregator "https://download.eclipse.org/cbi/updates/p2-aggregator/t /*** Updates from the Simrel repository ***/ // updateFrom("Oomph",0) -location oomph "https://download.eclipse.org/oomph/drops/release/1.31.0" { +location oomph "https://download.eclipse.org/oomph/drops/milestone/S20240408-091352-1.33.0-M1" { org.eclipse.oomph.version.feature.group org.eclipse.oomph.setup.workingsets.feature.group org.eclipse.oomph.projectconfig.feature.group @@ -39,17 +39,17 @@ location oomph "https://download.eclipse.org/oomph/drops/release/1.31.0" { } // updateFrom("EGit",0) -location egit "https://download.eclipse.org/egit/updates-6.8" // oomph +location egit "https://download.eclipse.org/egit/updates-6.9" // oomph // updateFrom("m2e",0) -location m2e "https://download.eclipse.org/technology/m2e/releases/2.5.0/" // oomph +location m2e "https://download.eclipse.org/technology/m2e/snapshots/2.6.1-M1" // oomph // Mylyn is disabled in the current Sirmrel repo // manualUpdate location mylyn "https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956" // oomph // updateFrom("EMF Compare",0) -location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202311200811/" { +location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R202401051648" { org.eclipse.emf.compare.ide.ui.feature.group lazy org.eclipse.emf.compare.source.feature.group } diff --git a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java index 38d80b02227..2669a590e93 100755 --- a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java +++ b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java @@ -68,7 +68,7 @@ public class BundlesTests extends AbstractPapyrusTest { private static final String GLAZED_LIST_VERSION = "1.9.0";//$NON-NLS-1$ - private static final String GUAVA_VERSION = "32.1.3"; //$NON-NLS-1$ + private static final String GUAVA_VERSION = "33.1.0"; //$NON-NLS-1$ private static final String GSON_VERSION = "2.9.1"; //$NON-NLS-1$ diff --git a/tests/junit/framework/org.eclipse.papyrus.junit.framework/META-INF/MANIFEST.MF b/tests/junit/framework/org.eclipse.papyrus.junit.framework/META-INF/MANIFEST.MF index 405fd9afce4..5f1a1cba7a7 100644 --- a/tests/junit/framework/org.eclipse.papyrus.junit.framework/META-INF/MANIFEST.MF +++ b/tests/junit/framework/org.eclipse.papyrus.junit.framework/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Bundle-Name: Conditional Junit Annotations Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.junit.framework;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.cache;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.cache;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.junit.framework diff --git a/tests/junit/framework/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF b/tests/junit/framework/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF index 8cc9e8bf000..1f6105a46bb 100644 --- a/tests/junit/framework/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF +++ b/tests/junit/framework/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF @@ -48,9 +48,9 @@ Bundle-Activator: org.eclipse.papyrus.junit.utils.Activator Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.junit.utils;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.cache;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)", - com.google.common.io;version="[32.0.0, 33.0.0)", - com.google.common.primitives;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.cache;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", + com.google.common.io;version="[33.1.0,33.2.0)", + com.google.common.primitives;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.junit.utils diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/META-INF/MANIFEST.MF index 61567034f61..6f336c0064c 100644 --- a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/META-INF/MANIFEST.MF @@ -14,5 +14,5 @@ Bundle-Name: Papyrus Project Editor Tests Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.eclipse.project.editors.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.eclipse.project.editors.tests diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF index 4e77701b1e7..f0ee76fc3db 100644 --- a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF @@ -40,6 +40,6 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.editor.integration.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.editor.integration.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.editor.integration.tests diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF index 79afc3acf9d..2c28aee8c51 100644 --- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.core.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)", - com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", + com.google.common.util.concurrent;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.core.tests diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF index ace184dcf85..bfceb1d5bb3 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF @@ -23,6 +23,6 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.readonly.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.emf.readonly.tests diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF index c080e300891..cb19d9cb934 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF @@ -23,8 +23,8 @@ Bundle-Localization: fragment Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)", - com.google.common.io;version="[32.0.0, 33.0.0)", - com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", + com.google.common.io;version="[33.1.0,33.2.0)", + com.google.common.util.concurrent;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.emf.tests diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF index 5de146c191d..0342e729307 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF @@ -23,6 +23,6 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.emf.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.ui.emf.tests diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF index d05a4398f56..75412c7018b 100644 --- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF @@ -25,6 +25,6 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.assistant.tests diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF index 46eb2435bed..2b872952362 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF @@ -28,7 +28,7 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.canonical.tests.internal.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.canonical.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)", - com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", + com.google.common.util.concurrent;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.canonical.tests diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF index f406b8d5a62..a1c5d315602 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF @@ -19,6 +19,6 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.commands.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.commands.tests diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF index bdb17184506..3ae6d9f7336 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF @@ -41,5 +41,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.common.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.util.concurrent;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.common.tests diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/META-INF/MANIFEST.MF index d281a539ef4..c6d3ada046a 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/META-INF/MANIFEST.MF @@ -14,6 +14,6 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.architecture.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.architecture.tests/META-INF/MANIFEST.MF index eec4b430047..13ad275163d 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.architecture.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.architecture.tests/META-INF/MANIFEST.MF @@ -26,4 +26,4 @@ Export-Package: org.eclipse.papyrus.infra.architecture.tests, org.eclipse.papyrus.infra.architecture.tests.merged, org.eclipse.papyrus.infra.core.architecture.tests, org.eclipse.papyrus.infra.core.internal.architecture.merger.tests;x-internal:=true -Import-Package: com.google.common.collect;version="[32.0.0,33.0.0)" +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/META-INF/MANIFEST.MF index 905dc448ed9..1b7abc80a5d 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/META-INF/MANIFEST.MF @@ -18,6 +18,6 @@ Bundle-Name: Papyrus Infrastructure Tools Tests Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.tools.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.tools.tests Eclipse-BundleShape: dir diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF index cd59401b259..beac267e93c 100644 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF @@ -25,5 +25,5 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.services.controlmode.tests.control.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.services.controlmode.tests diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/META-INF/MANIFEST.MF index 87f553502b8..8bef7cdbc6c 100644 --- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/META-INF/MANIFEST.MF @@ -25,4 +25,4 @@ Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.types.ui.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.types.ui.tests -Import-Package: com.google.common.base;version="[32.0.0,33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)" diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.common.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.common.tests/META-INF/MANIFEST.MF index a94fd8fcf73..7986ed42912 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.common.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.common.tests/META-INF/MANIFEST.MF @@ -22,4 +22,4 @@ Export-Package: org.eclipse.papyrus.toolsmiths.validation.common.tests, Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.validation.common.tests Bundle-Vendor: %providerName Bundle-Localization: plugin -Import-Package: com.google.common.collect;version="[32.0.0,33.0.0)" +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" diff --git a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF index 541a96b03fc..8ab8a5b0702 100644 --- a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF @@ -20,5 +20,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.controlmode.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.decoratormodel.controlmode.tests diff --git a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF index 7af4b03531d..70614889e3b 100644 --- a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF @@ -26,8 +26,8 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)", - com.google.common.io;version="[32.0.0, 33.0.0)", - com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", + com.google.common.io;version="[33.1.0,33.2.0)", + com.google.common.util.concurrent;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.decoratormodel.tests diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF index 9812a0094b2..86f3406a87c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.wizards.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.wizards.tests Bundle-ActivationPolicy: lazy diff --git a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/META-INF/MANIFEST.MF index 4e650c1b19d..32126deebed 100644 --- a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/META-INF/MANIFEST.MF @@ -28,5 +28,5 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.papyrus.uml.internationalization.controlmode.tests.Activator -Import-Package: com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.internationalization.controlmode.tests diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/META-INF/MANIFEST.MF index c197a493eb1..3e547a58fa7 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/META-INF/MANIFEST.MF @@ -21,6 +21,6 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.modelrepair.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.modelrepair.tests diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.properties.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.properties.tests/META-INF/MANIFEST.MF index 6d7815b1aae..97b551e3115 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.properties.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.properties.tests/META-INF/MANIFEST.MF @@ -30,5 +30,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.properties.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.properties.tests diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/META-INF/MANIFEST.MF index 40db00a32fd..b23d857a1be 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/META-INF/MANIFEST.MF @@ -32,5 +32,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.service.types.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.service.types.tests diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.types.core.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.types.core.tests/META-INF/MANIFEST.MF index 1deb5b3913e..ad1aee23a63 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.types.core.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.types.core.tests/META-INF/MANIFEST.MF @@ -15,5 +15,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.types.core.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.types.core.tests diff --git a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/META-INF/MANIFEST.MF index 3168ea42a1a..57dcd5bcb76 100644 --- a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/META-INF/MANIFEST.MF @@ -23,5 +23,5 @@ Export-Package: org.eclipse.papyrus.uml.profile.drafter.tests, Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-ActivationPolicy: lazy -Import-Package: com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.profile.drafter.tests diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF index 3100484d512..6c7564f10c6 100644 --- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF @@ -28,6 +28,6 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.tools.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.tools.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", - com.google.common.collect;version="[32.0.0, 33.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.tools.tests |