diff options
301 files changed, 2733 insertions, 766 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 ec0d0ab9b19..255293dba71 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 @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="org.eclipse.papyrus.infra.feature" - version="3.0.0.qualifier" label="Papyrus infra" - provider-name="Eclipse Modeling Project" + version="3.1.0.qualifier" + provider-name="Eclipse Modeling Project" license-feature="org.eclipse.license" license-feature-version="2.0.2"> - + <description url="https://eclipse.org/papyrus/"> - %description + %description </description> <copyright> @@ -18,8 +18,7 @@ <license url="%licenseURL"> %license </license> - - + <includes id="org.eclipse.papyrus.infra.core.feature" version="0.0.0"/> @@ -67,8 +66,6 @@ <includes id="org.eclipse.papyrus.infra.emf.expressions.feature" version="0.0.0"/> - - <plugin id="org.eclipse.papyrus.infra.onefile" @@ -136,7 +133,15 @@ id="org.eclipse.papyrus.infra.sync" download-size="0" install-size="0" - version="0.0.0"/> + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.papyrus.infra.guava" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> <plugin id="org.eclipse.papyrus.infra.types" 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 54aa2f2aa50..5f1958e93d1 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 @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.feature</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
\ No newline at end of file diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml index df753ecca92..f62b2e38783 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml @@ -57,7 +57,7 @@ id="com.google.guava" download-size="0" install-size="0" - version="27.1.0.v20190517-1946" + version="0.0.0" unpack="false"/> <plugin diff --git a/plugins/doc/org.eclipse.papyrus.customization.paletteconfiguration.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.customization.paletteconfiguration.doc/META-INF/MANIFEST.MF index fbb364d7e8c..4a6e4cb2565 100644 --- a/plugins/doc/org.eclipse.papyrus.customization.paletteconfiguration.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.customization.paletteconfiguration.doc/META-INF/MANIFEST.MF @@ -5,4 +5,4 @@ Bundle-Name: %pluginName Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.customization.paletteconfiguration.doc;singleton:=true Automatic-Module-Name: org.eclipse.papyrus.customization.paletteconfiguration.doc -Bundle-Localization: plugin
\ No newline at end of file +Bundle-Localization: plugin diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/.settings/.api_filters b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/.settings/.api_filters new file mode 100644 index 00000000000..8e1747fad6b --- /dev/null +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/.settings/.api_filters @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.core.architecture" version="2"> + <resource path="src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitecturePackageImpl.java" type="org.eclipse.papyrus.infra.core.architecture.impl.ArchitecturePackageImpl"> + <filter comment="generated code" id="1143996420"> + <message_arguments> + <message_argument value="createArchitectureAnnotations()"/> + </message_arguments> + </filter> + </resource> + <resource path="src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitecturePlugin.java" type="org.eclipse.papyrus.infra.core.architecture.impl.ArchitecturePlugin"> + <filter comment="generated code" id="1110441988"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.core.architecture.impl.ArchitecturePlugin"/> + </message_arguments> + </filter> + </resource> +</component> diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/META-INF/MANIFEST.MF index f590687d751..5366489194f 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/META-INF/MANIFEST.MF +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.infra.core.architecture;singleton:=true Automatic-Module-Name: org.eclipse.papyrus.infra.core.architecture -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.papyrus.infra.core.architecture.impl.ArchitecturePlugin$Implementation Bundle-Vendor: %providerName diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/pom.xml index 680a0e772c8..4a480924f23 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/pom.xml +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.core.architecture</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureCommandUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureCommandUtils.java index 4f9845b3217..15a58a6caa8 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureCommandUtils.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureCommandUtils.java @@ -32,6 +32,8 @@ import org.osgi.framework.Bundle; /** * Utilities for working with/resolving the command classes referenced by * <em>Architecture Models</em>. + * + * @since 3.1 */ public class ArchitectureCommandUtils { diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/.settings/.api_filters b/plugins/infra/core/org.eclipse.papyrus.infra.core/.settings/.api_filters new file mode 100644 index 00000000000..207cf4b7a4f --- /dev/null +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.core" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="4.1.0"/> + <message_argument value="4.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 4928bfe6b24..3603bd30160 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 @@ -31,15 +31,15 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-Activator: org.eclipse.papyrus.infra.core.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.core;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)", - com.google.common.io;version="[27.1.0, 28.0.0)", - com.google.common.util.concurrent;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)", + com.google.common.io;version="[30.1.0, 31.0.0)", + com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.core diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core/pom.xml index 15763a9bc9f..ce8235e31e5 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/pom.xml +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.core</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file 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 2b841e5ca93..06b66a010d7 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 @@ -15,14 +15,14 @@ Require-Bundle: org.apache.commons.io;bundle-version="[2.6.0,3.0.0)", org.eclipse.jdt.core;bundle-version="[3.24.0,4.0.0)";resolution:=optional Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.1.0.qualifier Eclipse-BuddyPolicy: dependent Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.infra.tools.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.tools;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)", - com.google.common.util.concurrent;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)", + com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.tools diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.tools/pom.xml index 3f3e69ff1dd..47288d91e82 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/pom.xml +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.tools</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ClasspathHelper.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ClasspathHelper.java index f7767cdaeaa..882a62cda22 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ClasspathHelper.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ClasspathHelper.java @@ -40,6 +40,8 @@ import org.eclipse.papyrus.infra.tools.Activator; /** * Optional support for a JDT workspace, to find development-time classes such as may be referenced for commands * in <em>Architecture Models</em>. + * + * @since 4.1 */ public class ClasspathHelper { diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/.settings/.api_filters b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/.settings/.api_filters new file mode 100644 index 00000000000..a13be90eff2 --- /dev/null +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.emf.gmf" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="2.1.0"/> + <message_argument value="2.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 44119b80035..79b1bdc1b51 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 @@ -7,12 +7,12 @@ 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-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.emf.internal.gmf.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.gmf;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Localization: plugin -Import-Package: com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.emf.gmf diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/pom.xml index 513a18de452..2e6e896b212 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/pom.xml +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.emf.gmf</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/.settings/.api_filters b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/.settings/.api_filters new file mode 100644 index 00000000000..26b59700b77 --- /dev/null +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.emf.readonly" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="4.1.0"/> + <message_argument value="4.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 85fc40ae82e..189d30d6bae 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 @@ -14,13 +14,13 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin 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-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.emf.readonly diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/pom.xml index 438d6c1b0e6..084e0057fd1 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/pom.xml +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.emf.readonly</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/.settings/.api_filters b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/.settings/.api_filters new file mode 100644 index 00000000000..316ee7a2362 --- /dev/null +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.emf" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="4.1.0"/> + <message_argument value="4.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 6c66e38e428..0208c8a64de 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 @@ -22,14 +22,14 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" Bundle-Vendor: Eclipse Modeling Project Bundle-ActivationPolicy: lazy -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.1.0.qualifier Bundle-Name: EMF Tools Bundle-Activator: org.eclipse.papyrus.infra.emf.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.emf;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)", - com.google.common.util.concurrent;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)", + com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.emf diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/pom.xml index a00627fbf10..c381577028c 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/pom.xml +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/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> <artifactId>org.eclipse.papyrus.infra-emf</artifactId> @@ -7,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.emf</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/.settings/.api_filters b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/.settings/.api_filters new file mode 100644 index 00000000000..6f2e13938f1 --- /dev/null +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.ui.emf" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="3.1.0"/> + <message_argument value="3.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 cd4a3bfa959..11f9333033d 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 @@ -35,13 +35,13 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.papyrus.infra.core.architecture;bundle-version="[3.0.0,4.0.0)" Bundle-Vendor: %pluginProvider Bundle-ActivationPolicy: lazy -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin 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-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.ui.emf diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/pom.xml index f6c9c683b58..e89cb372391 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/pom.xml +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/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> <artifactId>org.eclipse.papyrus.infra-emf</artifactId> @@ -7,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.ui.emf</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file 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 8fda464d1ad..6c78a320b0b 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-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.assistant.ui diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/.settings/.api_filters b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/.settings/.api_filters new file mode 100644 index 00000000000..7faff2aa342 --- /dev/null +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.gmfdiag.assistant" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="2.1.0"/> + <message_argument value="2.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 011d7b7f07d..f2f43f6b9b3 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 @@ -25,7 +25,7 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.assistant, Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.assistant.internal.core.AssistantPlugin$Implementation @@ -33,6 +33,6 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.assistant diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/pom.xml b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/pom.xml index bf1e93e0844..ef06f423ebe 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/pom.xml +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.gmfdiag.assistant</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file 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 a48ecd73fdd..d25b7a5637b 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-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.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 28fa13b9358..e6eda5122b8 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 @@ -51,5 +51,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-11 -Import-Package: com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.css diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/.settings/.api_filters b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/.settings/.api_filters new file mode 100644 index 00000000000..ef1730aba0a --- /dev/null +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.gmfdiag.canonical" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="3.1.0"/> + <message_argument value="3.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 294a2e6ef15..dd14b885c19 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 @@ -15,7 +15,7 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.canonical.editpolicy, org.eclipse.papyrus.infra.gmfdiag.canonical.strategy Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.canonical.internal.Activator @@ -23,7 +23,7 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.canonical;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)", - com.google.common.util.concurrent;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)", + com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.canonical diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/pom.xml index b36aaa9297a..b5c5a302fb9 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/pom.xml +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/pom.xml @@ -1,12 +1,15 @@ <?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> <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> + <artifactId>org.eclipse.papyrus.infra.gmfdiag.canonical</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.1.0-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/.settings/.api_filters b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.settings/.api_filters new file mode 100644 index 00000000000..fbd75a89482 --- /dev/null +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.gmfdiag.common" version="2"> + <resource path="src/org/eclipse/papyrus/infra/gmfdiag/common/sync/UISyncUtils.java" type="org.eclipse.papyrus.infra.gmfdiag.common.sync.UISyncUtils"> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.common.sync.UISyncUtils"/> + <message_argument value="asyncExec(ISyncObject, SyncServiceRunnable<V,X>)"/> + </message_arguments> + </filter> + </resource> +</component> 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 77724c9b8cf..ebb9c24d826 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 @@ -48,7 +48,8 @@ Require-Bundle: com.ibm.icu, org.eclipse.ui.ide;bundle-version="[3.17.0,4.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)", org.w3c.dom.svg;bundle-version="[1.1.0,2.0.0)", - org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.7.0" + org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.infra.guava;bundle-version="[1.0.0,2.0.0)" Export-Package: org.eclipse.papyrus.infra.gmfdiag.common, org.eclipse.papyrus.infra.gmfdiag.common.adapter, org.eclipse.papyrus.infra.gmfdiag.common.advice, @@ -98,14 +99,14 @@ Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.common.Activator Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.1.0.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="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)", - com.google.common.util.concurrent;version="[27.1.0, 28.0.0)", +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)", + com.google.common.util.concurrent;version="[30.1.0, 31.0.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.ViewProviderServiceImpl.xml, diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/OSGI-INF/org.eclipse.papyrus.infra.gmfdiag.common.internal.service.EditPolicyProviderServiceImpl.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/OSGI-INF/org.eclipse.papyrus.infra.gmfdiag.common.internal.service.EditPolicyProviderServiceImpl.xml index 20616bc68ae..20616bc68ae 100644..100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/OSGI-INF/org.eclipse.papyrus.infra.gmfdiag.common.internal.service.EditPolicyProviderServiceImpl.xml +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/OSGI-INF/org.eclipse.papyrus.infra.gmfdiag.common.internal.service.EditPolicyProviderServiceImpl.xml diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/OSGI-INF/org.eclipse.papyrus.infra.gmfdiag.common.internal.service.ViewProviderServiceImpl.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/OSGI-INF/org.eclipse.papyrus.infra.gmfdiag.common.internal.service.ViewProviderServiceImpl.xml index f9fb788e860..f9fb788e860 100644..100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/OSGI-INF/org.eclipse.papyrus.infra.gmfdiag.common.internal.service.ViewProviderServiceImpl.xml +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/OSGI-INF/org.eclipse.papyrus.infra.gmfdiag.common.internal.service.ViewProviderServiceImpl.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 cadf54ab6a2..55516b17229 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.0.0-SNAPSHOT</version> + <version>4.1.0-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/sync/AbstractNestedDiagramViewsSyncFeature.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/AbstractNestedDiagramViewsSyncFeature.java index a583835cbae..68e6003b0f5 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/AbstractNestedDiagramViewsSyncFeature.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/AbstractNestedDiagramViewsSyncFeature.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others. + * Copyright (c) 2014, 2015, 2021 CEA LIST, Christian W. Damus, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -12,6 +12,7 @@ * CEA LIST - Initial API and implementation * Christian W. Damus - bug 465416 * Christian W. Damus - bug 477384 + * Quentin Le Menez - bug 570177 * *****************************************************************************/ diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/UISyncUtils.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/UISyncUtils.java index 63d4615d2c6..b946f6bb219 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/UISyncUtils.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/UISyncUtils.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2015 Christian W. Damus and others. + * Copyright (c) 2015, 2021 Christian W. Damus and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -10,18 +10,18 @@ * * Contributors: * Christian W. Damus - Initial API and implementation + * Quentin Le Menez - bug 570177 * *****************************************************************************/ package org.eclipse.papyrus.infra.gmfdiag.common.sync; +import org.eclipse.papyrus.infra.guava.internal.CheckedFuture; import org.eclipse.papyrus.infra.sync.ISyncObject; import org.eclipse.papyrus.infra.sync.service.ISyncService; import org.eclipse.papyrus.infra.sync.service.SyncServiceRunnable; import org.eclipse.swt.widgets.Display; -import com.google.common.util.concurrent.CheckedFuture; - /** * Sync framework utilities for a UI context. */ @@ -46,6 +46,7 @@ public class UISyncUtils { * @return the future result of the {@code operation} * * @see SyncServiceRunnable.Safe + * @since 4.1 */ public static <V, X extends Exception> CheckedFuture<V, X> asyncExec(final ISyncObject syncObject, final SyncServiceRunnable<V, X> operation) { return syncObject.runAsync(operation); diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/.settings/.api_filters b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/.settings/.api_filters new file mode 100644 index 00000000000..6ab8dd3f4df --- /dev/null +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.gmfdiag.menu" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="2.1.0"/> + <message_argument value="2.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 86ca86f1e04..60e8c099de4 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 @@ -17,12 +17,12 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.menu, org.eclipse.papyrus.infra.gmfdiag.menu.utils Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.menu.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.menu;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.menu diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/pom.xml index 4733ac45612..fa81fe78874 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/pom.xml +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.gmfdiag.menu</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.settings/.api_filters b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.settings/.api_filters new file mode 100644 index 00000000000..2b79ef983ec --- /dev/null +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.gmfdiag.properties" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="5.1.0"/> + <message_argument value="5.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 5f759d38d72..532bed8fcab 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 @@ -30,7 +30,7 @@ Require-Bundle: org.eclipse.core.databinding.property;bundle-version="[1.8.0,2.0 org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.papyrus.infra.gmfdiag.properties.constraint" -Bundle-Version: 5.0.0.qualifier +Bundle-Version: 5.1.0.qualifier Bundle-Localization: plugin Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.properties.Activator @@ -38,5 +38,5 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.properties;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.properties diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/pom.xml index 29ec4119895..6ba8718fd09 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/pom.xml +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.gmfdiag.properties</artifactId> - <version>5.0.0-SNAPSHOT</version> + <version>5.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/.settings/.api_filters b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/.settings/.api_filters new file mode 100644 index 00000000000..1ae42d426a7 --- /dev/null +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="4.1.0"/> + <message_argument value="4.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 cb5ee95cfd1..0041a47ae38 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 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.1.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.presentation.PaletteConfigurationEditorPlugin$Implementation Bundle-Vendor: %providerName @@ -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="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/pom.xml b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/pom.xml index 4490a599402..ee3b48f16bd 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/pom.xml +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/pom.xml @@ -13,6 +13,6 @@ <relativePath>../../../../toolsmiths/pom.xml</relativePath> </parent> <artifactId>org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/.settings/.api_filters b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/.settings/.api_filters new file mode 100644 index 00000000000..b94bd0c62c0 --- /dev/null +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.internationalization.readonly" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="2.1.0"/> + <message_argument value="2.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 6aac1ec9f87..c3ea6f38d94 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 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.infra.internationalization.readonly;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -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="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.internationalization.readonly diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/pom.xml b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/pom.xml index 7958b4c3c7e..67c00e413f6 100644 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/pom.xml +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.internationalization.readonly</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/.settings/.api_filters b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/.settings/.api_filters new file mode 100644 index 00000000000..eaf79e58c7b --- /dev/null +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.internationalization" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="2.1.0"/> + <message_argument value="2.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 6956a24caf6..c4671010599 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 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.infra.internationalization;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -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="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.internationalization diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/pom.xml b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/pom.xml index 08721cdbd2f..bcaa6e68545 100644 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/pom.xml +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.internationalization</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.classpath b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.classpath new file mode 100755 index 00000000000..e801ebfb468 --- /dev/null +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.classpath @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.project b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.project new file mode 100755 index 00000000000..6f26bc5b0db --- /dev/null +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.project @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.guava</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.settings/org.eclipse.core.resources.prefs b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.settings/org.eclipse.core.resources.prefs new file mode 100755 index 00000000000..896a9a53a53 --- /dev/null +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/<project>=UTF-8
\ No newline at end of file diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.settings/org.eclipse.core.runtime.prefs b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.settings/org.eclipse.core.runtime.prefs new file mode 100755 index 00000000000..5a0ad22d2a7 --- /dev/null +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.settings/org.eclipse.core.runtime.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +line.separator=\n diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.settings/org.eclipse.jdt.core.prefs new file mode 100755 index 00000000000..037f04a07c2 --- /dev/null +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,319 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=260 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=false +org.eclipse.jdt.core.formatter.join_wrapped_lines=false +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=260 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=false +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.settings/org.eclipse.jdt.ui.prefs new file mode 100755 index 00000000000..ba7542ef658 --- /dev/null +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,127 @@ +cleanup.add_default_serial_version_id=true +cleanup.add_generated_serial_version_id=false +cleanup.add_missing_annotations=true +cleanup.add_missing_deprecated_annotations=true +cleanup.add_missing_methods=false +cleanup.add_missing_nls_tags=false +cleanup.add_missing_override_annotations=true +cleanup.add_missing_override_annotations_interface_methods=true +cleanup.add_serial_version_id=false +cleanup.always_use_blocks=true +cleanup.always_use_parentheses_in_expressions=false +cleanup.always_use_this_for_non_static_field_access=false +cleanup.always_use_this_for_non_static_method_access=false +cleanup.convert_functional_interfaces=false +cleanup.convert_to_enhanced_for_loop=false +cleanup.correct_indentation=false +cleanup.format_source_code=false +cleanup.format_source_code_changes_only=false +cleanup.insert_inferred_type_arguments=false +cleanup.make_local_variable_final=true +cleanup.make_parameters_final=false +cleanup.make_private_fields_final=true +cleanup.make_type_abstract_if_missing_method=false +cleanup.make_variable_declarations_final=false +cleanup.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=true +cleanup.organize_imports=false +cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.qualify_static_member_accesses_with_declaring_class=true +cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.remove_private_constructors=true +cleanup.remove_redundant_type_arguments=true +cleanup.remove_trailing_whitespaces=true +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_casts=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_imports=true +cleanup.remove_unused_local_variables=false +cleanup.remove_unused_private_fields=true +cleanup.remove_unused_private_members=false +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.sort_members=false +cleanup.sort_members_all=false +cleanup.use_anonymous_class_creation=false +cleanup.use_blocks=true +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_lambda=true +cleanup.use_parentheses_in_expressions=false +cleanup.use_this_for_non_static_field_access=false +cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.use_this_for_non_static_method_access=false +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup.use_type_arguments=false +cleanup_profile=_Papyrus +cleanup_settings_version=2 +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_Papyrus +formatter_settings_version=12 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=java;javax;org;com; +org.eclipse.jdt.ui.javadoc=true +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License 2.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-2.0/\n *\n * SPDX-License-Identifier: EPL-2.0\n *\n * Contributors\:\n * CEA LIST - Initial API and implementation\n * \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=true +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_missing_override_annotations_interface_methods=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_functional_interfaces=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=true +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.insert_inferred_type_arguments=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=false +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=true +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_redundant_modifiers=false +sp_cleanup.remove_redundant_type_arguments=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_unnecessary_nls_tags=true +sp_cleanup.remove_unused_imports=true +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_anonymous_class_creation=false +sp_cleanup.use_blocks=true +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_lambda=true +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.settings/org.eclipse.pde.api.tools.prefs b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.settings/org.eclipse.pde.api.tools.prefs new file mode 100755 index 00000000000..b2260f87129 --- /dev/null +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.settings/org.eclipse.pde.api.tools.prefs @@ -0,0 +1,104 @@ +ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Error +ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error +ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error +ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error +ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error +ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error +API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error +API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Warning +API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Warning +API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error +API_USE_SCAN_FIELD_SEVERITY=Error +API_USE_SCAN_METHOD_SEVERITY=Error +API_USE_SCAN_TYPE_SEVERITY=Error +CLASS_ELEMENT_TYPE_ADDED_FIELD=Warning +CLASS_ELEMENT_TYPE_ADDED_METHOD=Error +CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error +CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error +CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error +CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error +CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error +CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error +CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error +CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error +CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error +CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error +CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error +CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error +CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error +CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error +CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error +CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error +CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error +ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error +ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error +ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error +ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error +ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error +ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error +FIELD_ELEMENT_TYPE_ADDED_VALUE=Warning +FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error +FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error +FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error +FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error +FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error +FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error +FIELD_ELEMENT_TYPE_CHANGED_VALUE=Warning +FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error +FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error +ILLEGAL_EXTEND=Warning +ILLEGAL_IMPLEMENT=Warning +ILLEGAL_INSTANTIATE=Warning +ILLEGAL_OVERRIDE=Warning +ILLEGAL_REFERENCE=Warning +INTERFACE_ELEMENT_TYPE_ADDED_DEFAULT_METHOD=Warning +INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore +INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error +INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error +INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error +INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error +INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error +INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error +INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error +INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error +INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error +INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error +INVALID_ANNOTATION=Ignore +INVALID_JAVADOC_TAG=Ignore +INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore +LEAK_EXTEND=Warning +LEAK_FIELD_DECL=Warning +LEAK_IMPLEMENT=Warning +LEAK_METHOD_PARAM=Warning +LEAK_METHOD_RETURN_TYPE=Warning +METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error +METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error +METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error +METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error +METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error +METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error +METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error +METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error +METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error +METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error +MISSING_EE_DESCRIPTIONS=Error +TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error +TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error +TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error +TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error +TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error +TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error +UNUSED_PROBLEM_FILTERS=Warning +automatically_removed_unused_problem_filters=Enabled +changed_execution_env=Warning +eclipse.preferences.version=1 +incompatible_api_component_version=Warning +incompatible_api_component_version_include_major_without_breaking_change=Disabled +incompatible_api_component_version_include_minor_without_api_change=Disabled +incompatible_api_component_version_report_major_without_breaking_change=Error +incompatible_api_component_version_report_minor_without_api_change=Error +invalid_since_tag_version=Error +malformed_since_tag=Error +missing_since_tag=Error +report_api_breakage_when_major_version_incremented=Disabled +report_resolution_errors_api_component=Warning 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 new file mode 100755 index 00000000000..3d4965a1074 --- /dev/null +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/META-INF/MANIFEST.MF @@ -0,0 +1,20 @@ +Manifest-Version: 1.0 +Require-Bundle: com.google.guava;bundle-version="[30.1.0,31.0.0)", + org.eclipse.osgi;bundle-version="[3.16.200,4.0.0)", + org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)", + org.eclipse.core.runtime;bundle-version="[3.20.100,4.0.0)" +Export-Package: org.eclipse.papyrus.infra.guava.internal +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.0.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.infra.guava.Activator +Bundle-SymbolicName: org.eclipse.papyrus.infra.guava;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)", + com.google.common.reflect;version="[30.1.0, 31.0.0)", + com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" +Automatic-Module-Name: org.eclipse.papyrus.infra.guava diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.guava/README.md b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/README.md new file mode 100755 index 00000000000..3eb03f943b1 --- /dev/null +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/README.md @@ -0,0 +1,4 @@ +# Disclaimer +This plugin is used to palliate a removed dependency going from guava 27.1.0 to 30.1.0. + +It should not be treated as API by anyone and is not intended to be kept. diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.guava/THE_APACHE_SOFTWARE_LICENCE_VERSION_2.0.txt b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/THE_APACHE_SOFTWARE_LICENCE_VERSION_2.0.txt new file mode 100755 index 00000000000..d6456956733 --- /dev/null +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/THE_APACHE_SOFTWARE_LICENCE_VERSION_2.0.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.guava/about.html b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/about.html new file mode 100755 index 00000000000..f3a9b20a93b --- /dev/null +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/about.html @@ -0,0 +1,43 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> +<title>About</title> +</head> +<body lang="EN-US"> +<h2>About This Content</h2> + +<p>January 25, 2017</p> +<h3>License</h3> + +<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +For purposes of the EPL, "Program" will mean the Content.</p> + +<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p> + +<h3>Third Party Content</h3> +<p>The Content includes items that have been sourced from third parties as set out below. If you +did not receive this Content directly from the Eclipse Foundation, the following is provided +for informational purposes only, and you should look to the Redistributor's license for +terms and conditions of use.</p> + +<h4>Guava: Google Core Libraries for Java</h4> + +<p>The plug-in includes software developed by Kevin Bourrillion <kevinb@google.com> (Google) as part of the Guava: Google Core Libraries for Java project.</p> + +<p>Guava: Google Core Libraries for Java is provided to you under the terms and conditions of the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt" target="_blank">The Apache Software License, Version 2.0</a> (<a href="about_files/THE_APACHE_SOFTWARE_LICENSE__VERSION_2.0.txt" target="_blank">THE_APACHE_SOFTWARE_LICENSE__VERSION_2.0.txt</a>) license.</p> + +<p>Guava: Google Core Libraries for Java including its source is available from <a href="https://github.com/google/guava/guava" target="_blank">github.com/google/guava/guava</a>. Bugs or feature requests can be made in the project issue tracking system at <a href="https://github.com/google/guava/issues" target="_blank">github.com/google/guava/issues</a>.</p> + + +</body> +</html>
\ No newline at end of file diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.guava/build.properties b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/build.properties new file mode 100755 index 00000000000..36fe710d596 --- /dev/null +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/build.properties @@ -0,0 +1,9 @@ +# + +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.properties,\ + about.html +src.includes = about.html diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.guava/plugin.properties b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/plugin.properties new file mode 100755 index 00000000000..ea0e7c9febf --- /dev/null +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/plugin.properties @@ -0,0 +1,4 @@ +# + +pluginName = Papyrus Guava dependency +providerName = Eclipse Modeling Project diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.guava/pom.xml b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/pom.xml new file mode 100755 index 00000000000..8e0222514e8 --- /dev/null +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/pom.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + 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> + <artifactId>org.eclipse.papyrus.infra-misc</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <artifactId>org.eclipse.papyrus.infra.guava</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project>
\ No newline at end of file diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.guava/src/org/eclipse/papyrus/infra/guava/Activator.java b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/src/org/eclipse/papyrus/infra/guava/Activator.java new file mode 100755 index 00000000000..9c6ee818ac8 --- /dev/null +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/src/org/eclipse/papyrus/infra/guava/Activator.java @@ -0,0 +1,74 @@ +/***************************************************************************** + * Copyright (c) 2021 CEA LIST and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.guava; + +import org.eclipse.core.runtime.Plugin; +import org.eclipse.papyrus.infra.core.log.LogHelper; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends Plugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.guava"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + /** Logging helper */ + public static LogHelper log; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + log = new LogHelper(this); + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + @Override + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + +} diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.guava/src/org/eclipse/papyrus/infra/guava/internal/AbstractCheckedFuture.java b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/src/org/eclipse/papyrus/infra/guava/internal/AbstractCheckedFuture.java new file mode 100755 index 00000000000..46bfe00f23d --- /dev/null +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/src/org/eclipse/papyrus/infra/guava/internal/AbstractCheckedFuture.java @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2008 The Guava Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ + +package org.eclipse.papyrus.infra.guava.internal; + +import java.util.concurrent.CancellationException; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +import com.google.common.annotations.Beta; +import com.google.common.annotations.GwtIncompatible; +import com.google.common.util.concurrent.ForwardingListenableFuture; +import com.google.common.util.concurrent.ListenableFuture; + +/** + * A delegating wrapper around a {@link ListenableFuture} that adds support for the {@link + * #checkedGet()} and {@link #checkedGet(long, TimeUnit)} methods. + * + * @author Sven Mawson + * @since 1.0 + * @deprecated {@link CheckedFuture} cannot properly support the chained operations that are the + * primary goal of {@link ListenableFuture}. {@code CheckedFuture} also encourages users to + * rethrow exceptions from one thread in another thread, producing misleading stack traces. + * Additionally, it has a surprising policy about which exceptions to map and which to leave + * untouched. Guava users who want a {@code CheckedFuture} can fork the classes for their own + * use, possibly specializing them to the particular exception type they use. We recommend that + * most people use {@code ListenableFuture} and perform any exception wrapping themselves. This + * class is scheduled for removal from Guava in January 2019. + */ +// TODO(b/72241575): Remove by 2019-01 +@Beta +@Deprecated +@GwtIncompatible +public abstract class AbstractCheckedFuture<V, X extends Exception> + extends ForwardingListenableFuture.SimpleForwardingListenableFuture<V> + implements CheckedFuture<V, X> { + /** Constructs an {@code AbstractCheckedFuture} that wraps a delegate. */ + protected AbstractCheckedFuture(ListenableFuture<V> delegate) { + super(delegate); + } + + /** + * Translates from an {@link InterruptedException}, {@link CancellationException} or {@link + * ExecutionException} thrown by {@code get} to an exception of type {@code X} to be thrown by + * {@code checkedGet}. Subclasses must implement this method. + * + * <p> + * If {@code e} is an {@code InterruptedException}, the calling {@code checkedGet} method has + * already restored the interrupt after catching the exception. If an implementation of {@link + * #mapException(Exception)} wishes to swallow the interrupt, it can do so by calling {@link + * Thread#interrupted()}. + * + * <p> + * Subclasses may choose to throw, rather than return, a subclass of {@code RuntimeException} + * to allow creating a CheckedFuture that throws both checked and unchecked exceptions. + */ + // We might like @ForOverride here, but some subclasses invoke this from their get() methods. + protected abstract X mapException(Exception e); + + /** + * {@inheritDoc} + * + * <p> + * This implementation calls {@link #get()} and maps that method's standard exceptions to + * instances of type {@code X} using {@link #mapException}. + * + * <p> + * In addition, if {@code get} throws an {@link InterruptedException}, this implementation will + * set the current thread's interrupt status before calling {@code mapException}. + * + * @throws X + * if {@link #get()} throws an {@link InterruptedException}, {@link + * CancellationException}, or {@link ExecutionException} + */ + @Override + public V checkedGet() throws X { + try { + return get(); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw mapException(e); + } catch (CancellationException | ExecutionException e) { + throw mapException(e); + } + } + + /** + * {@inheritDoc} + * + * <p> + * This implementation calls {@link #get(long, TimeUnit)} and maps that method's standard + * exceptions (excluding {@link TimeoutException}, which is propagated) to instances of type + * {@code X} using {@link #mapException}. + * + * <p> + * In addition, if {@code get} throws an {@link InterruptedException}, this implementation will + * set the current thread's interrupt status before calling {@code mapException}. + * + * @throws X + * if {@link #get()} throws an {@link InterruptedException}, {@link + * CancellationException}, or {@link ExecutionException} + */ + @Override + public V checkedGet(long timeout, TimeUnit unit) throws TimeoutException, X { + try { + return get(timeout, unit); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw mapException(e); + } catch (CancellationException | ExecutionException e) { + throw mapException(e); + } + } +}
\ No newline at end of file diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.guava/src/org/eclipse/papyrus/infra/guava/internal/CheckedFuture.java b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/src/org/eclipse/papyrus/infra/guava/internal/CheckedFuture.java new file mode 100755 index 00000000000..b129d3d5a3c --- /dev/null +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/src/org/eclipse/papyrus/infra/guava/internal/CheckedFuture.java @@ -0,0 +1,100 @@ +/* + * Copyright (C) 2008 The Guava Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ + +package org.eclipse.papyrus.infra.guava.internal; + +import java.util.concurrent.CancellationException; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +import com.google.common.annotations.Beta; +import com.google.common.annotations.GwtCompatible; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; + +/** + * A {@code CheckedFuture} is a {@link ListenableFuture} that includes versions of the {@code get} + * methods that can throw a checked exception. This makes it easier to create a future that executes + * logic which can throw an exception. + * + * <p> + * <b>Warning:</b> We recommend against using {@code CheckedFuture} in new projects. {@code + * CheckedFuture} is difficult to build libraries atop. {@code CheckedFuture} ports of methods like + * {@link Futures#transformAsync} have historically had bugs, and some of these bugs are necessary, + * unavoidable consequences of the {@code CheckedFuture} API. Additionally, {@code CheckedFuture} + * encourages users to take exceptions from one thread and rethrow them in another, producing + * confusing stack traces. + * + * <p> + * A common implementation is {@link Futures#immediateCheckedFuture}. + * + * <p> + * Implementations of this interface must adapt the exceptions thrown by {@code Future#get()}: + * {@link CancellationException}, {@link ExecutionException} and {@link InterruptedException} into + * the type specified by the {@code X} type parameter. + * + * <p> + * This interface also extends the ListenableFuture interface to allow listeners to be added. + * This allows the future to be used as a normal {@link Future} or as an asynchronous callback + * mechanism as needed. This allows multiple callbacks to be registered for a particular task, and + * the future will guarantee execution of all listeners when the task completes. + * + * <p> + * For a simpler alternative to CheckedFuture, consider accessing Future values with {@link + * Futures#getChecked(Future, Class) Futures.getChecked()}. + * + * @author Sven Mawson + * @since 1.0 + * @deprecated {@link CheckedFuture} cannot properly support the chained operations that are the + * primary goal of {@link ListenableFuture}. {@code CheckedFuture} also encourages users to + * rethrow exceptions from one thread in another thread, producing misleading stack traces. + * Additionally, it has a surprising policy about which exceptions to map and which to leave + * untouched. Guava users who want a {@code CheckedFuture} can fork the classes for their own + * use, possibly specializing them to the particular exception type they use. We recommend that + * most people use {@code ListenableFuture} and perform any exception wrapping themselves. This + * class is scheduled for removal from Guava in January 2019. + */ +// TODO(b/72241575): Remove by 2019-01 +@Beta +@Deprecated +@GwtCompatible +public interface CheckedFuture<V, X extends Exception> extends ListenableFuture<V> { + + /** + * Exception checking version of {@link Future#get()} that will translate {@link + * InterruptedException}, {@link CancellationException} and {@link ExecutionException} into + * application-specific exceptions. + * + * @return the result of executing the future. + * @throws X + * on interruption, cancellation or execution exceptions. + */ + V checkedGet() throws X; + + /** + * Exception checking version of {@link Future#get(long, TimeUnit)} that will translate {@link + * InterruptedException}, {@link CancellationException} and {@link ExecutionException} into + * application-specific exceptions. On timeout this method throws a normal {@link + * TimeoutException}. + * + * @return the result of executing the future. + * @throws TimeoutException + * if retrieving the result timed out. + * @throws X + * on interruption, cancellation or execution exceptions. + */ + V checkedGet(long timeout, TimeUnit unit) throws TimeoutException, X; +}
\ No newline at end of file diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/.settings/.api_filters b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/.settings/.api_filters new file mode 100644 index 00000000000..0c9df1f4b33 --- /dev/null +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/.settings/.api_filters @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.sync" version="2"> + <resource path="src/org/eclipse/papyrus/infra/sync/ISyncObject.java" type="org.eclipse.papyrus.infra.sync.ISyncObject"> + <filter id="403804204"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.sync.ISyncObject"/> + <message_argument value="runAsync(SyncServiceRunnable<V,X>)"/> + </message_arguments> + </filter> + <filter id="405901410"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.sync.ISyncObject"/> + <message_argument value="runAsync(SyncServiceRunnable<V,X>)"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/papyrus/infra/sync/SyncObject.java" type="org.eclipse.papyrus.infra.sync.SyncObject"> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.sync.SyncObject"/> + <message_argument value="runAsync(SyncServiceRunnable<V,X>)"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/papyrus/infra/sync/service/SyncServiceRunnable.java" type="org.eclipse.papyrus.infra.sync.service.SyncServiceRunnable"> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.sync.service.SyncServiceRunnable"/> + <message_argument value="asFuture(ISyncObject)"/> + </message_arguments> + </filter> + </resource> +</component> 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 27a28063cbb..9df0636da3c 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 @@ -5,22 +5,23 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.papyrus.infra.core;bundle-version="[4.0.0,5.0.0)", org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.infra.tools;bundle-version="[4.0.0,5.0.0)", - org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" + org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)", + org.eclipse.papyrus.infra.guava;bundle-version="[1.0.0,2.0.0)" Export-Package: org.eclipse.papyrus.infra.sync, org.eclipse.papyrus.infra.sync.internal;x-internal:=true, org.eclipse.papyrus.infra.sync.policy, org.eclipse.papyrus.infra.sync.service Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.sync.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.sync;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)", - com.google.common.reflect;version="[27.1.0, 28.0.0)", - com.google.common.util.concurrent;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)", + com.google.common.reflect;version="[30.1.0, 31.0.0)", + com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.sync diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/pom.xml b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/pom.xml index a6b47a9abb1..c8486b182c0 100644 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/pom.xml +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.sync</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/ISyncObject.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/ISyncObject.java index 6745957d71a..f180d64465f 100644 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/ISyncObject.java +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/ISyncObject.java @@ -1,6 +1,6 @@ /***************************************************************************** - * Copyright (c) 2015 Christian W. Damus and others. - * + * Copyright (c) 2015, 2021 Christian W. Damus and others. + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -10,18 +10,18 @@ * * Contributors: * Christian W. Damus - Initial API and implementation - * + * Quentin Le Menez - bug 570177 + * *****************************************************************************/ package org.eclipse.papyrus.infra.sync; import org.eclipse.emf.common.command.Command; import org.eclipse.emf.transaction.TransactionalEditingDomain; +import org.eclipse.papyrus.infra.guava.internal.CheckedFuture; import org.eclipse.papyrus.infra.sync.service.ISyncService; import org.eclipse.papyrus.infra.sync.service.SyncServiceRunnable; -import com.google.common.util.concurrent.CheckedFuture; - /** * Common interface of objects in the synchronization framework. */ @@ -29,18 +29,18 @@ public interface ISyncObject { /** * Queries whether I am currently being actively synchronized. The only reason why I should not * be synchronized is that I pertain to an object that is no longer in the model. - * + * * @return whether I am participating in synchronization */ boolean isActive(); /** * Obtains a sync registry of a particular type. - * + * * @param registryType * the sync registry to retrieve * @return the registry (never {@code null} because it is created on-demand if necessary) - * + * * @throws IllegalStateException * if the registry could not be instantiated for some reason */ @@ -49,14 +49,14 @@ public interface ISyncObject { /** * Runs an operation in the context of the {@link ISyncService} that owns me. * The {@link SyncServiceRunnable.Safe Safe} variant does not throw a checked exception. - * + * * @param operation * a sync-service operation * @return the result of the {@code operation}, if it completes without throwing - * + * * @throws X * a checked exception that the {@code operation} may optionally declare - * + * * @see SyncServiceRunnable.Safe */ <V, X extends Exception> V run(SyncServiceRunnable<V, X> operation) throws X; @@ -64,12 +64,13 @@ public interface ISyncObject { /** * Asynchronously runs an operation in the context of the {@link ISyncService} that owns me. * The {@link SyncServiceRunnable.Safe Safe} variant does not throw a checked exception. - * + * * @param operation * a sync-service operation * @return the future result of the {@code operation} - * + * * @see SyncServiceRunnable.Safe + * @since 3.1 */ <V, X extends Exception> CheckedFuture<V, X> runAsync(SyncServiceRunnable<V, X> operation); @@ -80,7 +81,7 @@ public interface ISyncObject { * If the domain has a read/write transaction in progress, then the command is executed as a nested transaction. * Otherwise, it is assumed that the context of the command is an initial synchronization on opening a model or diagram * and the command is executed in an unprotected write transaction. - * + * * @param command * a command to execute in the current editing domain */ diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncObject.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncObject.java index 55dcc0bdddb..b9d3940c5d7 100644 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncObject.java +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncObject.java @@ -1,6 +1,6 @@ /***************************************************************************** - * Copyright (c) 2015 Christian W. Damus and others. - * + * Copyright (c) 2015, 2021 Christian W. Damus and others. + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -10,19 +10,19 @@ * * Contributors: * Christian W. Damus - Initial API and implementation - * + * Quentin Le Menez - bug 570177 + * *****************************************************************************/ package org.eclipse.papyrus.infra.sync; import org.eclipse.emf.common.command.Command; import org.eclipse.emf.transaction.TransactionalEditingDomain; +import org.eclipse.papyrus.infra.guava.internal.CheckedFuture; import org.eclipse.papyrus.infra.sync.internal.SyncService; import org.eclipse.papyrus.infra.sync.service.ISyncService; import org.eclipse.papyrus.infra.sync.service.SyncServiceRunnable; -import com.google.common.util.concurrent.CheckedFuture; - /** * A core synchronization framework object. */ diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncService.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncService.java index ea04a4d9542..7c6f5ab27e7 100644 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncService.java +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncService.java @@ -1,6 +1,6 @@ /***************************************************************************** - * Copyright (c) 2015 Christian W. Damus and others. - * + * Copyright (c) 2015, 2021 Christian W. Damus and others. + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -10,7 +10,8 @@ * * Contributors: * Christian W. Damus - Initial API and implementation - * + * Quentin Le Menez - bug 570177 + * *****************************************************************************/ package org.eclipse.papyrus.infra.sync.internal; @@ -38,6 +39,7 @@ import org.eclipse.papyrus.infra.core.services.ServiceException; import org.eclipse.papyrus.infra.core.services.ServicesRegistry; import org.eclipse.papyrus.infra.core.utils.ServiceUtils; import org.eclipse.papyrus.infra.core.utils.TransactionHelper; +import org.eclipse.papyrus.infra.guava.internal.CheckedFuture; import org.eclipse.papyrus.infra.sync.Activator; import org.eclipse.papyrus.infra.sync.EMFDispatch; import org.eclipse.papyrus.infra.sync.EMFDispatchManager; @@ -53,7 +55,6 @@ import org.eclipse.papyrus.infra.sync.service.SyncServiceRunnable; import org.eclipse.papyrus.infra.tools.util.TypeUtils; import com.google.common.collect.Maps; -import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.MoreExecutors; /** @@ -318,12 +319,12 @@ public class SyncService implements ISyncService { /** * Registers a synchronization policy delegate with me. - * + * * @param policyDelegate * the policy delegate to register * @param featureType * the feature type on which to register it - * + * * @return the listener on which the policy delegate must attach dispatchers for reacting to changes in the synchronized feature(s) */ public EMFListener register(SyncPolicyDelegate<?, ?> policyDelegate, Class<?> featureType) { @@ -333,7 +334,7 @@ public class SyncService implements ISyncService { /** * De-registers a former synchronization policy delegate. - * + * * @param policyDelegate * the policy delegate to de-register * @param featureType diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/SyncServiceRunnable.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/SyncServiceRunnable.java index b37e26531ac..caa5cb53207 100644 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/SyncServiceRunnable.java +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/SyncServiceRunnable.java @@ -1,6 +1,6 @@ /***************************************************************************** - * Copyright (c) 2015 Christian W. Damus and others. - * + * Copyright (c) 2015, 2021 Christian W. Damus and others. + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -10,7 +10,8 @@ * * Contributors: * Christian W. Damus - Initial API and implementation - * + * Quentin Le Menez - bug 570177 + * *****************************************************************************/ package org.eclipse.papyrus.infra.sync.service; @@ -18,25 +19,25 @@ package org.eclipse.papyrus.infra.sync.service; import java.lang.reflect.UndeclaredThrowableException; import java.util.concurrent.Callable; +import org.eclipse.papyrus.infra.guava.internal.AbstractCheckedFuture; +import org.eclipse.papyrus.infra.guava.internal.CheckedFuture; import org.eclipse.papyrus.infra.sync.ISyncObject; import com.google.common.reflect.TypeToken; -import com.google.common.util.concurrent.AbstractCheckedFuture; -import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFutureTask; /** * An operation that runs in the context of the {@link ISyncService synchronization service}. * The {@link SyncServiceRunnable.Safe Safe} variant does not throw a checked exception. - * + * * @see ISyncService#run(SyncServiceRunnable) * @see SyncServiceRunnable.Safe */ public abstract class SyncServiceRunnable<V, X extends Exception> { @SuppressWarnings("serial") - private final TypeToken<X> exceptionType = new TypeToken<X>(getClass()) { + private final TypeToken<X> exceptionType = new TypeToken<>(getClass()) { }; public abstract V run(ISyncService syncService) throws X; @@ -48,11 +49,12 @@ public abstract class SyncServiceRunnable<V, X extends Exception> { /** * Obtains me as a {@link Runnable} checked future result in the context of a sync object. - * + * * @param context * the synchronization context in which context I shall run - * + * * @return a checked future result that implements that {@link Runnable} API for execution + * @since 3.1 */ public CheckedFuture<V, X> asFuture(final ISyncObject context) { return checked(ListenableFutureTask.create(new Callable<V>() { @@ -64,7 +66,7 @@ public abstract class SyncServiceRunnable<V, X extends Exception> { } private CheckedFuture<V, X> checked(final ListenableFuture<V> future) { - class Checked extends AbstractCheckedFuture<V, X>implements Runnable { + class Checked extends AbstractCheckedFuture<V, X> implements Runnable { Checked() { super(future); } diff --git a/plugins/infra/misc/pom.xml b/plugins/infra/misc/pom.xml index 70e45113a66..3575b1620bf 100644 --- a/plugins/infra/misc/pom.xml +++ b/plugins/infra/misc/pom.xml @@ -15,5 +15,6 @@ <module>org.eclipse.papyrus.infra.hyperlink</module> <module>org.eclipse.papyrus.infra.psf</module> <module>org.eclipse.papyrus.infra.sync</module> + <module>org.eclipse.papyrus.infra.guava</module> </modules> </project> diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/.settings/.api_filters b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/.settings/.api_filters new file mode 100644 index 00000000000..c9e60be97c2 --- /dev/null +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.nattable.common" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="6.1.0"/> + <message_argument value="6.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 6c837fc9642..cd5d9d04786 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 @@ -45,11 +45,11 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy -Bundle-Version: 6.0.0.qualifier +Bundle-Version: 6.1.0.qualifier Bundle-Name: %Bundle-Name 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-11 -Import-Package: com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.nattable.common diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml index 61553425494..04cedf1b31b 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.nattable.common</artifactId> - <version>6.0.0-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/.settings/.api_filters b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/.settings/.api_filters new file mode 100644 index 00000000000..ffa429c82fb --- /dev/null +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.nattable.controlmode" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="3.1.0"/> + <message_argument value="3.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 7cdd511a1ed..8a95544bb30 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 @@ -15,13 +15,13 @@ 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: %Bundle-Vendor Bundle-ActivationPolicy: lazy -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.infra.nattable.controlmode.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.controlmode;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.nattable.controlmode diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/pom.xml index cbf12ae4c3f..8fa957c4df9 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/pom.xml +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.nattable.controlmode</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/.settings/.api_filters b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/.settings/.api_filters new file mode 100644 index 00000000000..1507d1acc83 --- /dev/null +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.nattable" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="7.1.0"/> + <message_argument value="7.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 6982515d43e..c628a45b285 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 @@ -92,12 +92,12 @@ Require-Bundle: ca.odell.glazedlists;bundle-version="[1.9.0,2.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.infra.nattable.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.nattable diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml index 044e0765085..731eab8f9d9 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.nattable</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/.settings/.api_filters b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/.settings/.api_filters new file mode 100644 index 00000000000..c1a7653436f --- /dev/null +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.services.controlmode" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="3.1.0"/> + <message_argument value="3.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 e4e4df51e5e..c9c3ad06fb7 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 @@ -29,14 +29,14 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.services.controlmode.ControlModePlugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)", - com.google.common.util.concurrent;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)", + com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.services.controlmode diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/pom.xml index 9f171ece900..86b181392b4 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/pom.xml +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.services.controlmode</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/.settings/.api_filters b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/.settings/.api_filters new file mode 100644 index 00000000000..63f2a0a2b76 --- /dev/null +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.services.edit" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="4.1.0"/> + <message_argument value="4.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 948af9ed3a3..8f73aa0afd2 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 @@ -19,12 +19,12 @@ Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="[2.18.0,3.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.1.0.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName 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-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.services.edit diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/pom.xml index 6bc751fb4d7..844da0a5d2b 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/pom.xml +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.services.edit</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/.settings/.api_filters b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/.settings/.api_filters new file mode 100644 index 00000000000..3906e9aa505 --- /dev/null +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.services.localizer" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="3.1.0"/> + <message_argument value="3.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 6615b226568..2201193b9ee 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 @@ -10,12 +10,12 @@ 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-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin 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-11 -Import-Package: com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.services.localizer diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/pom.xml index 597f50de56b..7b7d1c6c219 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/pom.xml +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.services.localizer</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/.settings/.api_filters b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/.settings/.api_filters new file mode 100644 index 00000000000..3ffa1a5eff9 --- /dev/null +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.services.validation" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="4.1.0"/> + <message_argument value="4.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 6019a3d8284..3768921bf15 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-11 -Import-Package: com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.services.validation diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.settings/.api_filters b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.settings/.api_filters new file mode 100644 index 00000000000..c23c397cfd1 --- /dev/null +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.types.core" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="5.1.0"/> + <message_argument value="5.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 df4acec34b0..012f9ef9b2b 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 @@ -18,12 +18,12 @@ Export-Package: org.eclipse.papyrus.infra.types.core, Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Bundle-Version: 5.0.0.qualifier +Bundle-Version: 5.1.0.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName 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-11 -Import-Package: com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.types.core diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/pom.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/pom.xml index bcd684fa126..1a43e390d58 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/pom.xml +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.types.core</artifactId> - <version>5.0.0-SNAPSHOT</version> + <version>5.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.settings/.api_filters b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.settings/.api_filters new file mode 100644 index 00000000000..9cddccc43e1 --- /dev/null +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.ui.resources" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="2.1.0"/> + <message_argument value="2.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 8bcd2d9104f..daab8297638 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 @@ -13,12 +13,12 @@ Require-Bundle: org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName 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-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.ui.resources diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/pom.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/pom.xml index 0a87b4f6b01..1d128d879ee 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/pom.xml +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.ui.resources</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.settings/.api_filters b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.settings/.api_filters new file mode 100644 index 00000000000..182b0a9ba3c --- /dev/null +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.ui" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="3.1.0"/> + <message_argument value="3.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 14cc4d8a9fc..9bf40d47335 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 @@ -44,15 +44,15 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="[1.9.0,2.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)" Bundle-Vendor: %providerName -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Eclipse-BuddyPolicy: dependent Bundle-ManifestVersion: 2 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="[27.1.0, 28.0.0)", - com.google.common.cache;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)", - com.google.common.util.concurrent;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.cache;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)", + com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.ui diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/pom.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/pom.xml index d2e2ff9c78e..e47f5228476 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/pom.xml +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/pom.xml @@ -9,7 +9,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.ui</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <description>Plugin dedicated to manage generic menus and actions, linked to EMF but not to UML nor GMF technologies.</description> </project>
\ No newline at end of file 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 aeb857a98a2..4ac02b669ec 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-11 -Import-Package: com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.widgets diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/.api_filters b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/.api_filters new file mode 100644 index 00000000000..0015585a49d --- /dev/null +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.uml.profile.types.generator.ui" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="2.1.0"/> + <message_argument value="2.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 abaf53d840b..083ebf33474 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 @@ -18,7 +18,7 @@ Export-Package: org.eclipse.papyrus.uml.profile.types.generator.ui.internal, Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-ManifestVersion: 2 @@ -26,5 +26,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-11 -Import-Package: com.google.common.util.concurrent;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.profile.types.generator.ui diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/pom.xml b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/pom.xml index d40af49ee31..a959d4d07f3 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/pom.xml +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.profile.types.generator.ui</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/toolsmiths/org.eclipse.papyrus.def/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.def/.classpath index af24306dd29..45051717aca 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.def/.classpath +++ b/plugins/toolsmiths/org.eclipse.papyrus.def/.classpath @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"> + <attributes> + <attribute name="module" value="true"/> + </attributes> + </classpathentry> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="xtend"/> <classpathentry kind="src" path="xtend-gen"/> diff --git a/plugins/toolsmiths/org.eclipse.papyrus.def/.settings/.api_filters b/plugins/toolsmiths/org.eclipse.papyrus.def/.settings/.api_filters new file mode 100644 index 00000000000..f764b1e208b --- /dev/null +++ b/plugins/toolsmiths/org.eclipse.papyrus.def/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.def" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter comment="we force the change to 2.1.0" id="926941240"> + <message_arguments> + <message_argument value="2.1.0"/> + <message_argument value="2.0.0"/> + </message_arguments> + </filter> + </resource> +</component> diff --git a/plugins/toolsmiths/org.eclipse.papyrus.def/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.def/META-INF/MANIFEST.MF index b01d9113a3b..7c8aa4a891c 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.def/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/org.eclipse.papyrus.def/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0 org.eclipse.papyrus.gmf.codegen;bundle-version="[2.11.0,3.0.0)" Bundle-Vendor: %providerName Bundle-ClassPath: . -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-Activator: org.eclipse.papyrus.gmf.codegen.util.DefaultActivator diff --git a/plugins/toolsmiths/org.eclipse.papyrus.def/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.def/pom.xml index 9c1c751fe77..ae2a6911854 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.def/pom.xml +++ b/plugins/toolsmiths/org.eclipse.papyrus.def/pom.xml @@ -9,7 +9,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.def</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <properties> diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/META-INF/MANIFEST.MF index d9bda46a6bc..774b293a356 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)", org.eclipse.ui.views.properties.tabbed;bundle-version="[3.8.0,4.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.100.qualifier Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.dev.project.management.Activator diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/pom.xml index 236c9823011..6ceb6dde0fd 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/pom.xml +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/pom.xml @@ -10,6 +10,6 @@ </parent> <artifactId>org.eclipse.papyrus.dev.project.management</artifactId> <groupId>org.eclipse.papyrus</groupId> - <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/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java index aa688a72bae..a0a21521deb 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2016 Christian W. Damus and others. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -10,7 +10,7 @@ * * Contributors: * Christian W. Damus - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.dev.project.management.internal.operations; @@ -37,8 +37,8 @@ public class VersionRules { private final VersionRule rule = VersionRule.composeAll( new CurrentVersionRule(), // The default behaviour new FixedRangeRule(dep -> dep.startsWith("org.apache.batik"), "[1.6.0,1.7.0)"), //$NON-NLS-1$//$NON-NLS-2$ - new SkipRule("com.ibm.icu"), //$NON-NLS-1$ - new FixedRangeRule("com.google.guava", "27.1.0") //$NON-NLS-1$ + new SkipRule("com.ibm.icu") //$NON-NLS-1$ + ,new FixedRangeRule("com.google.guava", "30.1.0") //$NON-NLS-1$ ); public VersionRules() { @@ -48,12 +48,12 @@ public class VersionRules { /** * Queries the version range that should constraint a dependency of the given {@code kind} * on a bundle or package. - * + * * @param kind * the dependency kind * @param dependency * the bundle or package dependency - * + * * @return the appropriate version range, or {@code null} if unknown or the range * currently specified in the manfiest can be retained as is */ diff --git a/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/.settings/.api_filters b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/.settings/.api_filters new file mode 100644 index 00000000000..8f408dc0d12 --- /dev/null +++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.releng.tools" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="3.1.0"/> + <message_argument value="3.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 3c0f2d074b8..b54e9d1a416 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 @@ -12,12 +12,12 @@ Require-Bundle: org.eclipse.cbi.p2repo.aggregator;bundle-version="[1.0.0,2.0.0)" org.eclipse.xtext;bundle-version="[2.22.0,3.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.releng.tools.internal.Activator Bundle-SymbolicName: org.eclipse.papyrus.releng.tools;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.releng.tools diff --git a/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/pom.xml index 5508c6b31f8..c7a7d8c7c3c 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/pom.xml +++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/pom.xml @@ -10,6 +10,6 @@ </parent> <artifactId>org.eclipse.papyrus.releng.tools</artifactId> <groupId>org.eclipse.papyrus</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file 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 90df787a256..053b126114c 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 @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.papyrus.uml.m2m.qvto.tests.tools;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: com.google.guava;bundle-version="[21.0.0,28.0.0)", +Require-Bundle: com.google.guava;bundle-version="[30.0.0,31.0.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/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/pom.xml index bb67708ea53..94e7a190b28 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/pom.xml +++ b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/pom.xml @@ -11,6 +11,6 @@ <groupId>org.eclipse.papyrus</groupId> <artifactId>org.eclipse.papyrus.uml.m2m.qvto.tests.tools</artifactId> <description>Papyrus Model to Model with QvTo tools help methods for tests</description> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration/.settings/.api_filters b/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration/.settings/.api_filters new file mode 100644 index 00000000000..93fb91b7f2f --- /dev/null +++ b/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.toolsmiths.profilemigration" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="1.1.0"/> + <message_argument value="1.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 1a1dda9518e..778b94ef674 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 @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths.profilemigration;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-ClassPath: . -Require-Bundle: com.google.guava;bundle-version="[21.0.0,28.0.0)", +Require-Bundle: com.google.guava;bundle-version="[30.0.0,31.0.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/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration/pom.xml b/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration/pom.xml index 2e78698bf10..1f920570022 100644 --- a/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration/pom.xml +++ b/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.toolsmiths.profilemigration</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file 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 80d1700339e..00c147467e3 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-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.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 131b4e54468..fc46df08c83 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-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)", - com.google.common.util.concurrent;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)", + com.google.common.util.concurrent;version="[30.1.0, 31.0.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 b98e29f6a4d..c3eca716ccd 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-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)", - com.google.common.eventbus;version="[27.1.0, 28.0.0)", - com.google.common.util.concurrent;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)", + com.google.common.eventbus;version="[30.1.0, 31.0.0)", + com.google.common.util.concurrent;version="[30.1.0, 31.0.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 baa8435de1b..05b6289c9c3 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-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)", - com.google.common.util.concurrent;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)", + com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.decoratormodel diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/.settings/.api_filters b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/.settings/.api_filters new file mode 100644 index 00000000000..c766e2f1e84 --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.uml.diagram.activity" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="4.1.0"/> + <message_argument value="4.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 1e1953f5257..90f97201525 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 @@ -79,10 +79,10 @@ 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 Eclipse-LazyStart: true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.1.0.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="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.activity diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/pom.xml index 1a70aff6d6d..bdcc902b30d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/pom.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/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.activity</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/.settings/.api_filters b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/.settings/.api_filters new file mode 100644 index 00000000000..7c782620038 --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.uml.diagram.clazz" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="4.1.0"/> + <message_argument value="4.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 ac95c742ac6..c16f2334ebe 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 @@ -69,11 +69,11 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.papyrus.infra.architecture;bundle-version="[3.0.0,4.0.0)" Bundle-Vendor: %providerName Eclipse-LazyStart: true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.1.0.qualifier Bundle-Activator: org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.clazz; singleton:=true -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.clazz diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/pom.xml index 94e37a0b271..f418a3bcbd7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/pom.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.diagram.clazz</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.1.0-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/.settings/.api_filters b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/.settings/.api_filters new file mode 100644 index 00000000000..98de4f15c41 --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.uml.diagram.common" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="4.1.0"/> + <message_argument value="4.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 586cfbeb304..c817349280b 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: 4.0.0.qualifier +Bundle-Version: 4.1.0.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="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.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 e6d60a2dbcd..c23243c2115 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>4.0.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/.settings/.api_filters b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/.settings/.api_filters new file mode 100644 index 00000000000..3bb59a795c8 --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.uml.diagram.communication" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="5.1.0"/> + <message_argument value="5.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 170cc3d2de8..633eb5c6650 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 @@ -57,9 +57,9 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.uml2.uml.resources;bundle-version="[5.5.0,6.0.0)" Bundle-Vendor: %providerName Eclipse-LazyStart: true -Bundle-Version: 5.0.0.qualifier +Bundle-Version: 5.1.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="[27.1.0, 28.0.0)" +Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.communication diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/pom.xml index 2ff29b824e6..df7cc387f7e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/pom.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.diagram.communication</artifactId> - <version>5.0.0-SNAPSHOT</version> + <version>5.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/.settings/.api_filters b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/.settings/.api_filters new file mode 100644 index 00000000000..43ef3d4bae5 --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.uml.diagram.composite" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="4.1.0"/> + <message_argument value="4.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 4f987574814..1bebce524de 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 @@ -68,9 +68,9 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.uml2.uml.editor;bundle-version="[5.5.0,6.0.0)" Bundle-Vendor: %providerName Eclipse-LazyStart: true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.1.0.qualifier Bundle-Activator: org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.composite; singleton:=true -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.composite diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/pom.xml index 6c91f57e914..81ae7feca9a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/pom.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.diagram.composite</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/.settings/.api_filters b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/.settings/.api_filters new file mode 100644 index 00000000000..332dbc0caa9 --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.uml.diagram.interactionoverview" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="4.1.0"/> + <message_argument value="4.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 1c728e95121..83dfdf48b57 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 @@ -52,12 +52,12 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.uml2.uml.editor;bundle-version="[5.5.0,6.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.1.0.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName 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-11 -Import-Package: com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.interactionoverview diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/pom.xml index 7315a3c579a..1ef56560b24 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/pom.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/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.interactionoverview</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/.settings/.api_filters b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/.settings/.api_filters new file mode 100644 index 00000000000..0b5618c979c --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.uml.diagram.profile" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="4.1.0"/> + <message_argument value="4.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 c876d524840..4f378bc76e1 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 @@ -67,10 +67,10 @@ 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 Eclipse-LazyStart: true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.1.0.qualifier Bundle-Activator: org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.profile; singleton:=true -Import-Package: com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.profile diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/pom.xml index cbfa443143b..73aafb2e6f9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/pom.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.diagram.profile</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.restrictions/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.restrictions/META-INF/MANIFEST.MF index 8d7eebf5f1b..0ca57ff5578 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.restrictions/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.restrictions/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: SequenceDiagram Restrictions Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.sequence.restrictions -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Vendor: Eclipse Modeling Project Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.sequence.restrictions Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.restrictions/OSGI-INF/org.eclipse.papyrus.uml.diagram.sequence.restrictions.SequenceEditPolicyProviderTester.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.restrictions/OSGI-INF/org.eclipse.papyrus.uml.diagram.sequence.restrictions.SequenceEditPolicyProviderTester.xml index f45599187af..f45599187af 100644..100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.restrictions/OSGI-INF/org.eclipse.papyrus.uml.diagram.sequence.restrictions.SequenceEditPolicyProviderTester.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.restrictions/OSGI-INF/org.eclipse.papyrus.uml.diagram.sequence.restrictions.SequenceEditPolicyProviderTester.xml diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.restrictions/OSGI-INF/org.eclipse.papyrus.uml.diagram.sequence.restrictions.SequenceViewProviderTester.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.restrictions/OSGI-INF/org.eclipse.papyrus.uml.diagram.sequence.restrictions.SequenceViewProviderTester.xml index a7f239b7d7a..a7f239b7d7a 100644..100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.restrictions/OSGI-INF/org.eclipse.papyrus.uml.diagram.sequence.restrictions.SequenceViewProviderTester.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.restrictions/OSGI-INF/org.eclipse.papyrus.uml.diagram.sequence.restrictions.SequenceViewProviderTester.xml diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.restrictions/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.restrictions/pom.xml index b8ce1a8a27b..0cabdf66d59 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.restrictions/pom.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.restrictions/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.sequence.restrictions</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/.settings/.api_filters b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/.settings/.api_filters new file mode 100644 index 00000000000..fd618a0206f --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.uml.diagram.sequence" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="6.1.0"/> + <message_argument value="6.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 27d6a7fbe66..8a1d28d43d4 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 @@ -59,9 +59,9 @@ 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: 6.0.0.qualifier +Bundle-Version: 6.1.0.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="[27.1.0, 28.0.0)" +Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.sequence 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 a03afd408bf..aa17dc79203 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>6.0.0-SNAPSHOT</version> + <version>6.1.0-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/.settings/.api_filters b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/.settings/.api_filters new file mode 100644 index 00000000000..0c9df9ba529 --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.uml.diagram.statemachine" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="4.1.0"/> + <message_argument value="4.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 4ae31168a87..805546c7da5 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 @@ -66,10 +66,10 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", Bundle-Vendor: %providerName Ant-Version: Apache Ant 1.7.0 Eclipse-LazyStart: true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.1.0.qualifier Bundle-Activator: org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.statemachine; singleton:=true -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.statemachine diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/pom.xml index 0b9c9855332..2795676fd06 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/pom.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.diagram.statemachine</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/.settings/.api_filters b/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/.settings/.api_filters new file mode 100644 index 00000000000..8838f054100 --- /dev/null +++ b/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.uml.m2m.qvto.common" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="2.1.0"/> + <message_argument value="2.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 bbf84d7694a..bd4d777b3ee 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 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.uml.m2m.qvto.common;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.papyrus.uml.m2m.qvto.common.Activator Bundle-Vendor: %providerName @@ -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="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.m2m.qvto.common diff --git a/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/pom.xml b/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/pom.xml index fa5994926ab..a63c3481440 100644 --- a/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/pom.xml +++ b/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/pom.xml @@ -10,6 +10,6 @@ </parent> <artifactId>org.eclipse.papyrus.uml.m2m.qvto.common</artifactId> <description>Papyrus Model to Model with QvTo transformations common plugin.</description> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.settings/.api_filters b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.settings/.api_filters new file mode 100644 index 00000000000..87430b06957 --- /dev/null +++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.uml.modelexplorer" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="3.1.0"/> + <message_argument value="3.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 01d28a754f9..c02df20c71c 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 @@ -35,12 +35,12 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.modelexplorer.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.modelexplorer;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.modelexplorer diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/pom.xml b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/pom.xml index 3c2f93bbb80..7c13d2351cf 100644 --- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/pom.xml +++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/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.modelexplorer</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/.settings/.api_filters b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/.settings/.api_filters new file mode 100644 index 00000000000..67d35a072c0 --- /dev/null +++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.uml.controlmode.profile" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="3.1.0"/> + <message_argument value="3.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 2d3835733fc..7d3cab0a353 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 @@ -13,13 +13,13 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName 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-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.controlmode.profile diff --git a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/pom.xml index 1907b66d768..72401afff2f 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/pom.xml +++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/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.controlmode.profile</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters/.settings/.api_filters b/plugins/uml/org.eclipse.papyrus.uml.filters/.settings/.api_filters new file mode 100644 index 00000000000..d85e359ad29 --- /dev/null +++ b/plugins/uml/org.eclipse.papyrus.uml.filters/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.uml.filters" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="2.1.0"/> + <message_argument value="2.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 60fc326cd9c..f095d99c554 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 @@ -11,7 +11,7 @@ Export-Package: org.eclipse.papyrus.infra.filters.internal;x-internal:=true, Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.filters.internal.UMLFiltersPlugin$Implementation @@ -19,5 +19,5 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.filters;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.filters diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.filters/pom.xml index 149a52b02ee..14f9afe482e 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.filters/pom.xml +++ b/plugins/uml/org.eclipse.papyrus.uml.filters/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.filters</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/.settings/.api_filters b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/.settings/.api_filters new file mode 100644 index 00000000000..a892488b596 --- /dev/null +++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.uml.modelrepair" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="3.1.0"/> + <message_argument value="3.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 d208afd9359..7016c6c2e28 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 @@ -30,15 +30,15 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.uml2.uml.edit;bundle-version="[5.5.0,6.0.0)" Bundle-Vendor: Eclipse Modeling Project Bundle-ActivationPolicy: lazy -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-Name: Model Repair Bundle-Activator: org.eclipse.papyrus.uml.modelrepair.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.modelrepair;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)", - com.google.common.eventbus;version="[27.1.0, 28.0.0)", - com.google.common.util.concurrent;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)", + com.google.common.eventbus;version="[30.1.0, 31.0.0)", + com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.modelrepair diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/pom.xml index dcba1534fd0..1dd2733272b 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/pom.xml +++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/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.modelrepair</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/.settings/.api_filters b/plugins/uml/org.eclipse.papyrus.uml.profile/.settings/.api_filters new file mode 100644 index 00000000000..eb1f792119b --- /dev/null +++ b/plugins/uml/org.eclipse.papyrus.uml.profile/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.uml.profile" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="4.1.0"/> + <message_argument value="4.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 5d5a7932aad..9a3e9588103 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 @@ -38,13 +38,13 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.uml2.uml.editor;bundle-version="[5.5.0,6.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-Activator: org.eclipse.papyrus.uml.profile.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.profile;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.util.concurrent;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.profile diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.profile/pom.xml index b0476b53ced..fa19eefb4ec 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.profile/pom.xml +++ b/plugins/uml/org.eclipse.papyrus.uml.profile/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.profile</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/.settings/.api_filters b/plugins/uml/org.eclipse.papyrus.uml.service.types/.settings/.api_filters new file mode 100644 index 00000000000..bf72cdb3dcc --- /dev/null +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.uml.service.types" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="5.1.0"/> + <message_argument value="5.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 ff7db1d4397..aae2c2a560c 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 @@ -29,12 +29,12 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.uml2.uml.profile.standard;bundle-version="[1.5.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 5.0.0.qualifier +Bundle-Version: 5.1.0.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName 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-11 -Import-Package: com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.service.types diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.service.types/pom.xml index 6d321b00bdd..480145c9cb7 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/pom.xml +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/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.service.types</artifactId> - <version>5.0.0-SNAPSHOT</version> + <version>5.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/.settings/.api_filters b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/.settings/.api_filters new file mode 100644 index 00000000000..869d997934c --- /dev/null +++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.uml.profile.drafter" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="2.1.0"/> + <message_argument value="2.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 0b50a3e90f8..68bf443bc57 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 @@ -26,13 +26,13 @@ Export-Package: org.eclipse.papyrus.uml.profile.drafter, org.eclipse.papyrus.uml.profile.drafter.utils Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin 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-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.profile.drafter diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/pom.xml b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/pom.xml index d2a46f38ad1..20b0dd0c2e6 100644 --- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/pom.xml +++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.profile.drafter</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/.settings/.api_filters b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/.settings/.api_filters new file mode 100644 index 00000000000..e52f508daea --- /dev/null +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.uml.tools.utils" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="4.1.0"/> + <message_argument value="4.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 3053c182738..e7a6c04b92c 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 @@ -18,14 +18,14 @@ Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0 org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)" Bundle-Vendor: %pluginProvider Bundle-ActivationPolicy: lazy -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.1.0.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName 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-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.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.utils/pom.xml b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/pom.xml index a3e2f5e343d..99552249cd5 100644 --- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/pom.xml +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/pom.xml @@ -9,7 +9,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.tools.utils</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <description>This plugin contributes a set of common utils tools for UML</description> </project>
\ No newline at end of file diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/.settings/.api_filters b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/.settings/.api_filters new file mode 100644 index 00000000000..cf5c14c2a86 --- /dev/null +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.uml.tools" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="5.1.0"/> + <message_argument value="5.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 bcfa5266b58..16a3b45a2a3 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 @@ -46,13 +46,13 @@ Require-Bundle: org.eclipse.core.databinding.property;bundle-version="[1.8.0,2.0 org.eclipse.uml2.uml.validation;bundle-version="[5.5.0,6.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy -Bundle-Version: 5.0.0.qualifier +Bundle-Version: 5.1.0.qualifier Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.uml.tools.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.tools;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.collect;version="[27.1.0, 28.0.0)", - com.google.common.util.concurrent;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)", + com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.tools diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/pom.xml b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/pom.xml index 3a4f23668b7..7d198ecf21d 100644 --- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/pom.xml +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/pom.xml @@ -9,7 +9,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.tools</artifactId> - <version>5.0.0-SNAPSHOT</version> + <version>5.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <description>This plugin contributes a set of common tools for UML</description> </project>
\ No newline at end of file diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.settings/.api_filters b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.settings/.api_filters new file mode 100644 index 00000000000..d4d8c7a1eda --- /dev/null +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.views.modelexplorer" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="4.1.0"/> + <message_argument value="4.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 c2aeaf6b502..66226c3cf7f 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 @@ -50,7 +50,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.1.0.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.views.modelexplorer.Activator @@ -58,6 +58,6 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.views.modelexplorer;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.views.modelexplorer diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/pom.xml b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/pom.xml index 9c038f131c9..1f59241ff95 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/pom.xml +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.views.modelexplorer</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/.settings/.api_filters b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/.settings/.api_filters new file mode 100644 index 00000000000..243c6f05722 --- /dev/null +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.views.properties.toolsmiths" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="3.1.0"/> + <message_argument value="3.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 26228486b17..004b7649a91 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 @@ -33,12 +33,12 @@ Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-ClassPath: ., bin -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.views.properties.toolsmiths.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.views.properties.toolsmiths;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.views.properties.toolsmiths diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/pom.xml b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/pom.xml index 33d3f72a322..6f5f61ec653 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/pom.xml +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/pom.xml @@ -13,6 +13,6 @@ <relativePath>../../../toolsmiths/pom.xml</relativePath> </parent> <artifactId>org.eclipse.papyrus.views.properties.toolsmiths</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/views/validation/org.eclipse.papyrus.views.validation/.settings/.api_filters b/plugins/views/validation/org.eclipse.papyrus.views.validation/.settings/.api_filters new file mode 100644 index 00000000000..b07d7ace912 --- /dev/null +++ b/plugins/views/validation/org.eclipse.papyrus.views.validation/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.views.validation" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="3.1.0"/> + <message_argument value="3.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 305eec7aa7f..f32c3b67fb3 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 @@ -16,13 +16,13 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.views.validation.internal.Activator Bundle-SymbolicName: org.eclipse.papyrus.views.validation;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.views.validation diff --git a/plugins/views/validation/org.eclipse.papyrus.views.validation/pom.xml b/plugins/views/validation/org.eclipse.papyrus.views.validation/pom.xml index 59ecd09f333..3f8e2d34dd7 100644 --- a/plugins/views/validation/org.eclipse.papyrus.views.validation/pom.xml +++ b/plugins/views/validation/org.eclipse.papyrus.views.validation/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.views.validation</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file @@ -7,7 +7,7 @@ <artifactId>org.eclipse.papyrus</artifactId> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> - + <modules> <module>releng</module> </modules> diff --git a/releng/main/pom.xml b/releng/main/pom.xml index 3dc0c497e69..51abd2881e5 100755 --- a/releng/main/pom.xml +++ b/releng/main/pom.xml @@ -8,10 +8,18 @@ <artifactId>org.eclipse.papyrus.all.releng</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - + <artifactId>org.eclipse.papyrus.releng</artifactId> <packaging>pom</packaging> + <properties> + <!-- https://repo.maven.apache.org/maven2/ --> + <mojo.buildhelper.version>3.2.0</mojo.buildhelper.version> + <mylyn.wikitext.version>3.0.38</mylyn.wikitext.version> + + <target.platform>org.eclipse.papyrus.main.${target.suffix}.target</target.platform> + </properties> + <modules> <module>../../plugins</module> <module>../../examples</module> @@ -21,14 +29,6 @@ <module>site</module> </modules> - <properties> - <!-- https://repo.maven.apache.org/maven2/ --> - <mojo.buildhelper.version>3.2.0</mojo.buildhelper.version> - <mylyn.wikitext.version>3.0.38</mylyn.wikitext.version> - - <target.platform>org.eclipse.papyrus.main.${target.suffix}.target</target.platform> - </properties> - <build> <pluginManagement> <!-- redistributed plugins --> diff --git a/releng/main/site/category.xml b/releng/main/site/category.xml index 7a4b9caff44..de29e2ae1f9 100644 --- a/releng/main/site/category.xml +++ b/releng/main/site/category.xml @@ -22,4 +22,6 @@ Papyrus User Examples offers a set of plugins dedicated to gather examples of Papyrus usage. </description> </category-def> + + <repository-reference location="http://download.eclipse.org/tools/orbit/downloads/drops/R20180206163158/repository/" enabled="true" /> </site> diff --git a/releng/main/site/pom.xml b/releng/main/site/pom.xml index b781112a263..672417e8f5b 100644 --- a/releng/main/site/pom.xml +++ b/releng/main/site/pom.xml @@ -14,14 +14,6 @@ <version>5.1.0-SNAPSHOT</version> <packaging>eclipse-repository</packaging> - - <pluginRepositories> - <pluginRepository> - <id>org.jboss.tools.tycho-plugins</id> - <url>https://repository.jboss.org/</url> - </pluginRepository> - </pluginRepositories> - <build> <plugins> <plugin> @@ -32,30 +24,6 @@ <includePackedArtifacts>true</includePackedArtifacts> </configuration> </plugin> - - <!-- workaround https://bugs.eclipse.org/bugs/show_bug.cgi?id=453708 --> - <plugin> - <groupId>org.jboss.tools.tycho-plugins</groupId> - <artifactId>repository-utils</artifactId> - <version>${jboss.utils.version}</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>generate-repository-facade</goal> - </goals> - <configuration> - <!-- do not generate the pesky web folder and index.html --> - <skipWebContentGeneration>true</skipWebContentGeneration> - <!-- p2 update site transitive dependencies repositories --> - <associateSites> - <!-- Oxygen orbit bundles for batik 1.6.0 --> - <site>http://download.eclipse.org/tools/orbit/downloads/drops/R20180206163158/repository/</site> - </associateSites> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </project> diff --git a/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target b/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target index 1d95f47b3b3..8691832c31e 100755 --- a/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target +++ b/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.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="1612516936"> +<target name="Papyrus Main" sequenceNumber="1615192519"> <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"/> @@ -18,23 +18,23 @@ <repository id="nattable" location="file:/home/data/httpd/download.eclipse.org/nattable/releases/1.5.0/repository"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="com.google.guava" version="27.1.0.v20190517-1946"/> - <unit id="com.google.guava.source" version="27.1.0.v20190517-1946"/> + <unit id="com.google.guava" version="30.1.0.v20210127-2300"/> + <unit id="com.google.guava.source" version="30.1.0.v20210127-2300"/> <unit id="com.google.gson" version="2.7.0.v20170129-0911"/> <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/> <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/> <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/> <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/> <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/> - <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository/"/> + <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> <repository id="xwt" location="file:/home/data/httpd/download.eclipse.org/xwt/milestones-1.6.0/1.6.0-M2/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.2.v20200609-1812"/> - <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/releases/3.10.2"/> + <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.3.v20210302-1249"/> + <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.10.3/S202103021249"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/> @@ -42,33 +42,33 @@ <repository id="xpand" location="file:/home/data/httpd/download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210110-1527"/> + <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210228-1829"/> <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.5milestones"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.sdk.feature.group" version="4.19.0.v20210129-2007"/> - <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.19-I-builds/I20210129-1800/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.19.0.v20210303-1800"/> + <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.19-I-builds/I20210303-1800/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.14.0.v20210201-1648"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.14.0.v20210201-1648"/> - <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.14.0/S202102011648"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.14.0.v20210301-1325"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.14.0.v20210301-1325"/> + <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.14.0/S202103011325"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.25.0.v20210111-0955"/> - <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/milestones/S202101110955"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.25.0.v20210301-1429"/> + <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.12.1.v20210201-1009"/> - <repository id="mwe" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/mwe/updates/milestones/S202102011009/"/> + <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.12.1.v20210218-2134"/> + <repository id="mwe" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/mwe/updates/releases/2.12.1/"/> </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="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.21.0/S-3.21.0.M2-20210128163350/repository/"/> + <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.21.0/S-3.21.0.RC2-20210304100654/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.13.0.202004160913"/> @@ -80,7 +80,7 @@ </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.sdk.feature.group" version="2.25.0.v20210114-1734"/> - <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S202101260740"/> + <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/release/2.25"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> diff --git a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target index d7e4bdd26d4..665545013df 100755 --- a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target +++ b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.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="1612516936"> +<target name="Papyrus Main" sequenceNumber="1615192519"> <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"/> @@ -18,23 +18,23 @@ <repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="com.google.guava" version="27.1.0.v20190517-1946"/> - <unit id="com.google.guava.source" version="27.1.0.v20190517-1946"/> + <unit id="com.google.guava" version="30.1.0.v20210127-2300"/> + <unit id="com.google.guava.source" version="30.1.0.v20210127-2300"/> <unit id="com.google.gson" version="2.7.0.v20170129-0911"/> <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/> <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/> <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/> <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/> <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/> - <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository/"/> + <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> <repository id="xwt" location="https://download.eclipse.org/xwt/milestones-1.6.0/1.6.0-M2/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.2.v20200609-1812"/> - <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.2"/> + <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.3.v20210302-1249"/> + <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/milestones/3.10.3/S202103021249"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/> @@ -42,33 +42,33 @@ <repository id="xpand" location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210110-1527"/> + <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210228-1829"/> <repository id="uml" location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5milestones"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.sdk.feature.group" version="4.19.0.v20210129-2007"/> - <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.19-I-builds/I20210129-1800/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.19.0.v20210303-1800"/> + <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.19-I-builds/I20210303-1800/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.14.0.v20210201-1648"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.14.0.v20210201-1648"/> - <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.14.0/S202102011648"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.14.0.v20210301-1325"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.14.0.v20210301-1325"/> + <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.14.0/S202103011325"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.25.0.v20210111-0955"/> - <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S202101110955"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.25.0.v20210301-1429"/> + <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.12.1.v20210201-1009"/> - <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202102011009/"/> + <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.12.1.v20210218-2134"/> + <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.12.1/"/> </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.21.0/S-3.21.0.M2-20210128163350/repository/"/> + <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.21.0/S-3.21.0.RC2-20210304100654/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.13.0.202004160913"/> @@ -80,7 +80,7 @@ </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.sdk.feature.group" version="2.25.0.v20210114-1734"/> - <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202101260740"/> + <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.25"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> diff --git a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd index e08ee61bcf5..07d82b74d74 100755 --- a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd +++ b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd @@ -23,9 +23,9 @@ location nattable "http://download.eclipse.org/nattable/releases/1.5.0/repositor //manualUpdate -location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository/" { - com.google.guava [21.0.0,28.0.0) // emf.compare still needs guava 21.0.0 - com.google.guava.source [21.0.0,28.0.0) +location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/" { + com.google.guava [21.0.0,31.0.0) // emf.compare still needs guava 21.0.0 + com.google.guava.source [21.0.0,31.0.0) com.google.gson [2.7.0,2.8.0) com.google.gson.source [2.7.0,2.8.0) org.apache.commons.lang3 3.1.0 @@ -47,7 +47,7 @@ location xwt "https://download.eclipse.org/xwt/milestones-1.6.0/1.6.0-M2/" { //updateFrom("QVT Operational for 2021-03",0) -location qvto "https://download.eclipse.org/mmt/qvto/updates/releases/3.10.2" { +location qvto "https://download.eclipse.org/mmt/qvto/updates/milestones/3.10.3/S202103021249" { org.eclipse.m2m.qvt.oml.sdk.feature.group } @@ -66,20 +66,20 @@ location uml "https://download.eclipse.org/modeling/mdt/uml2/updates/5.5mileston //updateFrom("Eclipse",0) -location platform "https://download.eclipse.org/eclipse/updates/4.19-I-builds/I20210129-1800/" { +location platform "https://download.eclipse.org/eclipse/updates/4.19-I-builds/I20210303-1800/" { org.eclipse.sdk.feature.group } //updateFrom("OCL for 2021-03",0) -location ocl "https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.14.0/S202102011648" { +location ocl "https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.14.0/S202103011325" { 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/milestones/S202101110955" { +location xtext "https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0" { org.eclipse.xtext.sdk.feature.group org.eclipse.xtend.sdk.feature.group org.eclipse.xtext.redist.feature.group @@ -89,13 +89,13 @@ location xtext "https://download.eclipse.org/modeling/tmf/xtext/updates/mileston //updateFrom("EMFT MWE for 2021-03",0) -location mwe "https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202102011009/" { +location mwe "https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.12.1/" { org.eclipse.emf.mwe2.language.sdk.feature.group } -//updateFrom("Web Tools Platform 3.21 for Simrel 2021-03",0) +//updateFrom("Web Tools Platform 3.21 for SimRel 2021-03",0) -location webtools "https://download.eclipse.org/webtools/downloads/drops/R3.21.0/S-3.21.0.M2-20210128163350/repository/" { +location webtools "https://download.eclipse.org/webtools/downloads/drops/R3.21.0/S-3.21.0.RC2-20210304100654/repository/" { org.eclipse.wst.xml_ui.feature.feature.group lazy } @@ -113,7 +113,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/milestone/S202101260740" { +location emf "https://download.eclipse.org/modeling/emf/emf/builds/release/2.25" { org.eclipse.emf.sdk.feature.group } diff --git a/releng/pom.xml b/releng/pom.xml index 5639ec3c65d..adc78e29aaa 100644 --- a/releng/pom.xml +++ b/releng/pom.xml @@ -10,9 +10,9 @@ <properties> <!-- https://repo.maven.apache.org/maven2/ --> - <tycho-version>1.3.0</tycho-version> + <tycho-version>2.2.0</tycho-version> + <tychoExtrasVersion>2.2.0</tychoExtrasVersion> <xtend-version>2.25.0.M1</xtend-version> - <tychoExtrasVersion>1.3.0</tychoExtrasVersion> <xtext.version>2.25.0.M1</xtext.version> <maven.resources.version>3.2.0</maven.resources.version> <maven.clean.version>3.1.0</maven.clean.version> diff --git a/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target b/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target index 67fd37862e4..4a48ab5fb13 100755 --- a/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target +++ b/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.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="1612516937"> +<target name="Papyrus RCP" sequenceNumber="1615192519"> <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"/> @@ -18,23 +18,23 @@ <repository id="nattable" location="file:/home/data/httpd/download.eclipse.org/nattable/releases/1.5.0/repository"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="com.google.guava" version="27.1.0.v20190517-1946"/> - <unit id="com.google.guava.source" version="27.1.0.v20190517-1946"/> + <unit id="com.google.guava" version="30.1.0.v20210127-2300"/> + <unit id="com.google.guava.source" version="30.1.0.v20210127-2300"/> <unit id="com.google.gson" version="2.7.0.v20170129-0911"/> <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/> <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/> <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/> <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/> <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/> - <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository/"/> + <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> <repository id="xwt" location="file:/home/data/httpd/download.eclipse.org/xwt/milestones-1.6.0/1.6.0-M2/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.2.v20200609-1812"/> - <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/releases/3.10.2"/> + <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.3.v20210302-1249"/> + <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.10.3/S202103021249"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/> @@ -42,29 +42,29 @@ <repository id="xpand" location="file:/home/data/httpd/download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210110-1527"/> + <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210228-1829"/> <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.5milestones"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.14.0.v20210201-1648"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.14.0.v20210201-1648"/> - <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.14.0/S202102011648"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.14.0.v20210301-1325"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.14.0.v20210301-1325"/> + <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.14.0/S202103011325"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.25.0.v20210111-0955"/> - <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/milestones/S202101110955"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.25.0.v20210301-1429"/> + <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.12.1.v20210201-1009"/> - <repository id="mwe" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/mwe/updates/milestones/S202102011009/"/> + <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.12.1.v20210218-2134"/> + <repository id="mwe" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/mwe/updates/releases/2.12.1/"/> </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="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.21.0/S-3.21.0.M2-20210128163350/repository/"/> + <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.21.0/S-3.21.0.RC2-20210304100654/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.13.0.202004160913"/> @@ -91,15 +91,15 @@ <repository id="gef" location="file:/home/data/httpd/download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.egit.feature.group" version="5.11.0.202102031030-m2"/> - <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/staging/v5.11.0.202102031030-m2"/> + <unit id="org.eclipse.egit.feature.group" version="5.11.0.202103031150-rc1"/> + <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/staging/v5.11.0.202103031150-rc1"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.19.0.v20210102-0921"/> - <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.1200.v20210129-1800"/> - <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.1100.v20210122-1532"/> - <unit id="org.eclipse.sdk.feature.group" version="4.19.0.v20210129-2007"/> - <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.19-I-builds/I20210129-1800/"/> + <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.19.0.v20210210-1828"/> + <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.1200.v20210303-1800"/> + <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.1100.v20210209-1541"/> + <unit id="org.eclipse.sdk.feature.group" version="4.19.0.v20210303-1800"/> + <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.19-I-builds/I20210303-1800/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.25.2.v20200828-1617"/> @@ -111,14 +111,14 @@ <repository id="mylyn" location="file:/home/data/httpd/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.13.202011201248"/> - <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.13.202011201248"/> - <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202011201248"/> + <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.14.202102231741"/> + <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.14.202102231741"/> + <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202102231741"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xsd.sdk.feature.group" version="2.25.0.v20201230-0854"/> <unit id="org.eclipse.emf.sdk.feature.group" version="2.25.0.v20210114-1734"/> - <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S202101260740"/> + <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/release/2.25"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.cdo.epp.feature.group" version="4.13.0.v20210203-1008"/> diff --git a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target index 5b5ad376854..b531189e764 100755 --- a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target +++ b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.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="1612516937"> +<target name="Papyrus RCP" sequenceNumber="1615192519"> <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"/> @@ -18,23 +18,23 @@ <repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="com.google.guava" version="27.1.0.v20190517-1946"/> - <unit id="com.google.guava.source" version="27.1.0.v20190517-1946"/> + <unit id="com.google.guava" version="30.1.0.v20210127-2300"/> + <unit id="com.google.guava.source" version="30.1.0.v20210127-2300"/> <unit id="com.google.gson" version="2.7.0.v20170129-0911"/> <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/> <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/> <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/> <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/> <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/> - <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository/"/> + <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> <repository id="xwt" location="https://download.eclipse.org/xwt/milestones-1.6.0/1.6.0-M2/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.2.v20200609-1812"/> - <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.2"/> + <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.3.v20210302-1249"/> + <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/milestones/3.10.3/S202103021249"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/> @@ -42,29 +42,29 @@ <repository id="xpand" location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210110-1527"/> + <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210228-1829"/> <repository id="uml" location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5milestones"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.14.0.v20210201-1648"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.14.0.v20210201-1648"/> - <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.14.0/S202102011648"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.14.0.v20210301-1325"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.14.0.v20210301-1325"/> + <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.14.0/S202103011325"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.25.0.v20210111-0955"/> - <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S202101110955"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.25.0.v20210301-1429"/> + <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.12.1.v20210201-1009"/> - <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202102011009/"/> + <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.12.1.v20210218-2134"/> + <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.12.1/"/> </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.21.0/S-3.21.0.M2-20210128163350/repository/"/> + <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.21.0/S-3.21.0.RC2-20210304100654/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.13.0.202004160913"/> @@ -91,15 +91,15 @@ <repository id="gef" location="https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.egit.feature.group" version="5.11.0.202102031030-m2"/> - <repository id="egit" location="https://download.eclipse.org/egit/staging/v5.11.0.202102031030-m2"/> + <unit id="org.eclipse.egit.feature.group" version="5.11.0.202103031150-rc1"/> + <repository id="egit" location="https://download.eclipse.org/egit/staging/v5.11.0.202103031150-rc1"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.19.0.v20210102-0921"/> - <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.1200.v20210129-1800"/> - <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.1100.v20210122-1532"/> - <unit id="org.eclipse.sdk.feature.group" version="4.19.0.v20210129-2007"/> - <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.19-I-builds/I20210129-1800/"/> + <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.19.0.v20210210-1828"/> + <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.1200.v20210303-1800"/> + <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.1100.v20210209-1541"/> + <unit id="org.eclipse.sdk.feature.group" version="4.19.0.v20210303-1800"/> + <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.19-I-builds/I20210303-1800/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.25.2.v20200828-1617"/> @@ -111,14 +111,14 @@ <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.13.202011201248"/> - <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.13.202011201248"/> - <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202011201248"/> + <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.14.202102231741"/> + <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.14.202102231741"/> + <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202102231741"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xsd.sdk.feature.group" version="2.25.0.v20201230-0854"/> <unit id="org.eclipse.emf.sdk.feature.group" version="2.25.0.v20210114-1734"/> - <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202101260740"/> + <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.25"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.cdo.epp.feature.group" version="4.13.0.v20210203-1008"/> diff --git a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd index a799c4b87c3..172b3ee6101 100644 --- a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd +++ b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd @@ -7,13 +7,13 @@ include "../../../main/targetPlatform/portable/org.eclipse.papyrus.main.portable //updateFrom("EGit",0) -location egit "https://download.eclipse.org/egit/staging/v5.11.0.202102031030-m2" { +location egit "https://download.eclipse.org/egit/staging/v5.11.0.202103031150-rc1" { org.eclipse.egit.feature.group } //updateFrom("Eclipse",0) -location platform "https://download.eclipse.org/eclipse/updates/4.19-I-builds/I20210129-1800/" { +location platform "https://download.eclipse.org/eclipse/updates/4.19-I-builds/I20210303-1800/" { org.eclipse.e4.core.tools.feature.feature.group org.eclipse.rcp.configuration.feature.group org.eclipse.equinox.executable.feature.group @@ -32,14 +32,14 @@ location mylyn "https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956" //updateFrom("EMF Compare",0) -location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202011201248" { +location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202102231741" { 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/milestone/S202101260740" { +location emf "https://download.eclipse.org/modeling/emf/emf/builds/release/2.25" { org.eclipse.xsd.sdk.feature.group } diff --git a/releng/tests/main-tests-with-cdo/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.cdo.eclipse.target.target b/releng/tests/main-tests-with-cdo/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.cdo.eclipse.target.target index 7be91778999..f486367fb22 100755 --- a/releng/tests/main-tests-with-cdo/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.cdo.eclipse.target.target +++ b/releng/tests/main-tests-with-cdo/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.cdo.eclipse.target.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="1612516937"> +<target name="Papyrus CDO Tests" sequenceNumber="1615192519"> <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"/> @@ -18,23 +18,23 @@ <repository id="nattable" location="file:/home/data/httpd/download.eclipse.org/nattable/releases/1.5.0/repository"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="com.google.guava" version="27.1.0.v20190517-1946"/> - <unit id="com.google.guava.source" version="27.1.0.v20190517-1946"/> + <unit id="com.google.guava" version="30.1.0.v20210127-2300"/> + <unit id="com.google.guava.source" version="30.1.0.v20210127-2300"/> <unit id="com.google.gson" version="2.7.0.v20170129-0911"/> <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/> <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/> <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/> <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/> <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/> - <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository/"/> + <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> <repository id="xwt" location="file:/home/data/httpd/download.eclipse.org/xwt/milestones-1.6.0/1.6.0-M2/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.2.v20200609-1812"/> - <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/releases/3.10.2"/> + <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.3.v20210302-1249"/> + <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.10.3/S202103021249"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/> @@ -42,33 +42,33 @@ <repository id="xpand" location="file:/home/data/httpd/download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210110-1527"/> + <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210228-1829"/> <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.5milestones"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.sdk.feature.group" version="4.19.0.v20210129-2007"/> - <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.19-I-builds/I20210129-1800/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.19.0.v20210303-1800"/> + <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.19-I-builds/I20210303-1800/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.14.0.v20210201-1648"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.14.0.v20210201-1648"/> - <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.14.0/S202102011648"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.14.0.v20210301-1325"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.14.0.v20210301-1325"/> + <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.14.0/S202103011325"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.25.0.v20210111-0955"/> - <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/milestones/S202101110955"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.25.0.v20210301-1429"/> + <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.12.1.v20210201-1009"/> - <repository id="mwe" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/mwe/updates/milestones/S202102011009/"/> + <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.12.1.v20210218-2134"/> + <repository id="mwe" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/mwe/updates/releases/2.12.1/"/> </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="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.21.0/S-3.21.0.M2-20210128163350/repository/"/> + <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.21.0/S-3.21.0.RC2-20210304100654/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.13.0.202004160913"/> @@ -80,7 +80,7 @@ </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.sdk.feature.group" version="2.25.0.v20210114-1734"/> - <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S202101260740"/> + <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/release/2.25"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> @@ -99,8 +99,8 @@ <repository id="gef" location="file:/home/data/httpd/download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.13.202011201248"/> - <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202011201248"/> + <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.14.202102231741"/> + <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202102231741"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.cdo.admin" version="0.0.0"/> diff --git a/releng/tests/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.target b/releng/tests/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.target index 27d5ce23b59..0e319f1e2b2 100755 --- a/releng/tests/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.target +++ b/releng/tests/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.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="1612516937"> +<target name="Papyrus CDO Tests" sequenceNumber="1615192519"> <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"/> @@ -18,23 +18,23 @@ <repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="com.google.guava" version="27.1.0.v20190517-1946"/> - <unit id="com.google.guava.source" version="27.1.0.v20190517-1946"/> + <unit id="com.google.guava" version="30.1.0.v20210127-2300"/> + <unit id="com.google.guava.source" version="30.1.0.v20210127-2300"/> <unit id="com.google.gson" version="2.7.0.v20170129-0911"/> <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/> <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/> <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/> <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/> <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/> - <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository/"/> + <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> <repository id="xwt" location="https://download.eclipse.org/xwt/milestones-1.6.0/1.6.0-M2/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.2.v20200609-1812"/> - <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.2"/> + <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.3.v20210302-1249"/> + <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/milestones/3.10.3/S202103021249"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/> @@ -42,33 +42,33 @@ <repository id="xpand" location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210110-1527"/> + <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210228-1829"/> <repository id="uml" location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5milestones"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.sdk.feature.group" version="4.19.0.v20210129-2007"/> - <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.19-I-builds/I20210129-1800/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.19.0.v20210303-1800"/> + <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.19-I-builds/I20210303-1800/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.14.0.v20210201-1648"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.14.0.v20210201-1648"/> - <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.14.0/S202102011648"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.14.0.v20210301-1325"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.14.0.v20210301-1325"/> + <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.14.0/S202103011325"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.25.0.v20210111-0955"/> - <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S202101110955"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.25.0.v20210301-1429"/> + <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.12.1.v20210201-1009"/> - <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202102011009/"/> + <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.12.1.v20210218-2134"/> + <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.12.1/"/> </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.21.0/S-3.21.0.M2-20210128163350/repository/"/> + <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.21.0/S-3.21.0.RC2-20210304100654/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.13.0.202004160913"/> @@ -80,7 +80,7 @@ </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.sdk.feature.group" version="2.25.0.v20210114-1734"/> - <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202101260740"/> + <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.25"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> @@ -99,8 +99,8 @@ <repository id="gef" location="https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.13.202011201248"/> - <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202011201248"/> + <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.14.202102231741"/> + <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202102231741"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.cdo.admin" version="0.0.0"/> diff --git a/releng/tests/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target b/releng/tests/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target index f9fdef81269..07c9c870023 100755 --- a/releng/tests/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target +++ b/releng/tests/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.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="1612516861"> +<target name="Papyrus Tests" sequenceNumber="1615192519"> <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"/> @@ -18,23 +18,23 @@ <repository id="nattable" location="file:/home/data/httpd/download.eclipse.org/nattable/releases/1.5.0/repository"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="com.google.guava" version="27.1.0.v20190517-1946"/> - <unit id="com.google.guava.source" version="27.1.0.v20190517-1946"/> + <unit id="com.google.guava" version="30.1.0.v20210127-2300"/> + <unit id="com.google.guava.source" version="30.1.0.v20210127-2300"/> <unit id="com.google.gson" version="2.7.0.v20170129-0911"/> <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/> <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/> <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/> <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/> <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/> - <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository/"/> + <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> <repository id="xwt" location="file:/home/data/httpd/download.eclipse.org/xwt/milestones-1.6.0/1.6.0-M2/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.2.v20200609-1812"/> - <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/releases/3.10.2"/> + <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.3.v20210302-1249"/> + <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.10.3/S202103021249"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/> @@ -42,33 +42,33 @@ <repository id="xpand" location="file:/home/data/httpd/download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210110-1527"/> + <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210228-1829"/> <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.5milestones"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.sdk.feature.group" version="4.19.0.v20210129-2007"/> - <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.19-I-builds/I20210129-1800/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.19.0.v20210303-1800"/> + <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.19-I-builds/I20210303-1800/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.14.0.v20210201-1648"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.14.0.v20210201-1648"/> - <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.14.0/S202102011648"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.14.0.v20210301-1325"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.14.0.v20210301-1325"/> + <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.14.0/S202103011325"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.25.0.v20210111-0955"/> - <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/milestones/S202101110955"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.25.0.v20210301-1429"/> + <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.12.1.v20210201-1009"/> - <repository id="mwe" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/mwe/updates/milestones/S202102011009/"/> + <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.12.1.v20210218-2134"/> + <repository id="mwe" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/mwe/updates/releases/2.12.1/"/> </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="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.21.0/S-3.21.0.M2-20210128163350/repository/"/> + <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.21.0/S-3.21.0.RC2-20210304100654/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.13.0.202004160913"/> @@ -80,7 +80,7 @@ </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.sdk.feature.group" version="2.25.0.v20210114-1734"/> - <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S202101260740"/> + <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/release/2.25"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> @@ -99,8 +99,8 @@ <repository id="gef" location="file:/home/data/httpd/download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.13.202011201248"/> - <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202011201248"/> + <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.14.202102231741"/> + <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202102231741"/> </location> </locations> </target> diff --git a/releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target b/releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target index 5464b62b523..c16ec5ad0f9 100755 --- a/releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target +++ b/releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.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="1612516861"> +<target name="Papyrus Tests" sequenceNumber="1615192519"> <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"/> @@ -18,23 +18,23 @@ <repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="com.google.guava" version="27.1.0.v20190517-1946"/> - <unit id="com.google.guava.source" version="27.1.0.v20190517-1946"/> + <unit id="com.google.guava" version="30.1.0.v20210127-2300"/> + <unit id="com.google.guava.source" version="30.1.0.v20210127-2300"/> <unit id="com.google.gson" version="2.7.0.v20170129-0911"/> <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/> <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/> <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/> <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/> <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/> - <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository/"/> + <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> <repository id="xwt" location="https://download.eclipse.org/xwt/milestones-1.6.0/1.6.0-M2/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.2.v20200609-1812"/> - <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.2"/> + <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.3.v20210302-1249"/> + <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/milestones/3.10.3/S202103021249"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/> @@ -42,33 +42,33 @@ <repository id="xpand" location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210110-1527"/> + <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210228-1829"/> <repository id="uml" location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5milestones"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.sdk.feature.group" version="4.19.0.v20210129-2007"/> - <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.19-I-builds/I20210129-1800/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.19.0.v20210303-1800"/> + <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.19-I-builds/I20210303-1800/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.14.0.v20210201-1648"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.14.0.v20210201-1648"/> - <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.14.0/S202102011648"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.14.0.v20210301-1325"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.14.0.v20210301-1325"/> + <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.14.0/S202103011325"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.25.0.v20210111-0955"/> - <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S202101110955"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.25.0.v20210301-1429"/> + <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.12.1.v20210201-1009"/> - <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202102011009/"/> + <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.12.1.v20210218-2134"/> + <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.12.1/"/> </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.21.0/S-3.21.0.M2-20210128163350/repository/"/> + <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.21.0/S-3.21.0.RC2-20210304100654/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.13.0.202004160913"/> @@ -80,7 +80,7 @@ </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.sdk.feature.group" version="2.25.0.v20210114-1734"/> - <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202101260740"/> + <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.25"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> @@ -99,8 +99,8 @@ <repository id="gef" location="https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.13.202011201248"/> - <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202011201248"/> + <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.14.202102231741"/> + <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202102231741"/> </location> </locations> </target> diff --git a/releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd b/releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd index 6ee5a9d0766..5f157ae5dc6 100644 --- a/releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd +++ b/releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd @@ -4,6 +4,6 @@ include "../../../../main/targetPlatform/portable/org.eclipse.papyrus.main.porta //updateFrom("EMF Compare",0) -location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202011201248" { +location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202102231741" { org.eclipse.emf.compare.source.feature.group }
\ No newline at end of file diff --git a/releng/tests/pom.xml b/releng/tests/pom.xml index 80dcd343b5b..dc9b55bf49b 100755 --- a/releng/tests/pom.xml +++ b/releng/tests/pom.xml @@ -16,7 +16,7 @@ <properties> <testConfig>CI_TESTS_CONFIG</testConfig> <!-- See org.eclipse.papyrus.junit.framework.classification.ClassificationConfig --> <testSuiteClass>org.eclipse.papyrus.tests.AllTests</testSuiteClass> - <jacoco.version>0.8.5</jacoco.version> <!-- https://repo.maven.apache.org/maven2/ --> + <jacoco.version>0.8.6</jacoco.version> <!-- https://repo.maven.apache.org/maven2/ --> <!-- Separate property for test argLine seems to be required when running Jacoco + Surefire --> <test.argLine>-Xms512m -Xmx2048m -XX:SoftRefLRUPolicyMSPerMB=100</test.argLine> @@ -153,10 +153,10 @@ <profile> <id>mainTestsCDO</id> <activation> - <property> - <name>mainTestsCDO</name> - <value>true</value> - </property> + <property> + <name>mainTestsCDO</name> + <value>true</value> + </property> </activation> <properties> <target.platform>org.eclipse.papyrus.main.tests.cdo.${target.suffix}.target</target.platform> diff --git a/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target b/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target new file mode 100755 index 00000000000..f28912be3f1 --- /dev/null +++ b/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target @@ -0,0 +1,145 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?pde?> +<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> +<target name="Papyrus Releng" sequenceNumber="1615192524"> + <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"/> + <unit id="org.eclipse.nebula.cwt.feature.feature.group" version="1.0.0.201703081533"/> + <repository id="nebula" location="http://download.eclipse.org/nebula/releases/1.2.0/"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.5.0.201703192131"/> + <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.5.0.201703192131"/> + <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.5.0.201703192131"/> + <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.5.0.201703192131"/> + <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.1.0.201703192131"/> + <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.1.0.201703192131"/> + <repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="com.google.guava" version="30.1.0.v20210127-2300"/> + <unit id="com.google.guava.source" version="30.1.0.v20210127-2300"/> + <unit id="com.google.gson" version="2.7.0.v20170129-0911"/> + <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/> + <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/> + <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/> + <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/> + <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/> + <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> + <repository id="xwt" location="https://download.eclipse.org/xwt/milestones-1.6.0/1.6.0-M2/"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.3.v20210302-1249"/> + <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/milestones/3.10.3/S202103021249"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/> + <unit id="org.eclipse.xtend.feature.group" version="2.2.0.v201605260315"/> + <repository id="xpand" location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210228-1829"/> + <repository id="uml" location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5milestones"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.sdk.feature.group" version="4.19.0.v20210303-1800"/> + <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.19-I-builds/I20210303-1800/"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.14.0.v20210301-1325"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.14.0.v20210301-1325"/> + <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.14.0/S202103011325"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.25.0.v20210301-1429"/> + <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.12.1.v20210218-2134"/> + <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.12.1/"/> + </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.21.0/S-3.21.0.RC2-20210304100654/repository/"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.13.0.202004160913"/> + <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202004160913"/> + </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.0.202004160913"/> + <repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.25.0.v20210114-1734"/> + <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.25"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> + <repository id="emfQuery" location="https://download.eclipse.org/modeling/emf/query/updates/releases/R201805030653"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.12.2.202008210805"/> + <repository id="emfValidation" location="https://download.eclipse.org/modeling/emf/validation/updates/releases/R202008210805"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.12.0.201805140824"/> + <repository id="emfTransaction" location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R201805140824/"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.gef.feature.group" version="3.11.0.201606061308"/> + <repository id="gef" location="https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/> + </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"/> + <repository id="tpd" location="http://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.source.feature.group" version="0.0.0"/> + <unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.feature.group" version="0.0.0"/> + <unit id="org.eclipse.cbi.p2repo.aggregator.engine.feature.source.feature.group" version="0.0.0"/> + <repository id="cbiAggregator" location="https://download.eclipse.org/cbi/updates/aggregator/ide/4.13/"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.oomph.version.feature.group" version="1.14.0.v20200813-0506"/> + <unit id="org.eclipse.oomph.setup.workingsets.feature.group" version="1.14.0.v20200815-0620"/> + <unit id="org.eclipse.oomph.projectconfig.feature.group" version="1.13.0.v20200624-1156"/> + <unit id="org.eclipse.oomph.setup.targlets.feature.group" version="1.14.0.v20200624-1156"/> + <unit id="org.eclipse.oomph.setup.mylyn.feature.group" version="1.15.0.v20200624-1156"/> + <unit id="org.eclipse.oomph.setup.workbench.feature.group" version="1.13.0.v20200624-1156"/> + <unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.13.0.v20200624-1156"/> + <unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.13.0.v20200624-1156"/> + <unit id="org.eclipse.oomph.targlets.feature.group" version="1.17.0.v20201231-0755"/> + <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.17.0.v20210221-1019"/> + <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.14.0.v20200624-1156"/> + <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.18.0.v20200624-1156"/> + <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.14.0.v20200624-1156"/> + <unit id="org.eclipse.oomph.p2.feature.group" version="1.18.0.v20201231-0755"/> + <unit id="org.eclipse.oomph.setup.feature.group" version="1.20.0.v20210223-0655"/> + <unit id="org.eclipse.oomph.preferences.feature.group" version="1.13.0.v20200624-1156"/> + <repository id="oomph" location="https://download.eclipse.org/oomph/drops/milestone/S20210303-042135-1.20.0-RC1"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <repository id="egit" location="https://download.eclipse.org/egit/staging/v5.11.0.202103031150-rc1"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <repository id="m2e" location="https://download.eclipse.org/technology/m2e/releases/1.17.2/"/> + </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.14.202102231741"/> + <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/S202102231741"/> + </location> + </locations> +</target> diff --git a/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.tpd b/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.tpd new file mode 100755 index 00000000000..4a808202c67 --- /dev/null +++ b/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.tpd @@ -0,0 +1,5 @@ +target "Papyrus Releng" with requirements source + +include "../../main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd" +include "../../toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.tpd" +include "../../tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd"
\ No newline at end of file diff --git a/releng/toolsmiths/pom.xml b/releng/toolsmiths/pom.xml index 97644d23907..fa6f16117ba 100755 --- a/releng/toolsmiths/pom.xml +++ b/releng/toolsmiths/pom.xml @@ -8,7 +8,7 @@ <artifactId>org.eclipse.papyrus.all.releng</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - + <artifactId>org.eclipse.papyrus.toolsmiths.releng</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> diff --git a/releng/toolsmiths/site/category.xml b/releng/toolsmiths/site/category.xml index 00c0fe2d756..bf6b768ba72 100644 --- a/releng/toolsmiths/site/category.xml +++ b/releng/toolsmiths/site/category.xml @@ -65,4 +65,5 @@ </category-def> <repository-reference location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a" enabled="true" /> + <repository-reference location="https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT" enabled="true" /> </site> diff --git a/releng/toolsmiths/site/pom.xml b/releng/toolsmiths/site/pom.xml index 1cc1bf3e140..d347f56b3dd 100644 --- a/releng/toolsmiths/site/pom.xml +++ b/releng/toolsmiths/site/pom.xml @@ -15,14 +15,6 @@ <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-repository</packaging> - - <pluginRepositories> - <pluginRepository> - <id>org.jboss.tools.tycho-plugins</id> - <url>https://repository.jboss.org/</url> - </pluginRepository> - </pluginRepositories> - <build> <plugins> <plugin> @@ -33,29 +25,6 @@ <includePackedArtifacts>true</includePackedArtifacts> </configuration> </plugin> - - <!-- workaround https://bugs.eclipse.org/bugs/show_bug.cgi?id=453708 --> - <plugin> - <groupId>org.jboss.tools.tycho-plugins</groupId> - <artifactId>repository-utils</artifactId> - <version>${jboss.utils.version}</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>generate-repository-facade</goal> - </goals> - <configuration> - <!-- do not generate the pesky web folder and index.html --> - <skipWebContentGeneration>true</skipWebContentGeneration> - <!-- p2 update site transitive dependencies repositories --> - <associateSites> - <site>https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/</site> - </associateSites> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </project> diff --git a/releng/toolsmiths/targetPlatform/eclipse/org.eclipse.papyrus.toolsmiths.eclipse.targetplatform.target b/releng/toolsmiths/targetPlatform/eclipse/org.eclipse.papyrus.toolsmiths.eclipse.targetplatform.target index 4f1b3df639e..8a5b5c487dc 100755 --- a/releng/toolsmiths/targetPlatform/eclipse/org.eclipse.papyrus.toolsmiths.eclipse.targetplatform.target +++ b/releng/toolsmiths/targetPlatform/eclipse/org.eclipse.papyrus.toolsmiths.eclipse.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="1612516861"> +<target name="Papyrus Toolsmiths" sequenceNumber="1615192524"> <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"/> @@ -18,23 +18,23 @@ <repository id="nattable" location="file:/home/data/httpd/download.eclipse.org/nattable/releases/1.5.0/repository"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="com.google.guava" version="27.1.0.v20190517-1946"/> - <unit id="com.google.guava.source" version="27.1.0.v20190517-1946"/> + <unit id="com.google.guava" version="30.1.0.v20210127-2300"/> + <unit id="com.google.guava.source" version="30.1.0.v20210127-2300"/> <unit id="com.google.gson" version="2.7.0.v20170129-0911"/> <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/> <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/> <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/> <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/> <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/> - <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository/"/> + <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> <repository id="xwt" location="file:/home/data/httpd/download.eclipse.org/xwt/milestones-1.6.0/1.6.0-M2/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.2.v20200609-1812"/> - <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/releases/3.10.2"/> + <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.3.v20210302-1249"/> + <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.10.3/S202103021249"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/> @@ -42,33 +42,33 @@ <repository id="xpand" location="file:/home/data/httpd/download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210110-1527"/> + <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210228-1829"/> <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.5milestones"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.sdk.feature.group" version="4.19.0.v20210129-2007"/> - <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.19-I-builds/I20210129-1800/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.19.0.v20210303-1800"/> + <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.19-I-builds/I20210303-1800/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.14.0.v20210201-1648"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.14.0.v20210201-1648"/> - <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.14.0/S202102011648"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.14.0.v20210301-1325"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.14.0.v20210301-1325"/> + <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.14.0/S202103011325"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.25.0.v20210111-0955"/> - <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/milestones/S202101110955"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.25.0.v20210301-1429"/> + <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.12.1.v20210201-1009"/> - <repository id="mwe" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/mwe/updates/milestones/S202102011009/"/> + <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.12.1.v20210218-2134"/> + <repository id="mwe" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/mwe/updates/releases/2.12.1/"/> </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="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.21.0/S-3.21.0.M2-20210128163350/repository/"/> + <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.21.0/S-3.21.0.RC2-20210304100654/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.13.0.202004160913"/> @@ -80,7 +80,7 @@ </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.sdk.feature.group" version="2.25.0.v20210114-1734"/> - <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S202101260740"/> + <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/release/2.25"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> @@ -118,28 +118,28 @@ <unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.13.0.v20200624-1156"/> <unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.13.0.v20200624-1156"/> <unit id="org.eclipse.oomph.targlets.feature.group" version="1.17.0.v20201231-0755"/> - <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.17.0.v20201231-0810"/> + <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.17.0.v20210221-1019"/> <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.14.0.v20200624-1156"/> <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.18.0.v20200624-1156"/> <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.14.0.v20200624-1156"/> <unit id="org.eclipse.oomph.p2.feature.group" version="1.18.0.v20201231-0755"/> - <unit id="org.eclipse.oomph.setup.feature.group" version="1.20.0.v20210126-0525"/> + <unit id="org.eclipse.oomph.setup.feature.group" version="1.20.0.v20210223-0655"/> <unit id="org.eclipse.oomph.preferences.feature.group" version="1.13.0.v20200624-1156"/> - <repository id="oomph" location="file:/home/data/httpd/download.eclipse.org/oomph/drops/milestone/S20210202-031757-1.20.0-M2"/> + <repository id="oomph" location="file:/home/data/httpd/download.eclipse.org/oomph/drops/milestone/S20210303-042135-1.20.0-RC1"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/staging/v5.11.0.202102031030-m2"/> + <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/staging/v5.11.0.202103031150-rc1"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <repository id="m2e" location="file:/home/data/httpd/download.eclipse.org/technology/m2e/releases/1.17.1/"/> + <repository id="m2e" location="file:/home/data/httpd/download.eclipse.org/technology/m2e/releases/1.17.2/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <repository id="mylyn" location="file:/home/data/httpd/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.13.202011201248"/> - <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202011201248"/> + <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.14.202102231741"/> + <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202102231741"/> </location> </locations> </target> diff --git a/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.target b/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.target index bea104bb91b..14520149908 100755 --- a/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.target +++ b/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.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="1612516861"> +<target name="Papyrus Toolsmiths" sequenceNumber="1615192524"> <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"/> @@ -18,23 +18,23 @@ <repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="com.google.guava" version="27.1.0.v20190517-1946"/> - <unit id="com.google.guava.source" version="27.1.0.v20190517-1946"/> + <unit id="com.google.guava" version="30.1.0.v20210127-2300"/> + <unit id="com.google.guava.source" version="30.1.0.v20210127-2300"/> <unit id="com.google.gson" version="2.7.0.v20170129-0911"/> <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/> <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/> <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/> <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/> <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/> - <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository/"/> + <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> <repository id="xwt" location="https://download.eclipse.org/xwt/milestones-1.6.0/1.6.0-M2/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.2.v20200609-1812"/> - <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.2"/> + <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.3.v20210302-1249"/> + <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/milestones/3.10.3/S202103021249"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/> @@ -42,33 +42,33 @@ <repository id="xpand" location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210110-1527"/> + <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210228-1829"/> <repository id="uml" location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5milestones"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.sdk.feature.group" version="4.19.0.v20210129-2007"/> - <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.19-I-builds/I20210129-1800/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.19.0.v20210303-1800"/> + <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.19-I-builds/I20210303-1800/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.14.0.v20210201-1648"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.14.0.v20210201-1648"/> - <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.14.0/S202102011648"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.14.0.v20210301-1325"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.14.0.v20210301-1325"/> + <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.14.0/S202103011325"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.25.0.v20210111-0955"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.25.0.v20210111-0955"/> - <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S202101110955"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.25.0.v20210301-1429"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.25.0.v20210301-1429"/> + <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.12.1.v20210201-1009"/> - <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202102011009/"/> + <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.12.1.v20210218-2134"/> + <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.12.1/"/> </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.21.0/S-3.21.0.M2-20210128163350/repository/"/> + <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.21.0/S-3.21.0.RC2-20210304100654/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.13.0.202004160913"/> @@ -80,7 +80,7 @@ </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.sdk.feature.group" version="2.25.0.v20210114-1734"/> - <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202101260740"/> + <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.25"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> @@ -118,28 +118,28 @@ <unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.13.0.v20200624-1156"/> <unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.13.0.v20200624-1156"/> <unit id="org.eclipse.oomph.targlets.feature.group" version="1.17.0.v20201231-0755"/> - <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.17.0.v20201231-0810"/> + <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.17.0.v20210221-1019"/> <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.14.0.v20200624-1156"/> <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.18.0.v20200624-1156"/> <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.14.0.v20200624-1156"/> <unit id="org.eclipse.oomph.p2.feature.group" version="1.18.0.v20201231-0755"/> - <unit id="org.eclipse.oomph.setup.feature.group" version="1.20.0.v20210126-0525"/> + <unit id="org.eclipse.oomph.setup.feature.group" version="1.20.0.v20210223-0655"/> <unit id="org.eclipse.oomph.preferences.feature.group" version="1.13.0.v20200624-1156"/> - <repository id="oomph" location="https://download.eclipse.org/oomph/drops/milestone/S20210202-031757-1.20.0-M2"/> + <repository id="oomph" location="https://download.eclipse.org/oomph/drops/milestone/S20210303-042135-1.20.0-RC1"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <repository id="egit" location="https://download.eclipse.org/egit/staging/v5.11.0.202102031030-m2"/> + <repository id="egit" location="https://download.eclipse.org/egit/staging/v5.11.0.202103031150-rc1"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <repository id="m2e" location="https://download.eclipse.org/technology/m2e/releases/1.17.1/"/> + <repository id="m2e" location="https://download.eclipse.org/technology/m2e/releases/1.17.2/"/> </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.13.202011201248"/> - <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202011201248"/> + <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.14.202102231741"/> + <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202102231741"/> </location> </locations> </target> diff --git a/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.tpd b/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.tpd index 0cc725388b1..44c5c7348e8 100644 --- a/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.tpd +++ b/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.tpd @@ -23,7 +23,7 @@ location cbiAggregator "https://download.eclipse.org/cbi/updates/aggregator/ide/ //updateFrom("Oomph",0) -location oomph "https://download.eclipse.org/oomph/drops/milestone/S20210202-031757-1.20.0-M2" { +location oomph "https://download.eclipse.org/oomph/drops/milestone/S20210303-042135-1.20.0-RC1" { org.eclipse.oomph.version.feature.group org.eclipse.oomph.setup.workingsets.feature.group org.eclipse.oomph.projectconfig.feature.group @@ -44,11 +44,11 @@ location oomph "https://download.eclipse.org/oomph/drops/milestone/S20210202-031 //updateFrom("EGit",0) -location egit "https://download.eclipse.org/egit/staging/v5.11.0.202102031030-m2" // oomph +location egit "https://download.eclipse.org/egit/staging/v5.11.0.202103031150-rc1" // oomph //updateFrom("m2e",0) -location m2e "https://download.eclipse.org/technology/m2e/releases/1.17.1/" // oomph +location m2e "https://download.eclipse.org/technology/m2e/releases/1.17.2/" // oomph //updateFrom("Mylyn",0) @@ -56,7 +56,7 @@ location mylyn "https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956" //updateFrom("EMF Compare",0) -location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202011201248" { +location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202102231741" { org.eclipse.emf.compare.ide.ui.feature.group lazy org.eclipse.emf.compare.source.feature.group }
\ No newline at end of file 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 ea5872c5146..7ee330e5c88 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 @@ -231,7 +231,7 @@ public class BundlesTests extends AbstractPapyrusTest { @Test public void guavaDependencyVersionTest() { - testPapyrusDependencies2("com.google.guava", "27.1.0");//$NON-NLS-1$ //$NON-NLS-2$ + testPapyrusDependencies2("com.google.guava", "30.1.0");//$NON-NLS-1$ //$NON-NLS-2$ } @Test diff --git a/tests/junit/framework/org.eclipse.papyrus.junit.framework/.settings/.api_filters b/tests/junit/framework/org.eclipse.papyrus.junit.framework/.settings/.api_filters new file mode 100644 index 00000000000..362fec14c32 --- /dev/null +++ b/tests/junit/framework/org.eclipse.papyrus.junit.framework/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.junit.framework" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="2.1.0"/> + <message_argument value="2.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 44941b6f7a4..e33f61d6c9f 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 @@ -9,12 +9,12 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)", org.eclipse.ui;bundle-version="[3.117.0,4.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)" Bundle-Vendor: Eclipse Modeling Project -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Name: Conditional Junit Annotations Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.junit.framework;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.cache;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.cache;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.junit.framework diff --git a/tests/junit/framework/org.eclipse.papyrus.junit.framework/pom.xml b/tests/junit/framework/org.eclipse.papyrus.junit.framework/pom.xml index f822f6c2265..f13dc126597 100644 --- a/tests/junit/framework/org.eclipse.papyrus.junit.framework/pom.xml +++ b/tests/junit/framework/org.eclipse.papyrus.junit.framework/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.papyrus</groupId> <artifactId>org.eclipse.papyrus.junit.framework</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/framework/org.eclipse.papyrus.junit.utils/.settings/.api_filters b/tests/junit/framework/org.eclipse.papyrus.junit.utils/.settings/.api_filters new file mode 100644 index 00000000000..9bc0528356a --- /dev/null +++ b/tests/junit/framework/org.eclipse.papyrus.junit.utils/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.junit.utils" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="926941240"> + <message_arguments> + <message_argument value="3.1.0"/> + <message_argument value="3.0.0"/> + </message_arguments> + </filter> + </resource> +</component> 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 3add5dcc926..fb7792ea4c3 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 @@ -41,16 +41,16 @@ Export-Package: org.eclipse.papyrus.junit.matchers, org.eclipse.papyrus.junit.utils.xtext Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.junit.utils.Activator Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.junit.utils;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.cache;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)", - com.google.common.io;version="[27.1.0, 28.0.0)", - com.google.common.primitives;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.cache;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)", + com.google.common.io;version="[30.1.0, 31.0.0)", + com.google.common.primitives;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.junit.utils diff --git a/tests/junit/framework/org.eclipse.papyrus.junit.utils/pom.xml b/tests/junit/framework/org.eclipse.papyrus.junit.utils/pom.xml index 54fcc197327..cbcb020087e 100644 --- a/tests/junit/framework/org.eclipse.papyrus.junit.utils/pom.xml +++ b/tests/junit/framework/org.eclipse.papyrus.junit.utils/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.papyrus</groupId> <artifactId>org.eclipse.papyrus.junit.utils</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/bundlestests/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/bundlestests/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF index ac4289f9ab0..db7dbd2ca23 100755 --- a/tests/junit/plugins/bundlestests/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/bundlestests/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF @@ -13,6 +13,7 @@ Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="[2.18.0,3.0.0)", org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)", org.eclipse.papyrus.bundles.tests;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.junit.framework;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.junit.utils;bundle-version="[3.0.0,4.0.0)", org.eclipse.ui.views.properties.tabbed;bundle-version="[3.8.0,4.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)" Automatic-Module-Name: org.eclipse.papyrus.developer.suite.tests 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 5f4d760a3ae..c249269172c 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 @@ -9,10 +9,10 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0) Export-Package: org.eclipse.papyrus.eclipse.project.editors.tests Bundle-Vendor: Eclipse Modeling Project Bundle-ActivationPolicy: lazy -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-Name: Papyrus Project Editor Tests Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.eclipse.project.editors.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.eclipse.project.editors.tests diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/pom.xml b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/pom.xml index 0c881a4c4cb..b201b00a07a 100644 --- a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/pom.xml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.eclipse.project.editors.tests</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file 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 0bf6cf74542..ce2748f7a5f 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 @@ -33,12 +33,12 @@ Export-Package: org.eclipse.papyrus.editor.integration.tests, org.eclipse.papyrus.editor.integration.tests.tests Bundle-Vendor: Eclipse Modeling Project Bundle-ActivationPolicy: lazy -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Name: Papyrus Editor Integration Tests 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-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.editor.integration.tests diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/pom.xml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/pom.xml index be28547347f..b50cffb522a 100644 --- a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/pom.xml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.editor.integration.tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editors.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/editor/org.eclipse.papyrus.editors.suite.tests/META-INF/MANIFEST.MF index f571f295172..891206d773b 100755 --- a/tests/junit/plugins/editor/org.eclipse.papyrus.editors.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editors.suite.tests/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 @@ -14,6 +14,7 @@ Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="[2.18.0,3.0.0)", org.eclipse.papyrus.eclipse.project.editors.tests;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.editor.integration.tests;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.junit.framework;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.junit.utils;bundle-version="[3.0.0,4.0.0)", org.eclipse.ui.views.properties.tabbed;bundle-version="[3.8.0,4.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)" Automatic-Module-Name: org.eclipse.papyrus.editors.suite.tests diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editors.suite.tests/pom.xml b/tests/junit/plugins/editor/org.eclipse.papyrus.editors.suite.tests/pom.xml index 084a19d78e2..07b0ee62f37 100755 --- a/tests/junit/plugins/editor/org.eclipse.papyrus.editors.suite.tests/pom.xml +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editors.suite.tests/pom.xml @@ -11,7 +11,7 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.editors.suite.tests</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <build> <plugins> diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/META-INF/MANIFEST.MF index 1cb12c6b60c..8703f0ae743 100755 --- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 @@ -16,6 +16,7 @@ Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="[2.18.0,3.0.0)", org.eclipse.papyrus.infra.core.sasheditor.tests;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.infra.core.tests;bundle-version="[4.0.0,5.0.0)", org.eclipse.papyrus.junit.framework;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.junit.utils;bundle-version="[3.0.0,4.0.0)", org.eclipse.ui.views.properties.tabbed;bundle-version="[3.8.0,4.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.core.suite.tests diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/pom.xml b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/pom.xml index 0c1621e572a..cbad5d3c1c3 100755 --- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/pom.xml +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/pom.xml @@ -11,7 +11,7 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.core.suite.tests</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <build> <plugins> 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 c4cbfd4c0c5..084ba3ae1d4 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 @@ -15,13 +15,13 @@ Export-Package: org.eclipse.papyrus.infra.core.resource, org.eclipse.papyrus.infra.core.services, org.eclipse.papyrus.infra.core.tests Bundle-Vendor: %providerName -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.core.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)", - com.google.common.util.concurrent;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)", + com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.core.tests diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/pom.xml b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/pom.xml index fe1a1723305..488ffae8fe7 100644 --- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/pom.xml +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.core.tests</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file 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 4207ccf5377..d94aba09780 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 @@ -17,12 +17,12 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", Export-Package: org.eclipse.papyrus.infra.emf.readonly, org.eclipse.papyrus.infra.emf.readonly.tests Bundle-Vendor: %providerName -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.readonly.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.emf.readonly.tests diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/pom.xml b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/pom.xml index ebaac029b0c..3bae82caced 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/pom.xml +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.emf.readonly.tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file 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 cf7000cbcc0..850c7f435d6 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 @@ -17,14 +17,14 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.xtext.ui;bundle-version="[2.22.0,3.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)" Bundle-Vendor: %providerName -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: fragment Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)", - com.google.common.io;version="[27.1.0, 28.0.0)", - com.google.common.util.concurrent;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)", + com.google.common.io;version="[30.1.0, 31.0.0)", + com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.emf.tests diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/pom.xml b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/pom.xml index 7eb8f0f789f..c4dfd2d29d5 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/pom.xml +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.emf.tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file 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 0fc873267a6..9ff71a1b0c4 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 @@ -17,12 +17,12 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", Export-Package: org.eclipse.papyrus.infra.ui.emf.tests, org.eclipse.papyrus.infra.ui.internal.emf.readonly.handlers Bundle-Vendor: %providerName -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.emf.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.ui.emf.tests diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/pom.xml b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/pom.xml index d17c54e4343..69727da5f0e 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/pom.xml +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.ui.emf.tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file 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 5b887177b47..9a3fc11e866 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 @@ -19,12 +19,12 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.assistant.tests diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/pom.xml b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/pom.xml index 4f367b71399..62b48f3a987 100644 --- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/pom.xml +++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.gmfdiag.assistant.tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file 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 c79a5f5cb90..b329fb088d1 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 @@ -21,14 +21,14 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.canonical.tests, org.eclipse.papyrus.infra.gmfdiag.canonical.tests.internal;x-internal:=true Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin 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-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)", - com.google.common.util.concurrent;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)", + com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.canonical.tests diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/pom.xml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/pom.xml index d340b437d85..79e795e6edf 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/pom.xml +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.gmfdiag.canonical.tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file 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 6f60aa59c67..abd780c610c 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 @@ -13,12 +13,12 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)" Export-Package: org.eclipse.papyrus.infra.gmfdiag.commands.tests Bundle-Vendor: %providerName -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.commands.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.commands.tests diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/pom.xml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/pom.xml index 17005e40c2a..ecc9d3f3424 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/pom.xml +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.gmfdiag.commands.tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file 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 9c76da7240f..0728393e86f 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 @@ -30,15 +30,16 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.papyrus.uml.diagram.composite;bundle-version="[4.0.0,5.0.0)", org.eclipse.papyrus.uml.service.types;bundle-version="[5.0.0,6.0.0)", org.eclipse.uml2.uml.editor;bundle-version="[5.5.0,6.0.0)", - org.junit;bundle-version="[4.13.0,5.0.0)" + org.junit;bundle-version="[4.13.0,5.0.0)", + org.eclipse.papyrus.infra.guava;bundle-version="[1.0.0,2.0.0)" Export-Package: org.eclipse.papyrus.infra.gmfdiag.common.tests, org.eclipse.papyrus.infra.gmfdiag.common.utils Bundle-Vendor: %providerName -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.common.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.util.concurrent;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.common.tests diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/pom.xml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/pom.xml index d7a24caccbb..3df7aef6c28 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/pom.xml +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.gmfdiag.common.tests</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file 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 0a754f9afa6..c2b92ee590c 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 @@ -7,12 +7,12 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0) org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="4.0.0" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Name: %Bundle-Name 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-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/pom.xml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/pom.xml index db70892a60c..1480148c2cd 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/pom.xml +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/META-INF/MANIFEST.MF index 13fb888558a..f94d9e51e34 100755 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 @@ -14,6 +14,7 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1 org.eclipse.papyrus.infra.nattable.tests;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.infra.nattable.views.tests;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.junit.framework;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.junit.utils;bundle-version="[3.0.0,4.0.0)", org.eclipse.uml2.uml.editor;bundle-version="[5.5.0,6.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.nattable.suite.tests diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/pom.xml b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/pom.xml index 0b04f21e6f1..5f9e5bf0855 100755 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/pom.xml +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/pom.xml @@ -11,7 +11,7 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.nattable.suite.tests</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <build> <plugins> diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/META-INF/MANIFEST.MF index 01036f274e5..f9ed88b0b77 100755 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 @@ -39,6 +39,7 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1 org.eclipse.papyrus.infra.ui.tests;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.infra.viewpoints.policy.tests;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.junit.framework;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.junit.utils;bundle-version="[3.0.0,4.0.0)", org.eclipse.uml2.uml.editor;bundle-version="[5.5.0,6.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.suite.tests diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/pom.xml b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/pom.xml index 2a750795e23..e9ee0d8ef70 100755 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/pom.xml +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/pom.xml @@ -11,7 +11,7 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.suite.tests</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <build> <plugins> 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 796cadb3cec..eca328c54c0 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 @@ -11,11 +11,11 @@ Export-Package: org.eclipse.papyrus.infra.tools.databinding, org.eclipse.papyrus.infra.tools.tests, org.eclipse.papyrus.infra.tools.util Bundle-Vendor: Eclipse Modeling Project -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Name: Papyrus Infrastructure Tools Tests Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.tools.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.tools.tests Eclipse-BundleShape: dir diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/pom.xml b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/pom.xml index d8b4a4b2120..f28f88b6501 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/pom.xml +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.tools.tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file 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 0c80b95775f..4c906d81ae3 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 @@ -19,11 +19,11 @@ Export-Package: org.eclipse.papyrus.infra.services.controlmode.tests, org.eclipse.papyrus.infra.services.controlmode.tests.uncontrol Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Name: %Bundle-Name 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-11 -Import-Package: com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.services.controlmode.tests diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/pom.xml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/pom.xml index 14f95d6655a..6de85b72d88 100644 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/pom.xml +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.services.controlmode.tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.suite.tests/META-INF/MANIFEST.MF index f1d1caadd79..ce486a958a6 100755 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.suite.tests/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 @@ -12,6 +12,7 @@ Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="[2.18.0,3.0.0)", org.eclipse.gmf.runtime.common.ui;bundle-version="[1.8.0,2.0.0)", org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)", org.eclipse.papyrus.junit.framework;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.junit.utils;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.toolsmiths.profilemigration.tests;bundle-version="[1.0.0,2.0.0)", org.eclipse.ui.views.properties.tabbed;bundle-version="[3.8.0,4.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)" diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.suite.tests/pom.xml b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.suite.tests/pom.xml index 8f865a5897a..cee40a600a1 100755 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.suite.tests/pom.xml +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.suite.tests/pom.xml @@ -11,7 +11,7 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.toolsmiths.suite.tests</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <build> <plugins> 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 a916ab7bc11..71bbf1223d5 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 @@ -14,11 +14,11 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", Export-Package: org.eclipse.papyrus.uml.decoratormodel.controlmode.tests Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.controlmode.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.decoratormodel.controlmode.tests diff --git a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/pom.xml b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/pom.xml index f2d30285194..c381e77cf0b 100644 --- a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/pom.xml +++ b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.decoratormodel.controlmode.tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file 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 3c85a1ac7f3..3f7f472dbaa 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 @@ -20,14 +20,14 @@ Export-Package: org.eclipse.papyrus.uml.decoratormodel.helper.tests, org.eclipse.papyrus.uml.decoratormodel.tests Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)", - com.google.common.io;version="[27.1.0, 28.0.0)", - com.google.common.util.concurrent;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)", + com.google.common.io;version="[30.1.0, 31.0.0)", + com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.decoratormodel.tests diff --git a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/pom.xml b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/pom.xml index 7c12a11fc83..01343df679c 100644 --- a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/pom.xml +++ b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.decoratormodel.tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/META-INF/MANIFEST.MF index 7c3c37cacd8..5b0ef224a52 100755 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 @@ -10,6 +10,7 @@ Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.suite.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", org.eclipse.papyrus.junit.framework;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.junit.utils;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.uml.diagram.activity.tests;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.uml.diagram.clazz.tests;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.uml.diagram.common.tests;bundle-version="[2.0.0,3.0.0)", diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/pom.xml index ea9d90df70c..4d8c29e02bb 100755 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/pom.xml +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/pom.xml @@ -11,7 +11,7 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.suite.tests</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <build> <plugins> 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 e13ce926a56..d6e1ee7e5c6 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 @@ -11,12 +11,12 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)" Export-Package: org.eclipse.papyrus.uml.diagram.wizards Bundle-Vendor: %providerName -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.wizards.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.wizards.tests diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/pom.xml index 8992ecd03be..ba32b2eaaaf 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/pom.xml +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.wizards.tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file 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 d67bae3206a..9752a924788 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 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.uml.internationalization.controlmode.tests;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -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="[27.1.0, 28.0.0)" +Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.internationalization.controlmode.tests diff --git a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/pom.xml b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/pom.xml index f23eae9a53f..60da8b78b30 100644 --- a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/pom.xml +++ b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.internationalization.controlmode.tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/META-INF/MANIFEST.MF index 07b895b1231..4fe8c88fa79 100755 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 @@ -10,6 +10,7 @@ Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.suite.tests;singleton:=tru Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", org.eclipse.papyrus.junit.framework;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.junit.utils;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.uml.nattable.clazz.config.tests;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.uml.nattable.generic.tests;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.uml.nattable.matrix.tests;bundle-version="[2.0.0,3.0.0)", diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/pom.xml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/pom.xml index 9a1ae6b4f46..2bba12dc516 100755 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/pom.xml +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/pom.xml @@ -11,7 +11,7 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.nattable.suite.tests</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <build> <plugins> 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 023285ab3c6..a520a3f572f 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 @@ -15,12 +15,12 @@ Export-Package: org.eclipse.papyrus.uml.modelrepair.internal.stereotypes, org.eclipse.papyrus.uml.modelrepair.internal.uripattern, org.eclipse.papyrus.uml.modelrepair.tests Bundle-Vendor: %providerName -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.modelrepair.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.modelrepair.tests diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/pom.xml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/pom.xml index c5ab850a7ab..2715a8f445d 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/pom.xml +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.modelrepair.tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file 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 0dc77f63b23..14eb6e1b24c 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 @@ -24,11 +24,11 @@ Export-Package: org.eclipse.papyrus.uml.properties.databinding.tests, org.eclipse.papyrus.uml.properties.modelelement.tests, org.eclipse.papyrus.uml.properties.tests Bundle-Vendor: %providerName -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.properties.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.properties.tests diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.properties.tests/pom.xml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.properties.tests/pom.xml index 8ff389d5655..386d0549ff7 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.properties.tests/pom.xml +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.properties.tests/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.properties.tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file 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 15576a73abe..b742f958064 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 @@ -26,11 +26,11 @@ Export-Package: org.eclipse.papyrus.uml.service.types.tests.creation, org.eclipse.papyrus.uml.service.types.tests.registry, org.eclipse.papyrus.uml.service.types.tests.suites Bundle-Vendor: %providerName -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.service.types.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.service.types.tests diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/pom.xml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/pom.xml index 4ff41204559..83082d9ca00 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/pom.xml +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.service.types.tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/META-INF/MANIFEST.MF index 6fe6e3982bf..5ef23455e2c 100755 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 @@ -10,6 +10,7 @@ Bundle-SymbolicName: org.eclipse.papyrus.uml.suite.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", org.eclipse.papyrus.junit.framework;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.junit.utils;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.uml.alf.tests;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.uml.architecture.tests;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.uml.decoratormodel.controlmode.tests;bundle-version="[2.0.0,3.0.0)", diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/pom.xml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/pom.xml index 8b489bbbb07..0a232ea0548 100755 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/pom.xml +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/pom.xml @@ -11,7 +11,7 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.suite.tests</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <build> <plugins> 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 f3f16de9c5a..a4d80105749 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 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.drafter.tests;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Activator: org.eclipse.papyrus.uml.profile.drafter.tests.Activator Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", @@ -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="[27.1.0, 28.0.0)" +Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.profile.drafter.tests diff --git a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/pom.xml b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/pom.xml index f6cc2dbefd2..a3c21fbb3dc 100644 --- a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/pom.xml +++ b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.profile.drafter.tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/META-INF/MANIFEST.MF index b5e12102b5d..dae0542b31a 100755 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 @@ -10,6 +10,7 @@ Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.suite.tests;singleton:=tru Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)", org.eclipse.papyrus.junit.framework;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.junit.utils;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.uml.textedit.parameter.tests;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.uml.textedit.port.tests;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.uml.textedit.property.tests;bundle-version="[2.0.0,3.0.0)", diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/pom.xml b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/pom.xml index 99f40a51422..7d2609a1526 100755 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/pom.xml +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/pom.xml @@ -11,7 +11,7 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.textedit.suite.tests</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <build> <plugins> 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 9933fadd500..a0cda29a65c 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 @@ -21,12 +21,12 @@ Export-Package: org.eclipse.papyrus.uml.tools.tests, org.eclipse.papyrus.uml.tools.tests.tests Bundle-Vendor: Eclipse Modeling Project Bundle-ActivationPolicy: lazy -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.1.0.qualifier Bundle-Name: UML Tools Tests 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-11 -Import-Package: com.google.common.base;version="[27.1.0, 28.0.0)", - com.google.common.collect;version="[27.1.0, 28.0.0)" +Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", + com.google.common.collect;version="[30.1.0, 31.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.tools.tests diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/pom.xml b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/pom.xml index 955a3d86089..ed3c1718c03 100644 --- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/pom.xml +++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.tools.tests</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/META-INF/MANIFEST.MF index abb2395e652..ddb35ff6525 100755 --- a/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 @@ -11,6 +11,7 @@ Manifest-Version: 1.0 Require-Bundle: org.eclipse.emf.ecore.editor;bundle-version="[2.17.0,3.0.0)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", org.eclipse.papyrus.junit.framework;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.junit.utils;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.views.documentation.tests;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.views.modelexplorer.tests;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.views.properties.toolsmiths.tests;bundle-version="[2.0.0,3.0.0)", diff --git a/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/pom.xml b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/pom.xml index 0476b45ffef..dc032a3b44c 100755 --- a/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/pom.xml +++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/pom.xml @@ -11,7 +11,7 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.views.suite.tests</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <build> <plugins> |